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
fix: Make select and combobox description height stable (#3385)
Ivan Starkovbe4a02704bfb
diff --git a/apps/builder/app/builder/features/settings-panel/variable-popover.tsx b/apps/builder/app/builder/features/settings-panel/variable-popover.tsxindex 1b2e94a77a..a1e7b94833 100644--- a/apps/builder/app/builder/features/settings-panel/variable-popover.tsx+++ b/apps/builder/app/builder/features/settings-panel/variable-popover.tsx@@ -232,7 +232,7 @@ const TypeField = ({disabled: options.get(option)?.disabled,})}getDescription={(option) => (- <Box css={{ width: theme.spacing[25] }}>+ <Box css={{ width: theme.spacing[27] }}>{options.get(option)?.description}</Box>)}diff --git a/apps/builder/app/builder/features/style-panel/controls/select/select-control.tsx b/apps/builder/app/builder/features/style-panel/controls/select/select-control.tsxindex 7468c92969..e06d8d470a 100644--- a/apps/builder/app/builder/features/style-panel/controls/select/select-control.tsx+++ b/apps/builder/app/builder/features/style-panel/controls/select/select-control.tsx@@ -66,7 +66,7 @@ export const SelectControl = ({if (description === undefined) {return;}- return <Box css={{ width: theme.spacing[25] }}>{description}</Box>;+ return <Box css={{ width: theme.spacing[26] }}>{description}</Box>;}}getItemProps={() => ({ text: "sentence" })}/>diff --git a/apps/builder/app/builder/features/style-panel/sections/advanced/add.tsx b/apps/builder/app/builder/features/style-panel/sections/advanced/add.tsxindex 94c26c2df4..8870592669 100644--- a/apps/builder/app/builder/features/style-panel/sections/advanced/add.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/advanced/add.tsx@@ -63,7 +63,7 @@ export const Add = ({item.value as keyof typeof propertyDescriptions];}- return <Box css={{ width: theme.spacing[25] }}>{description}</Box>;+ return <Box css={{ width: theme.spacing[28] }}>{description}</Box>;}}defaultHighlightedIndex={0}/>diff --git a/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx b/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsxindex 57190ab5d7..fb5a1e79c1 100644--- a/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx+++ b/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx@@ -15,6 +15,7 @@ import {handleNumericInputArrowKeys,theme,Flex,+ styled,} from "@webstudio-is/design-system";import type {KeywordValue,@@ -325,6 +326,9 @@ const itemToString = (item: CssValueInputValue | null) => {? String(item.value): toValue(item);};++const Description = styled(Box, { width: theme.spacing[27] });+/*** Common:* - Free text editing@@ -651,6 +655,7 @@ export const CssValueInput = ({: items[0]?.type === "keyword"? items[0]: undefined;+if (valueForDescription) {const key = `${property}:${toValue(valueForDescription@@ -658,6 +663,19 @@ export const CssValueInput = ({description = declarationDescriptions[key];}+ const descriptions = items+ .map((item) =>+ item.type === "keyword"+ ? declarationDescriptions[+ `${property}:${toValue(+ item+ )}` as keyof typeof declarationDescriptions+ ]+ : undefined+ )+ .filter(Boolean)+ .map((descr) => <Description>{descr}</Description>);+return (<ComboboxRoot open={isOpen}><Box {...getComboboxProps()} css={{ width: "100%" }}>@@ -701,8 +719,8 @@ export const CssValueInput = ({))}</ComboboxScrollArea>{description && (- <ComboboxItemDescription>- <Box css={{ width: theme.spacing[25] }}>{description}</Box>+ <ComboboxItemDescription descriptions={descriptions}>+ <Description>{description}</Description></ComboboxItemDescription>)}</ComboboxListbox>diff --git a/packages/design-system/src/components/combobox.stories.tsx b/packages/design-system/src/components/combobox.stories.tsxindex 097eaa8c69..36840a7075 100644--- a/packages/design-system/src/components/combobox.stories.tsx+++ b/packages/design-system/src/components/combobox.stories.tsx@@ -117,7 +117,11 @@ export const Complex = () => {</ComboboxListboxItem>);})}- <ComboboxItemDescription>Description</ComboboxItemDescription>+ <ComboboxItemDescription+ descriptions={["Hello", "World", "Description"]}+ >+ Description+ </ComboboxItemDescription></ComboboxListbox></ComboboxContent></Flex>diff --git a/packages/design-system/src/components/combobox.tsx b/packages/design-system/src/components/combobox.tsxindex ba01d5d819..b043a4f515 100644--- a/packages/design-system/src/components/combobox.tsx+++ b/packages/design-system/src/components/combobox.tsx@@ -36,6 +36,7 @@ import {} from "./menu";import { ScrollArea } from "./scroll-area";import { Flex, InputField, NestedInputButton } from "..";+import { Box } from "./box";export const ComboboxListbox = styled("ul",@@ -119,9 +120,11 @@ export const ComboboxListboxItem = forwardRef(ListboxItemBase);export const ComboboxItemDescription = ({children,- style,- ...props-}: ComponentProps<typeof ListboxItem>) => {+ descriptions,+}: {+ children: ReactNode;+ descriptions: ReactNode[];+}) => {return (<><ComboboxSeparator@@ -131,14 +134,34 @@ export const ComboboxItemDescription = ({}}/><ListboxItem- {...props}+ css={{+ display: "grid",+ }}hintstyle={{- ...style,order: "var(--ws-combobox-description-order)",}}>- {children}+ {descriptions.map((descr, index) => (+ <Box+ css={{+ gridColumn: "1",+ gridRow: "1",+ visibility: "hidden",+ }}+ key={index}+ >+ {descr}+ </Box>+ ))}+ <Box+ css={{+ gridColumn: "1",+ gridRow: "1",+ }}+ >+ {children}+ </Box></ListboxItem><ComboboxSeparatorstyle={{@@ -435,6 +458,7 @@ export const Combobox = <Item,>({: combobox.items[combobox.highlightedIndex];const description = getDescription?.(descriptionItem);+ const descriptions = combobox.items.map((item) => getDescription?.(item));return (<ComboboxRoot open={combobox.isOpen}>@@ -463,7 +487,9 @@ export const Combobox = <Item,>({})}</ComboboxScrollArea>{description && (- <ComboboxItemDescription>{description}</ComboboxItemDescription>+ <ComboboxItemDescription descriptions={descriptions}>+ {description}+ </ComboboxItemDescription>)}</ComboboxListbox></ComboboxContent>diff --git a/packages/design-system/src/components/select.stories.tsx b/packages/design-system/src/components/select.stories.tsxindex 159ac1d9a9..9c6aa0f390 100644--- a/packages/design-system/src/components/select.stories.tsx+++ b/packages/design-system/src/components/select.stories.tsx@@ -86,26 +86,33 @@ export const WithDescriptions: StoryFn<typeof Select> = () => {const options = [{ label: "Apple", description: "An apple fruit" },{ label: "Banana", description: "A banana fruit" },- { label: "Orange", description: "An orange fruit" },+ {+ label: "Orange",+ description:+ "An orange fruit An orange fruit An orange fruit An orange fruit",+ },{ label: "Pear", description: "A pear fruit" },{ label: "Grape", description: "A grape fruit" },];const [value, setValue] = useState<(typeof options)[number]>(options[0]);return (- <Select- name="fruit"- options={options}- value={value}- getValue={(value) => value.label}- onChange={setValue}- getLabel={(option) => {- return option.label;- }}- getDescription={(option) => {- return option.description;- }}- />+ <>+ <div style={{ height: "300px" }}></div>+ <Select+ name="fruit"+ options={options}+ value={value}+ getValue={(value) => value.label}+ onChange={setValue}+ getLabel={(option) => {+ return option.label;+ }}+ getDescription={(option) => {+ return <div style={{ width: "150px" }}>{option.description}</div>;+ }}+ />+ </>);};diff --git a/packages/design-system/src/components/select.tsx b/packages/design-system/src/components/select.tsxindex e94ecd8bfc..7031b930e8 100644--- a/packages/design-system/src/components/select.tsx+++ b/packages/design-system/src/components/select.tsx@@ -18,6 +18,7 @@ import {MenuCheckedIcon,} from "./menu";import { SelectButton } from "./select-button";+import { Box } from "./box";export const SelectContent = styled(Primitive.Content, menuCss, {"&[data-side=top]": {@@ -86,9 +87,11 @@ const Description = styled("div", menuItemCss);// Note this only works in combination with position: popper on Content component, because only popper exposes data-side attributeexport const SelectItemDescription = ({children,- style,- ...props-}: ComponentProps<typeof Description>) => {+ descriptions,+}: {+ children: ReactNode;+ descriptions: ReactNode[];+}) => {return (<><SelectSeparator@@ -97,16 +100,38 @@ export const SelectItemDescription = ({order: "var(--ws-select-description-order)",}}/>+<Description- {...props}+ css={{+ display: "grid",+ }}hintstyle={{- ...style,order: "var(--ws-select-description-order)",}}>- {children}+ {descriptions.map((descr, index) => (+ <Box+ css={{+ gridColumn: "1",+ gridRow: "1",+ visibility: "hidden",+ }}+ key={index}+ >+ {descr}+ </Box>+ ))}+ <Box+ css={{+ gridColumn: "1",+ gridRow: "1",+ }}+ >+ {children}+ </Box></Description>+<SelectSeparatorstyle={{display: `var(--ws-select-description-display-top, none)`,@@ -193,6 +218,8 @@ const SelectBase = <Option,>(? getDescription?.(itemForDescription): undefined;+ const descriptions = options.map((option) => getDescription?.(option));+return (<Primitive.Rootname={name}@@ -252,7 +279,9 @@ const SelectBase = <Option,>(</SelectScrollDownButton>{description && (- <SelectItemDescription>{description}</SelectItemDescription>+ <SelectItemDescription descriptions={descriptions}>+ {description}+ </SelectItemDescription>)}</SelectContent></Primitive.Portal>