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 breadcrumbs labels (#2038)
Bogdan Chadkind88939b4779d
diff --git a/apps/builder/app/builder/features/footer/breadcrumbs.tsx b/apps/builder/app/builder/features/footer/breadcrumbs.tsxindex 63de7829fd..579a206fff 100644--- a/apps/builder/app/builder/features/footer/breadcrumbs.tsx+++ b/apps/builder/app/builder/features/footer/breadcrumbs.tsx@@ -8,11 +8,13 @@ import {} from "@webstudio-is/design-system";import {instancesStore,+ registeredComponentMetasStore,selectedInstanceSelectorStore,selectedStyleSourceSelectorStore,} from "~/shared/nano-states";import { getAncestorInstanceSelector } from "~/shared/tree-utils";import { textEditingInstanceSelectorStore } from "~/shared/nano-states";+import { getInstanceLabel } from "~/shared/instance-utils";type BreadcrumbProps = {children: JSX.Element | string;@@ -42,6 +44,7 @@ const Breadcrumb = ({ children, onClick }: BreadcrumbProps) => {export const Breadcrumbs = () => {const instances = useStore(instancesStore);const selectedInstanceSelector = useStore(selectedInstanceSelectorStore);+ const metas = useStore(registeredComponentMetasStore);return (<Flex align="center" css={{ height: "100%" }}>@@ -59,6 +62,10 @@ export const Breadcrumbs = () => {if (instance === undefined) {return;}+ const meta = metas.get(instance.component);+ if (meta === undefined) {+ return;+ }return (<Breadcrumbkey={instance.id}@@ -73,7 +80,7 @@ export const Breadcrumbs = () => {selectedStyleSourceSelectorStore.set(undefined);}}>- {instance.label || instance.component}+ {getInstanceLabel(instance, meta)}</Breadcrumb>);})diff --git a/apps/builder/app/builder/features/inspector/inspector.tsx b/apps/builder/app/builder/features/inspector/inspector.tsxindex 3cfba4362b..a7aeca3eb4 100644--- a/apps/builder/app/builder/features/inspector/inspector.tsx+++ b/apps/builder/app/builder/features/inspector/inspector.tsx@@ -26,7 +26,7 @@ import {import { NavigatorTree } from "~/builder/shared/navigator-tree";import type { Settings } from "~/builder/shared/client-settings";import { MetaIcon } from "~/builder/shared/meta-icon";-import { getInstanceLabel } from "~/builder/shared/tree";+import { getInstanceLabel } from "~/shared/instance-utils";const InstanceInfo = ({ instance }: { instance: Instance }) => {const metas = useStore(registeredComponentMetasStore);diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/label.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/label.tsxindex 8b53ee86ef..3e86c858eb 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/outline/label.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/label.tsx@@ -3,9 +3,9 @@ import { useStore } from "@nanostores/react";import { styled, type Rect } from "@webstudio-is/design-system";import type { Instance } from "@webstudio-is/project-build";import { theme } from "@webstudio-is/design-system";-import { getInstanceLabel } from "~/builder/shared/tree";import { MetaIcon } from "~/builder/shared/meta-icon";import { registeredComponentMetasStore } from "~/shared/nano-states";+import { getInstanceLabel } from "~/shared/instance-utils";type LabelPosition = "top" | "inside" | "bottom";type LabelRefCallback = (element: HTMLElement | null) => void;diff --git a/apps/builder/app/builder/shared/tree/index.tsx b/apps/builder/app/builder/shared/tree/index.tsxindex 5ee06ab54f..45041f0c2a 100644--- a/apps/builder/app/builder/shared/tree/index.tsx+++ b/apps/builder/app/builder/shared/tree/index.tsx@@ -11,7 +11,6 @@ import {} from "@webstudio-is/design-system";import type { Instance } from "@webstudio-is/project-build";import store from "immerhin";-import { type WsComponentMeta } from "@webstudio-is/react-sdk";import {editingItemIdStore,instancesStore,@@ -19,6 +18,7 @@ import {} from "~/shared/nano-states";import { MetaIcon } from "../meta-icon";import { useContentEditable } from "~/shared/dom-hooks";+import { getInstanceLabel } from "~/shared/instance-utils";export const InstanceTree = (props: Omit<@@ -121,13 +121,6 @@ export const InstanceTree = ();};-export const getInstanceLabel = (- instance: { label?: string },- meta: WsComponentMeta-) => {- return instance.label || meta.label;-};-const TreeItem = ({prefix,children,diff --git a/apps/builder/app/shared/instance-utils.ts b/apps/builder/app/shared/instance-utils.tsindex 5e71b2676c..b98d35d4fe 100644--- a/apps/builder/app/shared/instance-utils.ts+++ b/apps/builder/app/shared/instance-utils.ts@@ -39,6 +39,13 @@ import { removeByMutable } from "./array-utils";import { isBaseBreakpoint } from "./breakpoints";import { getElementByInstanceSelector } from "./dom-utils";+export const getInstanceLabel = (+ instance: { label?: string },+ meta: WsComponentMeta+) => {+ return instance.label || meta.label;+};+export const findClosestEditableInstanceSelector = (instanceSelector: InstanceSelector,instances: Instances,diff --git a/packages/sdk-components-react-radix/src/dialog.ws.tsx b/packages/sdk-components-react-radix/src/dialog.ws.tsxindex aa643c352b..00b788c506 100644--- a/packages/sdk-components-react-radix/src/dialog.ws.tsx+++ b/packages/sdk-components-react-radix/src/dialog.ws.tsx@@ -46,7 +46,7 @@ export const metaDialogTrigger: WsComponentMeta = {category: "hidden",invalidAncestors: [],type: "container",- label: "DialogTrigger",+ label: "Dialog Trigger",icon: TriggerIcon,stylable: false,detachable: false,@@ -56,7 +56,7 @@ export const metaDialogContent: WsComponentMeta = {category: "hidden",invalidAncestors: [],type: "container",- label: "DialogContent",+ label: "Dialog Content",presetStyle,icon: ContentIcon,detachable: false,@@ -66,7 +66,7 @@ export const metaDialogOverlay: WsComponentMeta = {category: "hidden",invalidAncestors: [],type: "container",- label: "DialogOverlay",+ label: "Dialog Overlay",presetStyle,icon: OverlayIcon,detachable: false,@@ -77,7 +77,7 @@ export const metaDialogTitle: WsComponentMeta = {invalidAncestors: [],type: "container",presetStyle: titlePresetStyle,- label: "DialogTitle",+ label: "Dialog Title",icon: HeadingIcon,};@@ -86,7 +86,7 @@ export const metaDialogDescription: WsComponentMeta = {invalidAncestors: [],type: "container",presetStyle: descriptionPresetStyle,- label: "DialogDescription",+ label: "Dialog Description",icon: TextIcon,};@@ -95,7 +95,7 @@ export const metaDialogClose: WsComponentMeta = {invalidAncestors: [],type: "container",presetStyle: buttonPresetStyle,- label: "DialogClose",+ label: "Dialog Close",icon: ButtonElementIcon,};@@ -119,7 +119,6 @@ export const metaDialog: WsComponentMeta = {{type: "instance",component: "Dialog",- label: "Dialog",dataSources: {// We don't have support for boolean or undefined, instead of binding on open we bind on a stringisOpen: { type: "variable", initialValue: "initial" },@@ -147,7 +146,6 @@ export const metaDialog: WsComponentMeta = {{type: "instance",component: "DialogOverlay",- label: "Dialog Overlay",props: [],/*** fixed inset-0 z-50 bg-background/80 backdrop-blur-sm@@ -166,7 +164,6 @@ export const metaDialog: WsComponentMeta = {{type: "instance",component: "DialogContent",- label: "Dialog Content",props: [],/*** fixed w-full z-50@@ -199,7 +196,6 @@ export const metaDialog: WsComponentMeta = {{type: "instance",component: "DialogTitle",- label: "Dialog Title",props: [],/*** text-lg leading-none tracking-tight@@ -220,7 +216,6 @@ export const metaDialog: WsComponentMeta = {{type: "instance",component: "DialogDescription",- label: "Dialog Description",props: [],/*** text-sm text-muted-foreground@@ -249,7 +244,6 @@ export const metaDialog: WsComponentMeta = {{type: "instance",component: "DialogClose",- label: "Dialog Close",props: [],/*** absolute right-4 top-4diff --git a/packages/sdk-components-react-radix/src/popover.ws.tsx b/packages/sdk-components-react-radix/src/popover.ws.tsxindex fe429ae852..0b24559dd8 100644--- a/packages/sdk-components-react-radix/src/popover.ws.tsx+++ b/packages/sdk-components-react-radix/src/popover.ws.tsx@@ -21,7 +21,7 @@ export const metaPopoverTrigger: WsComponentMeta = {category: "hidden",invalidAncestors: [],type: "container",- label: "PopoverTrigger",+ label: "Popover Trigger",icon: TriggerIcon,stylable: false,detachable: false,@@ -32,7 +32,7 @@ export const metaPopoverContent: WsComponentMeta = {invalidAncestors: [],type: "container",presetStyle,- label: "PopoverContent",+ label: "Popover Content",icon: ContentIcon,detachable: false,};@@ -57,7 +57,6 @@ export const metaPopover: WsComponentMeta = {{type: "instance",component: "Popover",- label: "Popover",dataSources: {// We don't have support for boolean or undefined, instead of binding on open we bind on a stringisOpen: { type: "variable", initialValue: "initial" },@@ -85,7 +84,6 @@ export const metaPopover: WsComponentMeta = {{type: "instance",component: "PopoverContent",- label: "Popover Content",props: [],/*** z-50 w-72 rounded-md border bg-popover p-4 text-popover-foreground shadow-md outline-nonediff --git a/packages/sdk-components-react-radix/src/sheet.ws.tsx b/packages/sdk-components-react-radix/src/sheet.ws.tsxindex 4ad91165c3..63abb76749 100644--- a/packages/sdk-components-react-radix/src/sheet.ws.tsx+++ b/packages/sdk-components-react-radix/src/sheet.ws.tsx@@ -53,7 +53,7 @@ const descriptionPresetStyle = {export const metaSheetTrigger: WsComponentMeta = {category: "hidden",type: "container",- label: "SheetTrigger",+ label: "Sheet Trigger",icon: TriggerIcon,stylable: false,detachable: false,@@ -62,7 +62,7 @@ export const metaSheetTrigger: WsComponentMeta = {export const metaSheetContent: WsComponentMeta = {category: "hidden",type: "container",- label: "SheetContent",+ label: "Sheet Content",icon: ContentIcon,detachable: false,presetStyle: contentPresetStyle,@@ -78,7 +78,7 @@ export const metaSheetOverlay: WsComponentMeta = {category: "hidden",type: "container",presetStyle,- label: "SheetOverlay",+ label: "Sheet Overlay",icon: OverlayIcon,detachable: false,};@@ -87,7 +87,7 @@ export const metaSheetTitle: WsComponentMeta = {category: "hidden",type: "container",presetStyle: titlePresetStyle,- label: "SheetTitle",+ label: "Sheet Title",icon: HeadingIcon,};@@ -95,7 +95,7 @@ export const metaSheetDescription: WsComponentMeta = {category: "hidden",type: "container",presetStyle: descriptionPresetStyle,- label: "SheetDescription",+ label: "Sheet Description",icon: TextIcon,};@@ -103,7 +103,7 @@ export const metaSheetClose: WsComponentMeta = {category: "hidden",type: "container",presetStyle: buttonPresetStyle,- label: "SheetClose",+ label: "Sheet Close",icon: ButtonElementIcon,};@@ -127,7 +127,6 @@ export const metaSheet: WsComponentMeta = {{type: "instance",component: "Sheet",- label: "Sheet",dataSources: {// We don't have support for boolean or undefined, instead of binding on open we bind on a stringisOpen: { type: "variable", initialValue: "initial" },@@ -154,7 +153,6 @@ export const metaSheet: WsComponentMeta = {{type: "instance",component: "SheetOverlay",- label: "Sheet Overlay",/*** fixed inset-0 z-50 bg-background/80 backdrop-blur-sm* flex@@ -174,7 +172,6 @@ export const metaSheet: WsComponentMeta = {{type: "instance",component: "SheetContent",- label: "Sheet Content",/*** fixed w-full z-50* grid gap-4 max-w-lg@@ -213,7 +210,6 @@ export const metaSheet: WsComponentMeta = {{type: "instance",component: "SheetTitle",- label: "Sheet Title",/*** text-lg leading-none tracking-tight**/@@ -233,7 +229,6 @@ export const metaSheet: WsComponentMeta = {{type: "instance",component: "SheetDescription",- label: "Sheet Description",/*** text-sm text-muted-foreground**/@@ -261,7 +256,6 @@ export const metaSheet: WsComponentMeta = {{type: "instance",component: "SheetClose",- label: "Sheet Close",/*** absolute right-4 top-4* rounded-sm opacity-70diff --git a/packages/sdk-components-react-radix/src/tooltip.ws.tsx b/packages/sdk-components-react-radix/src/tooltip.ws.tsxindex 5acb54b064..c05b1815a2 100644--- a/packages/sdk-components-react-radix/src/tooltip.ws.tsx+++ b/packages/sdk-components-react-radix/src/tooltip.ws.tsx@@ -22,7 +22,7 @@ export const metaTooltipTrigger: WsComponentMeta = {detachable: false,invalidAncestors: [],type: "container",- label: "TooltipTrigger",+ label: "Tooltip Trigger",icon: TriggerIcon,stylable: false,};@@ -33,7 +33,7 @@ export const metaTooltipContent: WsComponentMeta = {invalidAncestors: [],type: "container",presetStyle,- label: "TooltipContent",+ label: "Tooltip Content",icon: ContentIcon,};@@ -57,7 +57,6 @@ export const metaTooltip: WsComponentMeta = {{type: "instance",component: "Tooltip",- label: "Tooltip",dataSources: {// We don't have support for boolean or undefined, instead of binding on open we bind on a stringisOpen: { type: "variable", initialValue: "initial" },@@ -85,7 +84,6 @@ export const metaTooltip: WsComponentMeta = {{type: "instance",component: "TooltipContent",- label: "Tooltip Content",props: [],/*** z-50 overflow-hidden rounded-md border bg-popover px-3 py-1.5 text-sm text-popover-foreground shadow-md