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
refactor: use List and ListItem component (#2974)
Oleg Isonen2db6cf37fa6a
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx b/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsxindex 6252bc757a..07f18e75fd 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx@@ -1,6 +1,5 @@import { useMemo } from "react";import { useStore } from "@nanostores/react";-import { usePress } from "@react-aria/interactions";import {type WsComponentMeta,componentCategories,@@ -9,9 +8,9 @@ import {theme,Flex,ComponentCard,- Tooltip,- ArrowFocus,ScrollArea,+ List,+ ListItem,} from "@webstudio-is/design-system";import { PlusIcon } from "@webstudio-is/icons";import { CollapsibleSection } from "~/builder/shared/collapsible-section";@@ -37,18 +36,6 @@ export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {publish,metaByComponentName,});- const { pressProps } = usePress({- onPress(event) {- const component = elementToComponentName(- event.target,- metaByComponentName- );- if (component) {- onSetActiveTab("none");- handleInsert(component);- }- },- });return (<Root ref={draggableContainerRef}>@@ -66,41 +53,47 @@ export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {}).map((category) => (<CollapsibleSection label={category} key={category} fullWidth>- <ArrowFocus- render={({ handleKeyDown }) => (- <Flex- onKeyDown={handleKeyDown}- gap="2"- wrap="wrap"- css={{ px: theme.spacing[9], overflow: "auto" }}- >- {(metaByCategory.get(category) ?? []).map(- (meta: WsComponentMeta, index) => {- const component = componentNamesByMeta.get(meta);- if (component === undefined) {- return;- }- return (- <Tooltip- content={meta.description ?? meta.label}- key={component}- css={{ maxWidth: theme.spacing[28] }}- >- <ComponentCard- {...pressProps}- {...{ [dragItemAttribute]: component }}- label={getInstanceLabel({ component }, meta)}- icon={<MetaIcon size="auto" icon={meta.icon} />}- tabIndex={index === 0 ? 0 : -1}- />- </Tooltip>- );+ <List asChild>+ <Flex+ gap="2"+ wrap="wrap"+ css={{ px: theme.spacing[9], overflow: "auto" }}+ >+ {(metaByCategory.get(category) ?? []).map(+ (meta: WsComponentMeta, index) => {+ const component = componentNamesByMeta.get(meta);+ if (component === undefined) {+ return;}- )}- {dragCard}- </Flex>- )}- />+ return (+ <ListItem+ asChild+ index={index}+ key={component}+ onSelect={(event) => {+ const component = elementToComponentName(+ event.target as HTMLElement,+ metaByComponentName+ );+ if (component) {+ onSetActiveTab("none");+ handleInsert(component);+ }+ }}+ >+ <ComponentCard+ {...{ [dragItemAttribute]: component }}+ label={getInstanceLabel({ component }, meta)}+ description={meta.description}+ icon={<MetaIcon size="auto" icon={meta.icon} />}+ />+ </ListItem>+ );+ }+ )}+ {dragCard}+ </Flex>+ </List></CollapsibleSection>))}</ScrollArea>diff --git a/packages/design-system/src/components/component-card.stories.tsx b/packages/design-system/src/components/component-card.stories.tsxindex b1f665b185..b56916cb6b 100644--- a/packages/design-system/src/components/component-card.stories.tsx+++ b/packages/design-system/src/components/component-card.stories.tsx@@ -1,6 +1,7 @@import { BoxIcon } from "@webstudio-is/icons";import { StoryGrid, StorySection } from "./storybook";import { ComponentCard } from "./component-card";+import { TooltipProvider } from "./tooltip";export default {title: "Library/Component Card",@@ -8,7 +9,7 @@ export default {export const Demo = () => {return (- <>+ <TooltipProvider><StorySection title="States"><StoryGrid horizontal><ComponentCard icon={<BoxIcon />} label="Box" tabIndex={1} />@@ -52,7 +53,7 @@ export const Demo = () => {/></StoryGrid></StorySection>- </>+ </TooltipProvider>);};Demo.storyName = "Component Card";diff --git a/packages/design-system/src/components/component-card.tsx b/packages/design-system/src/components/component-card.tsxindex c6ff8b022d..d7f0c649d1 100644--- a/packages/design-system/src/components/component-card.tsx+++ b/packages/design-system/src/components/component-card.tsx@@ -3,9 +3,10 @@* https://www.figma.com/file/sfCE7iLS0k25qCxiifQNLE/%F0%9F%93%9A-Webstudio-Library?node-id=2608-8921*/-import { forwardRef, type ElementRef, type ComponentProps } from "react";-import { textVariants } from "../";+import { forwardRef, type ComponentProps } from "react";import { css, theme } from "../stitches.config";+import { textVariants } from "./text";+import { Tooltip } from "./tooltip";const cardStyle = css({boxSizing: "border-box",@@ -60,25 +61,31 @@ const textStyle = css(textVariants.small, {type ComponentCardProps = {label: string;+ description?: string;icon: JSX.Element;state?: "hover" | "disabled" | "focus";} & ComponentProps<"div">;-export const ComponentCard = forwardRef<ElementRef<"div">, ComponentCardProps>(- ({ icon, label, className, state, ...props }, ref) => {+export const ComponentCard = forwardRef<HTMLDivElement, ComponentCardProps>(+ ({ icon, label, className, state, description, ...props }, ref) => {return (- <div- className={cardStyle({ className })}- ref={ref}- data-state={state}- {...props}+ <Tooltip+ content={description ?? label}+ css={{ maxWidth: theme.spacing[28] }}>- {icon}+ <div+ className={cardStyle({ className })}+ ref={ref}+ data-state={state}+ {...props}+ >+ {icon}- <div className={textContainerStyle()}>- <div className={textStyle()}>{label}</div>+ <div className={textContainerStyle()}>+ <div className={textStyle()}>{label}</div>+ </div></div>- </div>+ </Tooltip>);});