diff --git a/app/client/package.json b/app/client/package.json index fe38d8c380..ebdb795629 100644 --- a/app/client/package.json +++ b/app/client/package.json @@ -91,7 +91,7 @@ "cypress-log-to-output": "^1.1.2", "dayjs": "^1.10.6", "deep-diff": "^1.0.2", - "design-system": "npm:@appsmithorg/design-system@2.1.11", + "design-system": "npm:@appsmithorg/design-system@2.1.11-alpha.4", "design-system-old": "npm:@appsmithorg/design-system-old@1.1.8", "downloadjs": "^1.4.7", "fast-deep-equal": "^3.1.3", diff --git a/app/client/src/assets/icons/gifs/config_pagination.gif b/app/client/src/assets/icons/gifs/config_pagination.gif new file mode 100644 index 0000000000..9549fa7d5c Binary files /dev/null and b/app/client/src/assets/icons/gifs/config_pagination.gif differ diff --git a/app/client/src/assets/icons/gifs/config_pagination_darkmode.gif b/app/client/src/assets/icons/gifs/config_pagination_darkmode.gif deleted file mode 100644 index 83bdde4502..0000000000 Binary files a/app/client/src/assets/icons/gifs/config_pagination_darkmode.gif and /dev/null differ diff --git a/app/client/src/assets/icons/gifs/config_pagination_lightmode.gif b/app/client/src/assets/icons/gifs/config_pagination_lightmode.gif deleted file mode 100644 index 01108af6c0..0000000000 Binary files a/app/client/src/assets/icons/gifs/config_pagination_lightmode.gif and /dev/null differ diff --git a/app/client/src/assets/icons/gifs/darkmode_thumbnail.png b/app/client/src/assets/icons/gifs/darkmode_thumbnail.png deleted file mode 100644 index c520dad867..0000000000 Binary files a/app/client/src/assets/icons/gifs/darkmode_thumbnail.png and /dev/null differ diff --git a/app/client/src/assets/icons/gifs/thumbnail.png b/app/client/src/assets/icons/gifs/thumbnail.png new file mode 100644 index 0000000000..caa0b8bd21 Binary files /dev/null and b/app/client/src/assets/icons/gifs/thumbnail.png differ diff --git a/app/client/src/components/editorComponents/CodeEditor/EvaluatedValuePopup.tsx b/app/client/src/components/editorComponents/CodeEditor/EvaluatedValuePopup.tsx index f474347afe..21181e1b5b 100644 --- a/app/client/src/components/editorComponents/CodeEditor/EvaluatedValuePopup.tsx +++ b/app/client/src/components/editorComponents/CodeEditor/EvaluatedValuePopup.tsx @@ -71,8 +71,8 @@ const ContentWrapper = styled.div<{ colorTheme: EditorTheme }>` `; const CopyIconWrapper = styled(Button)` - position: absolute; - right: 0; + position: absolute !important; + right: var(--ads-v2-spaces-2); top: var(--ads-v2-spaces-2); cursor: pointer; padding: 0; diff --git a/app/client/src/components/editorComponents/CodeEditor/styledComponents.ts b/app/client/src/components/editorComponents/CodeEditor/styledComponents.ts index 7c07618005..6ec052c0fa 100644 --- a/app/client/src/components/editorComponents/CodeEditor/styledComponents.ts +++ b/app/client/src/components/editorComponents/CodeEditor/styledComponents.ts @@ -93,7 +93,6 @@ export const EditorWrapper = styled.div<{ : props.theme.colors.textDefault} !important; } .cm-s-duotone-light.CodeMirror { - padding: 0 6px; border-radius: var(--ads-v2-border-radius); /* ${(props) => props.isFocused && diff --git a/app/client/src/pages/Editor/APIEditor/Pagination.tsx b/app/client/src/pages/Editor/APIEditor/Pagination.tsx index d3753c78f6..c7f44f59ef 100644 --- a/app/client/src/pages/Editor/APIEditor/Pagination.tsx +++ b/app/client/src/pages/Editor/APIEditor/Pagination.tsx @@ -7,15 +7,11 @@ import { PaginationType } from "entities/Action"; import RadioFieldGroup from "components/editorComponents/form/fields/RadioGroupField"; import { Classes, Text, TextType } from "design-system-old"; import { Button } from "design-system"; -import { - CodeEditorBorder, - EditorTheme, -} from "components/editorComponents/CodeEditor/EditorConfig"; +import type { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig"; +import { CodeEditorBorder } from "components/editorComponents/CodeEditor/EditorConfig"; import { GifPlayer } from "design-system-old"; -import lightmodeGif from "assets/icons/gifs/config_pagination_lightmode.gif"; -import darkmodeGif from "assets/icons/gifs/config_pagination_darkmode.gif"; -import lightmodeThumbnail from "assets/icons/gifs/lightmode_thumbnail.png"; -import darkmodeThumbnail from "assets/icons/gifs/darkmode_thumbnail.png"; +import thumbnail from "assets/icons/gifs/thumbnail.png"; +import configPagination from "assets/icons/gifs/config_pagination.gif"; interface PaginationProps { actionName: string; @@ -144,18 +140,7 @@ export default function Pagination(props: PaginationProps) { - + 1. How to configure table for pagination @@ -228,18 +213,7 @@ export default function Pagination(props: PaginationProps) { - + 1. How to configure table for pagination diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyPaneSearchInput.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyPaneSearchInput.tsx index 8f1032cc23..be61ec2456 100644 --- a/app/client/src/pages/Editor/PropertyPane/PropertyPaneSearchInput.tsx +++ b/app/client/src/pages/Editor/PropertyPane/PropertyPaneSearchInput.tsx @@ -11,7 +11,7 @@ import { PROPERTY_SEARCH_INPUT_PLACEHOLDER } from "@appsmith/constants/messages" const Container = styled.div` position: sticky; - top: 42px; + top: 44px; z-index: 3; margin-bottom: 2px; background: var(--ads-v2-color-white); diff --git a/app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx b/app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx index 96c8c9eb75..07d4b2359a 100644 --- a/app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx +++ b/app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx @@ -59,8 +59,6 @@ const Row = styled.div` align-items: center; `; -const DEFAULT_OPTION = "--Select--"; - function MergeSuccessIndicator() { const theme = useTheme() as Theme; @@ -98,10 +96,10 @@ export default function Merge() { const [showMergeSuccessIndicator, setShowMergeSuccessIndicator] = useState(false); - const [selectedBranchOption, setSelectedBranchOption] = useState({ - label: DEFAULT_OPTION, - value: DEFAULT_OPTION, - }); + const [selectedBranchOption, setSelectedBranchOption] = useState<{ + label: string; + value: string; + }>(); /** * Removes the current branch from the list @@ -160,18 +158,18 @@ export default function Merge() { AnalyticsUtil.logEvent("GS_MERGE_CHANGES_BUTTON_CLICK", { source: "GIT_MERGE_MODAL", }); - if (currentBranch && selectedBranchOption.value) { + if (currentBranch && selectedBranchOption?.value) { dispatch( mergeBranchInit({ payload: { sourceBranch: currentBranch, - destinationBranch: selectedBranchOption.value, + destinationBranch: selectedBranchOption?.value, }, onSuccessCallback: handleMergeSuccess, }), ); } - }, [currentBranch, selectedBranchOption.value, dispatch]); + }, [currentBranch, selectedBranchOption?.value, dispatch]); useEffect(() => { dispatch(fetchGitStatusInit()); @@ -183,25 +181,18 @@ export default function Merge() { useEffect(() => { // when user selects a branch to merge - if ( - selectedBranchOption.value !== DEFAULT_OPTION && - currentBranch && - selectedBranchOption.value - ) { + if (currentBranch && selectedBranchOption?.value) { dispatch( fetchMergeStatusInit({ sourceBranch: currentBranch, - destinationBranch: selectedBranchOption.value, + destinationBranch: selectedBranchOption?.value, }), ); setShowMergeSuccessIndicator(false); } - }, [currentBranch, selectedBranchOption.value, dispatch]); + }, [currentBranch, selectedBranchOption?.value, dispatch]); - const mergeBtnDisabled = - DEFAULT_OPTION === selectedBranchOption.value || - isFetchingMergeStatus || - !isMergeAble; + const mergeBtnDisabled = isFetchingMergeStatus || !isMergeAble; let status = MERGE_STATUS_STATE.NONE; if (isFetchingGitStatus) { diff --git a/app/client/yarn.lock b/app/client/yarn.lock index 36c5184222..8f743e08e4 100644 --- a/app/client/yarn.lock +++ b/app/client/yarn.lock @@ -9638,7 +9638,7 @@ __metadata: cypress-xpath: ^1.6.0 dayjs: ^1.10.6 deep-diff: ^1.0.2 - design-system: "npm:@appsmithorg/design-system@2.1.11" + design-system: "npm:@appsmithorg/design-system@2.1.11-alpha.4" design-system-old: "npm:@appsmithorg/design-system-old@1.1.8" diff: ^5.0.0 dotenv: ^8.1.0 @@ -13675,9 +13675,9 @@ __metadata: languageName: node linkType: hard -"design-system@npm:@appsmithorg/design-system@2.1.11": - version: 2.1.11 - resolution: "@appsmithorg/design-system@npm:2.1.11" +"design-system@npm:@appsmithorg/design-system@2.1.11-alpha.4": + version: 2.1.11-alpha.4 + resolution: "@appsmithorg/design-system@npm:2.1.11-alpha.4" dependencies: "@radix-ui/react-dialog": ^1.0.2 "@radix-ui/react-dropdown-menu": ^2.0.4 @@ -13702,7 +13702,7 @@ __metadata: react-dom: ^17.0.2 react-router-dom: ^5.0.0 styled-components: ^5.3.6 - checksum: d2dab007f1a943067928dd019e64dd89648b94246320a3a54d1620d8b696baf74311e256e1176be9e2eef1b13f4f433549a023e8335c326c1438f3361bc76146 + checksum: 66014d3ccfd789c0c86b0b6697ec35e77fe133d52e30706ef6a248b350c14e281898bb326fbe4f521edd39b2c892b39b028f5bc45b70a2fd74331a183f8055ca languageName: node linkType: hard