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
feat: use background color to highlight the selected navigator tree (#5667)
Shrekfa54dbaafce5
diff --git a/apps/builder/app/builder/features/navigator/navigator-tree.tsx b/apps/builder/app/builder/features/navigator/navigator-tree.tsxindex 9545eebe84..517dc4c177 100644--- a/apps/builder/app/builder/features/navigator/navigator-tree.tsx+++ b/apps/builder/app/builder/features/navigator/navigator-tree.tsx@@ -51,7 +51,7 @@ import {type ItemDropTarget,$propValuesByInstanceSelectorWithMemoryProps,} from "~/shared/nano-states";-import type { InstanceSelector } from "~/shared/tree-utils";+import { isDescendantOrSelf, type InstanceSelector } from "~/shared/tree-utils";import { serverSyncStore } from "~/shared/sync/sync-stores";import { reparentInstance, toggleInstanceShow } from "~/shared/instance-utils";import { emitCommand } from "~/builder/shared/commands";@@ -661,6 +661,10 @@ export const NavigatorTree = () => {getInstanceKey(item.selector));const show = Boolean(propValues?.get(showAttribute) ?? true);+ const isSelectedDescendantItem =+ selectedInstanceSelector !== undefined &&+ item.selector.join() !== selectedInstanceSelector.join() &&+ isDescendantOrSelf(item.selector, selectedInstanceSelector);// Hook memory propconst isAnimationSelected =@@ -733,6 +737,7 @@ export const NavigatorTree = () => {<TreeNodelevel={level}isSelected={selectedKey === key}+ isSelectedDescendant={isSelectedDescendantItem}isHighlighted={hoveredKey === key || dropTargetKey === key}isExpanded={item.isExpanded}isActionVisible={isAnimating}diff --git a/apps/builder/app/shared/tree-utils.test.ts b/apps/builder/app/shared/tree-utils.test.tsindex 6def465e75..5cdf4b0813 100644--- a/apps/builder/app/shared/tree-utils.test.ts+++ b/apps/builder/app/shared/tree-utils.test.ts@@ -122,4 +122,10 @@ test("is descendant or self", () => {expect(isDescendantOrSelf(["1", "2", "3"], ["1", "2", "3"])).toBe(true);expect(isDescendantOrSelf(["0", "1", "2", "3"], ["1", "2", "3"])).toBe(true);expect(isDescendantOrSelf(["1", "2", "3"], ["0", "1", "2", "3"])).toBe(false);+ expect(+ isDescendantOrSelf(+ ["item-child", "collection:entry-1", "collection", "body", "page-root"],+ ["collection", "body", "page-root"]+ )+ ).toBe(true);});diff --git a/packages/design-system/src/__generated__/figma-design-tokens.json b/packages/design-system/src/__generated__/figma-design-tokens.jsonindex 0e5ca7f2e8..09549c35e6 100644--- a/packages/design-system/src/__generated__/figma-design-tokens.json+++ b/packages/design-system/src/__generated__/figma-design-tokens.json@@ -565,7 +565,7 @@"description": "color for current item in the navigator item, menu item, pages panel item components"},"current-child": {- "value": "{background.panel}",+ "value": "#eef6ff","type": "color","description": "color for child of current item in the navigator item, pages panel item components"},diff --git a/packages/design-system/src/__generated__/figma-design-tokens.ts b/packages/design-system/src/__generated__/figma-design-tokens.tsindex 70fcd5266c..69a0139284 100644--- a/packages/design-system/src/__generated__/figma-design-tokens.ts+++ b/packages/design-system/src/__generated__/figma-design-tokens.ts@@ -404,7 +404,7 @@ export const color = {backgroundButtonDisabled: "#e9ebed",backgroundButtonDisabledDark: "#646464",backgroundItemCurrent: "#e1f0ff",- backgroundItemCurrentChild: "#fff",+ backgroundItemCurrentChild: "#eef6ff",backgroundItemCurrentHidden: "#7e868c",backgroundItemMenuItemHover: "#efefef",backgroundTooltipMain: "#11181c",diff --git a/packages/design-system/src/components/tree.stories.tsx b/packages/design-system/src/components/tree.stories.tsxindex 988c431e55..c8bdd2c9c6 100644--- a/packages/design-system/src/components/tree.stories.tsx+++ b/packages/design-system/src/components/tree.stories.tsx@@ -298,6 +298,16 @@ export const Tree = () => {With prefix and action visible</TreeNodeLabel></TreeNode>+ <TreeNode+ level={2}+ isSelected={false}+ isSelectedDescendant+ isExpanded={undefined}+ buttonProps={{}}+ action={<SmallIconButton tabIndex={-1} icon={<EllipsesIcon />} />}+ >+ <TreeNodeLabel>Selected descendant node</TreeNodeLabel>+ </TreeNode><TreeNodelevel={1}tabbablediff --git a/packages/design-system/src/components/tree.tsx b/packages/design-system/src/components/tree.tsxindex 9c1dba7a45..1f4de28313 100644--- a/packages/design-system/src/components/tree.tsx+++ b/packages/design-system/src/components/tree.tsx@@ -31,8 +31,26 @@ const treeNodeLevel = "--tree-node-level";const treeNodeOutline = "--tree-node-outline";const treeNodeBackgroundColor = "--tree-node-background-color";const treeActionOpacity = "--tree-action-opacity";-const treeDepthBarsVisibility = "--tree-depth-bars-visibility";-const treeDepthBarsColor = "--tree-depth-bars-color";++type TreeSelectionState = "none" | "selected" | "selected-descendant";++const getTreeSelectionState = ({+ isSelected,+ isSelectedDescendant,+}: {+ isSelected: boolean;+ isSelectedDescendant: boolean;+}): TreeSelectionState => {+ if (isSelected) {+ return "selected";+ }++ if (isSelectedDescendant) {+ return "selected-descendant";+ }++ return "none";+};const ITEM_PADDING_LEFT = 8;// extra padding on the right to make sure scrollbar doesn't obscure anything@@ -44,11 +62,6 @@ const TreeContainer = ({ children }: { children: ReactNode }) => {const focusManager = useFocusManager();return (<Box- css={{- "&:hover": {- [treeDepthBarsVisibility]: "visible",- },- }}onKeyDown={(event) => {if (event.defaultPrevented) {return;@@ -100,29 +113,16 @@ const NodeContainer = styled("div", {backgroundColor: `var(${treeNodeBackgroundColor})`,[treeActionOpacity]: 1,},- "&:has([aria-selected=true])": {+ '&[data-selection-state="selected-descendant"]': {+ [treeNodeBackgroundColor]: theme.colors.backgroundItemCurrentChild,+ backgroundColor: `var(${treeNodeBackgroundColor})`,+ },+ '&[data-selection-state="selected"]': {[treeNodeBackgroundColor]: theme.colors.backgroundItemCurrent,backgroundColor: `var(${treeNodeBackgroundColor})`,- [treeDepthBarsColor]: theme.colors.borderItemChildLineCurrent,},});-const DepthBars = styled("div", {- visibility: `var(${treeDepthBarsVisibility}, hidden)`,- position: "absolute",- top: 0,- left: 0,- width: `calc((var(${treeNodeLevel}) - 1) * ${BARS_GAP}px)`,- height: "100%",- backgroundImage: `repeating-linear-gradient(- to right,- transparent,- transparent ${BARS_GAP - 1}px,- var(${treeDepthBarsColor}, ${theme.colors.borderItemChildLine}) ${BARS_GAP - 1}px,- var(${treeDepthBarsColor}, ${theme.colors.borderItemChildLine}) ${BARS_GAP}px- )`,-});-const NodeButton = styled("button", {all: "unset",boxSizing: "border-box",@@ -404,6 +404,7 @@ export const TreeNode = ({level,tabbable,isSelected,+ isSelectedDescendant = false,isHighlighted,isExpanded,isActionVisible,@@ -416,6 +417,7 @@ export const TreeNode = ({level: number;tabbable?: boolean;isSelected: boolean;+ isSelectedDescendant?: boolean;isHighlighted?: boolean;isExpanded?: undefined | boolean;isActionVisible?: boolean;@@ -426,6 +428,10 @@ export const TreeNode = ({children: ReactNode;}) => {const buttonRef = useRef<HTMLButtonElement>(null);+ const selectionState = getTreeSelectionState({+ isSelected,+ isSelectedDescendant,+ });// scroll the selected button into view when selected from canvas.useEffect(() => {if (isSelected) {@@ -463,13 +469,13 @@ export const TreeNode = ({return (<NodeContainer{...nodeProps}+ data-selection-state={selectionState}css={{[treeNodeLevel]: level,...(isActionVisible && { [treeActionOpacity]: 1 }),}}onKeyDown={handleKeydown}>- <DepthBars /><NodeButton{...buttonProps}ref={buttonRef}