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.

Drop item state from style sources (#1346)

Bogdan Chadkin5f8344b2c4bf
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 1570155e8d..0b16347332 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
@@ -8,11 +8,7 @@ import {
type StyleSourceSelections,
getStyleDeclKey,
} from "@webstudio-is/project-build";
-import {
- type ItemSource,
- type ItemState,
- StyleSourceInput,
-} from "./style-source";
+import { type ItemSource, StyleSourceInput } from "./style-source";
import { useStore } from "@nanostores/react";
import {
availableStyleSourcesStore,
@@ -247,28 +243,23 @@ const renameStyleSource = (id: StyleSource["id"], label: string) => {
type StyleSourceInputItem = {
id: string;
label: string;
- state: ItemState;
+ disabled: boolean;
source: ItemSource;
};
-const convertToInputItem = (
- styleSource: StyleSource,
- selectedStyleSource?: StyleSource["id"]
-): StyleSourceInputItem => {
- const state: ItemState =
- selectedStyleSource === styleSource.id ? "selected" : "unselected";
+const convertToInputItem = (styleSource: StyleSource): StyleSourceInputItem => {
if (styleSource.type === "local") {
return {
id: styleSource.id,
label: "Local",
- state,
+ disabled: false,
source: styleSource.type,
};
}
return {
id: styleSource.id,
label: styleSource.name,
- state,
+ disabled: false,
source: styleSource.type,
};
};
@@ -283,7 +274,7 @@ export const StyleSourcesSection = () => {
convertToInputItem(styleSource)
);
const value = selectedInstanceStyleSources.map((styleSource) =>
- convertToInputItem(styleSource, selectedStyleSource?.id)
+ convertToInputItem(styleSource)
);
const [editingItemId, setEditingItemId] = useState<
@@ -299,6 +290,7 @@ export const StyleSourcesSection = () => {
<StyleSourceInput
items={items}
value={value}
+ selectedItemId={selectedStyleSource?.id}
onCreateItem={createStyleSource}
onSelectAutocompleteItem={({ id }) => {
addStyleSourceToInstace(id);
diff --git a/apps/builder/app/builder/features/style-panel/style-source/index.ts b/apps/builder/app/builder/features/style-panel/style-source/index.ts
index a5ed9a9aa7..c0ad1de8fc 100644
--- a/apps/builder/app/builder/features/style-panel/style-source/index.ts
+++ b/apps/builder/app/builder/features/style-panel/style-source/index.ts
@@ -1,3 +1,3 @@
export * from "./style-source-input";
export * from "./style-source-badge";
-export { type ItemState, type ItemSource } from "./style-source";
+export type { ItemSource } from "./style-source";
diff --git a/apps/builder/app/builder/features/style-panel/style-source/style-source-badge.stories.tsx b/apps/builder/app/builder/features/style-panel/style-source/style-source-badge.stories.tsx
index cb4ffadaa1..f5ff8733d1 100644
--- a/apps/builder/app/builder/features/style-panel/style-source/style-source-badge.stories.tsx
+++ b/apps/builder/app/builder/features/style-panel/style-source/style-source-badge.stories.tsx
@@ -15,9 +15,6 @@ export const All: ComponentStory<typeof StyleSourceBadge> = () => {
<StyleSourceBadge source="token" variant="small">
Token
</StyleSourceBadge>
- <StyleSourceBadge source="state" variant="small">
- State
- </StyleSourceBadge>
</Flex>
);
};
diff --git a/apps/builder/app/builder/features/style-panel/style-source/style-source-badge.tsx b/apps/builder/app/builder/features/style-panel/style-source/style-source-badge.tsx
index 761bf1fb70..cd519f2c20 100644
--- a/apps/builder/app/builder/features/style-panel/style-source/style-source-badge.tsx
+++ b/apps/builder/app/builder/features/style-panel/style-source/style-source-badge.tsx
@@ -16,9 +16,6 @@ export const StyleSourceBadge = styled(DeprecatedText2, {
tag: {
backgroundColor: theme.colors.backgroundStyleSourceTag,
},
- state: {
- backgroundColor: theme.colors.backgroundStyleSourceState,
- },
},
},
});
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 b44dbfae56..71588256dc 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
@@ -1,7 +1,7 @@
import { nanoid } from "nanoid";
import type { ComponentStory } from "@storybook/react";
import { useState } from "react";
-import { StyleSourceInput, type ItemState, type ItemSource } from ".";
+import { StyleSourceInput, type ItemSource } from ".";
export default {
component: StyleSourceInput,
@@ -11,14 +11,14 @@ type Item = {
id: string;
label: string;
source: ItemSource;
- state: ItemState;
+ disabled: boolean;
};
const localItem: Item = {
id: nanoid(),
label: "Local",
source: "local",
- state: "selected",
+ disabled: false,
};
const getItems = (): Array<Item> => [
@@ -26,19 +26,13 @@ const getItems = (): Array<Item> => [
id: nanoid(),
label: "Token",
source: "token",
- state: "unselected",
+ disabled: false,
},
{
id: nanoid(),
label: "Tag",
source: "tag",
- state: "unselected",
- },
- {
- id: nanoid(),
- label: "State",
- source: "state",
- state: "unselected",
+ disabled: false,
},
];
@@ -51,18 +45,9 @@ const createItem = (
id: nanoid(),
label,
source: "token",
- state: "selected",
+ disabled: false,
};
- const nextValue = value.map((item) => {
- if (item.state === "selected") {
- return {
- ...item,
- state: "unselected" as const,
- };
- }
- return item;
- });
- setValue([...nextValue, item]);
+ setValue([...value, item]);
};
const removeItem = (
@@ -80,6 +65,7 @@ export const Basic: ComponentStory<typeof StyleSourceInput> = () => {
css={{ width: 300 }}
items={getItems()}
value={value}
+ selectedItemId={localItem.id}
onCreateItem={(label) => {
createItem(label, value, setValue);
}}
@@ -103,7 +89,7 @@ export const WithTruncatedItem: ComponentStory<
label:
"Local Something Something Something Something Something Something Something Something Something Something Something",
source: "local",
- state: "selected",
+ disabled: false,
},
]);
return (
@@ -111,6 +97,7 @@ export const WithTruncatedItem: ComponentStory<
css={{ width: 300 }}
items={getItems()}
value={value}
+ selectedItemId={value[0].id}
onCreateItem={(label) => {
createItem(label, value, setValue);
}}
@@ -133,10 +120,12 @@ export const Complete: ComponentStory<typeof StyleSourceInput> = () => {
id: nanoid(),
label: "Disabled",
source: "token",
-
- state: "disabled",
+ disabled: true,
},
]);
+ const [selectedItemId, setSelectedItemId] = useState<undefined | Item["id"]>(
+ localItem.id
+ );
const [editingItemId, setEditingItemId] = useState<undefined | Item["id"]>();
return (
@@ -144,19 +133,10 @@ export const Complete: ComponentStory<typeof StyleSourceInput> = () => {
css={{ width: 300 }}
items={getItems()}
value={value}
+ selectedItemId={selectedItemId}
editingItemId={editingItemId}
onSelectItem={(itemToSelect) => {
- setValue(
- value.map((item) => {
- if (item.id === itemToSelect?.id) {
- return { ...item, state: "selected" };
- }
- if (item.state === "selected") {
- return { ...item, state: "unselected" };
- }
- return item;
- })
- );
+ setSelectedItemId(itemToSelect?.id);
}}
onEditItem={setEditingItemId}
onCreateItem={(label) => {
@@ -182,7 +162,7 @@ export const Complete: ComponentStory<typeof StyleSourceInput> = () => {
setValue(
value.map((item) => {
if (item.id === itemIdToDisable) {
- return { ...item, state: "disabled" };
+ return { ...item, disabled: true };
}
return item;
})
@@ -192,7 +172,7 @@ export const Complete: ComponentStory<typeof StyleSourceInput> = () => {
setValue(
value.map((item) => {
if (item.id === itemIdToEnable) {
- return { ...item, state: "unselected" };
+ return { ...item, disabled: false };
}
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 2b5da8913d..8cbeeb126c 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
@@ -36,12 +36,7 @@ import {
type RefObject,
} from "react";
import { mergeRefs } from "@react-aria/utils";
-import {
- type ItemSource,
- menuCssVars,
- StyleSource,
- type ItemState,
-} from "./style-source";
+import { type ItemSource, menuCssVars, StyleSource } from "./style-source";
import { useSortable } from "./use-sortable";
import { theme } from "@webstudio-is/design-system";
import { matchSorter } from "match-sorter";
@@ -50,7 +45,7 @@ import { StyleSourceBadge } from "./style-source-badge";
type IntermediateItem = {
id: string;
label: string;
- state: ItemState;
+ disabled: boolean;
source: ItemSource;
isAdded?: boolean;
};
@@ -64,6 +59,7 @@ type TextFieldBaseWrapperProps<Item extends IntermediateItem> = Omit<
"variant" | "state" | "css"
> & {
value: Array<Item>;
+ selectedItemId: undefined | Item["id"];
label: string;
disabled?: boolean;
containerRef?: RefObject<HTMLDivElement>;
@@ -94,6 +90,7 @@ const TextFieldBase: ForwardRefRenderFunction<
onKeyDown,
label,
value,
+ selectedItemId,
renderStyleSourceMenuItems,
onChangeItem,
onSort,
@@ -131,9 +128,10 @@ const TextFieldBase: ForwardRefRenderFunction<
label={item.label}
menuItems={renderStyleSourceMenuItems(item)}
id={item.id}
+ selected={item.id === selectedItemId}
+ disabled={item.disabled}
isDragging={item.id === dragItemId}
isEditing={item.id === editingItemId}
- state={item.state}
source={item.source}
onChangeEditing={(isEditing) => {
onEditItem?.(isEditing ? item.id : undefined);
@@ -169,6 +167,7 @@ type StyleSourceInputProps<Item extends IntermediateItem> = {
items?: Array<Item>;
value?: Array<Item>;
editingItemId?: Item["id"];
+ selectedItemId?: Item["id"];
onSelectAutocompleteItem?: (item: Item) => void;
onRemoveItem?: (id: Item["id"]) => void;
onDeleteItem?: (id: Item["id"]) => void;
@@ -202,7 +201,7 @@ const matchOrSuggestToCreate = (
matched.unshift({
id: newItemId,
label: search.trim(),
- state: "unselected",
+ disabled: false,
source: "token",
isAdded: false,
});
@@ -225,7 +224,7 @@ const markAddedValues = <Item extends IntermediateItem>(
const renderMenuItems = (props: {
itemId: IntermediateItem["id"];
source: ItemSource;
- state: ItemState;
+ disabled: boolean;
onEdit?: (itemId: IntermediateItem["id"]) => void;
onDuplicate?: (itemId: IntermediateItem["id"]) => void;
onConvertToToken?: (itemId: IntermediateItem["id"]) => void;
@@ -250,16 +249,17 @@ const renderMenuItems = (props: {
Convert to token
</DropdownMenuItem>
)}
- {props.state === "disabled" && (
+ {/* @todo implement disabling
+ {props.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
@@ -293,7 +293,7 @@ export const StyleSourceInput = (
items: markAddedValues(props.items ?? [], value),
value: {
label,
- state: "unselected",
+ disabled: false,
id: "",
source: "local",
},
@@ -336,12 +336,13 @@ export const StyleSourceInput = (
<Box {...getComboboxProps()}>
<ComboboxAnchor>
<TextField
+ // @todo inputProps is any which breaks all types passed to TextField
{...inputProps}
renderStyleSourceMenuItems={(item) =>
renderMenuItems({
itemId: item.id,
source: item.source,
- state: item.state,
+ disabled: item.disabled,
onDuplicate: props.onDuplicateItem,
onConvertToToken: props.onConvertToToken,
onEnable: props.onEnableItem,
@@ -357,6 +358,7 @@ export const StyleSourceInput = (
onSort={props.onSort}
label={label}
value={value}
+ selectedItemId={props.selectedItemId}
css={props.css}
editingItemId={props.editingItemId}
/>
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 c9eae9b604..cc8a60a36f 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
@@ -78,11 +78,6 @@ const MenuTrigger = styled("button", {
background: theme.colors.backgroundButtonHover,
},
},
- state: {
- "&:hover": {
- background: theme.colors.backgroundButtonHover,
- },
- },
},
},
});
@@ -111,9 +106,6 @@ const MenuTriggerGradient = styled(Box, {
tag: {
background: theme.colors.backgroundStyleSourceGradientTag,
},
- state: {
- background: theme.colors.backgroundStyleSourceGradientState,
- },
},
},
});
@@ -143,9 +135,7 @@ const Menu = (props: MenuProps) => {
);
};
-export type ItemState = "unselected" | "selected" | "disabled";
-
-export type ItemSource = "token" | "tag" | "state" | "local";
+export type ItemSource = "token" | "tag" | "local";
const useEditableText = ({
isEditable,
@@ -306,44 +296,47 @@ const StyledSourceButton = styled(Box, {
tag: {
backgroundColor: theme.colors.backgroundStyleSourceTag,
},
- state: {
- backgroundColor: theme.colors.backgroundStyleSourceState,
- },
},
- state: {
- selected: {},
- unselected: {
+ selected: {
+ true: {},
+ false: {
"&:not(:hover)": {
backgroundColor: theme.colors.backgroundStyleSourceNeutral,
},
},
- disabled: {
+ },
+ disabled: {
+ true: {
"&:not(:hover)": {
backgroundColor: theme.colors.backgroundStyleSourceDisabled,
},
},
+ false: {},
},
},
defaultVariants: {
- state: "unselected",
+ selected: false,
+ disabled: false,
},
});
type SourceButtonProps = {
id: string;
- state: ItemState;
+ selected: boolean;
+ disabled: boolean;
source: ItemSource;
children: Array<JSX.Element | boolean>;
};
const SourceButton = forwardRef<HTMLDivElement, SourceButtonProps>(
- ({ id, state, source, children }, ref) => {
+ ({ id, selected, disabled, source, children }, ref) => {
return (
<StyledSourceButton
- state={state}
+ selected={selected}
+ disabled={disabled}
source={source}
data-id={id}
- aria-current={state === "selected"}
+ aria-current={selected}
role="button"
ref={ref}
>
@@ -358,9 +351,10 @@ type StyleSourceProps = {
id: string;
label: string;
menuItems: ReactNode;
+ selected: boolean;
+ disabled: boolean;
isEditing: boolean;
isDragging: boolean;
- state: ItemState;
source: ItemSource;
onSelect: () => void;
onChangeValue: (value: string) => void;
@@ -370,8 +364,9 @@ type StyleSourceProps = {
export const StyleSource = ({
id,
label,
- state,
menuItems,
+ selected,
+ disabled,
isEditing,
isDragging,
source,
@@ -383,13 +378,19 @@ export const StyleSource = ({
const showMenu = isEditing === false && isDragging === false;
return (
- <SourceButton state={state} source={source} id={id} ref={ref}>
+ <SourceButton
+ selected={selected}
+ disabled={disabled}
+ source={source}
+ id={id}
+ ref={ref}
+ >
<EditableText
isEditable={source !== "local"}
isEditing={isEditing}
onChangeEditing={onChangeEditing}
onClick={() => {
- if (state !== "disabled" && isEditing === false) {
+ if (disabled === false && isEditing === false) {
onSelect();
}
}}