* fix style bugs * fix select styles * test: fix font size issue for cypress tests * incorporate ashit feedback * test: addresed review comments for cypress tests * add analytics events * height issue in view mode * incorporate code review feedbacks * incorporate code review feedbacks * refactor: addressed review comments; removed border radius and box shadow for text widget; Updated migrations * feat: Makes shadow and radius controls keyboard accessible (#11547) * makes shadow and radius controls keyboard accessible * removes unused imports * moves options out of render method * fix: changed the misnomer background property name to the relevant property name * fix: border radius issue for the map widget * address qa bugs * address qa bugs * fix ux of theming pane when widget is selected * fix: * added backgroundColor to the video widget * restricted pop-over border radius to 0.375rem * added box shadow for the input group for select widget * fix: added delete icon in the delete theme modal * address qa bugs * change checkbox column size in config * add js convertible to button color * remove unused imports * test: fixed jest tests * fix primary color typo * fix: migrations for the theming * fix: * Removed background color from MultiTreeSelect and TreeSelect component. * grouped button's menu button pop over border radius restricting to 0.375rem. * test: updated Dsl migration UT * address qa bugs * address qa bugs * fix: address qa comments * address qa bugs * fix: * migration issue; * unit test cases; * fix rating widget scroll issue * fix youtube video border radius bug * fix select widget * fix select widgets styles * address qa bugs * merge conflicts * makes the reset button keyboard accessible (#12134) * -resolved merge conflicts * address qa bugs * fix: labelTextSize migration fixes * refactor: * made changes to the fontSizeUtils function * fixed the issue related to unit tests * fix button group widget * remove unused imports * fix: fixed the text size migration for the table widget * refactor: addressed review comments for the table widget theming migration * fix button group widget * add init calls for view mode * json form init theme changes * fix: added migration for boxShadow, borderRadius and textSizes for table widget * fix broken fields * test: fixed unit tests * wip * inconsistancy fixes and schemaItem update in updateHook/fieldConfiguration * feat: init json form migration theming * json form primaryColor -> accentColor * update table widget * update table widget * object field label styling * fix: migration related to the JSON form * fix: fixed labelTextSize migration for JSON form nested widgets * property control nested stylesheet lookup * JSONForm label styles form array items * show label for checkbox field array item * fix button group widget * wip * refactor: addressed table widget review comments * refactor: addressed ashit review comments; * added childStylesheet for widgets * feat: Keyboard navigable Color Picker control (#11797) * Makes ColorPicker keyboard accessible * seperate out keyboard and mouse interactions * fix issue with not focusing back to input * Adds test for Color picker * chore: added comment for the boxShadow property * fix: * added unit test cases for the widget and property utils * resolved warning messages * wip * theme config update * fix merge conflicts * refactor: moved theming migration inside the migrations folder * fix qa bugs * fix jest test * fix: unit test cases * fix table column creation logic * refactor: addressed review comments for migrations * fix: Overriding margin and padding for custom render in the dropdown component (#12875) * * fix for custom render padding and margin in ADS dropdown * * fix for removing padding from normal render options * refactor: moved the boxShadow condition to the variable * fix qa bugs * fix: migration QA callouts for audio recorder widget * refactor: added updated comments for boxShadow migration for table widget * fix theme binfings for JSONForm fields under Object * fix table widget theming bug * fix: addressed code review comments * fix: unit test cases * fix: qa migration callouts * fix table widget theming bug * fix JSONForm currency input dropdown not submit form * Added new tests - AppThemingSpec * fix qa bugs * fix unit test * fix JSONForm cellBorderWidth to have default value post migration * fix unit test * fix qa bugs * remove unused imports * fix qa bugs * fix JSONForm input height issue * fix qa bugs * Updating Theming spec * * dropdown color fixes (#13249) * fix caching issue ; * Fixed Theming tests * fix tests * fix tab widget tests * fix: json form children level migration issue * fix table widget tests * Updated test * updated tests * updated test * updated tests * updated tests * updated pageload * fix cypress tests * remove cypress created files * fix color picker issues * Failure fixes * Fixed some more tests * fix: cypress test failures * fix tests * remove consoles * fix table tests * fix qa bugs * updating snapshots for AppPageLayout_spec as per new UI * fix rating widget bug * fix qa bugs * fix: * cypress failing tests * Migration QA callouts * Removed unused imports * update constract check algo * fix color contrast issue * fix: cypress failure test cases * update font sizes labels * fix regression bugs * fix: * JSON form labelTextSize issue fix * Updated comment for the fontSizeUtility function * migrations issues related to table widget borderRadius and boxShadow * fix: default labelTextSize issue for the Input and Select families * fix regression bugs * fix regression bugs * PassingParams spec - added wait time * fix: font family default value issue on JS toggle * fix js toggle issue in text widget * fix tests * fix tests * fix tests * fix cypress tests * fix regression bugs * fix regression bugs * fix: * refactored table widget migration function as per review comments, * added default value to the widget * fix: failing unit test cases * fix theming spec * fix cypress tests * test: fixed failed cypress test * incorporate ashit feedback * fix cypress tests * fix: addressed review comments * comment out table cypress test * fix merge conflicts * comment out color picker tests Co-authored-by: Pawan Kumar <pawankumar@Pawans-MacBook-Pro.local> Co-authored-by: keyurparalkar <keyur@appsmith.com> Co-authored-by: Aswath K <aswath@appsmith.com> Co-authored-by: Nayan <nayan@appsmith.com> Co-authored-by: Ashit Rath <ashit@appsmith.com> Co-authored-by: balajisoundar <balaji@appsmith.com> Co-authored-by: albinAppsmith <87797149+albinAppsmith@users.noreply.github.com> Co-authored-by: Aishwarya UR <aishwarya@appsmith.com> Co-authored-by: apple <nandan@thinkify.io> Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local>
247 lines
6.8 KiB
TypeScript
247 lines
6.8 KiB
TypeScript
import React from "react";
|
|
import {
|
|
CommonComponentProps,
|
|
Classes,
|
|
Variant,
|
|
ToastTypeOptions,
|
|
} from "./common";
|
|
import styled from "styled-components";
|
|
import Icon, { IconSize } from "./Icon";
|
|
import Text, { TextType } from "./Text";
|
|
import { toast, ToastOptions, ToastContainer } from "react-toastify";
|
|
import "react-toastify/dist/ReactToastify.css";
|
|
import { ReduxActionType } from "@appsmith/constants/ReduxActionConstants";
|
|
import { useDispatch } from "react-redux";
|
|
import { Colors } from "constants/Colors";
|
|
import DebugButton from "components/editorComponents/Debugger/DebugCTA";
|
|
import * as log from "loglevel";
|
|
|
|
export type ToastProps = ToastOptions &
|
|
CommonComponentProps & {
|
|
contentClassName?: string;
|
|
text: string;
|
|
actionElement?: JSX.Element;
|
|
variant?: Variant;
|
|
duration?: number;
|
|
onUndo?: () => void;
|
|
dispatchableAction?: { type: ReduxActionType; payload: any };
|
|
showDebugButton?: boolean;
|
|
hideProgressBar?: boolean;
|
|
hideActionElementSpace?: boolean;
|
|
width?: string;
|
|
maxWidth?: string;
|
|
};
|
|
|
|
const WrappedToastContainer = styled.div`
|
|
.Toastify__toast-container {
|
|
width: auto;
|
|
padding: 0px;
|
|
}
|
|
.Toastify__toast--default {
|
|
background: transparent;
|
|
}
|
|
.Toastify__toast {
|
|
cursor: auto;
|
|
min-height: auto;
|
|
border-radius: 0px !important;
|
|
font-family: ${(props) => props.theme.fonts.text};
|
|
margin-bottom: ${(props) => props.theme.spaces[4]}px;
|
|
}
|
|
.Toastify__toast-container--top-right {
|
|
top: 8em;
|
|
}
|
|
`;
|
|
export function StyledToastContainer(props: ToastOptions) {
|
|
return (
|
|
<WrappedToastContainer>
|
|
<ToastContainer {...props} />
|
|
</WrappedToastContainer>
|
|
);
|
|
}
|
|
|
|
const ToastBody = styled.div<{
|
|
variant?: Variant;
|
|
isUndo?: boolean;
|
|
dispatchableAction?: { type: ReduxActionType; payload: any };
|
|
width?: string;
|
|
maxWidth?: string;
|
|
}>`
|
|
width: ${(props) => props.width || "fit-content"};
|
|
max-width: ${(props) => props.maxWidth || "264px"};
|
|
margin-left: auto;
|
|
background: ${(props) => props.theme.colors.toast.bg};
|
|
padding: ${(props) => props.theme.spaces[4]}px
|
|
${(props) => props.theme.spaces[5]}px;
|
|
display: flex;
|
|
align-items: center;
|
|
justify-content: space-between;
|
|
// Using word-break here, as overflow-wrap: anywhere
|
|
// has no effect in safari
|
|
word-break: break-word;
|
|
overflow-wrap: anywhere;
|
|
|
|
div > .${Classes.ICON} {
|
|
cursor: auto;
|
|
margin-right: ${(props) => props.theme.spaces[3]}px;
|
|
margin-top: ${(props) => props.theme.spaces[1] / 2}px;
|
|
svg {
|
|
path {
|
|
fill: ${(props) =>
|
|
props.variant === Variant.warning
|
|
? props.theme.colors.toast.warningColor
|
|
: props.variant === Variant.danger
|
|
? "#FFFFFF"
|
|
: "#9F9F9F"};
|
|
}
|
|
rect {
|
|
${(props) =>
|
|
props.variant === Variant.danger
|
|
? `fill: ${props.theme.colors.toast.dangerColor}`
|
|
: null};
|
|
}
|
|
}
|
|
}
|
|
|
|
.${Classes.TEXT} {
|
|
color: ${(props) => props.theme.colors.toast.textColor};
|
|
}
|
|
|
|
${(props) =>
|
|
props.isUndo || props.dispatchableAction
|
|
? `
|
|
.undo-section .${Classes.TEXT} {
|
|
cursor: pointer;
|
|
margin-left: ${props.theme.spaces[3]}px;
|
|
color: ${props.theme.colors.toast.undo};
|
|
line-height: 18px;
|
|
font-weight: 600;
|
|
white-space: nowrap
|
|
}
|
|
`
|
|
: null}
|
|
`;
|
|
|
|
const FlexContainer = styled.div`
|
|
display: flex;
|
|
align-items: flex-start;
|
|
flex: 1;
|
|
`;
|
|
|
|
const ToastTextWrapper = styled.div`
|
|
flex: 1;
|
|
min-width: 0;
|
|
`;
|
|
|
|
const StyledDebugButton = styled(DebugButton)`
|
|
margin-left: auto;
|
|
`;
|
|
|
|
const StyledActionText = styled(Text)`
|
|
color: ${(props) => props.theme.colors.toast.undoRedoColor} !important;
|
|
cursor: pointer;
|
|
margin-left: ${(props) => props.theme.spaces[3]}px;
|
|
`;
|
|
|
|
export function ToastComponent(
|
|
props: ToastProps & { undoAction?: () => void },
|
|
) {
|
|
const dispatch = useDispatch();
|
|
|
|
return (
|
|
<ToastBody
|
|
className="t--toast-action"
|
|
dispatchableAction={props.dispatchableAction}
|
|
isUndo={!!props.onUndo}
|
|
maxWidth={props.maxWidth}
|
|
variant={props.variant || Variant.info}
|
|
width={props.width}
|
|
>
|
|
<FlexContainer style={{ minWidth: 0 }}>
|
|
{props.variant === Variant.success ? (
|
|
<Icon fillColor={Colors.GREEN} name="success" size={IconSize.XXL} />
|
|
) : props.variant === Variant.warning ? (
|
|
<Icon name="warning" size={IconSize.XXL} />
|
|
) : null}
|
|
{props.variant === Variant.danger ? (
|
|
<Icon name="error" size={IconSize.XXL} />
|
|
) : null}
|
|
<ToastTextWrapper>
|
|
<Text className={props.contentClassName} type={TextType.P1}>
|
|
{props.text}
|
|
</Text>
|
|
{props.actionElement && (
|
|
<StyledActionText type={TextType.P1}>
|
|
{!props.hideActionElementSpace ? <> </> : ""}
|
|
{props.actionElement}
|
|
</StyledActionText>
|
|
)}
|
|
{props.variant === Variant.danger && props.showDebugButton ? (
|
|
<StyledDebugButton
|
|
className="t--toast-debug-button"
|
|
source={"TOAST"}
|
|
/>
|
|
) : null}
|
|
</ToastTextWrapper>
|
|
</FlexContainer>
|
|
<div className="undo-section">
|
|
{props.onUndo || props.dispatchableAction ? (
|
|
<Text
|
|
onClick={() => {
|
|
if (props.dispatchableAction) {
|
|
dispatch(props.dispatchableAction);
|
|
props.undoAction && props.undoAction();
|
|
} else {
|
|
props.undoAction && props.undoAction();
|
|
}
|
|
}}
|
|
type={TextType.H6}
|
|
>
|
|
UNDO
|
|
</Text>
|
|
) : null}
|
|
</div>
|
|
</ToastBody>
|
|
);
|
|
}
|
|
|
|
export const Toaster = {
|
|
show: (config: ToastProps) => {
|
|
if (typeof config.text !== "string") {
|
|
log.error("Toast message needs to be a string");
|
|
return;
|
|
}
|
|
if (config.variant && !Object.values(Variant).includes(config.variant)) {
|
|
log.error(
|
|
"Toast type needs to be a one of " +
|
|
Object.values(ToastTypeOptions).join(", "),
|
|
);
|
|
return;
|
|
}
|
|
// Stringified JSON is a long, but valid key :shrug:
|
|
const toastId = JSON.stringify(config);
|
|
toast(
|
|
<ToastComponent
|
|
undoAction={() => {
|
|
toast.dismiss(toastId);
|
|
config.onUndo && config.onUndo();
|
|
}}
|
|
{...config}
|
|
/>,
|
|
{
|
|
toastId: toastId,
|
|
pauseOnHover: !config.dispatchableAction && !config.hideProgressBar,
|
|
pauseOnFocusLoss: !config.dispatchableAction && !config.hideProgressBar,
|
|
autoClose: false,
|
|
closeOnClick: true,
|
|
position: "top-center",
|
|
hideProgressBar: config.hideProgressBar,
|
|
},
|
|
);
|
|
// Update autoclose everytime to keep resetting the timer.
|
|
toast.update(toastId, {
|
|
autoClose: config.duration || 5000,
|
|
});
|
|
},
|
|
clear: () => toast.dismiss(),
|
|
};
|