Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
feat: Delete declaration and delete all declarations in advanced style panel context menu (#4948)
Oleg Isonen02bcc55299fb
diff --git a/apps/builder/app/builder/features/style-panel/sections/advanced/advanced.tsx b/apps/builder/app/builder/features/style-panel/sections/advanced/advanced.tsxindex f9e813e103..d8280e9f1b 100644--- a/apps/builder/app/builder/features/style-panel/sections/advanced/advanced.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/advanced/advanced.tsx@@ -66,7 +66,7 @@ const AdvancedStyleSection = (props: {export const Section = () => {const styleMap = useStore($advancedStylesLonghands);const apiRef = useRef<CssEditorApi>();- const properties = Array.from(styleMap.keys()) as Array<CssProperty>;+ const properties = Array.from(styleMap.keys());const selectedInstanceKey = useStore($selectedInstanceKey);// Memorizing recent properties by instance id, so that when user switches between instances and comes back// they are still in-place@@ -90,16 +90,14 @@ export const Section = () => {setRecentPropertiesMap(newRecentPropertiesMap);};- const handleAddProperties = (styleMap: CssStyleMap) => {+ const handleAddDeclarations = (styleMap: CssStyleMap) => {const batch = createBatchUpdate();for (const [property, value] of styleMap) {- batch.setProperty(property as CssProperty)(value);+ batch.setProperty(property)(value);}batch.publish({ listed: true });- const insertedProperties = Array.from(- styleMap.keys()- ) as Array<CssProperty>;+ const insertedProperties = Array.from(styleMap.keys());updateRecentProperties([...recentProperties, ...insertedProperties]);};@@ -114,6 +112,19 @@ export const Section = () => {);};+ const handleDeleteAllDeclarations = (styleMap: CssStyleMap) => {+ const batch = createBatchUpdate();+ for (const [property] of styleMap) {+ batch.deleteProperty(property);+ }+ batch.publish();+ updateRecentProperties(+ recentProperties.filter(+ (recentProperty) => styleMap.has(recentProperty) === false+ )+ );+ };+return (<AdvancedStyleSectionlabel="Advanced"@@ -126,7 +137,8 @@ export const Section = () => {styleMap={styleMap}onDeleteProperty={handleDeleteProperty}onSetProperty={setProperty}- onAddProperties={handleAddProperties}+ onAddDeclarations={handleAddDeclarations}+ onDeleteAllDeclarations={handleDeleteAllDeclarations}apiRef={apiRef}recentProperties={recentProperties}/>diff --git a/apps/builder/app/builder/shared/css-editor/copy-paste-menu.tsx b/apps/builder/app/builder/shared/css-editor/css-editor-context-menu.tsxsimilarity index 62%rename from apps/builder/app/builder/shared/css-editor/copy-paste-menu.tsxrename to apps/builder/app/builder/shared/css-editor/css-editor-context-menu.tsxindex 63d98d0b0d..540200c466 100644--- a/apps/builder/app/builder/shared/css-editor/copy-paste-menu.tsx+++ b/apps/builder/app/builder/shared/css-editor/css-editor-context-menu.tsx@@ -8,7 +8,6 @@ import {} from "@webstudio-is/design-system";import {generateStyleMap,- hyphenateProperty,mergeStyles,toValue,type CssProperty,@@ -17,16 +16,20 @@ import {export const copyAttribute = "data-declaration";-export const CopyPasteMenu = ({+export const CssEditorContextMenu = ({children,properties,styleMap,onPaste,+ onDeleteProperty,+ onDeleteAllDeclarations,}: {children: ReactNode;- properties: Array<string>;+ properties: Array<CssProperty>;styleMap: CssStyleMap;onPaste: (cssText: string) => void;+ onDeleteProperty: (property: CssProperty) => void;+ onDeleteAllDeclarations: (styleMap: CssStyleMap) => void;}) => {const lastClickedProperty = useRef<string>();@@ -34,37 +37,56 @@ export const CopyPasteMenu = ({navigator.clipboard.readText().then(onPaste);};- const handleCopyAll = () => {+ // Gets all currently visible declarations based on what's in the search or filters.+ const getAllDeclarations = () => {// We want to only copy properties that are currently in front of the user.// That includes search or any future filters.const currentStyleMap: CssStyleMap = new Map();for (const [property, value] of styleMap) {const isEmpty = toValue(value) === "";if (properties.includes(property) && isEmpty === false) {- currentStyleMap.set(hyphenateProperty(property), value);+ currentStyleMap.set(property, value);}}+ return currentStyleMap;+ };- const css = generateStyleMap(mergeStyles(currentStyleMap));+ const handleCopyAll = () => {+ const styleMap = getAllDeclarations();+ const css = generateStyleMap(mergeStyles(styleMap));navigator.clipboard.writeText(css);};const handleCopy = () => {- const property = lastClickedProperty.current;+ const property = lastClickedProperty.current as CssProperty;if (property === undefined) {return;}- const value = styleMap.get(property as CssProperty);+ const value = styleMap.get(property);if (value === undefined) {return;}- const style = new Map([[property, value]]);- const css = generateStyleMap(style);++ const css = generateStyleMap(new Map([[property, value]]));navigator.clipboard.writeText(css);};+ const handleDelete = () => {+ const property = lastClickedProperty.current as CssProperty;+ const value = styleMap.get(property);+ if (value === undefined) {+ return;+ }+ onDeleteProperty(property);+ };++ const handleDeleteAllDeclarations = () => {+ const styleMap = getAllDeclarations();+ onDeleteAllDeclarations(styleMap);+ };+return (<ContextMenu><ContextMenuTrigger@@ -93,6 +115,12 @@ export const CopyPasteMenu = ({<ContextMenuItem onSelect={handlePaste}>Paste declarations</ContextMenuItem>+ <ContextMenuItem destructive onSelect={handleDelete}>+ Delete declaration+ </ContextMenuItem>+ <ContextMenuItem destructive onSelect={handleDeleteAllDeclarations}>+ Delete all declarations+ </ContextMenuItem></ContextMenuContent></ContextMenu>);diff --git a/apps/builder/app/builder/shared/css-editor/css-editor.stories.tsx b/apps/builder/app/builder/shared/css-editor/css-editor.stories.tsxindex 2c6f41930f..c09665ce2d 100644--- a/apps/builder/app/builder/shared/css-editor/css-editor.stories.tsx+++ b/apps/builder/app/builder/shared/css-editor/css-editor.stories.tsx@@ -55,7 +55,8 @@ export const CssEditor = () => {styleMap={styleMap}onDeleteProperty={() => undefined}onSetProperty={() => () => undefined}- onAddProperties={() => undefined}+ onAddDeclarations={() => undefined}+ onDeleteAllDeclarations={() => undefined}/>);};diff --git a/apps/builder/app/builder/shared/css-editor/css-editor.tsx b/apps/builder/app/builder/shared/css-editor/css-editor.tsxindex 84d931e82a..1900fa0e68 100644--- a/apps/builder/app/builder/shared/css-editor/css-editor.tsx+++ b/apps/builder/app/builder/shared/css-editor/css-editor.tsx@@ -31,6 +31,7 @@ import {type CssProperty,type CssStyleMap,} from "@webstudio-is/css-engine";+// @todo all style panel stuff needs to be moved to shared and/or decoupled from style panelimport { CssValueInputContainer } from "../../features/style-panel/shared/css-value-input";import { styleConfigByName } from "../../features/style-panel/shared/configs";import {@@ -40,7 +41,7 @@ import {import { PropertyInfo } from "../../features/style-panel/property-label";import { ColorPopover } from "../../features/style-panel/shared/color-picker";import { useClientSupports } from "~/shared/client-supports";-import { CopyPasteMenu, copyAttribute } from "./copy-paste-menu";+import { CssEditorContextMenu, copyAttribute } from "./css-editor-context-menu";import { AddStyleInput } from "./add-style-input";import { parseStyleInput } from "./parse-style-input";import type {@@ -309,7 +310,8 @@ export type CssEditorApi = { showAddStyleInput: () => void } | undefined;export const CssEditor = ({onDeleteProperty,onSetProperty,- onAddProperties,+ onAddDeclarations,+ onDeleteAllDeclarations,styleMap,apiRef,showSearch = true,@@ -317,7 +319,8 @@ export const CssEditor = ({}: {onDeleteProperty: DeleteProperty;onSetProperty: SetProperty;- onAddProperties: (styleMap: CssStyleMap) => void;+ onAddDeclarations: (styleMap: CssStyleMap) => void;+ onDeleteAllDeclarations: (styleMap: CssStyleMap) => void;styleMap: CssStyleMap;apiRef?: RefObject<CssEditorApi>;showSearch?: boolean;@@ -357,7 +360,7 @@ export const CssEditor = ({if (styleMap.size === 0) {return new Map();}- onAddProperties(styleMap);+ onAddDeclarations(styleMap);return styleMap;};@@ -415,8 +418,10 @@ export const CssEditor = ({/></Box>)}- <CopyPasteMenu+ <CssEditorContextMenuonPaste={handleInsertStyles}+ onDeleteProperty={onDeleteProperty}+ onDeleteAllDeclarations={onDeleteAllDeclarations}styleMap={styleMap}properties={searchProperties ?? [...recentProperties, ...currentProperties]@@ -496,7 +501,7 @@ export const CssEditor = ({})}</Flex></Flex>- </CopyPasteMenu>+ </CssEditorContextMenu></>);};diff --git a/packages/design-system/package.json b/packages/design-system/package.jsonindex 0c02aa19da..411107b618 100644--- a/packages/design-system/package.json+++ b/packages/design-system/package.json@@ -65,6 +65,7 @@"match-sorter": "^8.0.0","react-hot-toast": "^2.5.1","token-transformer": "^0.0.28",+ "type-fest": "^4.32.0","use-debounce": "^10.0.4","warn-once": "^0.1.1"},diff --git a/packages/design-system/src/components/context-menu.tsx b/packages/design-system/src/components/context-menu.tsxindex fb5379ba1b..347e89248e 100644--- a/packages/design-system/src/components/context-menu.tsx+++ b/packages/design-system/src/components/context-menu.tsx@@ -19,6 +19,7 @@ import {MenuCheckedIcon,} from "./menu";export { DropdownMenuArrow } from "./menu";+import type { Simplify } from "type-fest";export const ContextMenu = ContextMenuPrimitive.Root;@@ -57,9 +58,10 @@ export const ContextMenuLabel = styled(ContextMenuPrimitive.Label, labelCss);const StyledMenuItem = styled(ContextMenuPrimitive.Item, menuItemCss, {defaultVariants: { withIndicator: true },});+export const ContextMenuItem = forwardRef<ElementRef<typeof StyledMenuItem>,- ComponentProps<typeof StyledMenuItem> & { icon?: ReactNode }+ Simplify<ComponentProps<typeof StyledMenuItem> & { icon?: ReactNode }>>(({ icon, children, withIndicator, ...props }, forwardedRef) =>icon ? (<StyledMenuItemdiff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 1047268782..7601d484ff 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -1420,6 +1420,9 @@ importers:token-transformer:specifier: ^0.0.28version: 0.0.28+ type-fest:+ specifier: ^4.32.0+ version: 4.32.0use-debounce:specifier: ^10.0.4version: 10.0.4([email protected])