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.

Current item in style source UI (#774)

Oleg Isonen0f90b779f7cd
diff --git a/apps/designer/app/designer/features/style-panel/style-source-input/style-source-input.stories.tsx b/apps/designer/app/designer/features/style-panel/style-source-input/style-source-input.stories.tsx
index 75fc4eda8c..9cdb86e57a 100644
--- a/apps/designer/app/designer/features/style-panel/style-source-input/style-source-input.stories.tsx
+++ b/apps/designer/app/designer/features/style-panel/style-source-input/style-source-input.stories.tsx
@@ -10,7 +10,7 @@ export default {
type Item = {
id: string;
label: string;
- type: "token" | "local";
+ source: "token" | "local";
hasMenu: boolean;
state: ItemState;
};
@@ -18,61 +18,62 @@ type Item = {
const localItem: Item = {
id: "0",
label: "Local",
- type: "local",
+ source: "local",
hasMenu: false,
state: "initial",
};
const items: Array<Item> = [
- { id: "1", label: "Apple", type: "token", hasMenu: false, state: "initial" },
+ {
+ id: "1",
+ label: "Apple",
+ source: "token",
+ hasMenu: false,
+ state: "initial",
+ },
{
id: "2",
label: "Banana",
- type: "token",
+ source: "token",
hasMenu: false,
state: "initial",
},
{
id: "3",
label: "Orange",
- type: "token",
+ source: "token",
hasMenu: false,
state: "initial",
},
];
-export const Initial: ComponentStory<typeof StyleSourceInput> = () => {
- const [value, setValue] = useState<Array<Item>>([localItem]);
- return (
- <StyleSourceInput
- css={{ width: 300 }}
- items={items}
- value={value}
- onCreateItem={({ label }) => {
- const item: Item = {
- id: uuid(),
- label,
- type: "token",
- hasMenu: false,
- state: "initial",
- };
- setValue([...value, item]);
- }}
- onSelectItem={(item) => {
- setValue([...value, item]);
- }}
- onRemoveItem={(itemToRemove) => {
- if (itemToRemove.type === "local") {
- return;
- }
- setValue(value.filter((item) => item.id !== itemToRemove.id));
- }}
- onSort={setValue}
- />
- );
+const createItem = (
+ label: string,
+ value: Array<Item>,
+ setValue: (value: Array<Item>) => void
+) => {
+ const item: Item = {
+ id: uuid(),
+ label,
+ source: "token",
+ hasMenu: false,
+ state: "initial",
+ };
+ setValue([...value, item]);
+};
+
+const removeItem = (
+ itemToRemove: Item,
+ value: Array<Item>,
+ setValue: (value: Array<Item>) => void
+) => {
+ if (itemToRemove.source === "local") {
+ return;
+ }
+ setValue(value.filter((item) => item.id !== itemToRemove.id));
};
-export const WithItems: ComponentStory<typeof StyleSourceInput> = () => {
+export const Basic: ComponentStory<typeof StyleSourceInput> = () => {
const [value, setValue] = useState([localItem, ...items]);
return (
<StyleSourceInput
@@ -80,23 +81,13 @@ export const WithItems: ComponentStory<typeof StyleSourceInput> = () => {
items={items}
value={value}
onCreateItem={({ label }) => {
- const item: Item = {
- id: uuid(),
- label,
- type: "token",
- hasMenu: false,
- state: "initial",
- };
- setValue([...value, item]);
+ createItem(label, value, setValue);
}}
onSelectItem={(item) => {
setValue([...value, item]);
}}
onRemoveItem={(itemToRemove) => {
- if (itemToRemove.type === "local") {
- return;
- }
- setValue(value.filter((item) => item.id !== itemToRemove.id));
+ removeItem(itemToRemove, value, setValue);
}}
onSort={setValue}
/>
@@ -111,7 +102,7 @@ export const WithTruncatedItem: ComponentStory<
id: "0",
label:
"Local Something Something Something Something Something Something Something Something Something Something Something",
- type: "local",
+ source: "local",
hasMenu: false,
state: "initial",
},
@@ -122,64 +113,51 @@ export const WithTruncatedItem: ComponentStory<
items={items}
value={value}
onCreateItem={({ label }) => {
- const item: Item = {
- id: uuid(),
- label,
- type: "token",
- hasMenu: false,
- state: "initial",
- };
- setValue([...value, item]);
+ createItem(label, value, setValue);
}}
onSelectItem={(item) => {
setValue([...value, item]);
}}
onRemoveItem={(itemToRemove) => {
- if (itemToRemove.type === "local") {
- return;
- }
- setValue(value.filter((item) => item.id !== itemToRemove.id));
+ removeItem(itemToRemove, value, setValue);
}}
onSort={setValue}
/>
);
};
-export const WithMenu: ComponentStory<typeof StyleSourceInput> = () => {
+export const Complete: ComponentStory<typeof StyleSourceInput> = () => {
const [value, setValue] = useState<Array<Item>>([
+ ...items,
{
id: "0",
- label: "Apple",
- type: "token",
+ label: "Grape",
+ source: "token",
hasMenu: true,
state: "initial",
},
]);
- const [editingIndex, setEditingIndex] = useState<number>(-1);
+ const [editingItemId, setEditingItemId] = useState<string>();
+ const [currentItemId, setCurrentItemId] = useState<string | undefined>(
+ value.at(-1)?.id
+ );
return (
<StyleSourceInput
css={{ width: 300 }}
items={items}
value={value}
- editingIndex={editingIndex}
+ editingItemId={editingItemId}
+ currentItemId={currentItemId}
+ onChangeCurrent={setCurrentItemId}
+ onChangeEditing={setEditingItemId}
onCreateItem={({ label }) => {
- const item: Item = {
- id: uuid(),
- label,
- type: "token",
- hasMenu: true,
- state: "initial",
- };
- setValue([...value, item]);
+ createItem(label, value, setValue);
}}
onSelectItem={(item) => {
setValue([...value, item]);
}}
onRemoveItem={(itemToRemove) => {
- if (itemToRemove.type === "local") {
- return;
- }
- setValue(value.filter((item) => item.id !== itemToRemove.id));
+ removeItem(itemToRemove, value, setValue);
}}
onChangeItem={(changedItem) => {
setValue(
@@ -224,7 +202,7 @@ export const WithMenu: ComponentStory<typeof StyleSourceInput> = () => {
return item;
});
setValue(nextValue);
- setEditingIndex(nextValue.indexOf(duplicatedItem));
+ setEditingItemId(duplicatedItem.id);
}}
onSort={setValue}
/>
diff --git a/apps/designer/app/designer/features/style-panel/style-source-input/style-source-input.tsx b/apps/designer/app/designer/features/style-panel/style-source-input/style-source-input.tsx
index 6a4db9a4ff..412e2779fd 100644
--- a/apps/designer/app/designer/features/style-panel/style-source-input/style-source-input.tsx
+++ b/apps/designer/app/designer/features/style-panel/style-source-input/style-source-input.tsx
@@ -13,7 +13,6 @@ import {
} from "@webstudio-is/design-system";
import {
forwardRef,
- useEffect,
useState,
type ComponentProps,
type ForwardRefRenderFunction,
@@ -46,7 +45,10 @@ type TextFieldBaseWrapperProps<Item> = Omit<ComponentProps<"input">, "value"> &
onDisableItem?: (item: Item) => void;
onEnableItem?: (item: Item) => void;
onSort?: (items: Array<Item>) => void;
- editingIndex: number;
+ onChangeCurrent?: (id: string) => void;
+ onChangeEditing?: (id?: string) => void;
+ editingItemId?: string;
+ currentItemId?: string;
};
const TextFieldBase: ForwardRefRenderFunction<
@@ -73,18 +75,17 @@ const TextFieldBase: ForwardRefRenderFunction<
onDisableItem,
onEnableItem,
onSort,
- editingIndex: editingIndexProp,
+ onChangeCurrent,
+ onChangeEditing,
+ currentItemId,
+ editingItemId,
...textFieldProps
} = props;
- const [editingIndex, setEditingIndex] = useState(editingIndexProp);
const [internalInputRef, focusProps] = useTextFieldFocus({
disabled,
onFocus,
onBlur,
});
- useEffect(() => {
- setEditingIndex(editingIndexProp);
- }, [editingIndexProp]);
const { sortableRefCallback, dragItemId, placementIndicator } = useSortable({
items: value,
onSort,
@@ -106,12 +107,13 @@ const TextFieldBase: ForwardRefRenderFunction<
state={
item.id === dragItemId
? "dragging"
- : index === editingIndex
+ : item.id === editingItemId
? "editing"
: item.state
}
+ isCurrent={item.id === currentItemId}
onStateChange={(state) => {
- setEditingIndex(state === "editing" ? index : -1);
+ onChangeEditing?.(state === "editing" ? item.id : undefined);
if (state === "disabled") {
onDisableItem?.(item);
}
@@ -119,8 +121,11 @@ const TextFieldBase: ForwardRefRenderFunction<
onEnableItem?.(item);
}
}}
+ onChangeCurrent={() => {
+ onChangeCurrent?.(item.id);
+ }}
onChange={(label) => {
- setEditingIndex(-1);
+ onChangeEditing?.();
onChangeItem?.({ ...item, label });
}}
onDuplicate={() => {
@@ -136,7 +141,7 @@ const TextFieldBase: ForwardRefRenderFunction<
))}
{placementIndicator}
{/* We want input to be the first element in DOM so it receives the focus first */}
- {editingIndex === -1 && (
+ {editingItemId === undefined && (
<TextFieldInput
{...textFieldProps}
value={label}
@@ -157,11 +162,14 @@ TextField.displayName = "TextField";
type StyleSourceInputProps<Item> = {
items?: Array<Item>;
value?: Array<Item>;
- editingIndex?: number;
+ editingItemId?: string;
+ currentItemId?: string;
onSelectItem?: (item: Item) => void;
onRemoveItem?: (item: Item) => void;
onCreateItem?: (item: Item) => void;
onChangeItem?: (item: Item) => void;
+ onChangeCurrent?: (id: string) => void;
+ onChangeEditing?: (id?: string) => void;
onDuplicateItem?: (item: Item) => void;
onDisableItem?: (item: Item) => void;
onEnableItem?: (item: Item) => void;
@@ -173,7 +181,6 @@ export const StyleSourceInput = <Item extends IntermediateItem>(
props: StyleSourceInputProps<Item>
) => {
const value = props.value ?? [];
- const editingIndex = props.editingIndex ?? -1;
const [label, setLabel] = useState("");
const {
items,
@@ -217,6 +224,8 @@ export const StyleSourceInput = <Item extends IntermediateItem>(
{...inputProps}
onRemoveItem={props.onRemoveItem}
onChangeItem={props.onChangeItem}
+ onChangeCurrent={props.onChangeCurrent}
+ onChangeEditing={props.onChangeEditing}
onDuplicateItem={props.onDuplicateItem}
onDisableItem={props.onDisableItem}
onEnableItem={props.onEnableItem}
@@ -224,7 +233,8 @@ export const StyleSourceInput = <Item extends IntermediateItem>(
label={label}
value={value}
css={props.css}
- editingIndex={editingIndex}
+ editingItemId={props.editingItemId}
+ currentItemId={props.currentItemId}
/>
</ComboboxPopperAnchor>
<ComboboxPopperContent align="start" sideOffset={5}>
diff --git a/apps/designer/app/designer/features/style-panel/style-source-input/style-source.tsx b/apps/designer/app/designer/features/style-panel/style-source-input/style-source.tsx
index 7341a31822..24803c8657 100644
--- a/apps/designer/app/designer/features/style-panel/style-source-input/style-source.tsx
+++ b/apps/designer/app/designer/features/style-panel/style-source-input/style-source.tsx
@@ -95,19 +95,15 @@ const Menu = (props: MenuProps) => {
export type ItemState = "initial" | "editing" | "disabled" | "dragging";
-type EditableTextProps = {
- label: string;
- onChange: (value: string) => void;
- state: ItemState;
- onStateChange: (state: ItemState) => void;
-};
-
-const EditableText = ({
- onChange,
- label,
+const useEditableText = ({
state,
onStateChange,
-}: EditableTextProps) => {
+ onChange,
+}: {
+ state: ItemState;
+ onStateChange: (state: ItemState) => void;
+ onChange: (value: string) => void;
+}) => {
const ref = useRef<HTMLDivElement>(null);
useEffect(() => {
@@ -139,9 +135,29 @@ const EditableText = ({
}
};
- const handleClick = () => {
- onStateChange("editing");
- };
+ return { handleKeyDown, handleFinishEditing, ref };
+};
+
+type EditableTextProps = {
+ label: string;
+ onChange: (value: string) => void;
+ state: ItemState;
+ onStateChange: (state: ItemState) => void;
+ onChangeCurrent: () => void;
+};
+
+const EditableText = ({
+ onChange,
+ label,
+ state,
+ onStateChange,
+ onChangeCurrent,
+}: EditableTextProps) => {
+ const { ref, handleKeyDown, handleFinishEditing } = useEditableText({
+ state,
+ onStateChange,
+ onChange,
+ });
return (
<Text
@@ -149,7 +165,7 @@ const EditableText = ({
ref={ref}
onKeyDown={handleKeyDown}
onBlur={handleFinishEditing}
- onClick={handleClick}
+ onClick={onChangeCurrent}
css={{
outline: "none",
textOverflow: state === "editing" ? "clip" : "ellipsis",
@@ -210,15 +226,27 @@ type EditableItemProps = {
id: string;
children: Array<JSX.Element | false>;
state: ItemState;
+ isCurrent: boolean;
};
-const EditableItem = ({ children, state, id }: EditableItemProps) => {
+const EditableItem = ({
+ children,
+ state,
+ id,
+ isCurrent,
+}: EditableItemProps) => {
const ref = useForceRecalcStyle<HTMLDivElement>(
"max-width",
state === "editing"
);
return (
- <Item variant="gray" state={state} ref={ref} as="div" data-id={id}>
+ <Item
+ variant={isCurrent ? "blue" : "gray"}
+ state={state}
+ ref={ref}
+ as="div"
+ data-id={id}
+ >
{children}
</Item>
);
@@ -229,7 +257,9 @@ type StyleSourceProps = {
label: string;
hasMenu: boolean;
state: ItemState;
+ isCurrent: boolean;
onStateChange: (state: ItemState) => void;
+ onChangeCurrent: () => void;
onDuplicate: () => void;
onRemove: () => void;
onChange: (value: string) => void;
@@ -240,16 +270,19 @@ export const StyleSource = ({
label,
hasMenu,
state,
+ isCurrent,
onChange,
onStateChange,
+ onChangeCurrent,
onDuplicate,
onRemove,
}: StyleSourceProps) => {
return (
- <EditableItem state={state} id={id}>
+ <EditableItem state={state} id={id} isCurrent={isCurrent}>
<EditableText
state={state}
onStateChange={onStateChange}
+ onChangeCurrent={onChangeCurrent}
onChange={onChange}
label={label}
/>