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: make pages tree accessible from keyboard (#4132)
Bogdan Chadkin8aa750de132f
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsxindex 75004191d8..004d834770 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx@@ -100,7 +100,6 @@ import {deletePageMutable,$pageRootScope,duplicatePage,- toTreeData,isPathAvailable,} from "./page-utils";import { Form } from "./form";@@ -773,8 +772,8 @@ const FormFields = ({}}color="subtle">- Move this page to the “{toTreeData(pages).root.name}” folder- to set it as your home page+ Move this page to the “Root” folder to set it as your home+ page</Text></>) : values.documentType === "xml" ? (diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.test.ts b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.test.tsindex 2976ffd075..863a0b1b35 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.test.ts+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.test.ts@@ -13,7 +13,6 @@ import {isSlugAvailable,registerFolderChildMutable,reparentOrphansMutable,- toTreeData,filterSelfAndChildren,getExistingRoutePaths,$pageRootScope,@@ -97,162 +96,6 @@ const createPages = () => {const toMap = <T extends { id: string }>(list: T[]) =>new Map(list.map((item) => [item.id, item]));-describe("toTreeData", () => {- test("initial pages always has home pages and a root folder", () => {- const { pages } = createPages();- const tree = toTreeData(pages);- expect(tree.root).toEqual({- id: ROOT_FOLDER_ID,- name: "Root",- slug: "",- type: "folder",- children: [- {- data: {- id: "homePageId",- meta: {},- name: "Home",- path: "",- rootInstanceId: "rootInstanceId",- systemDataSourceId: "systemDataSourceId",- title: `"Home"`,- },- id: "homePageId",- type: "page",- },- ],- });- });-- test("add empty folder", () => {- const { pages, register, f } = createPages();- register([f("folder", [])]);-- const tree = toTreeData(pages);- expect(tree.root).toEqual({- id: ROOT_FOLDER_ID,- name: "Root",- slug: "",- type: "folder",- children: [- {- data: {- id: "homePageId",- meta: {},- name: "Home",- path: "",- rootInstanceId: "rootInstanceId",- systemDataSourceId: "systemDataSourceId",- title: `"Home"`,- },- id: "homePageId",- type: "page",- },- {- type: "folder",- id: "folder",- name: "folder",- slug: "folder",- children: [],- },- ],- });- });-- test("add a page inside a folder", () => {- const { pages, register, f, p } = createPages();- register([f("folder", [p("page", "/page")])]);-- const tree = toTreeData(pages);-- expect(tree.root).toEqual({- id: ROOT_FOLDER_ID,- name: "Root",- slug: "",- type: "folder",- children: [- {- data: {- id: "homePageId",- meta: {},- name: "Home",- path: "",- rootInstanceId: "rootInstanceId",- systemDataSourceId: "systemDataSourceId",- title: `"Home"`,- },- id: "homePageId",- type: "page",- },- {- type: "folder",- id: "folder",- name: "folder",- slug: "folder",- children: [- {- type: "page",- id: "page",- data: {- id: "page",- meta: {},- name: "page",- path: "/page",- rootInstanceId: "rootInstanceId",- systemDataSourceId: "systemDataSourceId",- title: `"page"`,- },- },- ],- },- ],- });- });-- test("nest a folder", () => {- const { pages, register, f } = createPages();- register([f("1", [f("1-1")])]);-- const tree = toTreeData(pages);- expect(tree.root).toEqual({- type: "folder",- id: ROOT_FOLDER_ID,- name: "Root",- slug: "",- children: [- {- type: "page",- id: "homePageId",- data: {- id: "homePageId",- name: "Home",- path: "",- title: `"Home"`,- meta: {},- rootInstanceId: "rootInstanceId",- systemDataSourceId: "systemDataSourceId",- },- },- {- type: "folder",- id: "1",- name: "1",- slug: "1",- children: [- {- type: "folder",- id: "1-1",- name: "1-1",- slug: "1-1",- children: [],- },- ],- },- ],- });- });-});-describe("reparentOrphansMutable", () => {// We must deal with the fact there can be an orphaned folder or page in a collaborative mode,// because user A can add a page to a folder while user B deletes the folder without receiving the create page yet.diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.tsindex cd114b8ff5..e7173b3fc9 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts@@ -32,83 +32,6 @@ import {} from "~/shared/nano-states";import { insertPageCopyMutable } from "~/shared/page-utils";-type TreePage = {- type: "page";- id: string;- data: Page;-};--type TreeFolder = {- // currently used only for root node- type: "folder";- id: Folder["id"];- name: Folder["name"];- slug: Folder["slug"];- children: Array<TreeData>;-};--export type TreeData = TreeFolder | TreePage;--type Index = Map<string, TreeData>;--/**- * Return a nested tree structure from flat pages and folders.- * To be used for rendering.- */-export const toTreeData = (- pages: Pages-): { root: TreeFolder; index: Index } => {- const pagesMap = new Map(pages.pages.map((page) => [page.id, page]));- pagesMap.set(pages.homePage.id, pages.homePage);-- const foldersMap = new Map(- pages.folders.map((folder) => [folder.id, folder])- );- const index: Index = new Map();-- const folderToTree = (folder: Folder) => {- // Using map to ensure uniqueness of children.- const children = new Map<string, TreeData>();- for (const id of folder.children) {- const folder = foldersMap.get(id);- // It is a folder, not a page.- if (folder) {- const treeFolder = folderToTree(folder);- children.set(treeFolder.id, treeFolder);- index.set(folder.id, treeFolder);- continue;- }- const page = pagesMap.get(id);- if (page) {- const treePage = {- type: "page",- id: page.id,- data: page,- } satisfies TreePage;- children.set(treePage.id, treePage);- index.set(page.id, treePage);- continue;- }- }-- return {- type: "folder",- id: folder.id,- name: folder.name,- slug: folder.slug,- children: Array.from(children.values()),- } satisfies TreeFolder;- };- const rootFolder = foldersMap.get(ROOT_FOLDER_ID);- if (rootFolder === undefined) {- throw new Error("Root folder not found");- }- return {- root: folderToTree(rootFolder),- index,- };-};-/*** When page or folder needs to be deleted or moved to a different parent,* we want to cleanup any existing reference to it in current folder.diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsxindex 1e70da3a54..4ef5af6632 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx@@ -1,15 +1,13 @@-import { useCallback, useEffect, useMemo, useRef } from "react";+import { useEffect, useRef } from "react";import { useStore } from "@nanostores/react";import {- TreeItemLabel,- TreeItemBody,- TreeNode,- type TreeItemRenderProps,- type ItemSelector,Tooltip,Box,Button,SmallIconButton,+ TreeNode,+ TreeRoot,+ TreeNodeLabel,} from "@webstudio-is/design-system";import {ChevronRightIcon,@@ -30,8 +28,6 @@ import { switchPage } from "~/shared/pages";import {getAllChildrenAndSelf,reparentOrphansMutable,- toTreeData,- type TreeData,} from "./page-utils";import {FolderSettings,@@ -40,8 +36,8 @@ import {} from "./folder-settings";import { serverSyncStore } from "~/shared/sync";import { useMount } from "~/shared/hook-utils/use-mount";-import { ROOT_FOLDER_ID, type Folder } from "@webstudio-is/sdk";-import { atom } from "nanostores";+import { ROOT_FOLDER_ID, type Folder, type Page } from "@webstudio-is/sdk";+import { atom, computed } from "nanostores";import { isPathnamePattern } from "~/builder/shared/url-pattern";const ItemSuffix = ({@@ -86,10 +82,13 @@ const ItemSuffix = ({return (<Tooltip content={menuLabel} disableHoverableContent><SmallIconButton+ tabIndex={-1}aria-label={menuLabel}state={isParentSelected ? "open" : undefined}onClick={() => onEdit(isEditing ? undefined : itemId)}ref={buttonRef}+ // forces to highlight tree node and show action+ aria-current={isEditing}icon={isEditing ? <ChevronRightIcon /> : <EllipsesIcon />}/></Tooltip>@@ -117,7 +116,68 @@ const isFolder = (id: string, folders: Array<Folder>) => {};// We want to keep the state when panel is closed and opened again.-const $expandedItems = atom<Set<string>>(new Set());+const $expandedItems = atom(new Set<string>());++type PagesTreeItem =+ | {+ id: string;+ level: number;+ isExpanded?: boolean;+ type: "page";+ page: Page;+ }+ | {+ id: string;+ level: number;+ isExpanded?: boolean;+ type: "folder";+ folder: Folder;+ };++const $flatPagesTree = computed(+ [$pages, $expandedItems],+ (pagesData, expandedItems) => {+ const flatPagesTree: PagesTreeItem[] = [];+ if (pagesData === undefined) {+ return flatPagesTree;+ }+ const folders = new Map(+ pagesData.folders.map((folder) => [folder.id, folder])+ );+ const pages = new Map(pagesData.pages.map((page) => [page.id, page]));+ pages.set(pagesData.homePage.id, pagesData.homePage);+ const traverse = (itemId: string, level = 0) => {+ const folder = folders.get(itemId);+ const page = pages.get(itemId);+ if (folder) {+ let isExpanded: undefined | boolean;+ if (level > 0 && folder.children.length > 0) {+ isExpanded = expandedItems.has(folder.id);+ }+ // hide root folder+ if (itemId !== ROOT_FOLDER_ID) {+ flatPagesTree.push({+ id: itemId,+ level,+ isExpanded,+ type: "folder",+ folder,+ });+ }+ if (level === 0 || isExpanded) {+ for (const childId of folder.children) {+ traverse(childId, level + 1);+ }+ }+ }+ if (page) {+ flatPagesTree.push({ id: itemId, level, type: "page", page });+ }+ };+ traverse(ROOT_FOLDER_ID);+ return flatPagesTree;+ }+);const PagesPanel = ({onClose,@@ -137,80 +197,10 @@ const PagesPanel = ({editingItemId?: string;}) => {const pages = useStore($pages);- const treeData = useMemo(() => pages && toTreeData(pages), [pages]);- const expandedItems = useStore($expandedItems);+ const flatPagesTree = useStore($flatPagesTree);useReparentOrphans();- const renderItem = useCallback(- (props: TreeItemRenderProps<TreeData>) => {- const isEditing = editingItemId === props.itemData.id;-- if (props.itemData.id === ROOT_FOLDER_ID) {- return null;- }-- return (- <TreeItemBody- {...props}- suffix={- <ItemSuffix- type={props.itemData.type}- isParentSelected={props.isSelected ?? false}- itemId={props.itemData.id}- editingItemId={editingItemId}- onEdit={onEdit}- />- }- alwaysShowSuffix={isEditing}- forceFocus={isEditing}- >- {props.itemData.type === "folder" && (- <TreeItemLabel prefix={<FolderIcon />}>- {props.itemData.name}- </TreeItemLabel>- )}- {props.itemData.type === "page" && (- <TreeItemLabel- prefix={- props.itemData.id === pages?.homePage.id ? (- <HomeIcon />- ) : isPathnamePattern(props.itemData.data.path) ? (- <DynamicPageIcon />- ) : (- <PageIcon />- )- }- >- {props.itemData.data.name}- </TreeItemLabel>- )}- </TreeItemBody>- );- },- [editingItemId, onEdit, pages]- );-- const selectTreeNode = useCallback(- ([itemId]: ItemSelector, all?: boolean) => {- const folders = pages?.folders ?? [];- if (isFolder(itemId, folders)) {- const items = all- ? getAllChildrenAndSelf(itemId, folders, "folder")- : [itemId];- const nextExpandedItems = new Set(expandedItems);- items.forEach((itemId) => {- nextExpandedItems.has(itemId)- ? nextExpandedItems.delete(itemId)- : nextExpandedItems.add(itemId);- });- $expandedItems.set(nextExpandedItems);- return;- }- onSelect(itemId);- },- [onSelect, pages?.folders, expandedItems]- );- if (treeData === undefined || pages === undefined) {+ if (pages === undefined) {return null;}@@ -241,44 +231,75 @@ const PagesPanel = ({}/><Box css={{ overflowY: "auto", flexBasis: 0, flexGrow: 1 }}>- <TreeNode<TreeData>- selectedItemSelector={[selectedPageId, treeData.root.id]}- onSelect={selectTreeNode}- itemData={treeData.root}- renderItem={renderItem}- getItemChildren={([nodeId]) => {- if (nodeId === ROOT_FOLDER_ID) {- return treeData.root.children;- }- const item = treeData.index.get(nodeId);- if (item?.type === "folder") {- return item.children;- }- // Page can't have children.- return [];- }}- isItemHidden={() => false}- getIsExpanded={([itemId]) => {- return expandedItems.has(itemId);- }}- setIsExpanded={([itemId], isExpanded, all) => {- const nextExpandedItems = new Set(expandedItems);- if (itemId === undefined) {- return;- }- const items = all- ? getAllChildrenAndSelf(itemId, pages.folders, "folder")- : [itemId];- items.forEach((itemId) => {- if (isExpanded) {- nextExpandedItems.add(itemId);- return;+ <TreeRoot>+ {flatPagesTree.map((item, index) => {+ const handleExpand = (isExpanded: boolean, all: boolean) => {+ const expandedItems = new Set($expandedItems.get());+ const items = all+ ? getAllChildrenAndSelf(item.id, pages.folders, "folder")+ : [item.id];+ for (const itemId of items) {+ if (isExpanded) {+ expandedItems.add(itemId);+ } else {+ expandedItems.delete(itemId);+ }}- nextExpandedItems.delete(itemId);- });- $expandedItems.set(nextExpandedItems);- }}- />+ $expandedItems.set(expandedItems);+ };++ return (+ <TreeNode+ key={item.id}+ level={item.level}+ tabbable={index === 0}+ isSelected={item.id === selectedPageId}+ isExpanded={item.isExpanded}+ onExpand={handleExpand}+ buttonProps={{+ onClick: (event) => {+ if (item.type === "folder") {+ handleExpand(item.isExpanded === false, event.altKey);+ }+ if (item.type === "page") {+ onSelect(item.id);+ }+ },+ }}+ action={+ <ItemSuffix+ type={item.type}+ isParentSelected={item.id === selectedPageId}+ itemId={item.id}+ editingItemId={editingItemId}+ onEdit={onEdit}+ />+ }+ >+ {item.type === "folder" && (+ <TreeNodeLabel prefix={<FolderIcon />}>+ {item.folder.name}+ </TreeNodeLabel>+ )}+ {item.type === "page" && (+ <TreeNodeLabel+ prefix={+ item.id === pages?.homePage.id ? (+ <HomeIcon />+ ) : isPathnamePattern(item.page.path) ? (+ <DynamicPageIcon />+ ) : (+ <PageIcon />+ )+ }+ >+ {item.page.name}+ </TreeNodeLabel>+ )}+ </TreeNode>+ );+ })}+ </TreeRoot></Box></Root>);diff --git a/packages/design-system/package.json b/packages/design-system/package.jsonindex 741e40a2b6..7feb82d95d 100644--- a/packages/design-system/package.json+++ b/packages/design-system/package.json@@ -55,7 +55,7 @@"@radix-ui/react-toolbar": "^1.1.0","@radix-ui/react-tooltip": "^1.1.2","@radix-ui/react-use-controllable-state": "^1.1.0",- "@react-aria/focus": "^3.14.2",+ "@react-aria/focus": "^3.18.2","@react-aria/interactions": "^3.19.0","@react-aria/utils": "^3.21.0","@stitches/react": "1.3.1-1",diff --git a/packages/design-system/src/components/__DEPRECATED__/tree/index.ts b/packages/design-system/src/components/__DEPRECATED__/tree/index.tsindex 02d27b02dd..019b7cd278 100644--- a/packages/design-system/src/components/__DEPRECATED__/tree/index.ts+++ b/packages/design-system/src/components/__DEPRECATED__/tree/index.ts@@ -1,3 +1,9 @@export type { ItemSelector, ItemDropTarget } from "./item-utils";export * from "./tree";-export * from "./tree-node";+export {+ TreeItemBody,+ TreeItemLabel,+ getNodeVars,+ getPlacementIndicatorAlignment,+ type TreeItemRenderProps,+} from "./tree-node";diff --git a/packages/design-system/src/components/__DEPRECATED__/tree/tree.tsx b/packages/design-system/src/components/__DEPRECATED__/tree/tree.tsxindex aaeed730e4..d08f8f74ad 100644--- a/packages/design-system/src/components/__DEPRECATED__/tree/tree.tsx+++ b/packages/design-system/src/components/__DEPRECATED__/tree/tree.tsx@@ -52,14 +52,14 @@ const KeyboardNavigation = ({return;}if (event.key === "ArrowUp") {- focusManager.focusPrevious({+ focusManager?.focusPrevious({accept: (node) => node.hasAttribute("data-item-button-id"),});// prevent scrollingevent.preventDefault();}if (event.key === "ArrowDown") {- focusManager.focusNext({+ focusManager?.focusNext({accept: (node) => node.hasAttribute("data-item-button-id"),});// prevent scrollingdiff --git a/packages/design-system/src/components/primitives/arrow-focus.tsx b/packages/design-system/src/components/primitives/arrow-focus.tsxindex e7f2b0c095..75cece876f 100644--- a/packages/design-system/src/components/primitives/arrow-focus.tsx+++ b/packages/design-system/src/components/primitives/arrow-focus.tsx@@ -85,11 +85,11 @@ const ContextHelper = ({ render }: { render: Render }) => {}if (event.key === "ArrowRight" || event.key === "ArrowDown") {- focusManager.focusNext({ wrap: true, accept, ...focusManagerOptions });+ focusManager?.focusNext({ wrap: true, accept, ...focusManagerOptions });event.preventDefault(); // Prevents the page from scrolling}if (event.key === "ArrowLeft" || event.key === "ArrowUp") {- focusManager.focusPrevious({+ focusManager?.focusPrevious({wrap: true,accept,...focusManagerOptions,diff --git a/packages/design-system/src/components/tree.stories.tsx b/packages/design-system/src/components/tree.stories.tsxnew file mode 100644index 0000000000..42deab07ad--- /dev/null+++ b/packages/design-system/src/components/tree.stories.tsx@@ -0,0 +1,110 @@+import { useMemo, useState } from "react";+import { EllipsesIcon } from "@webstudio-is/icons";+import { SmallIconButton } from "./small-icon-button";+import { Box } from "./box";+import { TreeRoot, TreeNode, TreeNodeLabel } from "./tree";++export default {+ title: "Library/Tree",+};++type Node = {+ name: string;+ children: Node[];+};++type FlatNode = {+ name: string;+ level: number;+ isExpanded?: boolean;+};++const data: Node = {+ name: "Root",+ children: [+ {+ name: "Box 1",+ children: [+ { name: "Box 2", children: [] },+ { name: "Container 1", children: [] },+ { name: "Wrapper 1", children: [] },+ ],+ },+ {+ name: "Container 2",+ children: [+ { name: "Box 3", children: [] },+ { name: "Container 3", children: [] },+ { name: "Wrapper 2", children: [] },+ ],+ },+ {+ name: "Wrapper 3",+ children: [+ { name: "Box 4", children: [] },+ { name: "Container 4", children: [] },+ { name: "Wrapper 4", children: [] },+ ],+ },+ ],+};++export const Tree = () => {+ const [selectedItemId, setSelectedItemId] = useState("");+ const [expandedItems, setExpandedItems] = useState(new Set<string>());+ const flatTree = useMemo(() => {+ const flatTree: FlatNode[] = [];+ const traverse = (node: Node, level = 0) => {+ let isExpanded;+ if (level > 0 && node.children.length > 0) {+ isExpanded = expandedItems.has(node.name);+ }+ // hide root folder+ flatTree.push({+ name: node.name,+ level,+ isExpanded,+ });+ if (level === 0 || isExpanded) {+ for (const child of node.children) {+ traverse(child, level + 1);+ }+ }+ };+ traverse(data);+ return flatTree;+ }, [expandedItems]);+ return (+ <Box css={{ maxWidth: 300 }}>+ <TreeRoot>+ {flatTree.map((node) => (+ <TreeNode+ key={node.name}+ level={node.level}+ isSelected={node.name === selectedItemId}+ isExpanded={node.isExpanded}+ onExpand={(isExpanded) => {+ setExpandedItems((prevExpandedItems) => {+ const newExpandedItems = new Set(prevExpandedItems);+ if (isExpanded) {+ newExpandedItems.add(node.name);+ } else {+ newExpandedItems.delete(node.name);+ }+ return newExpandedItems;+ });+ }}+ buttonProps={{+ onClick: () => {+ setSelectedItemId(node.name);+ },+ }}+ action={<SmallIconButton tabIndex={-1} icon={<EllipsesIcon />} />}+ >+ <TreeNodeLabel>{node.name}</TreeNodeLabel>+ </TreeNode>+ ))}+ </TreeRoot>+ </Box>+ );+};diff --git a/packages/design-system/src/components/tree.tsx b/packages/design-system/src/components/tree.tsxnew file mode 100644index 0000000000..a42e980832--- /dev/null+++ b/packages/design-system/src/components/tree.tsx@@ -0,0 +1,265 @@+import {+ useEffect,+ useRef,+ type ComponentPropsWithoutRef,+ type KeyboardEvent,+ type ReactNode,+} from "react";+import { FocusScope, useFocusManager } from "@react-aria/focus";+import {+ ChevronFilledDownIcon,+ ChevronFilledRightIcon,+} from "@webstudio-is/icons";+import { styled, theme } from "../stitches.config";+import { Box } from "./box";+import { Text } from "./text";++const treeNodeLevel = "--tree-node-level";+const treeActionOpacity = "--tree-action-opacity";+const treeDepthBarsVisibility = "--tree-depth-bars-visibility";+const treeDepthBarsColor = "--tree-depth-bars-color";++const ITEM_HEIGHT = 32;+const ITEM_PADDING_LEFT = 8;+// extra padding on the right to make sure scrollbar doesn't obscure anything+const ITEM_PADDING_RIGHT = 10;+const BARS_GAP = 16;+const EXPAND_WIDTH = 24;+const ACTION_WIDTH = 24;++const TreeContainer = ({ children }: { children: ReactNode }) => {+ const focusManager = useFocusManager();+ return (+ <Box+ css={{+ "&:hover": {+ [treeDepthBarsVisibility]: "visible",+ },+ }}+ onKeyDown={(event) => {+ if (event.defaultPrevented) {+ return;+ }+ if (event.key === "ArrowUp" || event.key === "ArrowLeft") {+ focusManager?.focusPrevious({+ accept: (node) => node.hasAttribute("data-tree-button"),+ });+ // prevent scrolling+ event.preventDefault();+ }+ if (event.key === "ArrowDown") {+ focusManager?.focusNext({+ accept: (node) => node.hasAttribute("data-tree-button"),+ });+ // prevent scrolling+ event.preventDefault();+ }+ if (event.key === "ArrowRight") {+ focusManager?.focusNext({+ accept: (node) =>+ node.hasAttribute("data-tree-button") ||+ // try to focus button inside action+ node.closest("[data-tree-action]") !== null,+ });+ // prevent scrolling+ event.preventDefault();+ }+ }}+ >+ {children}+ </Box>+ );+};++export const TreeRoot = ({ children }: { children: ReactNode }) => {+ return (+ <FocusScope>+ <TreeContainer>{children}</TreeContainer>+ </FocusScope>+ );+};++const NodeContainer = styled("div", {+ position: "relative",+ height: ITEM_HEIGHT,+ "&:hover, &:has(:focus-visible), &:has([aria-current=true])": {+ outline: `2px solid ${theme.colors.borderFocus}`,+ outlineOffset: -3,+ borderRadius: theme.borderRadius[6],+ [treeActionOpacity]: 1,+ },+ "&:has([aria-selected=true])": {+ backgroundColor: theme.colors.backgroundItemCurrent,+ [treeDepthBarsColor]: theme.colors.borderItemChildLineCurrent,+ },+ "&:has([data-tree-action])": {+ paddingRight: ACTION_WIDTH,+ },+});++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",+ display: "flex",+ alignItems: "center",+ userSelect: "none",+ width: "100%",+ height: "inherit",+ minWidth: 0,+ paddingLeft: `calc(${ITEM_PADDING_LEFT}px + var(${treeNodeLevel}) * 16px)`,+ paddingRight: ITEM_PADDING_RIGHT,+ flexBasis: 0,+ flexGrow: 1,+ position: "relative",+});++const ExpandButton = styled("button", {+ all: "unset",+ display: "flex",+ justifyContent: "center",+ alignItems: "center",+ position: "absolute",+ top: 0,+ left: `calc(var(${treeNodeLevel}) * ${BARS_GAP}px - ${EXPAND_WIDTH / 2}px)`,+ width: EXPAND_WIDTH,+ height: "inherit",+});++const ActionContainer = styled("div", {+ // use opacity to hide action instead of visibility+ // to prevent focus loss while navigating with keyboard+ opacity: `var(${treeActionOpacity}, 0)`,+ position: "absolute",+ top: 0,+ right: ITEM_PADDING_RIGHT,+ width: ACTION_WIDTH,+ height: "inherit",+ display: "flex",+ justifyContent: "center",+ alignItems: "center",+});++export const TreeNode = ({+ level,+ tabbable,+ isSelected,+ isHighlighted,+ isExpanded,+ onExpand,+ buttonProps,+ action,+ children,+}: {+ level: number;+ tabbable?: boolean;+ isSelected: boolean;+ isHighlighted?: boolean;+ isExpanded: undefined | boolean;+ onExpand: (expanded: boolean, all: boolean) => void;+ buttonProps: ComponentPropsWithoutRef<"button">;+ action?: ReactNode;+ children: ReactNode;+}) => {+ const containerRef = useRef<HTMLDivElement>(null);+ // scroll the selected button into view when selected from canvas.+ useEffect(() => {+ if (isSelected) {+ containerRef.current?.scrollIntoView({+ behavior: "smooth",+ block: "nearest",+ });+ }+ }, [isSelected]);++ const handleKeydown = (event: KeyboardEvent) => {+ if (event.defaultPrevented) {+ return;+ }+ if (event.key === "ArrowLeft" && isExpanded === true) {+ onExpand(false, event.altKey);+ // allow to collapse and then navigate to previous node+ event.preventDefault();+ }+ if (event.key === "ArrowRight" && isExpanded === false) {+ onExpand(true, event.altKey);+ // allow to expand and then navigate to next node+ event.preventDefault();+ }+ if (event.key === " ") {+ onExpand(isExpanded === false, event.altKey);+ // prevent scrolling+ event.preventDefault();+ }+ };++ return (+ <NodeContainer+ ref={containerRef}+ css={{ [treeNodeLevel]: level }}+ onKeyDown={handleKeydown}+ >+ <DepthBars />+ <NodeButton+ {...buttonProps}+ tabIndex={tabbable || level === 0 ? undefined : -1}+ aria-selected={isSelected}+ aria-current={isHighlighted}+ data-tree-button+ >+ {children}+ </NodeButton>+ {isExpanded !== undefined && (+ <ExpandButton+ tabIndex={-1}+ onClick={(event) => onExpand(isExpanded === false, event.altKey)}+ >+ {isExpanded ? <ChevronFilledDownIcon /> : <ChevronFilledRightIcon />}+ </ExpandButton>+ )}+ {action && <ActionContainer data-tree-action>{action}</ActionContainer>}+ </NodeContainer>+ );+};++export const TreeNodeLabel = ({+ children,+ prefix,+ ...props+}: {+ children: ReactNode;+ prefix?: ReactNode;+}) => {+ return (+ <>+ {prefix}+ <Text+ variant="labelsSentenceCase"+ truncate+ css={{+ marginLeft: prefix ? theme.spacing[3] : 0,+ flexBasis: 0,+ flexGrow: 1,+ }}+ {...props}+ >+ {children}+ </Text>+ </>+ );+};diff --git a/packages/design-system/src/index.ts b/packages/design-system/src/index.tsindex b27c258f79..4131e1929e 100644--- a/packages/design-system/src/index.ts+++ b/packages/design-system/src/index.ts@@ -45,6 +45,7 @@ export * from "./components/ai-command-bar";export * from "./components/link";export * from "./components/panel-banner";export * from "./components/focus-ring";+export * from "./components/tree";// Not aligneddiff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 2f47d39753..cf0caf0700 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -1382,8 +1382,8 @@ importers:specifier: ^1.1.0version: 1.1.0(@types/[email protected])([email protected])'@react-aria/focus':- specifier: ^3.14.2- version: 3.14.2([email protected])+ specifier: ^3.18.2+ version: 3.18.2([email protected])'@react-aria/interactions':specifier: ^3.19.0version: 3.19.0([email protected])@@ -4809,8 +4809,8 @@ packages:'@radix-ui/[email protected]':resolution: {integrity: sha512-A9+lCBZoaMJlVKcRBz2YByCG+Cp2t6nAnMnNba+XiWxnj6r4JUFqfsgwocMBZU9LPtdxC6wB56ySYpc7LQIoJg==}- '@react-aria/[email protected]':- resolution: {integrity: sha512-ozP3g+C/fp3BAgI7dhFgBSzJCOwlW+pKaUlv7ay+btzXX0nc3jgt26uPSDr+Yv2tQcHcQnxfP0kHlXLS7to+lA==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-Jc/IY+StjA3uqN73o6txKQ527RFU7gnG5crEl5Xy3V+gbYp2O5L3ezAo/E0Ipi2cyMbG6T5Iit1IDs7hcGu8aw==}peerDependencies:react: 18.3.0-canary-14898b6a9-20240318@@ -4819,17 +4819,38 @@ packages:peerDependencies:react: 18.3.0-canary-14898b6a9-20240318+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-xE/77fRVSlqHp2sfkrMeNLrqf2amF/RyuAS6T5oDJemRSgYM3UoxTbWjucPhfnoW7r32pFPHHgz4lbdX8xqD/g==}+ peerDependencies:+ react: 18.3.0-canary-14898b6a9-20240318+'@react-aria/[email protected]':resolution: {integrity: sha512-Y54xs483rglN5DxbwfCPHxnkvZ+gZ0LbSYmR72LyWPGft8hN/lrl1VRS1EW2SMjnkEWlj+Km2mwvA3kEHDUA0A==}engines: {node: '>= 12'}peerDependencies:react: 18.3.0-canary-14898b6a9-20240318+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-xEwGKoysu+oXulibNUSkXf8itW0npHHTa6c4AyYeZIJyRoegeteYuFpZUBPtIDE8RfHdNsSmE1ssOkxRnwbkuQ==}+ engines: {node: '>= 12'}+ peerDependencies:+ react: 18.3.0-canary-14898b6a9-20240318+'@react-aria/[email protected]':resolution: {integrity: sha512-0ZNaXgvbWnqqiG7FB0qhAIENN7CmBU30AnyTzz5ZZgvJexUJkhd2GMjvTqrBZ6zSjeMpUEIKg5PUA1eptGRPww==}peerDependencies:react: 18.3.0-canary-14898b6a9-20240318+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==}+ peerDependencies:+ react: 18.3.0-canary-14898b6a9-20240318++ '@react-stately/[email protected]':+ resolution: {integrity: sha512-moClv7MlVSHpbYtQIkm0Cx+on8Pgt1XqtPx6fy9rQFb2DNc9u1G3AUVnqA17buOkH1vLxAtX4MedlxMWyRCYYA==}+ peerDependencies:+ react: 18.3.0-canary-14898b6a9-20240318+'@react-stately/[email protected]':resolution: {integrity: sha512-wCIoFDbt/uwNkWIBF+xV+21k8Z8Sj5qGO3uptTcVmjYcZngOaGGyB4NkiuZhmhG70Pkv+yVrRwoC1+4oav9cCg==}peerDependencies:@@ -4840,6 +4861,11 @@ packages:peerDependencies:react: 18.3.0-canary-14898b6a9-20240318+ '@react-types/[email protected]':+ resolution: {integrity: sha512-AUQeGYEm/zDTN6zLzdXolDxz3Jk5dDL7f506F07U8tBwxNNI3WRdhU84G0/AaFikOZzDXhOZDr3MhQMzyE7Ydw==}+ peerDependencies:+ react: 18.3.0-canary-14898b6a9-20240318+'@remix-run/[email protected]':resolution: {integrity: sha512-ki2glwFQVGS08A7YcySHE9g0l9UYpOqQixaRJ9RLDtui0D4YqhaWL/l95uT44RCRjQc6cjQmdPLtwvTtEDhxYQ==}engines: {node: '>=18.0.0'}@@ -6044,6 +6070,10 @@ packages:resolution: {integrity: sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==}engines: {node: '>=6'}+ resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}+ engines: {node: '>=6'}+resolution: {integrity: sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==}engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'}@@ -12830,13 +12860,13 @@ snapshots:'@radix-ui/[email protected]': {}- '@react-aria/[email protected]([email protected])':+ '@react-aria/[email protected]([email protected])':dependencies:- '@react-aria/interactions': 3.19.0([email protected])- '@react-aria/utils': 3.21.0([email protected])- '@react-types/shared': 3.21.0([email protected])+ '@react-aria/interactions': 3.22.2([email protected])+ '@react-aria/utils': 3.25.2([email protected])+ '@react-types/shared': 3.24.1([email protected])'@swc/helpers': 0.5.1- clsx: 1.2.1+ clsx: 2.1.1react: 18.3.0-canary-14898b6a9-20240318'@react-aria/[email protected]([email protected])':@@ -12847,11 +12877,24 @@ snapshots:'@swc/helpers': 0.5.1react: 18.3.0-canary-14898b6a9-20240318+ '@react-aria/[email protected]([email protected])':+ dependencies:+ '@react-aria/ssr': 3.9.5([email protected])+ '@react-aria/utils': 3.25.2([email protected])+ '@react-types/shared': 3.24.1([email protected])+ '@swc/helpers': 0.5.1+ react: 18.3.0-canary-14898b6a9-20240318+'@react-aria/[email protected]([email protected])':dependencies:'@swc/helpers': 0.5.1react: 18.3.0-canary-14898b6a9-20240318+ '@react-aria/[email protected]([email protected])':+ dependencies:+ '@swc/helpers': 0.5.1+ react: 18.3.0-canary-14898b6a9-20240318+'@react-aria/[email protected]([email protected])':dependencies:'@react-aria/ssr': 3.8.0([email protected])@@ -12861,6 +12904,20 @@ snapshots:clsx: 1.2.1react: 18.3.0-canary-14898b6a9-20240318+ '@react-aria/[email protected]([email protected])':+ dependencies:+ '@react-aria/ssr': 3.9.5([email protected])+ '@react-stately/utils': 3.10.3([email protected])+ '@react-types/shared': 3.24.1([email protected])+ '@swc/helpers': 0.5.1+ clsx: 2.1.1+ react: 18.3.0-canary-14898b6a9-20240318++ '@react-stately/[email protected]([email protected])':+ dependencies:+ '@swc/helpers': 0.5.1+ react: 18.3.0-canary-14898b6a9-20240318+'@react-stately/[email protected]([email protected])':dependencies:'@swc/helpers': 0.5.1@@ -12870,6 +12927,10 @@ snapshots:dependencies:react: 18.3.0-canary-14898b6a9-20240318+ '@react-types/[email protected]([email protected])':+ dependencies:+ react: 18.3.0-canary-14898b6a9-20240318+dependencies:'@cloudflare/workers-types': 4.20240701.0@@ -13367,7 +13428,7 @@ snapshots:'@swc/[email protected]':dependencies:- tslib: 2.6.0+ tslib: 2.6.2'@testing-library/[email protected]':dependencies:@@ -14381,6 +14442,8 @@ snapshots:+ [email protected]: {}+