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
Implement breakpoints popover design (#1534)
Oleg Isonen35b01e5e6858
diff --git a/apps/builder/app/builder/features/breakpoints/trigger-button.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-popover-toolbar-button.tsxsimilarity index 67%rename from apps/builder/app/builder/features/breakpoints/trigger-button.tsxrename to apps/builder/app/builder/features/breakpoints/breakpoints-popover-toolbar-button.tsxindex d0d0ced92c..57ffd78aed 100644--- a/apps/builder/app/builder/features/breakpoints/trigger-button.tsx+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-popover-toolbar-button.tsx@@ -1,12 +1,6 @@-import { type ComponentProps } from "react";+import { forwardRef, type ComponentProps } from "react";import { useStore } from "@nanostores/react";-import {- DropdownMenuSubTrigger,- DropdownMenuTrigger,- Flex,- theme,- toggleItemStyle,-} from "@webstudio-is/design-system";+import { Flex, theme } from "@webstudio-is/design-system";import { scaleStore, useCanvasWidth } from "~/builder/shared/nano-states";import { selectedBreakpointStore } from "~/shared/nano-states";@@ -29,9 +23,10 @@ const Value = ({);};-type TriggerButtonProps = ComponentProps<typeof DropdownMenuSubTrigger>;--export const TriggerButton = (props: TriggerButtonProps) => {+export const BreakpointsPopoverToolbarButton = forwardRef<+ HTMLButtonElement,+ ComponentProps<"button">+>((props, ref) => {const scale = useStore(scaleStore);const breakpoint = useStore(selectedBreakpointStore);const [canvasWidth] = useCanvasWidth();@@ -40,12 +35,7 @@ export const TriggerButton = (props: TriggerButtonProps) => {}const roundedScale = Math.round(scale);return (- <DropdownMenuTrigger- aria-label="Show breakpoints"- className={toggleItemStyle({- css: { gap: theme.spacing[5] },- })}- >+ <button ref={ref} {...props}><Value unit="PX" minWidth={55}>{Math.round(canvasWidth)}</Value>@@ -54,6 +44,8 @@ export const TriggerButton = (props: TriggerButtonProps) => {{roundedScale}</Value>)}- </DropdownMenuTrigger>+ </button>);-};+});++BreakpointsPopoverToolbarButton.displayName = "BreakpointsPopoverToolbarButton";diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsxnew file mode 100644index 0000000000..f7ebfeba5f--- /dev/null+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsx@@ -0,0 +1,217 @@+import { useState } from "react";+import { useStore } from "@nanostores/react";+import store from "immerhin";+import type { Breakpoint } from "@webstudio-is/project-build";+import {+ theme,+ PopoverSeparator,+ Flex,+ Label,+ Button,+ Popover,+ PopoverPortal,+ PopoverContent,+ PopoverTrigger,+ toggleItemStyle,+ MenuCheckedIcon,+ MenuItemIndicator,+ List,+ ListItem,+ MenuItemButton,+ Box,+ PopoverMenuItemContainer,+ PopoverMenuItemRightSlot,+} from "@webstudio-is/design-system";+import { useSubscribe } from "~/shared/pubsub";+import { BreakpointsEditor } from "./breakpoints-editor";+import { BreakpointsPopoverToolbarButton } from "./breakpoints-popover-toolbar-button";+import { WidthInput } from "./width-input";+import { ConfirmationDialog } from "./confirmation-dialog";+import {+ breakpointsStore,+ stylesStore,+ selectedBreakpointIdStore,+ selectedBreakpointStore,+} from "~/shared/nano-states";+import { isFeatureEnabled } from "@webstudio-is/feature-flags";+import { groupBreakpoints, minCanvasWidth } from "~/shared/breakpoints";+import { scaleStore } from "~/builder/shared/nano-states";++export const BreakpointsPopover = () => {+ const [view, setView] = useState<+ "initial" | "editor" | "confirmation" | undefined+ >();+ const [breakpointToDelete, setBreakpointToDelete] = useState<+ Breakpoint | undefined+ >();+ const breakpoints = useStore(breakpointsStore);+ const selectedBreakpoint = useStore(selectedBreakpointStore);+ const scale = useStore(scaleStore);++ useSubscribe("openBreakpointsMenu", () => {+ setView("initial");+ });++ useSubscribe("clickCanvas", () => {+ setView(undefined);+ });++ if (selectedBreakpoint === undefined) {+ return null;+ }++ const handleDelete = () => {+ if (breakpointToDelete === undefined) {+ return;+ }+ store.createTransaction(+ [breakpointsStore, stylesStore],+ (breakpoints, styles) => {+ const breakpointId = breakpointToDelete.id;+ breakpoints.delete(breakpointId);+ for (const [styleDeclKey, styleDecl] of styles) {+ if (styleDecl.breakpointId === breakpointId) {+ styles.delete(styleDeclKey);+ }+ }+ }+ );+ if (breakpointToDelete.id === selectedBreakpoint.id) {+ selectedBreakpointIdStore.set(undefined);+ }++ setBreakpointToDelete(undefined);+ setView("editor");+ };++ return (+ <Popover+ open={view !== undefined}+ onOpenChange={(isOpen) => {+ setView(isOpen ? "initial" : undefined);+ }}+ >+ <PopoverTrigger aria-label="Show breakpoints" asChild>+ <BreakpointsPopoverToolbarButton+ className={toggleItemStyle({+ css: { gap: theme.spacing[5] },+ })}+ />+ </PopoverTrigger>+ <PopoverPortal>+ <PopoverContent+ css={{ zIndex: theme.zIndices[1] }}+ sideOffset={0}+ collisionPadding={4}+ align="start"+ >+ {view === "confirmation" && breakpointToDelete && (+ <ConfirmationDialog+ breakpoint={breakpointToDelete}+ onAbort={() => {+ setBreakpointToDelete(undefined);+ setView("editor");+ }}+ onConfirm={handleDelete}+ />+ )}+ {view === "editor" && (+ <BreakpointsEditor+ onDelete={(breakpoint) => {+ setBreakpointToDelete(breakpoint);+ setView("confirmation");+ }}+ />+ )}+ {view === "initial" && (+ <>+ <Flex+ css={{ px: theme.spacing[7], py: theme.spacing[5] }}+ gap="3"+ >+ <WidthInput min={minCanvasWidth} />+ <Flex align="center" gap="2">+ <Label>Scale</Label>+ <Button+ color="neutral"+ css={{ width: theme.spacing[17] }}+ tabIndex={-1}+ >+ {Math.round(scale)}%+ </Button>+ </Flex>+ </Flex>+ <PopoverSeparator />+ <List asChild>+ <Flex direction="column" css={{ my: 0, mx: theme.spacing[3] }}>+ {groupBreakpoints(Array.from(breakpoints.values())).map(+ (breakpoint, index) => {+ return (+ <ListItem+ asChild+ onSelect={() => {+ selectedBreakpointIdStore.set(breakpoint.id);+ }}+ index={index}+ key={breakpoint.id}+ >+ <MenuItemButton withIndicator>+ {breakpoint === selectedBreakpoint && (+ <MenuItemIndicator>+ <MenuCheckedIcon />+ </MenuItemIndicator>+ )}+ <Box+ css={{ flexGrow: 1, textAlign: "left" }}+ as="span"+ >+ {breakpoint.minWidth ??+ breakpoint.maxWidth ??+ breakpoint.label}+ </Box>+ <PopoverMenuItemRightSlot+ css={{ color: theme.colors.foregroundSubtle }}+ >+ {breakpoint.minWidth !== undefined+ ? `≥ ${breakpoint.minWidth} PX`+ : breakpoint.maxWidth !== undefined+ ? `≤ ${breakpoint.maxWidth} PX`+ : "All Sizes"}+ </PopoverMenuItemRightSlot>+ </MenuItemButton>+ </ListItem>+ );+ }+ )}+ </Flex>+ </List>+ </>+ )}+ {isFeatureEnabled("breakpointsEditor") &&+ (view === "editor" || view === "initial") && (+ <>+ <PopoverSeparator />+ <PopoverMenuItemContainer+ css={{+ justifyContent: "center",+ px: theme.spacing[7],+ }}+ >+ <Button+ color="neutral"+ css={{ flexGrow: 1 }}+ onClick={(event) => {+ event.preventDefault();+ setView(view === "initial" ? "editor" : "initial");+ }}+ >+ {view === "editor" ? "Done" : "Edit breakpoints"}+ </Button>+ </PopoverMenuItemContainer>+ </>+ )}+ </PopoverContent>+ </PopoverPortal>+ </Popover>+ );+};diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-settings.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-settings.tsxdeleted file mode 100644index b39befbfdd..0000000000--- a/apps/builder/app/builder/features/breakpoints/breakpoints-settings.tsx+++ /dev/null@@ -1,183 +0,0 @@-import { useState } from "react";-import { useStore } from "@nanostores/react";-import store from "immerhin";-import type { Breakpoint } from "@webstudio-is/project-build";-import {- theme,- DropdownMenu,- DropdownMenuCheckboxItem,- DropdownMenuContent,- DropdownMenuItem,- DropdownMenuPortal,- DropdownMenuSeparator,- DropdownMenuItemRightSlot,- Flex,- Label,- Button,-} from "@webstudio-is/design-system";-import { useSubscribe } from "~/shared/pubsub";-import { BreakpointsEditor } from "./breakpoints-editor";-import { TriggerButton } from "./trigger-button";-import { WidthInput } from "./width-input";-import { ConfirmationDialog } from "./confirmation-dialog";-import {- breakpointsStore,- stylesStore,- selectedBreakpointIdStore,- selectedBreakpointStore,-} from "~/shared/nano-states";-import { isFeatureEnabled } from "@webstudio-is/feature-flags";-import { groupBreakpoints, minCanvasWidth } from "~/shared/breakpoints";-import { scaleStore } from "~/builder/shared/nano-states";--export const BreakpointsSettings = () => {- const [view, setView] = useState<- "selector" | "editor" | "confirmation" | undefined- >();- const [breakpointToDelete, setBreakpointToDelete] = useState<- Breakpoint | undefined- >();- const breakpoints = useStore(breakpointsStore);- const selectedBreakpoint = useStore(selectedBreakpointStore);- const scale = useStore(scaleStore);-- useSubscribe("openBreakpointsMenu", () => {- setView("selector");- });-- useSubscribe("clickCanvas", () => {- setView(undefined);- });-- if (selectedBreakpoint === undefined) {- return null;- }-- const handleDelete = () => {- if (breakpointToDelete === undefined) {- return;- }- store.createTransaction(- [breakpointsStore, stylesStore],- (breakpoints, styles) => {- const breakpointId = breakpointToDelete.id;- breakpoints.delete(breakpointId);- for (const [styleDeclKey, styleDecl] of styles) {- if (styleDecl.breakpointId === breakpointId) {- styles.delete(styleDeclKey);- }- }- }- );- if (breakpointToDelete.id === selectedBreakpoint.id) {- selectedBreakpointIdStore.set(undefined);- }-- setBreakpointToDelete(undefined);- setView("editor");- };-- return (- // @todo this should be a popover instead- // there is a bunch of accessibility issues here- <DropdownMenu- open={view !== undefined}- onOpenChange={(isOpen) => {- setView(isOpen ? "selector" : undefined);- }}- >- <TriggerButton />- <DropdownMenuPortal>- <DropdownMenuContent- css={{ zIndex: theme.zIndices[1] }}- sideOffset={4}- collisionPadding={4}- align="start"- >- {view === "confirmation" && breakpointToDelete && (- <ConfirmationDialog- breakpoint={breakpointToDelete}- onAbort={() => {- setBreakpointToDelete(undefined);- setView("editor");- }}- onConfirm={handleDelete}- />- )}- {view === "editor" && (- <>- <BreakpointsEditor- onDelete={(breakpoint) => {- setBreakpointToDelete(breakpoint);- setView("confirmation");- }}- />- <DropdownMenuSeparator />- <DropdownMenuItem- css={{ justifyContent: "center" }}- onSelect={(event) => {- event.preventDefault();- setView("selector");- }}- >- {"Done"}- </DropdownMenuItem>- </>- )}- {view === "selector" && (- <>- <Flex- css={{ px: theme.spacing[7], py: theme.spacing[5] }}- gap="3"- direction="row"- >- <WidthInput min={minCanvasWidth} />- <Flex align="center" gap="2">- <Label>Scale</Label>- <Button color="neutral" css={{ width: theme.spacing[17] }}>- {Math.round(scale)}%- </Button>- </Flex>- </Flex>- <DropdownMenuSeparator />-- {groupBreakpoints(Array.from(breakpoints.values())).map(- (breakpoint) => {- return (- <DropdownMenuCheckboxItem- checked={breakpoint === selectedBreakpoint}- key={breakpoint.id}- onSelect={() => {- selectedBreakpointIdStore.set(breakpoint.id);- }}- css={{ gap: theme.spacing[10] }}- >- {breakpoint.label}- <DropdownMenuItemRightSlot>- {breakpoint.minWidth ?? breakpoint.maxWidth ?? "any"}- </DropdownMenuItemRightSlot>- </DropdownMenuCheckboxItem>- );- }- )}- {isFeatureEnabled("breakpointsEditor") && (- <>- <DropdownMenuSeparator />- <DropdownMenuItem- css={{ justifyContent: "center" }}- onSelect={(event) => {- event.preventDefault();- setView("editor");- }}- >- Edit breakpoints- </DropdownMenuItem>- </>- )}- </>- )}- </DropdownMenuContent>- </DropdownMenuPortal>- </DropdownMenu>- );-};diff --git a/apps/builder/app/builder/features/breakpoints/index.ts b/apps/builder/app/builder/features/breakpoints/index.tsindex bd42273fee..42f7854f36 100644--- a/apps/builder/app/builder/features/breakpoints/index.ts+++ b/apps/builder/app/builder/features/breakpoints/index.ts@@ -1,3 +1,3 @@-export * from "./breakpoints-settings";+export * from "./breakpoints-popover";export * from "./breakpoints-selector-container";export * from "./use-set-initial-canvas-width";diff --git a/apps/builder/app/builder/features/topbar/topbar.tsx b/apps/builder/app/builder/features/topbar/topbar.tsxindex 5ca41e7351..8d28880e8c 100644--- a/apps/builder/app/builder/features/topbar/topbar.tsx+++ b/apps/builder/app/builder/features/topbar/topbar.tsx@@ -17,7 +17,7 @@ import { SyncStatus } from "./sync-status";import { Menu } from "./menu";import {BreakpointsSelectorContainer,- BreakpointsSettings,+ BreakpointsPopover,} from "../breakpoints";import { ViewMode } from "./view-mode";@@ -53,7 +53,7 @@ export const Topbar = ({ gridArea, project, publish }: TopbarProps) => {</Text></Flex><Flex css={{ minWidth: theme.spacing[23] }}>- <BreakpointsSettings />+ <BreakpointsPopover /></Flex><Flex grow align="center" justify="center"><BreakpointsSelectorContainer />diff --git a/apps/builder/app/builder/shared/fonts-manager/fonts-manager.tsx b/apps/builder/app/builder/shared/fonts-manager/fonts-manager.tsxindex 6f4c8124f8..e5e2bf4334 100644--- a/apps/builder/app/builder/shared/fonts-manager/fonts-manager.tsx+++ b/apps/builder/app/builder/shared/fonts-manager/fonts-manager.tsx@@ -1,8 +1,8 @@import {- List,- ListItem,- useList,- findNextListIndex,+ DeprecatedList,+ DeprecatedListItem,+ useDeprecatedList,+ deprecatedFindNextListIndex,theme,} from "@webstudio-is/design-system";import {@@ -40,7 +40,7 @@ const useLogic = ({handleChangeCurrent(selectedIndex);return;}- const nextIndex = findNextListIndex(+ const nextIndex = deprecatedFindNextListIndex(selectedIndex,groupedItems.length,direction@@ -75,7 +75,7 @@ const useLogic = ({}};- const { getItemProps, getListProps } = useList({+ const { getItemProps, getListProps } = useDeprecatedList({items: groupedItems,selectedIndex,currentIndex,@@ -133,13 +133,13 @@ export const FontsManager = ({ value, onChange }: FontsManagerProps) => {const renderItem = (item: Item, index: number) => {const itemProps = getItemProps({ index });return (- <ListItem+ <DeprecatedListItem{...itemProps}prefix={itemProps.current ? <CheckMarkIcon /> : undefined}suffix={item.type === "uploaded" ? renderMenu(index) : undefined}>{item.label}- </ListItem>+ </DeprecatedListItem>);};@@ -149,7 +149,7 @@ export const FontsManager = ({ value, onChange }: FontsManagerProps) => {type="font"isEmpty={groupedItems.length === 0}>- <List+ <DeprecatedList{...listProps}onBlur={(event) => {if (isMenuOpen === false) {@@ -158,7 +158,7 @@ export const FontsManager = ({ value, onChange }: FontsManagerProps) => {}}>{uploadedItems.length !== 0 && (- <ListItem state="disabled">{"Uploaded"}</ListItem>+ <DeprecatedListItem state="disabled">{"Uploaded"}</DeprecatedListItem>)}{uploadedItems.map(renderItem)}{systemItems.length !== 0 && (@@ -166,13 +166,13 @@ export const FontsManager = ({ value, onChange }: FontsManagerProps) => {{uploadedItems.length !== 0 && (<Separator css={{ mx: theme.spacing[9] }} />)}- <ListItem state="disabled">{"System"}</ListItem>+ <DeprecatedListItem state="disabled">{"System"}</DeprecatedListItem></>)}{systemItems.map((item, index) =>renderItem(item, index + uploadedItems.length))}- </List>+ </DeprecatedList></AssetsShell>);};diff --git a/apps/builder/app/builder/shared/image-manager/image-manager.tsx b/apps/builder/app/builder/shared/image-manager/image-manager.tsxindex f90a997b07..0479a8bd0b 100644--- a/apps/builder/app/builder/shared/image-manager/image-manager.tsx+++ b/apps/builder/app/builder/shared/image-manager/image-manager.tsx@@ -1,5 +1,9 @@import { useState, useMemo } from "react";-import { findNextListIndex, Grid, theme } from "@webstudio-is/design-system";+import {+ deprecatedFindNextListIndex,+ Grid,+ theme,+} from "@webstudio-is/design-system";import {AssetsShell,type AssetContainer,@@ -39,7 +43,7 @@ const useLogic = ({}return;}- const nextIndex = findNextListIndex(+ const nextIndex = deprecatedFindNextListIndex(selectedIndex,filteredItems.length,directiondiff --git a/packages/design-system/src/components/list.stories.tsx b/packages/design-system/src/components/__DEPRECATED__/list.stories.tsxsimilarity index 52%rename from packages/design-system/src/components/list.stories.tsxrename to packages/design-system/src/components/__DEPRECATED__/list.stories.tsxindex a380da6078..ecbbb037e7 100644--- a/packages/design-system/src/components/list.stories.tsx+++ b/packages/design-system/src/components/__DEPRECATED__/list.stories.tsx@@ -1,38 +1,38 @@import type { ComponentStory } from "@storybook/react";import { CheckMarkIcon, MenuIcon } from "@webstudio-is/icons";import { useState } from "react";-import { List, ListItem, useList } from "./list";+import { DeprecatedList, DeprecatedListItem, useDeprecatedList } from "./list";export default {- component: List,+ component: DeprecatedList,};-export const Declarative: ComponentStory<typeof List> = () => {+export const Declarative: ComponentStory<typeof DeprecatedList> = () => {return (- <List>- <ListItem>Apple</ListItem>- <ListItem state="disabled">Banana</ListItem>- <ListItem state="selected">Orange</ListItem>- <ListItem prefix={<CheckMarkIcon />} suffix={<MenuIcon />}>+ <DeprecatedList>+ <DeprecatedListItem>Apple</DeprecatedListItem>+ <DeprecatedListItem state="disabled">Banana</DeprecatedListItem>+ <DeprecatedListItem state="selected">Orange</DeprecatedListItem>+ <DeprecatedListItem prefix={<CheckMarkIcon />} suffix={<MenuIcon />}>Strawberry- </ListItem>- <ListItem+ </DeprecatedListItem>+ <DeprecatedListItemprefix={<CheckMarkIcon />}suffix={<MenuIcon />}currentstate="selected">Watermelon- </ListItem>- </List>+ </DeprecatedListItem>+ </DeprecatedList>);};-export const WithHook: ComponentStory<typeof List> = () => {+export const WithHook: ComponentStory<typeof DeprecatedList> = () => {const items = ["Banana", "Orange", "Apple"];const [selectedIndex, setSelectedIndex] = useState(-1);const [currentIndex, setCurrentIndex] = useState(-1);- const { getListProps, getItemProps } = useList({+ const { getListProps, getItemProps } = useDeprecatedList({items,selectedIndex,currentIndex,@@ -40,19 +40,19 @@ export const WithHook: ComponentStory<typeof List> = () => {onChangeCurrent: setCurrentIndex,});return (- <List {...getListProps()}>+ <DeprecatedList {...getListProps()}>{items.map((item, index) => {const itemProps = getItemProps({ index });return (- <ListItem+ <DeprecatedListItem{...itemProps}key={index}prefix={itemProps.current ? <CheckMarkIcon /> : undefined}>{item}- </ListItem>+ </DeprecatedListItem>);})}- </List>+ </DeprecatedList>);};diff --git a/packages/design-system/src/components/list.tsx b/packages/design-system/src/components/__DEPRECATED__/list.tsxsimilarity index 89%rename from packages/design-system/src/components/list.tsxrename to packages/design-system/src/components/__DEPRECATED__/list.tsxindex 4ad3dae562..1039093491 100644--- a/packages/design-system/src/components/list.tsx+++ b/packages/design-system/src/components/__DEPRECATED__/list.tsx@@ -4,9 +4,9 @@ import {forwardRef,type KeyboardEvent,} from "react";-import { DeprecatedText2 } from "./__DEPRECATED__/text2";-import { Flex } from "./flex";-import { styled, theme } from "../stitches.config";+import { DeprecatedText2 } from "./text2";+import { Flex } from "../flex";+import { styled, theme } from "../../stitches.config";const ListBase = styled("ul", {display: "flex",@@ -45,15 +45,15 @@ const ListItemBase = styled("li", {},});-export const List = forwardRef<+export const DeprecatedList = forwardRef<HTMLUListElement,ComponentProps<typeof ListBase>>((props, ref) => {return <ListBase role="listbox" ref={ref} {...props} />;});-List.displayName = "List";+DeprecatedList.displayName = "DeprecatedList";-export const ListItem = forwardRef<+export const DeprecatedListItem = forwardRef<HTMLLIElement,Omit<ComponentProps<typeof ListItemBase>, "prefix" | "suffix" | "current"> & {state?: "disabled" | "selected";@@ -86,9 +86,9 @@ export const ListItem = forwardRef<</ListItemBase>);});-ListItem.displayName = "ListItem";+DeprecatedListItem.displayName = "DeprecatedListItem";-export const findNextListIndex = (+export const deprecatedFindNextListIndex = (currentIndex: number,total: number,direction: "next" | "previous"@@ -117,7 +117,7 @@ type UseList<Item = unknown> = {onChangeCurrent: (index: number) => void;};-export const useList = ({+export const useDeprecatedList = ({items,selectedIndex,currentIndex,@@ -151,7 +151,7 @@ export const useList = ({switch (event.code) {case "ArrowUp":case "ArrowDown": {- const nextIndex = findNextListIndex(+ const nextIndex = deprecatedFindNextListIndex(selectedIndex,items.length,event.code === "ArrowUp" ? "previous" : "next"diff --git a/packages/design-system/src/components/combobox.tsx b/packages/design-system/src/components/combobox.tsxindex efd5df27ce..4ff1b80dfe 100644--- a/packages/design-system/src/components/combobox.tsx+++ b/packages/design-system/src/components/combobox.tsx@@ -26,9 +26,9 @@ import {import { matchSorter } from "match-sorter";import { styled, theme } from "../stitches.config";import {- itemCss,+ menuItemCss,menuCss,- itemIndicatorCss,+ menuItemIndicatorCss,labelCss,separatorCss,MenuCheckedIcon,@@ -48,9 +48,9 @@ const Listbox = styled(menuCss);-const ListboxItem = styled("li", itemCss);+const ListboxItem = styled("li", menuItemCss);-const Indicator = styled("span", itemIndicatorCss);+const Indicator = styled("span", menuItemIndicatorCss);export const ComboboxLabel = styled("li", labelCss);diff --git a/packages/design-system/src/components/dropdown-menu.tsx b/packages/design-system/src/components/dropdown-menu.tsxindex 6b16f0c9c0..938daf7999 100644--- a/packages/design-system/src/components/dropdown-menu.tsx+++ b/packages/design-system/src/components/dropdown-menu.tsx@@ -11,9 +11,9 @@ import {menuCss,subMenuCss,separatorCss,- itemCss,+ menuItemCss,labelCss,- itemIndicatorCss,+ menuItemIndicatorCss,subContentProps,MenuCheckedIcon,} from "./menu";@@ -46,7 +46,7 @@ export const DropdownMenuSeparator = styled(export const DropdownMenuLabel = styled(DropdownMenuPrimitive.Label, labelCss);-export const StyledMenuItem = styled(DropdownMenuPrimitive.Item, itemCss, {+export const StyledMenuItem = styled(DropdownMenuPrimitive.Item, menuItemCss, {defaultVariants: { withIndicator: true },});export const DropdownMenuItem = forwardRef<@@ -58,7 +58,7 @@ export const DropdownMenuItem = forwardRef<{...props}ref={forwardedRef}>- {icon && <div className={itemIndicatorCss()}>{icon}</div>}+ {icon && <div className={menuItemIndicatorCss()}>{icon}</div>}{children}</StyledMenuItem>));@@ -69,7 +69,7 @@ export const DropdownMenuItemRightSlot = styled("span", {display: "flex",});-const SubTriggerStyled = styled(DropdownMenuPrimitive.SubTrigger, itemCss, {+const SubTriggerStyled = styled(DropdownMenuPrimitive.SubTrigger, menuItemCss, {defaultVariants: { withIndicator: true },});export const DropdownMenuSubTrigger = forwardRef<@@ -81,7 +81,7 @@ export const DropdownMenuSubTrigger = forwardRef<{...props}ref={forwardedRef}>- {icon && <div className={itemIndicatorCss()}>{icon}</div>}+ {icon && <div className={menuItemIndicatorCss()}>{icon}</div>}{children}<DropdownMenuItemRightSlot><ChevronFilledRightIcon />@@ -90,9 +90,12 @@ export const DropdownMenuSubTrigger = forwardRef<));DropdownMenuSubTrigger.displayName = "DropdownMenuSubTrigger";-const Indicator = styled(DropdownMenuPrimitive.ItemIndicator, itemIndicatorCss);+const Indicator = styled(+ DropdownMenuPrimitive.ItemIndicator,+ menuItemIndicatorCss+);-const StyledRadioItem = styled(DropdownMenuPrimitive.RadioItem, itemCss);+const StyledRadioItem = styled(DropdownMenuPrimitive.RadioItem, menuItemCss);export const DropdownMenuRadioItem = forwardRef<ElementRef<typeof StyledRadioItem>,ComponentProps<typeof StyledRadioItem> & { icon?: ReactNode }@@ -104,7 +107,10 @@ export const DropdownMenuRadioItem = forwardRef<));DropdownMenuRadioItem.displayName = "DropdownMenuRadioItem";-const StyledCheckboxItem = styled(DropdownMenuPrimitive.CheckboxItem, itemCss);+const StyledCheckboxItem = styled(+ DropdownMenuPrimitive.CheckboxItem,+ menuItemCss+);export const DropdownMenuCheckboxItem = forwardRef<ElementRef<typeof StyledCheckboxItem>,ComponentProps<typeof StyledCheckboxItem> & { icon?: ReactNode }diff --git a/packages/design-system/src/components/menu.tsx b/packages/design-system/src/components/menu.tsxindex bf2257861f..b9dd7880b7 100644--- a/packages/design-system/src/components/menu.tsx+++ b/packages/design-system/src/components/menu.tsx@@ -32,7 +32,7 @@ export const labelCss = css(textVariants.titles, {});const indicatorSize = theme.spacing[9];-export const itemIndicatorCss = css({+export const menuItemIndicatorCss = css({position: "absolute",display: "flex",alignItems: "center",@@ -42,8 +42,10 @@ export const itemIndicatorCss = css({height: indicatorSize,});+export const MenuItemIndicator = styled("span", menuItemIndicatorCss);+const itemMargin = theme.spacing[3];-export const itemCss = css(textVariants.labelsTitleCase, {+export const menuItemCss = css(textVariants.labelsTitleCase, {outline: "none",cursor: "default",position: "relative",@@ -74,7 +76,7 @@ export const itemCss = css(textVariants.labelsTitleCase, {});// To use outside of any menu context, e.g. in a Popover-export const MenuItemButton = styled("button", itemCss, {+export const MenuItemButton = styled("button", menuItemCss, {border: "none",boxSizing: "border-box",width: `calc(100% - ${itemMargin} * 2)`,@@ -114,7 +116,7 @@ export const subMenuCss = css(menuCss, {});export const subContentProps: Partial<ComponentProps<typeof SubContent>> = {- // this depends on itemCss.margin and menuCss.padding,+ // this depends on menuItemCss.margin and menuCss.padding,// the goal is to make sub-menu overlap the parent menu by exactly 2pxsideOffset: 3,};diff --git a/packages/design-system/src/components/popover.tsx b/packages/design-system/src/components/popover.tsxindex dbc1f4122a..4dd0dd8a18 100644--- a/packages/design-system/src/components/popover.tsx+++ b/packages/design-system/src/components/popover.tsx@@ -74,9 +74,15 @@ export const PopoverContentContainer = styled("div", {});export const PopoverMenuItemContainer = styled("div", {+ display: "flex",margin: `0 ${theme.spacing[3]}`,});+export const PopoverMenuItemRightSlot = styled("span", {+ marginLeft: "auto",+ display: "flex",+});+export const PopoverSeparator = styled(Separator, {margin: `${theme.spacing[5]} 0`,});diff --git a/packages/design-system/src/components/primitives/list.tsx b/packages/design-system/src/components/primitives/list.tsxnew file mode 100644index 0000000000..fddb9a06a5--- /dev/null+++ b/packages/design-system/src/components/primitives/list.tsx@@ -0,0 +1,65 @@+import { usePress } from "@react-aria/interactions";+import { Slot, type SlotProps } from "@radix-ui/react-slot";+import { ArrowFocus } from "./arrow-focus";++type ListProps = SlotProps & {+ asChild?: boolean;+};++export const List = ({ asChild, ...props }: ListProps) => {+ const Component = asChild ? Slot : "ul";+ return (+ <ArrowFocus+ render={({ handleKeyDown }) => {+ return (+ <Component role="listbox" onKeyDown={handleKeyDown} {...props} />+ );+ }}+ />+ );+};+List.displayName = "List";++type ListItemProps = SlotProps & {+ state?: "disabled" | "selected";+ current?: boolean;+ index?: number;+ onSelect?: () => void;+ asChild?: boolean;+};++export const ListItem = ({+ state,+ current,+ index,+ onSelect,+ asChild,+ ...props+}: ListItemProps) => {+ const stateProp =+ state === "disabled"+ ? { "data-state": "disabled" }+ : state === "selected"+ ? { "data-state": "selected" }+ : undefined;+ const { pressProps } = usePress({+ onPress() {+ onSelect?.();+ },+ });+ const Component = asChild ? Slot : "li";+ return (+ <Component+ tabIndex={index === 0 ? 0 : -1}+ role="option"+ key={index}+ {...(state === "selected" ? { "aria-selected": true } : undefined)}+ {...(current ? { "aria-current": true } : undefined)}+ {...props}+ {...stateProp}+ {...pressProps}+ />+ );+};++ListItem.displayName = "ListItem";diff --git a/packages/design-system/src/components/select.tsx b/packages/design-system/src/components/select.tsxindex 314decec54..b269e76c2d 100644--- a/packages/design-system/src/components/select.tsx+++ b/packages/design-system/src/components/select.tsx@@ -7,8 +7,8 @@ import React, {} from "react";import {menuCss,- itemCss,- itemIndicatorCss,+ menuItemCss,+ menuItemIndicatorCss,labelCss,separatorCss,MenuCheckedIcon,@@ -27,13 +27,13 @@ export const SelectSeparator = styled(Primitive.Separator, separatorCss);export const SelectGroup = Primitive.Group;-const StyledItem = styled(Primitive.Item, itemCss, {+const StyledItem = styled(Primitive.Item, menuItemCss, {// we don't want to transform text using CSS in case of the Select,// we want getLabel to handle ittextTransform: "none",});-const StyledIndicator = styled(Primitive.ItemIndicator, itemIndicatorCss);+const StyledIndicator = styled(Primitive.ItemIndicator, menuItemIndicatorCss);const scrollButtonStyles = {display: "flex",diff --git a/packages/design-system/src/index.ts b/packages/design-system/src/index.tsindex e3a64e8c33..16c24a8e51 100644--- a/packages/design-system/src/index.ts+++ b/packages/design-system/src/index.ts@@ -17,7 +17,11 @@ export * from "./components/toggle-button";export * from "./components/dialog";export * from "./components/floating-panel-popover";export * from "./components/popover";-export { MenuItemButton } from "./components/menu";+export {+ MenuItemButton,+ MenuCheckedIcon,+ MenuItemIndicator,+} from "./components/menu";export * from "./components/switch";export * from "./components/toolbar";export * from "./components/two-rows-icon-button-container";@@ -63,7 +67,6 @@ export * from "./components/slider";export * from "./components/avatar";export * from "./components/icon-button-with-menu";export * from "./components/tree";-export * from "./components/list";// No need to align@@ -79,6 +82,7 @@ export * from "./components/primitives/arrow-focus";export * from "./components/scroll-area";export * from "./components/primitives/use-scrub";export * from "./components/primitives/numeric-input-arrow-keys";+export * from "./components/primitives/list";// Deprecated@@ -91,3 +95,4 @@ export { DeprecatedLabel } from "./components/__DEPRECATED__/label";export * from "./components/__DEPRECATED__/popover";export * from "./components/__DEPRECATED__/paragraph";export * from "./components/__DEPRECATED__/text-field";+export * from "./components/__DEPRECATED__/list";