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
Add style source states UI (#1349)
Bogdan Chadkina3beb9f810d8
diff --git a/apps/builder/.storybook/preview.tsx b/apps/builder/.storybook/preview.tsxindex 5eaef48f2a..f4a8c0012d 100644--- a/apps/builder/.storybook/preview.tsx+++ b/apps/builder/.storybook/preview.tsx@@ -1,7 +1,7 @@import * as React from "react";import { TooltipProvider } from "@radix-ui/react-tooltip";-import { globalCss } from "@webstudio-is/design-system";-import { theme } from "@webstudio-is/design-system";+import { theme, globalCss } from "@webstudio-is/design-system";+import { setEnv } from "@webstudio-is/feature-flags";import "@webstudio-is/storybook-config/setup-fonts";export const parameters = {@@ -25,6 +25,7 @@ const globalStyles = globalCss({export const decorators = [(StoryFn: any) => {globalStyles();+ setEnv("*");return (<TooltipProvider><StoryFn />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.tsxindex 0b16347332..0496ac2ebf 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@@ -14,8 +14,7 @@ import {availableStyleSourcesStore,selectedInstanceSelectorStore,selectedInstanceStyleSourcesStore,- selectedStyleSourceIdStore,- selectedStyleSourceStore,+ selectedStyleSourceSelectorStore,styleSourceSelectionsStore,styleSourcesStore,stylesStore,@@ -60,7 +59,7 @@ const createStyleSource = (name: string) => {styleSources.set(newStyleSource.id, newStyleSource);});- selectedStyleSourceIdStore.set(newStyleSource.id);+ selectedStyleSourceSelectorStore.set({ styleSourceId: newStyleSource.id });};const addStyleSourceToInstace = (newStyleSourceId: StyleSource["id"]) => {@@ -81,7 +80,7 @@ const addStyleSourceToInstace = (newStyleSourceId: StyleSource["id"]) => {}});- selectedStyleSourceIdStore.set(newStyleSourceId);+ selectedStyleSourceSelectorStore.set({ styleSourceId: newStyleSourceId });};const removeStyleSourceFromInstance = (styleSourceId: StyleSource["id"]) => {@@ -169,7 +168,7 @@ const duplicateStyleSource = (styleSourceId: StyleSource["id"]) => {});- selectedStyleSourceIdStore.set(newStyleSource.id);+ selectedStyleSourceSelectorStore.set({ styleSourceId: newStyleSource.id });return newStyleSource.id;};@@ -199,7 +198,7 @@ const convertLocalStyleSourceToToken = (styleSourceId: StyleSource["id"]) => {styleSources.set(newStyleSource.id, newStyleSource);});- selectedStyleSourceIdStore.set(newStyleSource.id);+ selectedStyleSourceSelectorStore.set({ styleSourceId: newStyleSource.id });};const reorderStyleSources = (styleSourceIds: StyleSource["id"][]) => {@@ -269,13 +268,15 @@ export const StyleSourcesSection = () => {const selectedInstanceStyleSources = useStore(selectedInstanceStyleSourcesStore);- const selectedStyleSource = useStore(selectedStyleSourceStore);const items = availableStyleSources.map((styleSource) =>convertToInputItem(styleSource));const value = selectedInstanceStyleSources.map((styleSource) =>convertToInputItem(styleSource));+ const selectedStyleSourceSelector = useStore(+ selectedStyleSourceSelectorStore+ );const [editingItemId, setEditingItemId] = useState<undefined | StyleSource["id"]@@ -290,7 +291,7 @@ export const StyleSourcesSection = () => {<StyleSourceInputitems={items}value={value}- selectedItemId={selectedStyleSource?.id}+ selectedItemSelector={selectedStyleSourceSelector}onCreateItem={createStyleSource}onSelectAutocompleteItem={({ id }) => {addStyleSourceToInstace(id);@@ -314,8 +315,8 @@ export const StyleSourcesSection = () => {onSort={(items) => {reorderStyleSources(items.map((item) => item.id));}}- onSelectItem={(selectedItem) => {- selectedStyleSourceIdStore.set(selectedItem?.id);+ onSelectItem={(styleSourceSelector) => {+ selectedStyleSourceSelectorStore.set(styleSourceSelector);}}// style source renamingeditingItemId={editingItemId}@@ -323,7 +324,9 @@ export const StyleSourcesSection = () => {setEditingItemId(id);// prevent deselect after renamingif (id !== undefined) {- selectedStyleSourceIdStore.set(id);+ selectedStyleSourceSelectorStore.set({+ styleSourceId: id,+ });}}}onChangeItem={(item) => {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.tsxindex 71588256dc..f58ccf2298 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 ItemSource } from ".";+import { type ItemSelector, type ItemSource, StyleSourceInput } from ".";export default {component: StyleSourceInput,@@ -65,7 +65,7 @@ export const Basic: ComponentStory<typeof StyleSourceInput> = () => {css={{ width: 300 }}items={getItems()}value={value}- selectedItemId={localItem.id}+ selectedItemSelector={{ styleSourceId: localItem.id }}onCreateItem={(label) => {createItem(label, value, setValue);}}@@ -97,7 +97,7 @@ export const WithTruncatedItem: ComponentStory<css={{ width: 300 }}items={getItems()}value={value}- selectedItemId={value[0].id}+ selectedItemSelector={{ styleSourceId: value[0].id }}onCreateItem={(label) => {createItem(label, value, setValue);}}@@ -123,9 +123,9 @@ export const Complete: ComponentStory<typeof StyleSourceInput> = () => {disabled: true,},]);- const [selectedItemId, setSelectedItemId] = useState<undefined | Item["id"]>(- localItem.id- );+ const [selectedItemSelector, setSelectedItemSelector] = useState<+ undefined | ItemSelector+ >({ styleSourceId: localItem.id });const [editingItemId, setEditingItemId] = useState<undefined | Item["id"]>();return (@@ -133,11 +133,9 @@ export const Complete: ComponentStory<typeof StyleSourceInput> = () => {css={{ width: 300 }}items={getItems()}value={value}- selectedItemId={selectedItemId}+ selectedItemSelector={selectedItemSelector}editingItemId={editingItemId}- onSelectItem={(itemToSelect) => {- setSelectedItemId(itemToSelect?.id);- }}+ onSelectItem={setSelectedItemSelector}onEditItem={setEditingItemId}onCreateItem={(label) => {createItem(label, value, setValue);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.tsxindex 8cbeeb126c..3527ce9231 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@@ -27,6 +27,8 @@ import {ComboboxLabel,ComboboxSeparator,DropdownMenuItem,+ DropdownMenuLabel,+ DropdownMenuSeparator,} from "@webstudio-is/design-system";import {forwardRef,@@ -41,6 +43,9 @@ import { useSortable } from "./use-sortable";import { theme } from "@webstudio-is/design-system";import { matchSorter } from "match-sorter";import { StyleSourceBadge } from "./style-source-badge";+import { CheckMarkIcon } from "@webstudio-is/icons";+import { isFeatureEnabled } from "@webstudio-is/feature-flags";+import { humanizeString } from "~/shared/string-utils";type IntermediateItem = {id: string;@@ -50,6 +55,11 @@ type IntermediateItem = {isAdded?: boolean;};+export type ItemSelector = {+ styleSourceId: IntermediateItem["id"];+ state?: string;+};+type TextFieldBaseWrapperProps<Item extends IntermediateItem> = Omit<ComponentProps<"input">,"value"@@ -59,7 +69,7 @@ type TextFieldBaseWrapperProps<Item extends IntermediateItem> = Omit<"variant" | "state" | "css"> & {value: Array<Item>;- selectedItemId: undefined | Item["id"];+ selectedItemSelector: undefined | ItemSelector;label: string;disabled?: boolean;containerRef?: RefObject<HTMLDivElement>;@@ -67,7 +77,7 @@ type TextFieldBaseWrapperProps<Item extends IntermediateItem> = Omit<renderStyleSourceMenuItems: (item: Item) => void;onChangeItem?: (item: Item) => void;onSort?: (items: Array<Item>) => void;- onSelectItem?: (item?: Item) => void;+ onSelectItem?: (itemSelector?: ItemSelector) => void;onEditItem?: (id?: Item["id"]) => void;editingItemId?: Item["id"];};@@ -90,7 +100,7 @@ const TextFieldBase: ForwardRefRenderFunction<onKeyDown,label,value,- selectedItemId,+ selectedItemSelector,renderStyleSourceMenuItems,onChangeItem,onSort,@@ -128,7 +138,12 @@ const TextFieldBase: ForwardRefRenderFunction<label={item.label}menuItems={renderStyleSourceMenuItems(item)}id={item.id}- selected={item.id === selectedItemId}+ selected={item.id === selectedItemSelector?.styleSourceId}+ state={+ item.id === selectedItemSelector?.styleSourceId+ ? selectedItemSelector.state+ : undefined+ }disabled={item.disabled}isDragging={item.id === dragItemId}isEditing={item.id === editingItemId}@@ -136,7 +151,7 @@ const TextFieldBase: ForwardRefRenderFunction<onChangeEditing={(isEditing) => {onEditItem?.(isEditing ? item.id : undefined);}}- onSelect={() => onSelectItem?.(item)}+ onSelect={() => onSelectItem?.({ styleSourceId: item.id })}onChangeValue={(label) => {onEditItem?.();onChangeItem?.({ ...item, label });@@ -166,8 +181,8 @@ TextField.displayName = "TextField";type StyleSourceInputProps<Item extends IntermediateItem> = {items?: Array<Item>;value?: Array<Item>;+ selectedItemSelector: undefined | ItemSelector;editingItemId?: Item["id"];- selectedItemId?: Item["id"];onSelectAutocompleteItem?: (item: Item) => void;onRemoveItem?: (id: Item["id"]) => void;onDeleteItem?: (id: Item["id"]) => void;@@ -175,7 +190,7 @@ type StyleSourceInputProps<Item extends IntermediateItem> = {onConvertToToken?: (id: Item["id"]) => void;onCreateItem?: (label: string) => void;onChangeItem?: (item: Item) => void;- onSelectItem?: (item?: Item) => void;+ onSelectItem?: (item: undefined | ItemSelector) => void;onEditItem?: (id?: Item["id"]) => void;onDisableItem?: (id: Item["id"]) => void;onEnableItem?: (id: Item["id"]) => void;@@ -221,10 +236,20 @@ const markAddedValues = <Item extends IntermediateItem>(return items.map((item) => ({ ...item, isAdded: valueIds.has(item.id) }));};+const userActionStates = [+ ":hover",+ ":active",+ ":focus",+ ":focus-visible",+ ":focus-within",+];+const renderMenuItems = (props: {+ selectedItemSelector: undefined | ItemSelector;itemId: IntermediateItem["id"];source: ItemSource;disabled: boolean;+ onSelect?: (itemSelector: undefined | ItemSelector) => void;onEdit?: (itemId: IntermediateItem["id"]) => void;onDuplicate?: (itemId: IntermediateItem["id"]) => void;onConvertToToken?: (itemId: IntermediateItem["id"]) => void;@@ -273,6 +298,27 @@ const renderMenuItems = (props: {Delete</DropdownMenuItem>)}+ {isFeatureEnabled("styleSourceStates") && (+ <>+ <DropdownMenuSeparator />+ <DropdownMenuLabel>States</DropdownMenuLabel>+ {userActionStates.map((state) => (+ <DropdownMenuItem+ key={state}+ withIndicator={true}+ icon={+ props.itemId === props.selectedItemSelector?.styleSourceId &&+ state === props.selectedItemSelector.state && <CheckMarkIcon />+ }+ onSelect={() =>+ props.onSelect?.({ styleSourceId: props.itemId, state })+ }+ >+ {humanizeString(state)}+ </DropdownMenuItem>+ ))}+ </>+ )}</>);@@ -340,9 +386,11 @@ export const StyleSourceInput = ({...inputProps}renderStyleSourceMenuItems={(item) =>renderMenuItems({+ selectedItemSelector: props.selectedItemSelector,itemId: item.id,source: item.source,disabled: item.disabled,+ onSelect: props.onSelectItem,onDuplicate: props.onDuplicateItem,onConvertToToken: props.onConvertToToken,onEnable: props.onEnableItem,@@ -358,7 +406,7 @@ export const StyleSourceInput = (onSort={props.onSort}label={label}value={value}- selectedItemId={props.selectedItemId}+ selectedItemSelector={props.selectedItemSelector}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.tsxindex cc8a60a36f..4d0f19315a 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@@ -20,6 +20,7 @@ import {type FocusEvent,type ReactNode,} from "react";+import { humanizeString } from "~/shared/string-utils";const menuTriggerVisibilityVar = cssVars.define("menu-trigger-visibility");const menuTriggerVisibilityOverrideVar = cssVars.define(@@ -142,13 +143,11 @@ const useEditableText = ({isEditing,onChangeEditing,onChangeValue,- onClick,}: {isEditable: boolean;isEditing: boolean;onChangeEditing: (isEditing: boolean) => void;onChangeValue: (value: string) => void;- onClick: () => void;}) => {const elementRef = useRef<HTMLDivElement>(null);const lastValueRef = useRef<string>("");@@ -201,7 +200,6 @@ const useEditableText = ({const handlers = {onKeyDown: handleKeyDown,onBlur: handleFinishEditing,- onClick,onDoubleClick: handleDoubleClick,};@@ -214,7 +212,6 @@ type EditableTextProps = {isEditing: boolean;onChangeEditing: (isEditing: boolean) => void;onChangeValue: (value: string) => void;- onClick: () => void;};const EditableText = ({@@ -223,14 +220,12 @@ const EditableText = ({isEditing,onChangeEditing,onChangeValue,- onClick,}: EditableTextProps) => {const { ref, handlers } = useEditableText({isEditable,isEditing,onChangeEditing,onChangeValue,- onClick,});return (@@ -275,10 +270,9 @@ const useForceRecalcStyle = <Element extends HTMLElement>(return ref;};-const StyledSourceButton = styled(Box, {+const StyledSourceContainer = styled(Box, {display: "inline-flex",borderRadius: theme.borderRadius[3],- padding: theme.spacing[4],minWidth: theme.spacing[13],maxWidth: "100%",position: "relative",@@ -314,44 +308,57 @@ const StyledSourceButton = styled(Box, {false: {},},},- defaultVariants: {- selected: false,- disabled: false,- },});-type SourceButtonProps = {+type SourceContainerProps = {id: string;+ source: ItemSource;selected: boolean;disabled: boolean;- source: ItemSource;children: Array<JSX.Element | boolean>;};-const SourceButton = forwardRef<HTMLDivElement, SourceButtonProps>(- ({ id, selected, disabled, source, children }, ref) => {+const SourceSourceContainer = forwardRef<HTMLDivElement, SourceContainerProps>(+ ({ id, source, selected, disabled, children }, ref) => {return (- <StyledSourceButton+ <StyledSourceContainer+ data-id={id}+ source={source}selected={selected}disabled={disabled}- source={source}- data-id={id}aria-current={selected}role="button"ref={ref}>{children}- </StyledSourceButton>+ </StyledSourceContainer>);});-SourceButton.displayName = "SourceButton";+SourceSourceContainer.displayName = "SourceSourceContainer";++const StyleSourceButton = styled("button", {+ all: "unset",+ display: "block",+ boxSizing: "border-box",+ padding: theme.spacing[4],+ maxWidth: "100%",+});++const StyleSourceState = styled(Box, {+ padding: theme.spacing[4],+ backgroundColor: theme.colors.backgroundStyleSourceToken,+ borderTopRightRadius: theme.borderRadius[3],+ borderBottomRightRadius: theme.borderRadius[3],+ cursor: "default",+});type StyleSourceProps = {id: string;label: string;menuItems: ReactNode;selected: boolean;+ state: undefined | string;disabled: boolean;isEditing: boolean;isDragging: boolean;@@ -366,6 +373,7 @@ export const StyleSource = ({label,menuItems,selected,+ state,disabled,isEditing,isDragging,@@ -378,26 +386,26 @@ export const StyleSource = ({const showMenu = isEditing === false && isDragging === false;return (- <SourceButton- selected={selected}- disabled={disabled}+ <SourceSourceContainersource={source}+ selected={selected && state === undefined}+ disabled={disabled}id={id}ref={ref}>- <EditableText- isEditable={source !== "local"}- isEditing={isEditing}- onChangeEditing={onChangeEditing}- onClick={() => {- if (disabled === false && isEditing === false) {- onSelect();- }- }}- onChangeValue={onChangeValue}- label={label}- />+ <StyleSourceButton disabled={disabled || isEditing} onClick={onSelect}>+ <EditableText+ isEditable={source !== "local"}+ isEditing={isEditing}+ onChangeEditing={onChangeEditing}+ onChangeValue={onChangeValue}+ label={label}+ />+ </StyleSourceButton>+ {state !== undefined && (+ <StyleSourceState>{humanizeString(state)}</StyleSourceState>+ )}{showMenu && <Menu source={source}>{menuItems}</Menu>}- </SourceButton>+ </SourceSourceContainer>);};diff --git a/apps/builder/app/shared/nano-states/nano-states.ts b/apps/builder/app/shared/nano-states/nano-states.tsindex 555d5a4477..e197280c53 100644--- a/apps/builder/app/shared/nano-states/nano-states.ts+++ b/apps/builder/app/shared/nano-states/nano-states.ts@@ -229,9 +229,14 @@ export const useSetStyleSourceSelections = (});};-export const selectedStyleSourceIdStore = atom<undefined | StyleSource["id"]>(- undefined-);+type StyleSourceSelector = {+ styleSourceId: StyleSource["id"];+ state?: string;+};++export const selectedStyleSourceSelectorStore = atom<+ undefined | StyleSourceSelector+>(undefined);/*** Indexed styles data is recomputed on every styles update@@ -378,11 +383,12 @@ export const selectedInstanceStyleSourcesStore = computed(* to the last style source of selected instance*/export const selectedStyleSourceStore = computed(- [selectedInstanceStyleSourcesStore, selectedStyleSourceIdStore],- (styleSources, selectedStyleSourceId) => {+ [selectedInstanceStyleSourcesStore, selectedStyleSourceSelectorStore],+ (styleSources, selectedStyleSourceSelector) => {return (- styleSources.find((item) => item.id === selectedStyleSourceId) ??- styleSources.at(-1)+ styleSources.find(+ (item) => item.id === selectedStyleSourceSelector?.styleSourceId+ ) ?? styleSources.at(-1));});diff --git a/packages/feature-flags/src/flags.ts b/packages/feature-flags/src/flags.tsindex 855c4b69b5..eadacf50ed 100644--- a/packages/feature-flags/src/flags.ts+++ b/packages/feature-flags/src/flags.ts@@ -3,3 +3,4 @@ export const dark = false;export const unsupportedBrowsers = false;export const displayContents = false;export const breakpointsEditor = false;+export const styleSourceStates = false;