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.

Add MenuCheckedAndSetIcon MenuSetDotIcon (#1015)

Roman Pominov4ca4124ac6d4
diff --git a/.lostpixel/baseline/library-menu-menu-item--menu-menu-item.png b/.lostpixel/baseline/library-menu-menu-item--menu-menu-item.png
index ca7bf0d468..8f3dbbb136 100644
Binary files a/.lostpixel/baseline/library-menu-menu-item--menu-menu-item.png and b/.lostpixel/baseline/library-menu-menu-item--menu-menu-item.png differ
diff --git a/packages/design-system/src/components/combobox.tsx b/packages/design-system/src/components/combobox.tsx
index f37b410c2d..e54c2e5ba8 100644
--- a/packages/design-system/src/components/combobox.tsx
+++ b/packages/design-system/src/components/combobox.tsx
@@ -9,7 +9,6 @@ import {
type ChangeEvent,
type ReactNode,
} from "react";
-import { CheckMarkIcon } from "@webstudio-is/icons";
// @todo:
// react-popper "is an internal utility, not intended for public usage"
// probably need to switch to @radix-ui/react-popover
@@ -29,6 +28,7 @@ import {
itemIndicatorCss,
labelCss,
separatorCss,
+ MenuCheckedIcon,
} from "./menu";
const Listbox = styled(
@@ -69,7 +69,7 @@ const ListboxItemBase: ForwardRefRenderFunction<
selectable = true,
highlighted,
children,
- icon = <CheckMarkIcon />,
+ icon = <MenuCheckedIcon />,
...rest
} = props;
return (
diff --git a/packages/design-system/src/components/dropdown-menu.tsx b/packages/design-system/src/components/dropdown-menu.tsx
index 33e5f92b54..6b16f0c9c0 100644
--- a/packages/design-system/src/components/dropdown-menu.tsx
+++ b/packages/design-system/src/components/dropdown-menu.tsx
@@ -4,7 +4,7 @@ import {
type ElementRef,
type ReactNode,
} from "react";
-import { CheckMarkIcon, ChevronFilledRightIcon } from "@webstudio-is/icons";
+import { ChevronFilledRightIcon } from "@webstudio-is/icons";
import { styled } from "../stitches.config";
import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";
import {
@@ -15,6 +15,7 @@ import {
labelCss,
itemIndicatorCss,
subContentProps,
+ MenuCheckedIcon,
} from "./menu";
export { DropdownMenuArrow } from "./menu";
@@ -95,7 +96,7 @@ const StyledRadioItem = styled(DropdownMenuPrimitive.RadioItem, itemCss);
export const DropdownMenuRadioItem = forwardRef<
ElementRef<typeof StyledRadioItem>,
ComponentProps<typeof StyledRadioItem> & { icon?: ReactNode }
->(({ children, icon = <CheckMarkIcon />, ...props }, forwardedRef) => (
+>(({ children, icon = <MenuCheckedIcon />, ...props }, forwardedRef) => (
<StyledRadioItem withIndicator {...props} ref={forwardedRef}>
<Indicator>{icon}</Indicator>
{children}
@@ -107,7 +108,7 @@ const StyledCheckboxItem = styled(DropdownMenuPrimitive.CheckboxItem, itemCss);
export const DropdownMenuCheckboxItem = forwardRef<
ElementRef<typeof StyledCheckboxItem>,
ComponentProps<typeof StyledCheckboxItem> & { icon?: ReactNode }
->(({ children, icon = <CheckMarkIcon />, ...props }, forwardedRef) => (
+>(({ children, icon = <MenuCheckedIcon />, ...props }, forwardedRef) => (
<StyledCheckboxItem withIndicator {...props} ref={forwardedRef}>
<Indicator>{icon}</Indicator>
{children}
diff --git a/packages/design-system/src/components/menu.stories.tsx b/packages/design-system/src/components/menu.stories.tsx
index 5740dbfbe4..92cb820e95 100644
--- a/packages/design-system/src/components/menu.stories.tsx
+++ b/packages/design-system/src/components/menu.stories.tsx
@@ -33,6 +33,7 @@ import {
SelectSeparator,
SelectGroup,
} from "./select";
+import { MenuCheckedAndSetIcon, MenuSetDotIcon } from "./menu";
import { TextField } from "./text-field";
import { Button } from "./button";
import {
@@ -48,6 +49,7 @@ import { StorySection } from "./storybook";
const DropdownDemo = ({ withIndicator }: { withIndicator: boolean }) => {
const [isApple, setIsApple] = useState(true);
const [isOrange, setIsOrange] = useState(true);
+ const [isPeach, setIsPeach] = useState(true);
const [radioValue, setRadioValue] = useState("apple");
return (
@@ -102,10 +104,18 @@ const DropdownDemo = ({ withIndicator }: { withIndicator: boolean }) => {
</DropdownMenuCheckboxItem>
<DropdownMenuCheckboxItem
checked={isOrange}
+ icon={<MenuCheckedAndSetIcon />}
onSelect={() => setIsOrange(isOrange === false)}
>
Orange
</DropdownMenuCheckboxItem>
+ <DropdownMenuCheckboxItem
+ checked={isPeach}
+ icon={<MenuSetDotIcon />}
+ onSelect={() => setIsPeach(isPeach === false)}
+ >
+ Peach
+ </DropdownMenuCheckboxItem>
<DropdownMenuSeparator />
<DropdownMenuLabel>Choose one</DropdownMenuLabel>
diff --git a/packages/design-system/src/components/menu.tsx b/packages/design-system/src/components/menu.tsx
index 248f4062dc..d31ceaafa8 100644
--- a/packages/design-system/src/components/menu.tsx
+++ b/packages/design-system/src/components/menu.tsx
@@ -22,6 +22,7 @@ import {
Arrow as BaseDropdownMenuArrow,
SubContent,
} from "@radix-ui/react-dropdown-menu";
+import { CheckMarkIcon, DotIcon } from "@webstudio-is/icons";
import { type ComponentProps } from "react";
export const labelCss = css(textVariants.title, {
@@ -133,3 +134,18 @@ export const DropdownMenuArrow = () => (
</ArrowSgv>
</BaseDropdownMenuArrow>
);
+
+const setIconStyle = css({
+ color: theme.colors.foregroundPrimary,
+});
+
+// Icon for the "checked" state from Figma
+export const MenuCheckedIcon = () => <CheckMarkIcon />;
+
+// Icon for the "checked and set" state from Figma
+export const MenuCheckedAndSetIcon = () => (
+ <CheckMarkIcon className={setIconStyle()} />
+);
+
+// Icon for the "set dot" state from Figma
+export const MenuSetDotIcon = () => <DotIcon className={setIconStyle()} />;
diff --git a/packages/design-system/src/components/select.tsx b/packages/design-system/src/components/select.tsx
index 16b417e43f..f1b17265f1 100644
--- a/packages/design-system/src/components/select.tsx
+++ b/packages/design-system/src/components/select.tsx
@@ -6,12 +6,9 @@ import {
itemIndicatorCss,
labelCss,
separatorCss,
+ MenuCheckedIcon,
} from "./menu";
-import {
- CheckMarkIcon,
- ChevronDownIcon,
- ChevronUpIcon,
-} from "@webstudio-is/icons";
+import { ChevronDownIcon, ChevronUpIcon } from "@webstudio-is/icons";
import { styled, theme } from "../stitches.config";
const StyledTrigger = styled(SelectPrimitive.Trigger, {
@@ -101,7 +98,7 @@ export const SelectScrollDownButton = styled(
);
const SelectItemBase = (
- { children, icon = <CheckMarkIcon />, ...props }: SelectItemProps,
+ { children, icon = <MenuCheckedIcon />, ...props }: SelectItemProps,
forwardedRef: Ref<HTMLDivElement>
) => {
return (
diff --git a/packages/icons/icons/dot.svg b/packages/icons/icons/dot.svg
index eb2a3e11f6..461ddd5412 100644
--- a/packages/icons/icons/dot.svg
+++ b/packages/icons/icons/dot.svg
@@ -1,3 +1,3 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 8C10 9.10457 9.10457 10 8 10C6.89543 10 6 9.10457 6 8C6 6.89543 6.89543 6 8 6C9.10457 6 10 6.89543 10 8Z" fill="#11181C"/>
+<path d="M10 8C10 9.10457 9.10457 10 8 10C6.89543 10 6 9.10457 6 8C6 6.89543 6.89543 6 8 6C9.10457 6 10 6.89543 10 8Z" />
</svg>
diff --git a/packages/icons/src/__generated__/dot.tsx b/packages/icons/src/__generated__/dot.tsx
index ac4076d3a6..22e5b1fbc4 100644
--- a/packages/icons/src/__generated__/dot.tsx
+++ b/packages/icons/src/__generated__/dot.tsx
@@ -7,7 +7,7 @@ import type { IconProps } from "../types";
export const DotIcon = forwardRef<SVGSVGElement, IconProps>(
({ color = "currentColor", size = 16, ...props }, forwardedRef) => {
return (
- <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width={size} height={size} fill={color} {...props} ref={forwardedRef}><path fill="#11181C" d="M10 8a2 2 0 1 1-4 0 2 2 0 0 1 4 0Z" /></svg>
+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width={size} height={size} fill={color} {...props} ref={forwardedRef}><path d="M10 8a2 2 0 1 1-4 0 2 2 0 0 1 4 0Z" /></svg>
);
}
);