@payloadcms/ui 4.0.0-internal.016994f → 4.0.0-internal.0731f09

package/dist/elements/Hierarchy/Tree/HierarchySidebarTab.js

@@ -3,6 +3,7 @@
 import { c as _c } from "react/compiler-runtime";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { formatAdminURL } from 'payload/shared';
+import * as qs from 'qs-esm';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { useConfig } from '../../../providers/Config/index.js';
 import { useHierarchy } from '../../../providers/Hierarchy/index.js';
@@ -13,11 +14,12 @@ import { HydrateHierarchyProvider } from '../HydrateProvider/index.js';
 import { HierarchySearch } from '../Search/index.js';
 import { HierarchyTree } from './index.js';
 export const HierarchySidebarTab = t0 => {
-  const $ = _c(37);
+  const $ = _c(44);
   const {
     baseFilter,
+    collectionSpecificOptions,
     hierarchyCollectionSlug,
-    icon: _icon,
+    icon,
     initialData,
     initialExpandedNodes,
     initialSelectedFilters,
@@ -42,38 +44,48 @@ export const HierarchySidebarTab = t0 => {
     admin: adminRoute
   } = t2;
   const [isSearchActive, setIsSearchActive] = useState(false);
+  let t3;
+  if ($[0] !== initialSelectedFilters) {
+    t3 = initialSelectedFilters ?? [];
+    $[0] = initialSelectedFilters;
+    $[1] = t3;
+  } else {
+    t3 = $[1];
+  }
+  const [selectedFilters, setSelectedFiltersLocal] = useState(t3);
   const {
+    setSelectedFilters: setSelectedFiltersContext,
     treeRefreshKeys
   } = useHierarchy();
   const sidebarTabs = useSidebarTabs();
   const resolvedParentFieldName = parentFieldName ?? "parent";
-  let t3;
-  if ($[0] !== resolvedParentFieldName || $[1] !== searchParams) {
-    t3 = searchParams.get(resolvedParentFieldName);
-    $[0] = resolvedParentFieldName;
-    $[1] = searchParams;
-    $[2] = t3;
+  let t4;
+  if ($[2] !== resolvedParentFieldName || $[3] !== searchParams) {
+    t4 = searchParams.get(resolvedParentFieldName);
+    $[2] = resolvedParentFieldName;
+    $[3] = searchParams;
+    $[4] = t4;
   } else {
-    t3 = $[2];
+    t4 = $[4];
   }
-  const currentParentParam = t3;
+  const currentParentParam = t4;
   const tabSlug = `hierarchy-${hierarchyCollectionSlug}`;
   const isActiveTab = sidebarTabs?.activeTabSlug === tabSlug;
-  let t4;
-  if ($[3] !== hierarchyCollectionSlug || $[4] !== treeRefreshKeys) {
-    t4 = treeRefreshKeys.get(hierarchyCollectionSlug) ?? 0;
-    $[3] = hierarchyCollectionSlug;
-    $[4] = treeRefreshKeys;
-    $[5] = t4;
+  let t5;
+  if ($[5] !== hierarchyCollectionSlug || $[6] !== treeRefreshKeys) {
+    t5 = treeRefreshKeys.get(hierarchyCollectionSlug) ?? 0;
+    $[5] = hierarchyCollectionSlug;
+    $[6] = treeRefreshKeys;
+    $[7] = t5;
   } else {
-    t4 = $[5];
+    t5 = $[7];
   }
-  const treeRefreshKey = t4;
+  const treeRefreshKey = t5;
   const prevTreeRefreshKeyRef = useRef(treeRefreshKey);
-  let t5;
   let t6;
-  if ($[6] !== currentParentParam || $[7] !== isActiveTab || $[8] !== resolvedParentFieldName || $[9] !== sidebarTabs || $[10] !== tabSlug || $[11] !== treeRefreshKey) {
-    t5 = () => {
+  let t7;
+  if ($[8] !== currentParentParam || $[9] !== isActiveTab || $[10] !== resolvedParentFieldName || $[11] !== sidebarTabs || $[12] !== tabSlug || $[13] !== treeRefreshKey) {
+    t6 = () => {
       if (prevTreeRefreshKeyRef.current !== treeRefreshKey) {
         prevTreeRefreshKeyRef.current = treeRefreshKey;
         sidebarTabs?.reloadTabContent(tabSlug, {
@@ -83,58 +95,75 @@ export const HierarchySidebarTab = t0 => {
         });
       }
     };
-    t6 = [treeRefreshKey, sidebarTabs, tabSlug, isActiveTab, currentParentParam, resolvedParentFieldName];
-    $[6] = currentParentParam;
-    $[7] = isActiveTab;
-    $[8] = resolvedParentFieldName;
-    $[9] = sidebarTabs;
-    $[10] = tabSlug;
-    $[11] = treeRefreshKey;
-    $[12] = t5;
-    $[13] = t6;
-  } else {
-    t5 = $[12];
-    t6 = $[13];
-  }
-  useEffect(t5, t6);
-  const selectedNodeId = isActiveTab ? currentParentParam ?? selectedNodeIdFromServer ?? undefined : undefined;
-  let t7;
-  if ($[14] !== baseFilter) {
-    t7 = baseFilter ? JSON.stringify(baseFilter) : "";
-    $[14] = baseFilter;
+    t7 = [treeRefreshKey, sidebarTabs, tabSlug, isActiveTab, currentParentParam, resolvedParentFieldName];
+    $[8] = currentParentParam;
+    $[9] = isActiveTab;
+    $[10] = resolvedParentFieldName;
+    $[11] = sidebarTabs;
+    $[12] = tabSlug;
+    $[13] = treeRefreshKey;
+    $[14] = t6;
     $[15] = t7;
   } else {
+    t6 = $[14];
     t7 = $[15];
   }
-  const baseFilterKey = t7;
+  useEffect(t6, t7);
+  const selectedNodeId = isActiveTab ? currentParentParam ?? selectedNodeIdFromServer ?? undefined : undefined;
   let t8;
-  if ($[16] !== adminRoute || $[17] !== hierarchyCollectionSlug || $[18] !== resolvedParentFieldName || $[19] !== router || $[20] !== startRouteTransition) {
-    t8 = t9 => {
+  if ($[16] !== baseFilter) {
+    t8 = baseFilter ? JSON.stringify(baseFilter) : "";
+    $[16] = baseFilter;
+    $[17] = t8;
+  } else {
+    t8 = $[17];
+  }
+  const baseFilterKey = t8;
+  let t9;
+  if ($[18] !== setSelectedFiltersContext) {
+    t9 = filters => {
+      setSelectedFiltersLocal(filters);
+      setSelectedFiltersContext(filters);
+    };
+    $[18] = setSelectedFiltersContext;
+    $[19] = t9;
+  } else {
+    t9 = $[19];
+  }
+  const handleFilterChange = t9;
+  let t10;
+  if ($[20] !== adminRoute || $[21] !== hierarchyCollectionSlug || $[22] !== resolvedParentFieldName || $[23] !== router || $[24] !== startRouteTransition) {
+    t10 = t11 => {
       const {
         id
-      } = t9;
+      } = t11;
       const url = formatAdminURL({
         adminRoute,
-        path: `/collections/${hierarchyCollectionSlug}/hierarchy?${resolvedParentFieldName}=${id}`
+        path: `/collections/${hierarchyCollectionSlug}${qs.stringify({
+          [resolvedParentFieldName]: id,
+          view: "hierarchy"
+        }, {
+          addQueryPrefix: true
+        })}`
       });
       startRouteTransition(() => {
         router.push(url);
         router.refresh();
       });
     };
-    $[16] = adminRoute;
-    $[17] = hierarchyCollectionSlug;
-    $[18] = resolvedParentFieldName;
-    $[19] = router;
-    $[20] = startRouteTransition;
-    $[21] = t8;
+    $[20] = adminRoute;
+    $[21] = hierarchyCollectionSlug;
+    $[22] = resolvedParentFieldName;
+    $[23] = router;
+    $[24] = startRouteTransition;
+    $[25] = t10;
   } else {
-    t8 = $[21];
+    t10 = $[25];
   }
-  const handleNavigateToParent = t8;
-  let t9;
-  if ($[22] !== _icon || $[23] !== baseFilter || $[24] !== baseFilterKey || $[25] !== handleNavigateToParent || $[26] !== hierarchyCollectionSlug || $[27] !== initialData || $[28] !== initialExpandedNodes || $[29] !== initialSelectedFilters || $[30] !== isSearchActive || $[31] !== parentFieldName || $[32] !== selectedNodeId || $[33] !== treeLimit || $[34] !== typeFieldName || $[35] !== useAsTitle) {
-    t9 = _jsxs(_Fragment, {
+  const handleNavigateToParent = t10;
+  let t11;
+  if ($[26] !== baseFilter || $[27] !== baseFilterKey || $[28] !== collectionSpecificOptions || $[29] !== handleFilterChange || $[30] !== handleNavigateToParent || $[31] !== hierarchyCollectionSlug || $[32] !== icon || $[33] !== initialData || $[34] !== initialExpandedNodes || $[35] !== initialSelectedFilters || $[36] !== isSearchActive || $[37] !== parentFieldName || $[38] !== selectedFilters || $[39] !== selectedNodeId || $[40] !== treeLimit || $[41] !== typeFieldName || $[42] !== useAsTitle) {
+    t11 = _jsxs(_Fragment, {
       children: [_jsx(HydrateHierarchyProvider, {
         baseFilter,
         collectionSlug: hierarchyCollectionSlug,
@@ -148,15 +177,17 @@ export const HierarchySidebarTab = t0 => {
         className: "hierarchy-sidebar-tab",
         children: [_jsx(HierarchySearch, {
           collectionSlug: hierarchyCollectionSlug,
+          collectionSpecificOptions,
           isActive: isSearchActive,
           onActiveChange: setIsSearchActive,
+          onFilterChange: handleFilterChange,
           onSelect: handleNavigateToParent,
-          parentId: selectedNodeId ?? null
+          selectedFilters
         }), !isSearchActive && _jsx(HierarchyTree, {
           baseFilter,
           collectionSlug: hierarchyCollectionSlug,
-          filterByCollections: initialSelectedFilters?.length ? initialSelectedFilters : undefined,
-          icon: _icon,
+          filterByCollections: selectedFilters.length > 0 ? selectedFilters : undefined,
+          icon,
           initialData,
           initialExpandedNodes,
           onNodeClick: handleNavigateToParent,
@@ -165,24 +196,27 @@ export const HierarchySidebarTab = t0 => {
         }, `${hierarchyCollectionSlug}-${baseFilterKey}`)]
       })]
     });
-    $[22] = _icon;
-    $[23] = baseFilter;
-    $[24] = baseFilterKey;
-    $[25] = handleNavigateToParent;
-    $[26] = hierarchyCollectionSlug;
-    $[27] = initialData;
-    $[28] = initialExpandedNodes;
-    $[29] = initialSelectedFilters;
-    $[30] = isSearchActive;
-    $[31] = parentFieldName;
-    $[32] = selectedNodeId;
-    $[33] = treeLimit;
-    $[34] = typeFieldName;
-    $[35] = useAsTitle;
-    $[36] = t9;
+    $[26] = baseFilter;
+    $[27] = baseFilterKey;
+    $[28] = collectionSpecificOptions;
+    $[29] = handleFilterChange;
+    $[30] = handleNavigateToParent;
+    $[31] = hierarchyCollectionSlug;
+    $[32] = icon;
+    $[33] = initialData;
+    $[34] = initialExpandedNodes;
+    $[35] = initialSelectedFilters;
+    $[36] = isSearchActive;
+    $[37] = parentFieldName;
+    $[38] = selectedFilters;
+    $[39] = selectedNodeId;
+    $[40] = treeLimit;
+    $[41] = typeFieldName;
+    $[42] = useAsTitle;
+    $[43] = t11;
   } else {
-    t9 = $[36];
+    t11 = $[43];
   }
-  return t9;
+  return t11;
 };
 //# sourceMappingURL=HierarchySidebarTab.js.map

package/dist/elements/Hierarchy/Tree/HierarchySidebarTab.js.map

@@ -1 +1 @@
-{"version":3,"file":"HierarchySidebarTab.js","names":["c","_c","formatAdminURL","React","useCallback","useEffect","useRef","useState","useConfig","useHierarchy","useRouter","useSearchParams","useRouteTransition","useSidebarTabs","HydrateHierarchyProvider","HierarchySearch","HierarchyTree","HierarchySidebarTab","t0","$","baseFilter","hierarchyCollectionSlug","icon","_icon","initialData","initialExpandedNodes","initialSelectedFilters","parentFieldName","selectedNodeId","selectedNodeIdFromServer","treeLimit","typeFieldName","useAsTitle","router","searchParams","startRouteTransition","config","t1","routes","t2","admin","adminRoute","isSearchActive","setIsSearchActive","treeRefreshKeys","sidebarTabs","resolvedParentFieldName","t3","get","currentParentParam","tabSlug","isActiveTab","activeTabSlug","t4","treeRefreshKey","prevTreeRefreshKeyRef","t5","t6","current","reloadTabContent","undefined","t7","JSON","stringify","baseFilterKey","t8","t9","id","url","path","push","refresh","handleNavigateToParent","_jsxs","_Fragment","children","_jsx","collectionSlug","expandedNodes","selectedFilters","treeData","className","isActive","onActiveChange","onSelect","parentId","filterByCollections","length","onNodeClick"],"sources":["../../../../src/elements/Hierarchy/Tree/HierarchySidebarTab.tsx"],"sourcesContent":["'use client'\n\nimport type { SidebarTabClientProps } from 'payload'\n\nimport { formatAdminURL } from 'payload/shared'\nimport React, { useCallback, useEffect, useRef, useState } from 'react'\n\nimport type { HierarchyInitialData } from './types.js'\n\nimport { useConfig } from '../../../providers/Config/index.js'\nimport { useHierarchy } from '../../../providers/Hierarchy/index.js'\nimport { useRouter, useSearchParams } from '../../../providers/RouterAdapter/index.js'\nimport { useRouteTransition } from '../../../providers/RouteTransition/index.js'\nimport { useSidebarTabs } from '../../../providers/SidebarTabs/index.js'\nimport { HydrateHierarchyProvider } from '../HydrateProvider/index.js'\nimport { HierarchySearch } from '../Search/index.js'\nimport { HierarchyTree } from './index.js'\n\nexport const HierarchySidebarTab: React.FC<\n  {\n    baseFilter?: Record<string, unknown>\n    hierarchyCollectionSlug: string\n    icon?: React.ReactNode\n    initialData?: HierarchyInitialData | null\n    initialExpandedNodes?: (number | string)[]\n    initialSelectedFilters?: string[]\n    parentFieldName?: string\n    selectedNodeId?: null | string\n    treeLimit?: number\n    typeFieldName?: string\n    useAsTitle?: string\n  } & SidebarTabClientProps\n> = ({\n  baseFilter,\n  hierarchyCollectionSlug,\n  icon: _icon,\n  initialData,\n  initialExpandedNodes,\n  initialSelectedFilters,\n  parentFieldName,\n  selectedNodeId: selectedNodeIdFromServer,\n  treeLimit,\n  typeFieldName,\n  useAsTitle,\n}) => {\n  const router = useRouter()\n  const searchParams = useSearchParams()\n  const { startRouteTransition } = useRouteTransition()\n  const {\n    config: {\n      routes: { admin: adminRoute },\n    },\n  } = useConfig()\n  const [isSearchActive, setIsSearchActive] = useState(false)\n  const { treeRefreshKeys } = useHierarchy()\n  const sidebarTabs = useSidebarTabs()\n\n  const resolvedParentFieldName = parentFieldName ?? 'parent'\n  const currentParentParam = searchParams.get(resolvedParentFieldName)\n\n  // When refreshTree(slug) is called from the list view (e.g. after mutations), reload this tab.\n  // Always reload regardless of active state so inactive tabs are fresh when switched to.\n  // The render-tab server function runs with a fresh request that lacks the client's URL query,\n  // so forward the current selected parent id — otherwise the reload can't tell which node is\n  // being viewed and rebuilds the tree from preference state.\n  const tabSlug = `hierarchy-${hierarchyCollectionSlug}`\n  const isActiveTab = sidebarTabs?.activeTabSlug === tabSlug\n  const treeRefreshKey = treeRefreshKeys.get(hierarchyCollectionSlug) ?? 0\n  const prevTreeRefreshKeyRef = useRef(treeRefreshKey)\n  useEffect(() => {\n    if (prevTreeRefreshKeyRef.current !== treeRefreshKey) {\n      prevTreeRefreshKeyRef.current = treeRefreshKey\n      // Only forward the selected parent id when this tab is active. currentParentParam\n      // reflects the global URL search params, so an inactive tab could otherwise pick up\n      // another hierarchy collection's value if they share the same parentFieldName.\n      sidebarTabs?.reloadTabContent(tabSlug, {\n        searchParams:\n          isActiveTab && currentParentParam\n            ? { [resolvedParentFieldName]: currentParentParam }\n            : undefined,\n      })\n    }\n  }, [\n    treeRefreshKey,\n    sidebarTabs,\n    tabSlug,\n    isActiveTab,\n    currentParentParam,\n    resolvedParentFieldName,\n  ])\n\n  // Only highlight selected node when this tab is active\n  const selectedNodeId = isActiveTab\n    ? (currentParentParam ?? selectedNodeIdFromServer ?? undefined)\n    : undefined\n\n  const baseFilterKey = baseFilter ? JSON.stringify(baseFilter) : ''\n\n  /**\n   * The tree always navigates into the hierarchy collection's own view, regardless of which\n   * collection the user was browsing by hierarchy when they clicked - picking a folder means going\n   * to that folder, not filtering the collection they came from.\n   */\n  const handleNavigateToParent = useCallback(\n    ({ id }: { id: number | string }) => {\n      const url = formatAdminURL({\n        adminRoute,\n        path: `/collections/${hierarchyCollectionSlug}/hierarchy?${resolvedParentFieldName}=${id}`,\n      })\n      startRouteTransition(() => {\n        router.push(url)\n        router.refresh()\n      })\n    },\n    [adminRoute, hierarchyCollectionSlug, resolvedParentFieldName, router, startRouteTransition],\n  )\n  return (\n    <>\n      <HydrateHierarchyProvider\n        baseFilter={baseFilter}\n        collectionSlug={hierarchyCollectionSlug}\n        expandedNodes={initialExpandedNodes}\n        parentFieldName={parentFieldName}\n        selectedFilters={initialSelectedFilters}\n        treeData={initialData}\n        treeLimit={treeLimit}\n        typeFieldName={typeFieldName}\n      />\n      <div className=\"hierarchy-sidebar-tab\">\n        <HierarchySearch\n          collectionSlug={hierarchyCollectionSlug}\n          isActive={isSearchActive}\n          onActiveChange={setIsSearchActive}\n          onSelect={handleNavigateToParent}\n          parentId={selectedNodeId ?? null}\n        />\n        {!isSearchActive && (\n          <HierarchyTree\n            baseFilter={baseFilter}\n            collectionSlug={hierarchyCollectionSlug}\n            filterByCollections={\n              initialSelectedFilters?.length ? initialSelectedFilters : undefined\n            }\n            icon={_icon}\n            initialData={initialData}\n            initialExpandedNodes={initialExpandedNodes}\n            key={`${hierarchyCollectionSlug}-${baseFilterKey}`}\n            onNodeClick={handleNavigateToParent}\n            selectedNodeId={selectedNodeId}\n            useAsTitle={useAsTitle}\n          />\n        )}\n      </div>\n    </>\n  )\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"HierarchySidebarTab.js","names":["c","_c","formatAdminURL","qs","React","useCallback","useEffect","useRef","useState","useConfig","useHierarchy","useRouter","useSearchParams","useRouteTransition","useSidebarTabs","HydrateHierarchyProvider","HierarchySearch","HierarchyTree","HierarchySidebarTab","t0","$","baseFilter","collectionSpecificOptions","hierarchyCollectionSlug","icon","initialData","initialExpandedNodes","initialSelectedFilters","parentFieldName","selectedNodeId","selectedNodeIdFromServer","treeLimit","typeFieldName","useAsTitle","router","searchParams","startRouteTransition","config","t1","routes","t2","admin","adminRoute","isSearchActive","setIsSearchActive","t3","selectedFilters","setSelectedFiltersLocal","setSelectedFilters","setSelectedFiltersContext","treeRefreshKeys","sidebarTabs","resolvedParentFieldName","t4","get","currentParentParam","tabSlug","isActiveTab","activeTabSlug","t5","treeRefreshKey","prevTreeRefreshKeyRef","t6","t7","current","reloadTabContent","undefined","t8","JSON","stringify","baseFilterKey","t9","filters","handleFilterChange","t10","t11","id","url","path","view","addQueryPrefix","push","refresh","handleNavigateToParent","_jsxs","_Fragment","children","_jsx","collectionSlug","expandedNodes","treeData","className","isActive","onActiveChange","onFilterChange","onSelect","filterByCollections","length","onNodeClick"],"sources":["../../../../src/elements/Hierarchy/Tree/HierarchySidebarTab.tsx"],"sourcesContent":["'use client'\n\nimport type { SidebarTabClientProps } from 'payload'\n\nimport { formatAdminURL } from 'payload/shared'\nimport * as qs from 'qs-esm'\nimport React, { useCallback, useEffect, useRef, useState } from 'react'\n\nimport type { HierarchyInitialData } from './types.js'\n\nimport { useConfig } from '../../../providers/Config/index.js'\nimport { useHierarchy } from '../../../providers/Hierarchy/index.js'\nimport { useRouter, useSearchParams } from '../../../providers/RouterAdapter/index.js'\nimport { useRouteTransition } from '../../../providers/RouteTransition/index.js'\nimport { useSidebarTabs } from '../../../providers/SidebarTabs/index.js'\nimport { HydrateHierarchyProvider } from '../HydrateProvider/index.js'\nimport { HierarchySearch } from '../Search/index.js'\nimport { HierarchyTree } from './index.js'\n\nexport const HierarchySidebarTab: React.FC<\n  {\n    baseFilter?: Record<string, unknown>\n    collectionSpecificOptions?: { label: string; value: string }[]\n    hierarchyCollectionSlug: string\n    icon?: React.ReactNode\n    initialData?: HierarchyInitialData | null\n    initialExpandedNodes?: (number | string)[]\n    initialSelectedFilters?: string[]\n    parentFieldName?: string\n    selectedNodeId?: null | string\n    treeLimit?: number\n    typeFieldName?: string\n    useAsTitle?: string\n  } & SidebarTabClientProps\n> = ({\n  baseFilter,\n  collectionSpecificOptions,\n  hierarchyCollectionSlug,\n  icon,\n  initialData,\n  initialExpandedNodes,\n  initialSelectedFilters,\n  parentFieldName,\n  selectedNodeId: selectedNodeIdFromServer,\n  treeLimit,\n  typeFieldName,\n  useAsTitle,\n}) => {\n  const router = useRouter()\n  const searchParams = useSearchParams()\n  const { startRouteTransition } = useRouteTransition()\n  const {\n    config: {\n      routes: { admin: adminRoute },\n    },\n  } = useConfig()\n  const [isSearchActive, setIsSearchActive] = useState(false)\n  const [selectedFilters, setSelectedFiltersLocal] = useState<string[]>(\n    initialSelectedFilters ?? [],\n  )\n  const { setSelectedFilters: setSelectedFiltersContext, treeRefreshKeys } = useHierarchy()\n  const sidebarTabs = useSidebarTabs()\n\n  const resolvedParentFieldName = parentFieldName ?? 'parent'\n  const currentParentParam = searchParams.get(resolvedParentFieldName)\n\n  // When refreshTree(slug) is called from the list view (e.g. after mutations), reload this tab.\n  // Always reload regardless of active state so inactive tabs are fresh when switched to.\n  // The render-tab server function runs with a fresh request that lacks the client's URL query,\n  // so forward the current selected parent id — otherwise the reload can't tell which node is\n  // being viewed and rebuilds the tree from preference state.\n  const tabSlug = `hierarchy-${hierarchyCollectionSlug}`\n  const isActiveTab = sidebarTabs?.activeTabSlug === tabSlug\n  const treeRefreshKey = treeRefreshKeys.get(hierarchyCollectionSlug) ?? 0\n  const prevTreeRefreshKeyRef = useRef(treeRefreshKey)\n  useEffect(() => {\n    if (prevTreeRefreshKeyRef.current !== treeRefreshKey) {\n      prevTreeRefreshKeyRef.current = treeRefreshKey\n      // Only forward the selected parent id when this tab is active. currentParentParam\n      // reflects the global URL search params, so an inactive tab could otherwise pick up\n      // another hierarchy collection's value if they share the same parentFieldName.\n      sidebarTabs?.reloadTabContent(tabSlug, {\n        searchParams:\n          isActiveTab && currentParentParam\n            ? { [resolvedParentFieldName]: currentParentParam }\n            : undefined,\n      })\n    }\n  }, [\n    treeRefreshKey,\n    sidebarTabs,\n    tabSlug,\n    isActiveTab,\n    currentParentParam,\n    resolvedParentFieldName,\n  ])\n\n  // Only highlight selected node when this tab is active\n  const selectedNodeId = isActiveTab\n    ? (currentParentParam ?? selectedNodeIdFromServer ?? undefined)\n    : undefined\n\n  const baseFilterKey = baseFilter ? JSON.stringify(baseFilter) : ''\n\n  const handleFilterChange = useCallback(\n    (filters: string[]) => {\n      setSelectedFiltersLocal(filters)\n      setSelectedFiltersContext(filters)\n    },\n    [setSelectedFiltersContext],\n  )\n\n  const handleNavigateToParent = useCallback(\n    ({ id }: { id: number | string }) => {\n      const url = formatAdminURL({\n        adminRoute,\n        path: `/collections/${hierarchyCollectionSlug}${qs.stringify(\n          { [resolvedParentFieldName]: id, view: 'hierarchy' },\n          { addQueryPrefix: true },\n        )}`,\n      })\n      void startRouteTransition(() => {\n        router.push(url)\n        router.refresh()\n      })\n    },\n    [adminRoute, hierarchyCollectionSlug, resolvedParentFieldName, router, startRouteTransition],\n  )\n  return (\n    <>\n      <HydrateHierarchyProvider\n        baseFilter={baseFilter}\n        collectionSlug={hierarchyCollectionSlug}\n        expandedNodes={initialExpandedNodes}\n        parentFieldName={parentFieldName}\n        selectedFilters={initialSelectedFilters}\n        treeData={initialData}\n        treeLimit={treeLimit}\n        typeFieldName={typeFieldName}\n      />\n      <div className=\"hierarchy-sidebar-tab\">\n        <HierarchySearch\n          collectionSlug={hierarchyCollectionSlug}\n          collectionSpecificOptions={collectionSpecificOptions}\n          isActive={isSearchActive}\n          onActiveChange={setIsSearchActive}\n          onFilterChange={handleFilterChange}\n          onSelect={handleNavigateToParent}\n          selectedFilters={selectedFilters}\n        />\n        {!isSearchActive && (\n          <HierarchyTree\n            baseFilter={baseFilter}\n            collectionSlug={hierarchyCollectionSlug}\n            filterByCollections={selectedFilters.length > 0 ? selectedFilters : undefined}\n            icon={icon}\n            initialData={initialData}\n            initialExpandedNodes={initialExpandedNodes}\n            key={`${hierarchyCollectionSlug}-${baseFilterKey}`}\n            onNodeClick={handleNavigateToParent}\n            selectedNodeId={selectedNodeId}\n            useAsTitle={useAsTitle}\n          />\n        )}\n      </div>\n    </>\n  )\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/elements/Hierarchy/Tree/HierarchySidebarTab.server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HierarchySidebarTab.server.d.ts","sourceRoot":"","sources":["../../../../src/elements/Hierarchy/Tree/HierarchySidebarTab.server.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAS,MAAM,SAAS,CAAA;AAI3D,OAAO,KAAK,MAAM,OAAO,CAAA;AAOzB,MAAM,MAAM,8BAA8B,GAAG;IAC3C,uBAAuB,EAAE,MAAM,CAAA;CAChC,GAAG,qBAAqB,CAAA;AAEzB,eAAO,MAAM,yBAAyB,EAAE,KAAK,CAAC,EAAE,CAAC,8BAA8B,CA4K9E,CAAA"}
+{"version":3,"file":"HierarchySidebarTab.server.d.ts","sourceRoot":"","sources":["../../../../src/elements/Hierarchy/Tree/HierarchySidebarTab.server.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAS,MAAM,SAAS,CAAA;AAK3D,OAAO,KAAK,MAAM,OAAO,CAAA;AAOzB,MAAM,MAAM,8BAA8B,GAAG;IAC3C,uBAAuB,EAAE,MAAM,CAAA;CAChC,GAAG,qBAAqB,CAAA;AAEzB,eAAO,MAAM,yBAAyB,EAAE,KAAK,CAAC,EAAE,CAAC,8BAA8B,CA+L9E,CAAA"}

package/dist/elements/Hierarchy/Tree/HierarchySidebarTab.server.js

@@ -1,4 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import { getTranslation } from '@payloadcms/translations';
 import { DEFAULT_HIERARCHY_TREE_LIMIT, getInitialTreeData } from 'payload';
 import { PREFERENCE_KEYS } from 'payload/shared';
 import React from 'react';
@@ -8,6 +9,7 @@ import { TagIcon } from '../../../icons/Tag/index.js';
 import { RenderServerComponent } from '../../RenderServerComponent/index.js';
 export const HierarchySidebarTabServer = async ({
   hierarchyCollectionSlug,
+  i18n,
   payload,
   req,
   searchParams,
@@ -24,16 +26,22 @@ export const HierarchySidebarTabServer = async ({
   let treeLimit;
   let typeFieldName;
   let useAsTitle;
+  let collectionSpecificOptions = [];
   let baseFilter = null;
   // Get collection config and render icon (outside try block - doesn't need async)
   const collectionConfig = payload.collections[hierarchyCollectionSlug]?.config;
   const hierarchyConfig = collectionConfig?.hierarchy && typeof collectionConfig.hierarchy === 'object' ? collectionConfig.hierarchy : undefined;
   const IconComponent = hierarchyConfig?.admin?.components?.SmallIcon;
   const icon = IconComponent ? RenderServerComponent({
+    clientProps: {
+      size: 16
+    },
     Component: IconComponent,
     importMap: payload.importMap,
     key: `hierarchy-sidebar-icon-${hierarchyCollectionSlug}`
-  }) : /*#__PURE__*/_jsx(TagIcon, {});
+  }) : /*#__PURE__*/_jsx(TagIcon, {
+    size: 16
+  });
   try {
     // Get parentFieldName from config first (needed for URL parsing)
     parentFieldName = hierarchyConfig?.parentFieldName ?? 'parent';
@@ -76,6 +84,17 @@ export const HierarchySidebarTabServer = async ({
     treeLimit = hierarchyConfig?.admin?.treeLimit;
     typeFieldName = hierarchyConfig?.collectionSpecific && typeof hierarchyConfig.collectionSpecific === 'object' ? hierarchyConfig.collectionSpecific.fieldName : undefined;
     useAsTitle = collectionConfig?.admin?.useAsTitle;
+    // STEP 2.5: Build collection-specific options from related collections
+    if (hierarchyConfig.collectionSpecific && hierarchyConfig?.relatedCollections) {
+      collectionSpecificOptions = Object.keys(hierarchyConfig.relatedCollections).map(slug => {
+        const relatedConfig = payload.collections[slug]?.config;
+        const label = relatedConfig?.labels?.plural ?? slug;
+        return {
+          label: getTranslation(label, i18n),
+          value: slug
+        };
+      }).sort((a, b) => a.label.localeCompare(b.label));
+    }
     // Track the immediate parent of the selected node (for ensuring siblings are loaded)
     let selectedNodeParentId = null;
     // If there's a selected node, ensure its ancestor chain is expanded
@@ -149,6 +168,7 @@ export const HierarchySidebarTabServer = async ({
   }
   return /*#__PURE__*/_jsx(HierarchySidebarTab, {
     baseFilter: baseFilter,
+    collectionSpecificOptions: collectionSpecificOptions,
     hierarchyCollectionSlug: hierarchyCollectionSlug,
     icon: icon,
     initialData: initialData,

package/dist/elements/Hierarchy/Tree/HierarchySidebarTab.server.js.map

@@ -1 +1 @@
-{"version":3,"file":"HierarchySidebarTab.server.js","names":["DEFAULT_HIERARCHY_TREE_LIMIT","getInitialTreeData","PREFERENCE_KEYS","React","HierarchySidebarTab","TagIcon","RenderServerComponent","HierarchySidebarTabServer","hierarchyCollectionSlug","payload","req","searchParams","user","initialData","initialExpandedNodes","initialSelectedFilters","selectedNodeId","parentFieldName","treeLimit","typeFieldName","useAsTitle","baseFilter","collectionConfig","collections","config","hierarchyConfig","hierarchy","undefined","IconComponent","admin","components","SmallIcon","icon","Component","importMap","key","_jsx","selectedNodeParam","String","preferenceKey","HIERARCHY_TREE","docs","preferenceDocs","find","collection","limit","overrideAccess","where","and","equals","id","preferences","value","expandedNodes","selectedFilters","collectionSpecific","fieldName","selectedNodeParentId","ancestorIds","currentNodeId","isFirstIteration","node","findByID","depth","parentId","push","expandedSet","Set","forEach","add","Array","from","baseFilterFn","baseListFilter","page","sort","collectionSlug","expandedNodeIds","length","filterByCollections","error","logger","warn","err","msg"],"sources":["../../../../src/elements/Hierarchy/Tree/HierarchySidebarTab.server.tsx"],"sourcesContent":["import type { SidebarTabServerProps, Where } from 'payload'\n\nimport { DEFAULT_HIERARCHY_TREE_LIMIT, getInitialTreeData } from 'payload'\nimport { PREFERENCE_KEYS } from 'payload/shared'\nimport React from 'react'\n\n// eslint-disable-next-line payload/no-imports-from-exports-dir -- Server component must reference exports dir for proper client boundary\nimport { HierarchySidebarTab } from '../../../exports/client/index.js'\nimport { TagIcon } from '../../../icons/Tag/index.js'\nimport { RenderServerComponent } from '../../RenderServerComponent/index.js'\n\nexport type HierarchySidebarTabServerProps = {\n  hierarchyCollectionSlug: string\n} & SidebarTabServerProps\n\nexport const HierarchySidebarTabServer: React.FC<HierarchySidebarTabServerProps> = async ({\n  hierarchyCollectionSlug,\n  payload,\n  req,\n  searchParams,\n  user,\n}) => {\n  if (!user) {\n    return null\n  }\n\n  let initialData = null\n  let initialExpandedNodes: (number | string)[] = []\n  let initialSelectedFilters: string[] = []\n  let selectedNodeId: null | string = null\n  let parentFieldName = 'parent'\n  let treeLimit: number | undefined\n  let typeFieldName: string | undefined\n  let useAsTitle: string | undefined\n  let baseFilter: null | Where = null\n\n  // Get collection config and render icon (outside try block - doesn't need async)\n  const collectionConfig = payload.collections[hierarchyCollectionSlug]?.config\n  const hierarchyConfig =\n    collectionConfig?.hierarchy && typeof collectionConfig.hierarchy === 'object'\n      ? collectionConfig.hierarchy\n      : undefined\n\n  const IconComponent = hierarchyConfig?.admin?.components?.SmallIcon\n  const icon = IconComponent ? (\n    RenderServerComponent({\n      Component: IconComponent,\n      importMap: payload.importMap,\n      key: `hierarchy-sidebar-icon-${hierarchyCollectionSlug}`,\n    })\n  ) : (\n    <TagIcon />\n  )\n\n  try {\n    // Get parentFieldName from config first (needed for URL parsing)\n    parentFieldName = hierarchyConfig?.parentFieldName ?? 'parent'\n\n    // Get selected node from URL (?<parentFieldName>=<id>)\n    const selectedNodeParam = searchParams?.[parentFieldName]\n    selectedNodeId = selectedNodeParam ? String(selectedNodeParam) : null\n\n    // STEP 1: Load user's expanded node preferences\n    const preferenceKey = `${PREFERENCE_KEYS.HIERARCHY_TREE}-${hierarchyCollectionSlug}`\n\n    const { docs: preferenceDocs } = await payload.find({\n      collection: 'payload-preferences',\n      limit: 1,\n      overrideAccess: false,\n      user,\n      where: {\n        and: [\n          { key: { equals: preferenceKey } },\n          { 'user.value': { equals: user.id } },\n          { 'user.relationTo': { equals: user.collection } },\n        ],\n      },\n    })\n\n    const preferences = preferenceDocs[0]\n\n    if (preferences?.value?.expandedNodes) {\n      initialExpandedNodes = preferences.value.expandedNodes\n    }\n\n    if (preferences?.value?.selectedFilters) {\n      initialSelectedFilters = preferences.value.selectedFilters\n    }\n\n    // STEP 2: Get remaining config values\n    treeLimit = hierarchyConfig?.admin?.treeLimit\n    typeFieldName =\n      hierarchyConfig?.collectionSpecific && typeof hierarchyConfig.collectionSpecific === 'object'\n        ? hierarchyConfig.collectionSpecific.fieldName\n        : undefined\n    useAsTitle = collectionConfig?.admin?.useAsTitle\n\n    // Track the immediate parent of the selected node (for ensuring siblings are loaded)\n    let selectedNodeParentId: null | number | string = null\n\n    // If there's a selected node, ensure its ancestor chain is expanded\n    if (selectedNodeId) {\n      // Walk up the parent chain to root\n      const ancestorIds: (number | string)[] = []\n      let currentNodeId: null | number | string = selectedNodeId\n      let isFirstIteration = true\n\n      while (currentNodeId) {\n        try {\n          const node = await payload.findByID({\n            id: currentNodeId,\n            collection: hierarchyCollectionSlug,\n            depth: 0,\n            overrideAccess: false,\n            user,\n          })\n\n          const parentId = node?.[parentFieldName]\n\n          // Capture the immediate parent of the selected node\n          if (isFirstIteration) {\n            selectedNodeParentId = parentId ?? null\n            isFirstIteration = false\n          }\n\n          if (parentId) {\n            ancestorIds.push(parentId)\n            currentNodeId = parentId\n          } else {\n            currentNodeId = null\n          }\n        } catch {\n          // Node not found or access denied\n          break\n        }\n      }\n\n      // Merge ancestor IDs with existing expanded nodes\n      const expandedSet = new Set(initialExpandedNodes)\n      ancestorIds.forEach((id) => expandedSet.add(id))\n      // Include the selected node itself so its own children are loaded.\n      expandedSet.add(selectedNodeId)\n      initialExpandedNodes = Array.from(expandedSet)\n    }\n\n    const baseFilterFn =\n      collectionConfig?.admin?.baseFilter ?? collectionConfig?.admin?.baseListFilter\n    if (baseFilterFn && req) {\n      baseFilter =\n        (await baseFilterFn({ limit: DEFAULT_HIERARCHY_TREE_LIMIT, page: 1, req, sort: 'id' })) ??\n        null\n    }\n\n    initialData = await getInitialTreeData({\n      baseFilter,\n      collectionSlug: hierarchyCollectionSlug,\n      expandedNodeIds: initialExpandedNodes,\n      ...(initialSelectedFilters.length > 0 && { filterByCollections: initialSelectedFilters }),\n      ...(treeLimit !== undefined && { limit: treeLimit }),\n      payload,\n      selectedNodeId,\n      selectedNodeParentId,\n      user: req.user,\n    })\n  } catch (error) {\n    payload.logger.warn({\n      err: error,\n      msg: `Failed to fetch hierarchy data for ${hierarchyCollectionSlug}`,\n    })\n    // Fall back to client-side fetching if server fetch fails\n  }\n\n  return (\n    <HierarchySidebarTab\n      baseFilter={baseFilter}\n      hierarchyCollectionSlug={hierarchyCollectionSlug}\n      icon={icon}\n      initialData={initialData}\n      initialExpandedNodes={initialExpandedNodes}\n      initialSelectedFilters={initialSelectedFilters}\n      parentFieldName={parentFieldName}\n      selectedNodeId={selectedNodeId}\n      treeLimit={treeLimit}\n      typeFieldName={typeFieldName}\n      useAsTitle={useAsTitle}\n    />\n  )\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"HierarchySidebarTab.server.js","names":["getTranslation","DEFAULT_HIERARCHY_TREE_LIMIT","getInitialTreeData","PREFERENCE_KEYS","React","HierarchySidebarTab","TagIcon","RenderServerComponent","HierarchySidebarTabServer","hierarchyCollectionSlug","i18n","payload","req","searchParams","user","initialData","initialExpandedNodes","initialSelectedFilters","selectedNodeId","parentFieldName","treeLimit","typeFieldName","useAsTitle","collectionSpecificOptions","baseFilter","collectionConfig","collections","config","hierarchyConfig","hierarchy","undefined","IconComponent","admin","components","SmallIcon","icon","clientProps","size","Component","importMap","key","_jsx","selectedNodeParam","String","preferenceKey","HIERARCHY_TREE","docs","preferenceDocs","find","collection","limit","overrideAccess","where","and","equals","id","preferences","value","expandedNodes","selectedFilters","collectionSpecific","fieldName","relatedCollections","Object","keys","map","slug","relatedConfig","label","labels","plural","sort","a","b","localeCompare","selectedNodeParentId","ancestorIds","currentNodeId","isFirstIteration","node","findByID","depth","parentId","push","expandedSet","Set","forEach","add","Array","from","baseFilterFn","baseListFilter","page","collectionSlug","expandedNodeIds","length","filterByCollections","error","logger","warn","err","msg"],"sources":["../../../../src/elements/Hierarchy/Tree/HierarchySidebarTab.server.tsx"],"sourcesContent":["import type { SidebarTabServerProps, Where } from 'payload'\n\nimport { getTranslation } from '@payloadcms/translations'\nimport { DEFAULT_HIERARCHY_TREE_LIMIT, getInitialTreeData } from 'payload'\nimport { PREFERENCE_KEYS } from 'payload/shared'\nimport React from 'react'\n\n// eslint-disable-next-line payload/no-imports-from-exports-dir -- Server component must reference exports dir for proper client boundary\nimport { HierarchySidebarTab } from '../../../exports/client/index.js'\nimport { TagIcon } from '../../../icons/Tag/index.js'\nimport { RenderServerComponent } from '../../RenderServerComponent/index.js'\n\nexport type HierarchySidebarTabServerProps = {\n  hierarchyCollectionSlug: string\n} & SidebarTabServerProps\n\nexport const HierarchySidebarTabServer: React.FC<HierarchySidebarTabServerProps> = async ({\n  hierarchyCollectionSlug,\n  i18n,\n  payload,\n  req,\n  searchParams,\n  user,\n}) => {\n  if (!user) {\n    return null\n  }\n\n  let initialData = null\n  let initialExpandedNodes: (number | string)[] = []\n  let initialSelectedFilters: string[] = []\n  let selectedNodeId: null | string = null\n  let parentFieldName = 'parent'\n  let treeLimit: number | undefined\n  let typeFieldName: string | undefined\n  let useAsTitle: string | undefined\n  let collectionSpecificOptions: { label: string; value: string }[] = []\n  let baseFilter: null | Where = null\n\n  // Get collection config and render icon (outside try block - doesn't need async)\n  const collectionConfig = payload.collections[hierarchyCollectionSlug]?.config\n  const hierarchyConfig =\n    collectionConfig?.hierarchy && typeof collectionConfig.hierarchy === 'object'\n      ? collectionConfig.hierarchy\n      : undefined\n\n  const IconComponent = hierarchyConfig?.admin?.components?.SmallIcon\n  const icon = IconComponent ? (\n    RenderServerComponent({\n      clientProps: { size: 16 },\n      Component: IconComponent,\n      importMap: payload.importMap,\n      key: `hierarchy-sidebar-icon-${hierarchyCollectionSlug}`,\n    })\n  ) : (\n    <TagIcon size={16} />\n  )\n\n  try {\n    // Get parentFieldName from config first (needed for URL parsing)\n    parentFieldName = hierarchyConfig?.parentFieldName ?? 'parent'\n\n    // Get selected node from URL (?<parentFieldName>=<id>)\n    const selectedNodeParam = searchParams?.[parentFieldName]\n    selectedNodeId = selectedNodeParam ? String(selectedNodeParam) : null\n\n    // STEP 1: Load user's expanded node preferences\n    const preferenceKey = `${PREFERENCE_KEYS.HIERARCHY_TREE}-${hierarchyCollectionSlug}`\n\n    const { docs: preferenceDocs } = await payload.find({\n      collection: 'payload-preferences',\n      limit: 1,\n      overrideAccess: false,\n      user,\n      where: {\n        and: [\n          { key: { equals: preferenceKey } },\n          { 'user.value': { equals: user.id } },\n          { 'user.relationTo': { equals: user.collection } },\n        ],\n      },\n    })\n\n    const preferences = preferenceDocs[0]\n\n    if (preferences?.value?.expandedNodes) {\n      initialExpandedNodes = preferences.value.expandedNodes\n    }\n\n    if (preferences?.value?.selectedFilters) {\n      initialSelectedFilters = preferences.value.selectedFilters\n    }\n\n    // STEP 2: Get remaining config values\n    treeLimit = hierarchyConfig?.admin?.treeLimit\n    typeFieldName =\n      hierarchyConfig?.collectionSpecific && typeof hierarchyConfig.collectionSpecific === 'object'\n        ? hierarchyConfig.collectionSpecific.fieldName\n        : undefined\n    useAsTitle = collectionConfig?.admin?.useAsTitle\n\n    // STEP 2.5: Build collection-specific options from related collections\n    if (hierarchyConfig.collectionSpecific && hierarchyConfig?.relatedCollections) {\n      collectionSpecificOptions = Object.keys(hierarchyConfig.relatedCollections)\n        .map((slug) => {\n          const relatedConfig = payload.collections[slug]?.config\n          const label = relatedConfig?.labels?.plural ?? slug\n\n          return {\n            label: getTranslation(label, i18n),\n            value: slug,\n          }\n        })\n        .sort((a, b) => a.label.localeCompare(b.label))\n    }\n\n    // Track the immediate parent of the selected node (for ensuring siblings are loaded)\n    let selectedNodeParentId: null | number | string = null\n\n    // If there's a selected node, ensure its ancestor chain is expanded\n    if (selectedNodeId) {\n      // Walk up the parent chain to root\n      const ancestorIds: (number | string)[] = []\n      let currentNodeId: null | number | string = selectedNodeId\n      let isFirstIteration = true\n\n      while (currentNodeId) {\n        try {\n          const node = await payload.findByID({\n            id: currentNodeId,\n            collection: hierarchyCollectionSlug,\n            depth: 0,\n            overrideAccess: false,\n            user,\n          })\n\n          const parentId = node?.[parentFieldName]\n\n          // Capture the immediate parent of the selected node\n          if (isFirstIteration) {\n            selectedNodeParentId = parentId ?? null\n            isFirstIteration = false\n          }\n\n          if (parentId) {\n            ancestorIds.push(parentId)\n            currentNodeId = parentId\n          } else {\n            currentNodeId = null\n          }\n        } catch {\n          // Node not found or access denied\n          break\n        }\n      }\n\n      // Merge ancestor IDs with existing expanded nodes\n      const expandedSet = new Set(initialExpandedNodes)\n      ancestorIds.forEach((id) => expandedSet.add(id))\n      // Include the selected node itself so its own children are loaded.\n      expandedSet.add(selectedNodeId)\n      initialExpandedNodes = Array.from(expandedSet)\n    }\n\n    const baseFilterFn =\n      collectionConfig?.admin?.baseFilter ?? collectionConfig?.admin?.baseListFilter\n    if (baseFilterFn && req) {\n      baseFilter =\n        (await baseFilterFn({ limit: DEFAULT_HIERARCHY_TREE_LIMIT, page: 1, req, sort: 'id' })) ??\n        null\n    }\n\n    initialData = await getInitialTreeData({\n      baseFilter,\n      collectionSlug: hierarchyCollectionSlug,\n      expandedNodeIds: initialExpandedNodes,\n      ...(initialSelectedFilters.length > 0 && { filterByCollections: initialSelectedFilters }),\n      ...(treeLimit !== undefined && { limit: treeLimit }),\n      payload,\n      selectedNodeId,\n      selectedNodeParentId,\n      user: req.user,\n    })\n  } catch (error) {\n    payload.logger.warn({\n      err: error,\n      msg: `Failed to fetch hierarchy data for ${hierarchyCollectionSlug}`,\n    })\n    // Fall back to client-side fetching if server fetch fails\n  }\n\n  return (\n    <HierarchySidebarTab\n      baseFilter={baseFilter}\n      collectionSpecificOptions={collectionSpecificOptions}\n      hierarchyCollectionSlug={hierarchyCollectionSlug}\n      icon={icon}\n      initialData={initialData}\n      initialExpandedNodes={initialExpandedNodes}\n      initialSelectedFilters={initialSelectedFilters}\n      parentFieldName={parentFieldName}\n      selectedNodeId={selectedNodeId}\n      treeLimit={treeLimit}\n      typeFieldName={typeFieldName}\n      useAsTitle={useAsTitle}\n    />\n  )\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/elements/Hierarchy/Tree/LoadMore/index.css

@@ -2,9 +2,9 @@
 
 .tree__load-more.load-more-row {
   padding-top: 0;
-  padding-inline-start: calc(
-    (var(--tree-depth, 0) * var(--tree-indent)) + var(--spacer-3) + var(--tree-chevron-width) +
-      var(--tree-chevron-spacing)
+  padding-left: calc(
+    (var(--tree-depth, 0) * var(--tree-indent)) + (var(--spacer-1) * var(--tree-depth)) +
+      var(--spacer-2-5) - 2px
   );
   height: var(--tree-node-content-height);
   position: relative;

package/dist/elements/Hierarchy/Tree/TreeFocusContext.d.ts

@@ -15,8 +15,9 @@ export declare const TreeFocusProvider: React.FC<{
     children: React.ReactNode;
 }>;
 export declare const useTreeFocus: () => TreeFocusContextType;
-export declare const useFocusableItem: ({ id, type, ref, }: {
+export declare const useFocusableItem: ({ id, type, isInitialTabStop, ref, }: {
     id: string;
+    isInitialTabStop?: boolean;
     ref: React.RefObject<HTMLElement>;
     type: 'load-more' | 'node';
 }) => {

package/dist/elements/Hierarchy/Tree/TreeFocusContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TreeFocusContext.d.ts","sourceRoot":"","sources":["../../../../src/elements/Hierarchy/Tree/TreeFocusContext.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAY9B,KAAK,aAAa,GAAG;IACnB,EAAE,EAAE,MAAM,CAAA;IACV,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;IACjC,IAAI,EAAE,WAAW,GAAG,MAAM,CAAA;CAC3B,CAAA;AAED,KAAK,oBAAoB,GAAG;IAC1B,SAAS,EAAE,IAAI,GAAG,MAAM,CAAA;IACxB,SAAS,EAAE,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAA;IAC7C,YAAY,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,YAAY,EAAE,CAAC,EAAE,EAAE,IAAI,GAAG,MAAM,KAAK,IAAI,CAAA;IACzC,cAAc,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAA;CACrC,CAAA;AAID,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC;IAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,CAgFrE,CAAA;AAED,eAAO,MAAM,YAAY,4BAMxB,CAAA;AAED,eAAO,MAAM,gBAAgB,uBAI1B;IACD,EAAE,EAAE,MAAM,CAAA;IACV,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;IACjC,IAAI,EAAE,WAAW,GAAG,MAAM,CAAA;CAC3B;;;;CAsCA,CAAA"}
+{"version":3,"file":"TreeFocusContext.d.ts","sourceRoot":"","sources":["../../../../src/elements/Hierarchy/Tree/TreeFocusContext.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAY9B,KAAK,aAAa,GAAG;IACnB,EAAE,EAAE,MAAM,CAAA;IACV,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;IACjC,IAAI,EAAE,WAAW,GAAG,MAAM,CAAA;CAC3B,CAAA;AAED,KAAK,oBAAoB,GAAG;IAC1B,SAAS,EAAE,IAAI,GAAG,MAAM,CAAA;IACxB,SAAS,EAAE,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAA;IAC7C,YAAY,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,YAAY,EAAE,CAAC,EAAE,EAAE,IAAI,GAAG,MAAM,KAAK,IAAI,CAAA;IACzC,cAAc,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAA;CACrC,CAAA;AAID,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC;IAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,CAiFrE,CAAA;AAED,eAAO,MAAM,YAAY,4BAMxB,CAAA;AAED,eAAO,MAAM,gBAAgB,yCAK1B;IACD,EAAE,EAAE,MAAM,CAAA;IACV,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;IACjC,IAAI,EAAE,WAAW,GAAG,MAAM,CAAA;CAC3B;;;;CAoCA,CAAA"}

package/dist/elements/Hierarchy/Tree/TreeFocusContext.js

@@ -23,6 +23,7 @@ export const TreeFocusProvider = ({
   }, []);
   const unregisterItem = useCallback(id_0 => {
     itemsRef.current.delete(id_0);
+    setFocusedIdState(focusedId_0 => focusedId_0 === id_0 ? null : focusedId_0);
   }, []);
   const moveFocus = useCallback(direction => {
     const items = Array.from(itemsRef.current.values());
@@ -81,8 +82,10 @@ export const useFocusableItem = t0 => {
   const {
     id,
     type,
+    isInitialTabStop: t1,
     ref
   } = t0;
+  const isInitialTabStop = t1 === undefined ? false : t1;
   const {
     focusedId,
     registerItem,
@@ -90,12 +93,11 @@ export const useFocusableItem = t0 => {
     unregisterItem
   } = useTreeFocus();
   const isFocused = focusedId === id;
-  const isFirstItemEver = focusedId === null;
   const wasFocusedRef = useRef(false);
-  let t1;
   let t2;
+  let t3;
   if ($[0] !== id || $[1] !== ref || $[2] !== registerItem || $[3] !== type || $[4] !== unregisterItem) {
-    t1 = () => {
+    t2 = () => {
       registerItem({
         id,
         type,
@@ -105,54 +107,54 @@ export const useFocusableItem = t0 => {
         unregisterItem(id);
       };
     };
-    t2 = [id, ref, type, registerItem, unregisterItem];
+    t3 = [id, ref, type, registerItem, unregisterItem];
     $[0] = id;
     $[1] = ref;
     $[2] = registerItem;
     $[3] = type;
     $[4] = unregisterItem;
-    $[5] = t1;
-    $[6] = t2;
+    $[5] = t2;
+    $[6] = t3;
   } else {
-    t1 = $[5];
-    t2 = $[6];
+    t2 = $[5];
+    t3 = $[6];
   }
-  useEffect(t1, t2);
-  let t3;
+  useEffect(t2, t3);
   let t4;
+  let t5;
   if ($[7] !== isFocused || $[8] !== ref) {
-    t3 = () => {
+    t4 = () => {
       if (isFocused && !wasFocusedRef.current && ref.current && document.activeElement !== ref.current) {
         ref.current.focus();
       }
       wasFocusedRef.current = isFocused;
     };
-    t4 = [isFocused, ref];
+    t5 = [isFocused, ref];
     $[7] = isFocused;
     $[8] = ref;
-    $[9] = t3;
-    $[10] = t4;
+    $[9] = t4;
+    $[10] = t5;
   } else {
-    t3 = $[9];
-    t4 = $[10];
+    t4 = $[9];
+    t5 = $[10];
   }
-  useLayoutEffect(t3, t4);
-  let t5;
+  useLayoutEffect(t4, t5);
+  let t6;
   if ($[11] !== id || $[12] !== setFocusedId) {
-    t5 = () => {
+    t6 = () => {
       setFocusedId(id);
     };
     $[11] = id;
     $[12] = setFocusedId;
-    $[13] = t5;
+    $[13] = t6;
   } else {
-    t5 = $[13];
+    t6 = $[13];
   }
-  const handleFocus = t5;
-  const tabIndex = isFocused ? 0 : isFirstItemEver ? 0 : -1;
-  let t6;
+  const handleFocus = t6;
+  const tabIndex = isFocused || focusedId === null && isInitialTabStop ? 0 : -1;
+  let t7;
   if ($[14] !== handleFocus || $[15] !== isFocused || $[16] !== tabIndex) {
-    t6 = {
+    t7 = {
       handleFocus,
       isFocused,
       tabIndex
@@ -160,10 +162,10 @@ export const useFocusableItem = t0 => {
     $[14] = handleFocus;
     $[15] = isFocused;
     $[16] = tabIndex;
-    $[17] = t6;
+    $[17] = t7;
   } else {
-    t6 = $[17];
+    t7 = $[17];
   }
-  return t6;
+  return t7;
 };
 //# sourceMappingURL=TreeFocusContext.js.map