Skip to content

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.

Refactor style source menu (#1342)

Bogdan Chadkinf8a811535989
diff --git a/apps/builder/app/builder/features/style-panel/style-source-section.tsx b/apps/builder/app/builder/features/style-panel/style-source-section.tsx
index c50e262655..ab53d98268 100644
--- a/apps/builder/app/builder/features/style-panel/style-source-section.tsx
+++ b/apps/builder/app/builder/features/style-panel/style-source-section.tsx
@@ -284,7 +284,7 @@ export const StyleSourcesSection = () => {
onSelectAutocompleteItem={({ id }) => {
addStyleSourceToInstace(id);
}}
- onRemoveItem={({ id }) => {
+ onRemoveItem={(id) => {
removeStyleSourceFromInstance(id);
}}
onDuplicateItem={(id) => {
diff --git a/apps/builder/app/builder/features/style-panel/style-source/style-source-input.stories.tsx b/apps/builder/app/builder/features/style-panel/style-source/style-source-input.stories.tsx
index a97e7f1c3c..38890f0da4 100644
--- a/apps/builder/app/builder/features/style-panel/style-source/style-source-input.stories.tsx
+++ b/apps/builder/app/builder/features/style-panel/style-source/style-source-input.stories.tsx
@@ -72,14 +72,11 @@ const createItem = (
};
const removeItem = (
- itemToRemove: Item,
+ itemIdToRemove: Item["id"],
value: Array<Item>,
setValue: (value: Array<Item>) => void
) => {
- if (itemToRemove.source === "local") {
- return;
- }
- setValue(value.filter((item) => item.id !== itemToRemove.id));
+ setValue(value.filter((item) => item.id !== itemIdToRemove));
};
export const Basic: ComponentStory<typeof StyleSourceInput> = () => {
@@ -95,8 +92,8 @@ export const Basic: ComponentStory<typeof StyleSourceInput> = () => {
onSelectAutocompleteItem={(item) => {
setValue([...value, item]);
}}
- onRemoveItem={(itemToRemove) => {
- removeItem(itemToRemove, value, setValue);
+ onRemoveItem={(itemId) => {
+ removeItem(itemId, value, setValue);
}}
onSort={setValue}
/>
@@ -189,20 +186,20 @@ export const Complete: ComponentStory<typeof StyleSourceInput> = () => {
})
);
}}
- onDisableItem={(itemToDisable) => {
+ onDisableItem={(itemIdToDisable) => {
setValue(
value.map((item) => {
- if (item.id === itemToDisable.id) {
+ if (item.id === itemIdToDisable) {
return { ...item, state: "disabled" };
}
return item;
})
);
}}
- onEnableItem={(itemToEnable) => {
+ onEnableItem={(itemIdToEnable) => {
setValue(
value.map((item) => {
- if (item.id === itemToEnable.id) {
+ if (item.id === itemIdToEnable) {
return { ...item, state: "unselected" };
}
return item;
diff --git a/apps/builder/app/builder/features/style-panel/style-source/style-source-input.tsx b/apps/builder/app/builder/features/style-panel/style-source/style-source-input.tsx
index 3ade90842d..ab010833a2 100644
--- a/apps/builder/app/builder/features/style-panel/style-source/style-source-input.tsx
+++ b/apps/builder/app/builder/features/style-panel/style-source/style-source-input.tsx
@@ -26,6 +26,7 @@ import {
type CSS,
ComboboxLabel,
ComboboxSeparator,
+ DropdownMenuItem,
} from "@webstudio-is/design-system";
import {
forwardRef,
@@ -68,12 +69,8 @@ type TextFieldBaseWrapperProps<Item extends IntermediateItem> = Omit<
disabled?: boolean;
containerRef?: RefObject<HTMLDivElement>;
inputRef?: RefObject<HTMLInputElement>;
- onDuplicateItem: (id: Item["id"]) => void;
- onConvertToToken: (id: Item["id"]) => void;
- onRemoveItem?: (item: Item) => void;
+ renderStyleSourceMenuItems: (item: Item) => void;
onChangeItem?: (item: Item) => void;
- onDisableItem?: (item: Item) => void;
- onEnableItem?: (item: Item) => void;
onSort?: (items: Array<Item>) => void;
onSelectItem?: (item?: Item) => void;
onEditItem?: (id?: Item["id"]) => void;
@@ -98,12 +95,8 @@ const TextFieldBase: ForwardRefRenderFunction<
onKeyDown,
label,
value,
- onDuplicateItem,
- onConvertToToken,
- onRemoveItem,
+ renderStyleSourceMenuItems,
onChangeItem,
- onDisableItem,
- onEnableItem,
onSort,
onSelectItem,
onEditItem,
@@ -133,8 +126,11 @@ const TextFieldBase: ForwardRefRenderFunction<
}
onKeyDown={onKeyDown}
>
- {value.map((item, index) => (
+ {value.map((item) => (
<StyleSource
+ key={item.id}
+ label={item.label}
+ menuItems={renderStyleSourceMenuItems(item)}
id={item.id}
isDragging={item.id === dragItemId}
isEditing={item.id === editingItemId}
@@ -144,28 +140,11 @@ const TextFieldBase: ForwardRefRenderFunction<
onChangeEditing={(isEditing) => {
onEditItem?.(isEditing ? item.id : undefined);
}}
- onChangeState={(state) => {
- if (state === "disabled") {
- onDisableItem?.(item);
- }
- if (state === "unselected") {
- onEnableItem?.(item);
- }
- }}
- onSelect={() => {
- onSelectItem?.(item.state === "selected" ? undefined : item);
- }}
+ onSelect={() => onSelectItem?.(item)}
onChangeValue={(label) => {
onEditItem?.();
onChangeItem?.({ ...item, label });
}}
- onDuplicate={() => onDuplicateItem?.(item.id)}
- onConvertToToken={() => onConvertToToken?.(item.id)}
- onRemove={() => {
- onRemoveItem?.(item);
- }}
- label={item.label}
- key={index}
/>
))}
{placementIndicator}
@@ -193,15 +172,15 @@ type StyleSourceInputProps<Item extends IntermediateItem> = {
value?: Array<Item>;
editingItemId?: Item["id"];
onSelectAutocompleteItem?: (item: Item) => void;
- onRemoveItem?: (item: Item) => void;
+ onRemoveItem?: (id: Item["id"]) => void;
onDuplicateItem?: (id: Item["id"]) => void;
onConvertToToken?: (id: Item["id"]) => void;
onCreateItem?: (label: string) => void;
onChangeItem?: (item: Item) => void;
onSelectItem?: (item?: Item) => void;
onEditItem?: (id?: Item["id"]) => void;
- onDisableItem?: (item: Item) => void;
- onEnableItem?: (item: Item) => void;
+ onDisableItem?: (id: Item["id"]) => void;
+ onEnableItem?: (id: Item["id"]) => void;
onSort?: (items: Array<Item>) => void;
css?: CSS;
};
@@ -245,8 +224,53 @@ const markAddedValues = <Item extends IntermediateItem>(
return items.map((item) => ({ ...item, isAdded: valueIds.has(item.id) }));
};
-export const StyleSourceInput = <Item extends IntermediateItem>(
- props: StyleSourceInputProps<Item>
+const renderMenuItems = (props: {
+ itemId: IntermediateItem["id"];
+ source: ItemSource;
+ state: ItemState;
+ onEdit?: (itemId: IntermediateItem["id"]) => void;
+ onDuplicate?: (itemId: IntermediateItem["id"]) => void;
+ onConvertToToken?: (itemId: IntermediateItem["id"]) => void;
+ onDisable?: (itemId: IntermediateItem["id"]) => void;
+ onEnable?: (itemId: IntermediateItem["id"]) => void;
+ onRemove?: (itemId: IntermediateItem["id"]) => void;
+}) => (
+ <>
+ {props.source !== "local" && (
+ <DropdownMenuItem onSelect={() => props.onEdit?.(props.itemId)}>
+ Edit Name
+ </DropdownMenuItem>
+ )}
+ {props.source !== "local" && (
+ <DropdownMenuItem onSelect={() => props.onDuplicate?.(props.itemId)}>
+ Duplicate
+ </DropdownMenuItem>
+ )}
+ {props.source === "local" && (
+ <DropdownMenuItem onSelect={() => props.onConvertToToken?.(props.itemId)}>
+ Convert to token
+ </DropdownMenuItem>
+ )}
+ {props.state === "disabled" && (
+ <DropdownMenuItem onSelect={() => props.onEnable?.(props.itemId)}>
+ Enable
+ </DropdownMenuItem>
+ )}
+ {props.state !== "disabled" && (
+ <DropdownMenuItem onSelect={() => props.onDisable?.(props.itemId)}>
+ Disable
+ </DropdownMenuItem>
+ )}
+ {props.source !== "local" && (
+ <DropdownMenuItem onSelect={() => props.onRemove?.(props.itemId)}>
+ Remove
+ </DropdownMenuItem>
+ )}
+ </>
+);
+
+export const StyleSourceInput = (
+ props: StyleSourceInputProps<IntermediateItem>
) => {
const value = props.value ?? [];
const [label, setLabel] = useState("");
@@ -276,7 +300,7 @@ export const StyleSourceInput = <Item extends IntermediateItem>(
if (item.id === newItemId) {
props.onCreateItem?.(item.label);
} else {
- props.onSelectAutocompleteItem?.(item as Item);
+ props.onSelectAutocompleteItem?.(item);
}
},
onInputChange(label) {
@@ -293,7 +317,7 @@ export const StyleSourceInput = <Item extends IntermediateItem>(
) {
const item = value[value.length - 1];
if (item.source !== "local") {
- props.onRemoveItem?.(item);
+ props.onRemoveItem?.(item.id);
}
}
},
@@ -307,14 +331,22 @@ export const StyleSourceInput = <Item extends IntermediateItem>(
<ComboboxAnchor>
<TextField
{...inputProps}
- onRemoveItem={props.onRemoveItem}
- onDuplicateItem={props.onDuplicateItem}
- onConvertToToken={props.onConvertToToken}
+ renderStyleSourceMenuItems={(item) =>
+ renderMenuItems({
+ itemId: item.id,
+ source: item.source,
+ state: item.state,
+ onDuplicate: props.onDuplicateItem,
+ onConvertToToken: props.onConvertToToken,
+ onRemove: props.onRemoveItem,
+ onEnable: props.onEnableItem,
+ onDisable: props.onDisableItem,
+ onEdit: props.onEditItem,
+ })
+ }
onChangeItem={props.onChangeItem}
onSelectItem={props.onSelectItem}
onEditItem={props.onEditItem}
- onDisableItem={props.onDisableItem}
- onEnableItem={props.onEnableItem}
onSort={props.onSort}
label={label}
value={value}
diff --git a/apps/builder/app/builder/features/style-panel/style-source/style-source.tsx b/apps/builder/app/builder/features/style-panel/style-source/style-source.tsx
index b707c986dd..2514e414a0 100644
--- a/apps/builder/app/builder/features/style-panel/style-source/style-source.tsx
+++ b/apps/builder/app/builder/features/style-panel/style-source/style-source.tsx
@@ -2,7 +2,6 @@ import { cssVars } from "@webstudio-is/css-vars";
import {
DropdownMenu,
DropdownMenuContent,
- DropdownMenuItem,
DropdownMenuPortal,
DropdownMenuTrigger,
DeprecatedText2,
@@ -19,22 +18,9 @@ import {
type KeyboardEvent,
type KeyboardEventHandler,
type FocusEvent,
+ type ReactNode,
} from "react";
-// Used to schedule function calls to be executed after at a later point in time.
-// Since menu is managing focus, we need to execute that callback when the management is done.
-const useCallScheduler = () => {
- const ref = useRef<(() => void) | undefined>();
- const call = () => {
- ref.current?.();
- ref.current = undefined;
- };
- const set = (fn: () => void) => () => {
- ref.current = fn;
- };
- return { call, set };
-};
-
const menuTriggerVisibilityVar = cssVars.define("menu-trigger-visibility");
const menuTriggerVisibilityOverrideVar = cssVars.define(
"menu-trigger-visibility-override"
@@ -134,23 +120,10 @@ const MenuTriggerGradient = styled(Box, {
type MenuProps = {
source: ItemSource;
- state: ItemState;
- onEdit: () => void;
- onDuplicate: () => void;
- onConvertToToken: () => void;
- onDisable: () => void;
- onEnable: () => void;
- onRemove: () => void;
+ children: ReactNode;
};
const Menu = (props: MenuProps) => {
- const scheduler = useCallScheduler();
- const canEdit = props.source !== "local";
- const canDuplicate = props.source !== "local";
- const canConvertToToken = props.source === "local";
- const canDisable = props.state !== "disabled";
- const canEnable = props.state === "disabled";
- const canRemove = props.source !== "local";
return (
<DropdownMenu modal>
<MenuTriggerGradient source={props.source} />
@@ -160,37 +133,10 @@ const Menu = (props: MenuProps) => {
</MenuTrigger>
</DropdownMenuTrigger>
<DropdownMenuPortal>
- <DropdownMenuContent onCloseAutoFocus={scheduler.call}>
- {canEdit && (
- <DropdownMenuItem onSelect={scheduler.set(props.onEdit)}>
- Edit Name
- </DropdownMenuItem>
- )}
- {canDuplicate && (
- <DropdownMenuItem onSelect={scheduler.set(props.onDuplicate)}>
- Duplicate
- </DropdownMenuItem>
- )}
- {canConvertToToken && (
- <DropdownMenuItem onSelect={scheduler.set(props.onConvertToToken)}>
- Convert to token
- </DropdownMenuItem>
- )}
- {canEnable && (
- <DropdownMenuItem onSelect={scheduler.set(props.onEnable)}>
- Enable
- </DropdownMenuItem>
- )}
- {canDisable && (
- <DropdownMenuItem onSelect={scheduler.set(props.onDisable)}>
- Disable
- </DropdownMenuItem>
- )}
- {canRemove && (
- <DropdownMenuItem onSelect={scheduler.set(props.onRemove)}>
- Remove
- </DropdownMenuItem>
- )}
+ <DropdownMenuContent
+ onCloseAutoFocus={(event) => event.preventDefault()}
+ >
+ {props.children}
</DropdownMenuContent>
</DropdownMenuPortal>
</DropdownMenu>
@@ -411,16 +357,13 @@ SourceButton.displayName = "SourceButton";
type StyleSourceProps = {
id: string;
label: string;
+ menuItems: ReactNode;
isEditable: boolean;
isEditing: boolean;
isDragging: boolean;
state: ItemState;
source: ItemSource;
- onChangeState: (state: ItemState) => void;
onSelect: () => void;
- onDuplicate: () => void;
- onConvertToToken: () => void;
- onRemove: () => void;
onChangeValue: (value: string) => void;
onChangeEditing: (isEditing: boolean) => void;
};
@@ -429,17 +372,14 @@ export const StyleSource = ({
id,
label,
state,
+ menuItems,
isEditable,
isEditing,
isDragging,
source,
onChangeValue,
onChangeEditing,
- onChangeState,
onSelect,
- onDuplicate,
- onConvertToToken,
- onRemove,
}: StyleSourceProps) => {
const ref = useForceRecalcStyle<HTMLDivElement>("max-width", isEditing);
const showMenu = isEditing === false && isDragging === false;
@@ -458,24 +398,7 @@ export const StyleSource = ({
onChangeValue={onChangeValue}
label={label}
/>
- {showMenu && (
- <Menu
- source={source}
- state={state}
- onDuplicate={onDuplicate}
- onConvertToToken={onConvertToToken}
- onRemove={onRemove}
- onEnable={() => {
- onChangeState("unselected");
- }}
- onDisable={() => {
- onChangeState("disabled");
- }}
- onEdit={() => {
- onChangeEditing(true);
- }}
- />
- )}
+ {showMenu && <Menu source={source}>{menuItems}</Menu>}
</SourceButton>
);
};