@payloadcms/ui 4.0.0-canary.9 → 4.0.0-internal.016994f

package/dist/elements/StepNav/index.js

@@ -1,21 +1,21 @@
 'use client';
 
-import { c as _c } from "react/compiler-runtime";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { getTranslation } from '@payloadcms/translations';
-import React, { Fragment } from 'react';
+import React, { Fragment, useEffect, useRef, useState } from 'react';
 import { useConfig } from '../../providers/Config/index.js';
 import { useTranslation } from '../../providers/Translation/index.js';
 import { Button } from '../Button/index.js';
+import { Popup, PopupList } from '../Popup/index.js';
 import { StepNavProvider, useStepNav } from './context.js';
+import { StepNavDropTarget } from './DropTarget/index.js';
 import './index.css';
 export { SetStepNav } from './SetStepNav.js';
 const baseClass = 'step-nav';
-const StepNav = t0 => {
-  const $ = _c(11);
-  const {
-    className
-  } = t0;
+const minItemsToCollapse = 4;
+const StepNav = ({
+  className
+}) => {
   const {
     i18n
   } = useTranslation();
@@ -23,75 +23,153 @@ const StepNav = t0 => {
     stepNav
   } = useStepNav();
   const {
-    config: t1
+    config: {
+      routes: {
+        admin
+      }
+    }
   } = useConfig();
-  const {
-    routes: t2
-  } = t1;
-  const {
-    admin
-  } = t2;
   const {
     t
   } = useTranslation();
+  const navRef = useRef(null);
+  const measurerRef = useRef(null);
+  const [isCollapsed, setIsCollapsed] = useState(false);
+  // Check if first item is a dashboard dropdown (React element with no URL)
+  // In that case, it replaces the home element entirely
   const firstItem = stepNav[0];
-  let t3;
-  if ($[0] !== firstItem) {
-    t3 = firstItem && !firstItem.url && typeof firstItem.label !== "string" && React.isValidElement(firstItem.label);
-    $[0] = firstItem;
-    $[1] = t3;
-  } else {
-    t3 = $[1];
-  }
-  const hasDashboardDropdown = t3;
-  let t4;
-  if ($[2] !== admin || $[3] !== className || $[4] !== hasDashboardDropdown || $[5] !== i18n || $[6] !== stepNav || $[7] !== t) {
-    const stepNavItems = hasDashboardDropdown ? stepNav : [{
-      label: t("general:dashboard"),
-      url: admin
-    }, ...stepNav];
-    let t5;
-    if ($[9] !== className) {
-      t5 = [baseClass, className].filter(Boolean);
-      $[9] = className;
-      $[10] = t5;
-    } else {
-      t5 = $[10];
+  const hasDashboardDropdown = firstItem && !firstItem.url && typeof firstItem.label !== 'string' && /*#__PURE__*/React.isValidElement(firstItem.label);
+  const stepNavItems = hasDashboardDropdown ? stepNav : [{
+    label: t('general:dashboard'),
+    url: admin
+  }, ...stepNav];
+  const canCollapse = !hasDashboardDropdown && stepNavItems.length >= minItemsToCollapse;
+  // Collapse only when the expanded breadcrumbs (measured via the hidden
+  // measurer) can't fit the available width.
+  useEffect(() => {
+    if (!canCollapse) {
+      setIsCollapsed(false);
+      return;
     }
-    t4 = _jsx("nav", {
-      className: t5.join(" "),
-      children: stepNavItems.map((item, i) => {
-        const StepLabel = getTranslation(item.label, i18n);
-        const isLast = stepNavItems.length === i + 1;
-        const isFirst = i === 0;
-        return _jsxs(Fragment, {
-          children: [item.url ? _jsx(Button, {
-            buttonStyle: "ghost",
-            className: [`${baseClass}__item`, isLast ? `${baseClass}__last` : undefined, isFirst ? `${baseClass}__first` : undefined].filter(Boolean).join(" "),
-            el: "link",
-            url: item.url,
-            children: StepLabel
-          }) : _jsx("span", {
-            className: [`${baseClass}__item`, isLast ? `${baseClass}__last` : undefined, isFirst ? `${baseClass}__first` : undefined].filter(Boolean).join(" "),
-            children: StepLabel
-          }), !isLast && _jsx("span", {
-            className: `${baseClass}__separator`,
-            children: "/"
-          })]
-        }, i);
-      })
+    const nav = navRef.current;
+    const measurer = measurerRef.current;
+    const container = nav?.parentElement;
+    if (!nav || !measurer || !container) {
+      return;
+    }
+    const measure = () => {
+      const available = container.clientWidth;
+      const needed = measurer.getBoundingClientRect().width;
+      setIsCollapsed(needed - available > 1);
+    };
+    measure();
+    const observer = new ResizeObserver(measure);
+    observer.observe(container);
+    // A web font finishing loading can change the measured width without the
+    // container resizing, so the ResizeObserver alone won't catch it.
+    let isEffectActive = true;
+    void document.fonts?.ready.then(() => {
+      if (isEffectActive) {
+        measure();
+      }
+    });
+    return () => {
+      isEffectActive = false;
+      observer.disconnect();
+    };
+  }, [canCollapse, stepNav, i18n, admin, t]);
+  const renderItem = (item, {
+    isFirst,
+    isLast
+  }) => {
+    const StepLabel = getTranslation(item.label, i18n);
+    const itemClassName = [`${baseClass}__item`, isLast ? `${baseClass}__last` : undefined, isFirst ? `${baseClass}__first` : undefined].filter(Boolean).join(' ');
+    const rendered = item.url ? /*#__PURE__*/_jsx(Button, {
+      buttonStyle: "ghost",
+      className: itemClassName,
+      el: "link",
+      url: item.url,
+      children: StepLabel
+    }) : /*#__PURE__*/_jsx("span", {
+      className: itemClassName,
+      children: StepLabel
     });
-    $[2] = admin;
-    $[3] = className;
-    $[4] = hasDashboardDropdown;
-    $[5] = i18n;
-    $[6] = stepNav;
-    $[7] = t;
-    $[8] = t4;
-  } else {
-    t4 = $[8];
-  }
-  return t4;
+    // Crumbs collapsed into the overflow popup are not visible mid-drag, so only the ones rendered
+    // in the trail itself become drop targets.
+    return item.dropTarget ? /*#__PURE__*/_jsx(StepNavDropTarget, {
+      dropTarget: item.dropTarget,
+      children: rendered
+    }) : rendered;
+  };
+  const separator = /*#__PURE__*/_jsx("span", {
+    className: `${baseClass}__separator`,
+    children: "/"
+  });
+  const shouldCollapse = canCollapse && isCollapsed;
+  const collapsedItems = shouldCollapse ? stepNavItems.slice(1, -1) : [];
+  const lastItem = stepNavItems[stepNavItems.length - 1];
+  return /*#__PURE__*/_jsxs(Fragment, {
+    children: [/*#__PURE__*/_jsx("nav", {
+      className: [baseClass, className].filter(Boolean).join(' '),
+      ref: navRef,
+      children: shouldCollapse ? /*#__PURE__*/_jsxs(Fragment, {
+        children: [renderItem(stepNavItems[0], {
+          isFirst: true,
+          isLast: false
+        }), separator, /*#__PURE__*/_jsx(Popup, {
+          button: "…",
+          buttonAriaLabel: t('general:moreOptions'),
+          buttonClassName: `${baseClass}__collapsed-toggle`,
+          buttonType: "custom",
+          className: `${baseClass}__collapsed`,
+          horizontalAlign: "left",
+          noBackground: true,
+          render: ({
+            close
+          }) => /*#__PURE__*/_jsx(PopupList.ButtonGroup, {
+            className: `${baseClass}__collapsed-list`,
+            children: collapsedItems.map((item_0, i) => /*#__PURE__*/_jsx(PopupList.Button, {
+              href: item_0.url,
+              onClick: close,
+              children: getTranslation(item_0.label, i18n)
+            }, i))
+          }),
+          size: "fit-content",
+          verticalAlign: "bottom"
+        }), separator, renderItem(lastItem, {
+          isFirst: false,
+          isLast: true
+        })]
+      }) : stepNavItems.map((item_1, i_0) => {
+        const isLast_0 = stepNavItems.length === i_0 + 1;
+        const isFirst_0 = i_0 === 0;
+        return /*#__PURE__*/_jsxs(Fragment, {
+          children: [renderItem(item_1, {
+            isFirst: isFirst_0,
+            isLast: isLast_0
+          }), !isLast_0 && separator]
+        }, i_0);
+      })
+    }), canCollapse ? /*#__PURE__*/_jsx("span", {
+      "aria-hidden": "true",
+      className: `${baseClass}__measurer-clip`,
+      inert: true,
+      children: /*#__PURE__*/_jsx("div", {
+        className: `${baseClass}__measurer`,
+        ref: measurerRef,
+        children: stepNavItems.map((item_2, i_1) => {
+          const isLast_1 = stepNavItems.length === i_1 + 1;
+          const isFirst_1 = i_1 === 0;
+          return /*#__PURE__*/_jsxs(Fragment, {
+            children: [renderItem(item_2, {
+              isFirst: isFirst_1,
+              isLast: isLast_1
+            }), !isLast_1 && separator]
+          }, i_1);
+        })
+      })
+    }) : null]
+  });
 };
 export { StepNav, StepNavProvider, useStepNav };
 //# sourceMappingURL=index.js.map

package/dist/elements/StepNav/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["c","_c","getTranslation","React","Fragment","useConfig","useTranslation","Button","StepNavProvider","useStepNav","SetStepNav","baseClass","StepNav","t0","$","className","i18n","stepNav","config","t1","routes","t2","admin","t","firstItem","t3","url","label","isValidElement","hasDashboardDropdown","t4","stepNavItems","t5","filter","Boolean","_jsx","join","children","map","item","i","StepLabel","isLast","length","isFirst","_jsxs","buttonStyle","undefined","el"],"sources":["../../../src/elements/StepNav/index.tsx"],"sourcesContent":["'use client'\n\nimport { getTranslation } from '@payloadcms/translations'\nimport React, { Fragment } from 'react'\n\nimport type { StepNavItem } from './types.js'\n\nimport { useConfig } from '../../providers/Config/index.js'\nimport { useTranslation } from '../../providers/Translation/index.js'\nimport { Button } from '../Button/index.js'\nimport { StepNavProvider, useStepNav } from './context.js'\nimport './index.css'\n\nexport { SetStepNav } from './SetStepNav.js'\n\nconst baseClass = 'step-nav'\n\nconst StepNav: React.FC<{\n  readonly className?: string\n}> = ({ className }) => {\n  const { i18n } = useTranslation()\n\n  const { stepNav } = useStepNav()\n\n  const {\n    config: {\n      routes: { admin },\n    },\n  } = useConfig()\n\n  const { t } = useTranslation()\n\n  // Check if first item is a dashboard dropdown (React element with no URL)\n  // In that case, it replaces the home element entirely\n  const firstItem = stepNav[0]\n  const hasDashboardDropdown =\n    firstItem &&\n    !firstItem.url &&\n    typeof firstItem.label !== 'string' &&\n    React.isValidElement(firstItem.label)\n\n  const stepNavItems = hasDashboardDropdown\n    ? stepNav\n    : [\n        {\n          label: t('general:dashboard'),\n          url: admin,\n        },\n        ...stepNav,\n      ]\n\n  return (\n    <nav className={[baseClass, className].filter(Boolean).join(' ')}>\n      {stepNavItems.map((item, i) => {\n        const StepLabel = getTranslation(item.label, i18n)\n        const isLast = stepNavItems.length === i + 1\n        const isFirst = i === 0\n\n        return (\n          <Fragment key={i}>\n            {item.url ? (\n              <Button\n                buttonStyle=\"ghost\"\n                className={[\n                  `${baseClass}__item`,\n                  isLast ? `${baseClass}__last` : undefined,\n                  isFirst ? `${baseClass}__first` : undefined,\n                ]\n                  .filter(Boolean)\n                  .join(' ')}\n                el=\"link\"\n                url={item.url}\n              >\n                {StepLabel}\n              </Button>\n            ) : (\n              <span\n                className={[\n                  `${baseClass}__item`,\n                  isLast ? `${baseClass}__last` : undefined,\n                  isFirst ? `${baseClass}__first` : undefined,\n                ]\n                  .filter(Boolean)\n                  .join(' ')}\n              >\n                {StepLabel}\n              </span>\n            )}\n            {!isLast && <span className={`${baseClass}__separator`}>/</span>}\n          </Fragment>\n        )\n      })}\n    </nav>\n  )\n}\n\nexport { StepNav, StepNavItem, StepNavProvider, useStepNav }\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["getTranslation","React","Fragment","useEffect","useRef","useState","useConfig","useTranslation","Button","Popup","PopupList","StepNavProvider","useStepNav","StepNavDropTarget","SetStepNav","baseClass","minItemsToCollapse","StepNav","className","i18n","stepNav","config","routes","admin","t","navRef","measurerRef","isCollapsed","setIsCollapsed","firstItem","hasDashboardDropdown","url","label","isValidElement","stepNavItems","canCollapse","length","nav","current","measurer","container","parentElement","measure","available","clientWidth","needed","getBoundingClientRect","width","observer","ResizeObserver","observe","isEffectActive","document","fonts","ready","then","disconnect","renderItem","item","isFirst","isLast","StepLabel","itemClassName","undefined","filter","Boolean","join","rendered","_jsx","buttonStyle","el","dropTarget","separator","shouldCollapse","collapsedItems","slice","lastItem","_jsxs","ref","button","buttonAriaLabel","buttonClassName","buttonType","horizontalAlign","noBackground","render","close","ButtonGroup","map","i","href","onClick","size","verticalAlign","inert"],"sources":["../../../src/elements/StepNav/index.tsx"],"sourcesContent":["'use client'\n\nimport { getTranslation } from '@payloadcms/translations'\nimport React, { Fragment, useEffect, useRef, useState } from 'react'\n\nimport type { StepNavItem } from './types.js'\n\nimport { useConfig } from '../../providers/Config/index.js'\nimport { useTranslation } from '../../providers/Translation/index.js'\nimport { Button } from '../Button/index.js'\nimport { Popup, PopupList } from '../Popup/index.js'\nimport { StepNavProvider, useStepNav } from './context.js'\nimport { StepNavDropTarget } from './DropTarget/index.js'\nimport './index.css'\n\nexport { SetStepNav } from './SetStepNav.js'\n\nconst baseClass = 'step-nav'\n\nconst minItemsToCollapse = 4\n\nconst StepNav: React.FC<{\n  readonly className?: string\n}> = ({ className }) => {\n  const { i18n } = useTranslation()\n\n  const { stepNav } = useStepNav()\n\n  const {\n    config: {\n      routes: { admin },\n    },\n  } = useConfig()\n\n  const { t } = useTranslation()\n\n  const navRef = useRef<HTMLElement>(null)\n  const measurerRef = useRef<HTMLDivElement>(null)\n  const [isCollapsed, setIsCollapsed] = useState(false)\n\n  // Check if first item is a dashboard dropdown (React element with no URL)\n  // In that case, it replaces the home element entirely\n  const firstItem = stepNav[0]\n  const hasDashboardDropdown =\n    firstItem &&\n    !firstItem.url &&\n    typeof firstItem.label !== 'string' &&\n    React.isValidElement(firstItem.label)\n\n  const stepNavItems = hasDashboardDropdown\n    ? stepNav\n    : [\n        {\n          label: t('general:dashboard'),\n          url: admin,\n        },\n        ...stepNav,\n      ]\n\n  const canCollapse = !hasDashboardDropdown && stepNavItems.length >= minItemsToCollapse\n\n  // Collapse only when the expanded breadcrumbs (measured via the hidden\n  // measurer) can't fit the available width.\n  useEffect(() => {\n    if (!canCollapse) {\n      setIsCollapsed(false)\n      return\n    }\n\n    const nav = navRef.current\n    const measurer = measurerRef.current\n    const container = nav?.parentElement\n\n    if (!nav || !measurer || !container) {\n      return\n    }\n\n    const measure = () => {\n      const available = container.clientWidth\n      const needed = measurer.getBoundingClientRect().width\n      setIsCollapsed(needed - available > 1)\n    }\n\n    measure()\n\n    const observer = new ResizeObserver(measure)\n    observer.observe(container)\n\n    // A web font finishing loading can change the measured width without the\n    // container resizing, so the ResizeObserver alone won't catch it.\n    let isEffectActive = true\n    void document.fonts?.ready.then(() => {\n      if (isEffectActive) {\n        measure()\n      }\n    })\n\n    return () => {\n      isEffectActive = false\n      observer.disconnect()\n    }\n  }, [canCollapse, stepNav, i18n, admin, t])\n\n  const renderItem = (\n    item: StepNavItem,\n    { isFirst, isLast }: { isFirst: boolean; isLast: boolean },\n  ) => {\n    const StepLabel = getTranslation(item.label, i18n)\n    const itemClassName = [\n      `${baseClass}__item`,\n      isLast ? `${baseClass}__last` : undefined,\n      isFirst ? `${baseClass}__first` : undefined,\n    ]\n      .filter(Boolean)\n      .join(' ')\n\n    const rendered = item.url ? (\n      <Button buttonStyle=\"ghost\" className={itemClassName} el=\"link\" url={item.url}>\n        {StepLabel}\n      </Button>\n    ) : (\n      <span className={itemClassName}>{StepLabel}</span>\n    )\n\n    // Crumbs collapsed into the overflow popup are not visible mid-drag, so only the ones rendered\n    // in the trail itself become drop targets.\n    return item.dropTarget ? (\n      <StepNavDropTarget dropTarget={item.dropTarget}>{rendered}</StepNavDropTarget>\n    ) : (\n      rendered\n    )\n  }\n\n  const separator = <span className={`${baseClass}__separator`}>/</span>\n\n  const shouldCollapse = canCollapse && isCollapsed\n  const collapsedItems = shouldCollapse ? stepNavItems.slice(1, -1) : []\n  const lastItem = stepNavItems[stepNavItems.length - 1]\n\n  return (\n    <Fragment>\n      <nav className={[baseClass, className].filter(Boolean).join(' ')} ref={navRef}>\n        {shouldCollapse ? (\n          <Fragment>\n            {renderItem(stepNavItems[0], { isFirst: true, isLast: false })}\n            {separator}\n            <Popup\n              button=\"…\"\n              buttonAriaLabel={t('general:moreOptions')}\n              buttonClassName={`${baseClass}__collapsed-toggle`}\n              buttonType=\"custom\"\n              className={`${baseClass}__collapsed`}\n              horizontalAlign=\"left\"\n              noBackground\n              render={({ close }) => (\n                <PopupList.ButtonGroup className={`${baseClass}__collapsed-list`}>\n                  {collapsedItems.map((item, i) => (\n                    <PopupList.Button href={item.url} key={i} onClick={close}>\n                      {getTranslation(item.label, i18n)}\n                    </PopupList.Button>\n                  ))}\n                </PopupList.ButtonGroup>\n              )}\n              size=\"fit-content\"\n              verticalAlign=\"bottom\"\n            />\n            {separator}\n            {renderItem(lastItem, { isFirst: false, isLast: true })}\n          </Fragment>\n        ) : (\n          stepNavItems.map((item, i) => {\n            const isLast = stepNavItems.length === i + 1\n            const isFirst = i === 0\n\n            return (\n              <Fragment key={i}>\n                {renderItem(item, { isFirst, isLast })}\n                {!isLast && separator}\n              </Fragment>\n            )\n          })\n        )}\n      </nav>\n      {canCollapse ? (\n        <span aria-hidden=\"true\" className={`${baseClass}__measurer-clip`} inert>\n          <div className={`${baseClass}__measurer`} ref={measurerRef}>\n            {stepNavItems.map((item, i) => {\n              const isLast = stepNavItems.length === i + 1\n              const isFirst = i === 0\n\n              return (\n                <Fragment key={i}>\n                  {renderItem(item, { isFirst, isLast })}\n                  {!isLast && separator}\n                </Fragment>\n              )\n            })}\n          </div>\n        </span>\n      ) : null}\n    </Fragment>\n  )\n}\n\nexport { StepNav, StepNavItem, StepNavProvider, useStepNav }\n"],"mappings":"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","ignoreList":[]}

package/dist/elements/StepNav/types.d.ts

@@ -1,6 +1,12 @@
 import type { LabelFunction, StaticLabel } from 'payload';
 import type React from 'react';
+import type { HierarchyDropData } from '../../providers/HierarchyDnd/types.js';
 export type StepNavItem = {
+    /**
+     * Makes this crumb a hierarchy drop target, so a drag can move documents to an ancestor folder or
+     * to root by dropping on the trail.
+     */
+    dropTarget?: HierarchyDropData;
     forceReload?: boolean;
     label: LabelFunction | React.JSX.Element | StaticLabel;
     url?: string;

package/dist/elements/StepNav/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/elements/StepNav/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AACzD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,MAAM,MAAM,WAAW,GAAG;IACxB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,KAAK,EAAE,aAAa,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,GAAG,WAAW,CAAA;IACtD,GAAG,CAAC,EAAE,MAAM,CAAA;CACb,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,UAAU,EAAE,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,IAAI,CAAA;IAC1C,OAAO,EAAE,WAAW,EAAE,CAAA;CACvB,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/elements/StepNav/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AACzD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAA;AAE9E,MAAM,MAAM,WAAW,GAAG;IACxB;;;OAGG;IACH,UAAU,CAAC,EAAE,iBAAiB,CAAA;IAC9B,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,KAAK,EAAE,aAAa,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,GAAG,WAAW,CAAA;IACtD,GAAG,CAAC,EAAE,MAAM,CAAA;CACb,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,UAAU,EAAE,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,IAAI,CAAA;IAC1C,OAAO,EAAE,WAAW,EAAE,CAAA;CACvB,CAAA"}

package/dist/elements/StepNav/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../../src/elements/StepNav/types.ts"],"sourcesContent":["import type { LabelFunction, StaticLabel } from 'payload'\nimport type React from 'react'\n\nexport type StepNavItem = {\n  forceReload?: boolean\n  label: LabelFunction | React.JSX.Element | StaticLabel\n  url?: string\n}\n\nexport type ContextType = {\n  setStepNav: (items: StepNavItem[]) => void\n  stepNav: StepNavItem[]\n}\n"],"mappings":"AASA","ignoreList":[]}
+{"version":3,"file":"types.js","names":[],"sources":["../../../src/elements/StepNav/types.ts"],"sourcesContent":["import type { LabelFunction, StaticLabel } from 'payload'\nimport type React from 'react'\n\nimport type { HierarchyDropData } from '../../providers/HierarchyDnd/types.js'\n\nexport type StepNavItem = {\n  /**\n   * Makes this crumb a hierarchy drop target, so a drag can move documents to an ancestor folder or\n   * to root by dropping on the trail.\n   */\n  dropTarget?: HierarchyDropData\n  forceReload?: boolean\n  label: LabelFunction | React.JSX.Element | StaticLabel\n  url?: string\n}\n\nexport type ContextType = {\n  setStepNav: (items: StepNavItem[]) => void\n  stepNav: StepNavItem[]\n}\n"],"mappings":"AAgBA","ignoreList":[]}

package/dist/elements/Table/DefaultCell/fields/File/index.css

@@ -2,24 +2,35 @@
   .file {
     display: flex;
     flex-wrap: nowrap;
+    align-items: center;
+    gap: var(--spacer-2-5);
+    flex: 1;
+    min-width: 0;
   }
 
+  /* The tile background and radius show through for files with no image preview, and keep the
+   * box aligned with the icons other first-column cells render. */
   .file__thumbnail {
-    display: inline-block;
-    max-width: var(--spacer-6);
-    height: var(--spacer-6);
-    border-radius: var(--radius-small);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: var(--spacer-5);
+    max-width: var(--spacer-5);
+    height: var(--spacer-5);
+    background-color: var(--color-bg-secondary);
+    border-radius: var(--radius-medium);
+    overflow: hidden;
+    flex-shrink: 0;
   }
 
+  /*
+   * `overflow: hidden` is required for the ellipsis, so the line box must be tall enough to
+   * contain the cell link's underline - the inherited body line-height crops it away.
+   */
   .file__filename {
-    align-self: center;
-
-    [dir='ltr'] & {
-      margin-left: calc(var(--spacer-4) - var(--spacer-1));
-    }
-
-    [dir='rtl'] & {
-      margin-right: calc(var(--spacer-4) - var(--spacer-1));
-    }
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    line-height: var(--text-body-large-line-height);
   }
 }

package/dist/elements/Table/DefaultCell/fields/Hierarchy/index.css

@@ -4,14 +4,33 @@
     align-items: center;
   }
 
-  .hierarchy-cell__pill {
-    cursor: pointer;
-    display: inline-flex;
-    align-items: center;
-    gap: var(--spacer-2);
+  .hierarchy-cell__button {
+    margin: 0;
+    font-weight: normal;
+
+    .btn__content {
+      gap: 0;
+    }
 
-    &:hover {
-      background-color: var(--color-bg-hover);
+    .btn__label {
+      min-inline-size: 0;
     }
   }
+
+  .hierarchy-cell__truncate {
+    display: block;
+    max-inline-size: calc(var(--spacer-6) * 4);
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  /* Dividers span the full menu width rather than sitting inside the list's inline padding. */
+  .hierarchy-cell__popup-content .popup-divider {
+    margin-inline: calc(var(--spacer-2) * -1);
+  }
+
+  .hierarchy-cell__control {
+    display: contents;
+  }
 }

package/dist/elements/Table/DefaultCell/fields/Hierarchy/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/elements/Table/DefaultCell/fields/Hierarchy/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAA;AAEjF,OAAO,KAA4D,MAAM,OAAO,CAAA;AAchF,OAAO,aAAa,CAAA;AAKpB,MAAM,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,uBAAuB,CAAC,CAAA;AAEnF,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAgOtD,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/elements/Table/DefaultCell/fields/Hierarchy/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,yBAAyB,EAAE,uBAAuB,EAAc,MAAM,SAAS,CAAA;AAI7F,OAAO,KAA4D,MAAM,OAAO,CAAA;AAgBhF,OAAO,aAAa,CAAA;AAKpB,MAAM,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,uBAAuB,CAAC,CAAA;AAEnF,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAwXtD,CAAA"}

package/dist/elements/Table/DefaultCell/fields/Hierarchy/index.js

@@ -1,7 +1,10 @@
 'use client';
 
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { getTranslation } from '@payloadcms/translations';
+import { formatAdminURL } from 'payload/shared';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { toast } from 'sonner';
 import { useIntersect } from '../../../../../hooks/useIntersect.js';
 import { FolderIcon } from '../../../../../icons/Folder/index.js';
 import { TagIcon } from '../../../../../icons/Tag/index.js';
@@ -11,6 +14,7 @@ import { canUseDOM } from '../../../../../utilities/canUseDOM.js';
 import { formatDocTitle } from '../../../../../utilities/formatDocTitle/index.js';
 import { Button } from '../../../../Button/index.js';
 import { useHierarchyModal } from '../../../../Hierarchy/Modal/useHierarchyModal.js';
+import { Popup, PopupList } from '../../../../Popup/index.js';
 import { useListRelationships } from '../../../RelationshipProvider/index.js';
 import './index.css';
 const baseClass = 'hierarchy-cell';
@@ -129,19 +133,17 @@ export const HierarchyCell = ({
       return item;
     });
   }, [cellDataFromProps]);
-  // Handle save from modal
-  const handleSave = useCallback(async ({
-    closeModal,
-    selections
+  // Persist a new set of IDs on the row's document and reflect it locally so the
+  // cell updates without a page reload. Changes apply immediately, so the outcome is
+  // confirmed with a toast.
+  const saveIds = useCallback(async ({
+    selectedIds,
+    successMessage
   }) => {
-    // Get selected IDs
-    const selectedIds = Array.from(selections.keys());
-    const newValue = hasMany ? selectedIds : selectedIds[0] ?? null;
-    // Update the document via API
     try {
       const response = await fetch(`${config.serverURL}${config.routes.api}/${collectionSlug}/${rowData.id}`, {
         body: JSON.stringify({
-          [field.name]: newValue
+          [field.name]: hasMany ? selectedIds : selectedIds[0] ?? null
         }),
         credentials: 'include',
         headers: {
@@ -149,8 +151,12 @@ export const HierarchyCell = ({
         },
         method: 'PATCH'
       });
-      if (response.ok && typeof relationTo === 'string') {
-        // Update local state with new selection to avoid page reload
+      const json = await response.json();
+      if (!response.ok) {
+        toast.error(json?.message || t('error:unknown'));
+        return;
+      }
+      if (typeof relationTo === 'string') {
         const newValues = selectedIds.map(id => ({
           relationTo,
           value: id
@@ -161,11 +167,11 @@ export const HierarchyCell = ({
           getRelationships(newValues);
         }
       }
+      toast.success(successMessage);
     } catch (_error) {
-      // swallow error and close modal anyway, user can try again
+      toast.error(t('error:unknown'));
     }
-    closeModal();
-  }, [collectionSlug, config, field.name, hasMany, rowData, relationTo, getRelationships]);
+  }, [collectionSlug, config, field.name, hasMany, rowData, relationTo, getRelationships, t]);
   // Build display labels
   const labels = useMemo(() => {
     return values.map(({
@@ -185,27 +191,146 @@ export const HierarchyCell = ({
       });
     });
   }, [values, documents, getEntityConfig, config.admin.dateFormat, t, i18n]);
+  // Title of the row's own document, used for the modal's `Move "..."` heading
+  const rowTitle = useMemo(() => formatDocTitle({
+    collectionConfig: getEntityConfig({
+      collectionSlug
+    }),
+    data: rowData,
+    dateFormat: config.admin.dateFormat,
+    fallback: `${t('general:untitled')} - ID: ${rowData?.id}`,
+    i18n
+  }), [collectionSlug, config.admin.dateFormat, getEntityConfig, i18n, rowData, t]);
   const displayText = labels.length > 0 ? labels.join(', ') : t('general:none');
   const isLoading = values.length > 0 && values.some(({
     relationTo: rel_0,
     value: value_0
   }) => documents[rel_0]?.[value_0] === null);
+  // A single value is required to name the folder in the menu, so `hasMany` fields keep the
+  // plain button that opens the move modal directly.
+  const currentId = !hasMany && values.length === 1 ? values[0].value : undefined;
+  const hasSingleFolder = typeof currentId === 'string' || typeof currentId === 'number';
+  // e.g. "Folder" / "Tag" - the hierarchy collection this document is filed under.
+  const hierarchyLabel = getTranslation(hierarchyCollectionConfig?.labels?.singular, i18n);
+  // Handle save from modal
+  const handleSave = useCallback(async ({
+    closeModal,
+    selections
+  }) => {
+    const selectedIds_0 = Array.from(selections.keys());
+    const destination = selections.get(selectedIds_0[0]);
+    const destinationTitle = destination?.path?.[destination.path.length - 1]?.title;
+    closeModal();
+    await saveIds({
+      selectedIds: selectedIds_0,
+      successMessage: !hasMany && destinationTitle ? `Moved "${rowTitle}" to ${destinationTitle}` : `Updated ${hierarchyLabel} for "${rowTitle}"`
+    });
+  }, [hasMany, hierarchyLabel, rowTitle, saveIds]);
+  const controlRef = useRef(null);
+  const [shouldRefocus, setShouldRefocus] = useState(false);
+  // Removal swaps the menu trigger out for the plain button, so focus is restored once the
+  // replacement has rendered rather than on the element that is about to unmount.
+  useEffect(() => {
+    if (shouldRefocus) {
+      controlRef.current?.querySelector('button')?.focus();
+      setShouldRefocus(false);
+    }
+  }, [shouldRefocus]);
+  const handleRemove = useCallback(() => {
+    void saveIds({
+      selectedIds: [],
+      successMessage: `Removed "${rowTitle}" from ${hierarchyLabel}`
+    });
+    setShouldRefocus(true);
+  }, [hierarchyLabel, rowTitle, saveIds]);
+  const goToHref = useMemo(() => {
+    if (!hasSingleFolder || !collectionSlug) {
+      return undefined;
+    }
+    const parentQueryParam = hierarchyConfig?.parentFieldName || 'parent';
+    return formatAdminURL({
+      adminRoute: config.routes.admin,
+      path: `/collections/${collectionSlug}/hierarchy?${parentQueryParam}=${currentId}`
+    });
+  }, [collectionSlug, config.routes.admin, currentId, hasSingleFolder, hierarchyConfig?.parentFieldName]);
   return /*#__PURE__*/_jsxs("div", {
     className: baseClass,
     ref: intersectionRef,
-    children: [/*#__PURE__*/_jsx(Button, {
-      buttonStyle: "pill",
-      className: `${baseClass}__pill`,
-      icon: displayIcon,
-      iconPosition: "left",
-      margin: false,
-      onClick: handleOpenModal,
-      size: "medium",
-      children: isLoading ? `${t('general:loading')}...` : displayText
+    children: [/*#__PURE__*/_jsx("div", {
+      className: `${baseClass}__control`,
+      ref: controlRef,
+      children: hasSingleFolder ? /*#__PURE__*/_jsx(Popup, {
+        caret: false,
+        className: `${baseClass}__popup`,
+        horizontalAlign: "left",
+        portalClassName: `${baseClass}__popup-content`,
+        render: ({
+          close
+        }) => /*#__PURE__*/_jsxs(PopupList.MenuItem, {
+          children: [/*#__PURE__*/_jsx(PopupList.Button, {
+            onClick: () => {
+              close();
+              handleOpenModal();
+            },
+            children: "Move to..."
+          }), /*#__PURE__*/_jsx(PopupList.Button, {
+            onClick: () => {
+              close();
+              handleRemove();
+            },
+            children: `Remove from ${hierarchyLabel}`
+          }), /*#__PURE__*/_jsx(PopupList.Divider, {}), /*#__PURE__*/_jsx(PopupList.Button, {
+            href: goToHref,
+            onClick: close,
+            children: /*#__PURE__*/_jsx("span", {
+              className: `${baseClass}__truncate`,
+              title: displayText,
+              children: `Go to "${displayText}"`
+            })
+          })]
+        }),
+        renderButton: ({
+          active,
+          onClick,
+          onKeyDown
+        }) => /*#__PURE__*/_jsx(Button, {
+          "aria-label": displayText,
+          buttonStyle: "secondary",
+          className: `${baseClass}__button`,
+          extraButtonProps: {
+            'aria-expanded': active,
+            'aria-haspopup': 'menu',
+            onKeyDown
+          },
+          icon: displayIcon,
+          iconPosition: "left",
+          margin: false,
+          onClick: onClick,
+          selected: active,
+          size: "medium",
+          tooltip: displayText,
+          children: /*#__PURE__*/_jsx("span", {
+            className: `${baseClass}__truncate`,
+            children: isLoading ? `${t('general:loading')}...` : displayText
+          })
+        }),
+        size: "fit-content",
+        verticalAlign: "bottom"
+      }) : /*#__PURE__*/_jsx(Button, {
+        buttonStyle: "secondary",
+        className: `${baseClass}__button`,
+        icon: displayIcon,
+        iconPosition: "left",
+        margin: false,
+        onClick: handleOpenModal,
+        size: "medium",
+        children: isLoading ? `${t('general:loading')}...` : displayText
+      })
     }), hierarchyCollectionSlug && hasMountedModal && /*#__PURE__*/_jsx(HierarchyModal, {
       hasMany: hasMany,
       initialSelections: initialSelections,
-      onSave: handleSave
+      onSave: handleSave,
+      title: !hasMany && rowTitle ? `${t('general:move')} "${rowTitle}"` : undefined
     })]
   });
 };