@payloadcms/ui 3.86.0-internal.ac46214 → 4.0.0-canary.1

package/dist/providers/TableColumns/buildColumnState/renderCell.js

@@ -1,9 +1,10 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { MissingEditorProp } from 'payload';
 import { formatAdminURL } from 'payload/shared';
+import React from 'react';
 import { RenderCustomComponent } from '../../../elements/RenderCustomComponent/index.js';
 import { RenderServerComponent } from '../../../elements/RenderServerComponent/index.js';
-import { DefaultCell, RenderDefaultCell } from '../../../exports/client/index.js';
+import { DefaultCell, FolderIcon, RenderDefaultCell, TagIcon } from '../../../exports/client/index.js';
 import { hasOptionLabelJSXElement } from '../../../utilities/hasOptionLabelJSXElement.js';
 import { findValueFromPath } from './findValueFromPath.js';
 export function renderCell({
@@ -80,9 +81,53 @@ export function renderCell({
       };
     }
   }
+  // Check if this is a hierarchy relationship field and pre-render the icon
+  let hierarchyIcon = undefined;
+  let hierarchySmallIcon = undefined;
+  if (clientField.type === 'relationship' && 'relationTo' in clientField) {
+    const relationTo = clientField.relationTo;
+    if (typeof relationTo === 'string') {
+      const relatedCollectionConfig = payload.collections[relationTo]?.config;
+      const hierarchyConfig = relatedCollectionConfig?.hierarchy;
+      if (hierarchyConfig && typeof hierarchyConfig === 'object') {
+        const iconComponent = hierarchyConfig.admin?.components?.Icon;
+        const smallIconComponent = hierarchyConfig.admin?.components?.SmallIcon;
+        if (iconComponent) {
+          // Pre-render the custom icon
+          hierarchyIcon = RenderServerComponent({
+            Component: iconComponent,
+            importMap: payload.importMap,
+            key: `hierarchy-icon-${relationTo}`
+          });
+        } else {
+          // Use default icon based on allowHasMany
+          hierarchyIcon = hierarchyConfig.allowHasMany === false ? /*#__PURE__*/_jsx(FolderIcon, {}, `hierarchy-icon-${relationTo}`) : /*#__PURE__*/_jsx(TagIcon, {}, `hierarchy-icon-${relationTo}`);
+        }
+        // Pre-render the small icon (used in compact display contexts)
+        if (smallIconComponent && smallIconComponent !== iconComponent) {
+          hierarchySmallIcon = RenderServerComponent({
+            Component: smallIconComponent,
+            importMap: payload.importMap,
+            key: `hierarchy-small-icon-${relationTo}`
+          });
+        } else {
+          hierarchySmallIcon = hierarchyIcon;
+        }
+      }
+    }
+  }
   const cellClientProps = {
     ...baseCellClientProps,
     cellData,
+    customCellProps: {
+      ...baseCellClientProps.customCellProps,
+      ...(hierarchyIcon ? {
+        hierarchyIcon
+      } : {}),
+      ...(hierarchySmallIcon ? {
+        hierarchySmallIcon
+      } : {})
+    },
     field: enrichedClientField,
     link: shouldLink,
     linkURL: customLinkURL,

package/dist/providers/TableColumns/buildColumnState/renderCell.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderCell.js","names":["MissingEditorProp","formatAdminURL","RenderCustomComponent","RenderServerComponent","DefaultCell","RenderDefaultCell","hasOptionLabelJSXElement","findValueFromPath","renderCell","clientField","collectionSlug","columnIndex","customCellProps","doc","enableRowSelections","i18n","isLinkedColumn","payload","req","rowIndex","serverField","viewType","baseCellClientProps","cellData","undefined","field","rowData","accessor","name","shouldLink","customLinkURL","collectionConfig","collections","config","formatDocURL","admin","adminRoute","routes","defaultURL","path","encodeURIComponent","String","id","customURL","_displayStatus","enrichedClientField","type","hasChangedOption","options","some","opt","value","label","t","cellClientProps","link","linkURL","cellServerProps","className","onClick","CustomCell","editor","Error","components","CustomCellComponent","Cell","clientProps","Component","CellComponent","importMap","serverProps","_jsx","CustomComponent","Fallback"],"sources":["../../../../src/providers/TableColumns/buildColumnState/renderCell.tsx"],"sourcesContent":["import type { I18nClient } from '@payloadcms/translations'\nimport type {\n  ClientField,\n  DefaultCellComponentProps,\n  DefaultServerCellComponentProps,\n  Document,\n  Field,\n  Payload,\n  PayloadRequest,\n  ViewTypes,\n} from 'payload'\n\nimport { MissingEditorProp } from 'payload'\nimport { formatAdminURL } from 'payload/shared'\n\nimport { RenderCustomComponent } from '../../../elements/RenderCustomComponent/index.js'\nimport { RenderServerComponent } from '../../../elements/RenderServerComponent/index.js'\nimport {\n  DefaultCell,\n  RenderDefaultCell,\n  // eslint-disable-next-line payload/no-imports-from-exports-dir -- MUST reference the exports dir: https://github.com/payloadcms/payload/issues/12002#issuecomment-2791493587\n} from '../../../exports/client/index.js'\nimport { hasOptionLabelJSXElement } from '../../../utilities/hasOptionLabelJSXElement.js'\nimport { findValueFromPath } from './findValueFromPath.js'\n\ntype RenderCellArgs = {\n  readonly clientField: ClientField\n  readonly collectionSlug: string\n  readonly columnIndex: number\n  readonly customCellProps: DefaultCellComponentProps['customCellProps']\n  readonly doc: Document\n  readonly enableRowSelections: boolean\n  readonly i18n: I18nClient\n  readonly isLinkedColumn: boolean\n  readonly payload: Payload\n  readonly req?: PayloadRequest\n  readonly rowIndex: number\n  readonly serverField: Field\n  readonly viewType?: ViewTypes\n}\nexport function renderCell({\n  clientField,\n  collectionSlug,\n  columnIndex,\n  customCellProps,\n  doc,\n  enableRowSelections,\n  i18n,\n  isLinkedColumn,\n  payload,\n  req,\n  rowIndex,\n  serverField,\n  viewType,\n}: RenderCellArgs) {\n  const baseCellClientProps: DefaultCellComponentProps = {\n    cellData: undefined,\n    collectionSlug,\n    customCellProps,\n    field: clientField,\n    rowData: undefined,\n    viewType,\n  }\n\n  const accessor: string | undefined =\n    ('accessor' in clientField ? (clientField.accessor as string) : undefined) ??\n    ('name' in clientField ? clientField.name : undefined)\n\n  // Check if there's a custom formatDocURL function for this linked column\n  let shouldLink = isLinkedColumn\n  let customLinkURL: string | undefined\n\n  if (isLinkedColumn && req) {\n    const collectionConfig = payload.collections[collectionSlug]?.config\n    const formatDocURL = collectionConfig?.admin?.formatDocURL\n\n    if (typeof formatDocURL === 'function') {\n      // Generate the default URL that would normally be used\n      const adminRoute = req.payload.config.routes?.admin || '/admin'\n      const defaultURL = formatAdminURL({\n        adminRoute,\n        path: `/collections/${collectionSlug}${viewType === 'trash' ? '/trash' : ''}/${encodeURIComponent(String(doc.id))}`,\n      })\n\n      const customURL = formatDocURL({\n        collectionSlug,\n        defaultURL,\n        doc,\n        req,\n        viewType,\n      })\n\n      if (customURL === null) {\n        // formatDocURL returned null = disable linking entirely\n        shouldLink = false\n      } else if (typeof customURL === 'string') {\n        // formatDocURL returned a string = use custom URL\n        shouldLink = true\n        customLinkURL = customURL\n      } else {\n        // formatDocURL returned unexpected type = disable linking for safety\n        shouldLink = false\n      }\n    }\n  }\n\n  // For _status field, use _displayStatus if available (for showing \"changed\" status in list view)\n  const cellData =\n    'name' in clientField && accessor === '_status' && '_displayStatus' in doc\n      ? doc._displayStatus\n      : 'name' in clientField\n        ? findValueFromPath(doc, accessor)\n        : undefined\n\n  // For _status field, add 'changed' option for display purposes\n  // The 'changed' status is computed at runtime\n  let enrichedClientField = clientField\n  if ('name' in clientField && accessor === '_status' && clientField.type === 'select') {\n    const hasChangedOption = clientField.options?.some(\n      (opt) => (typeof opt === 'object' ? opt.value : opt) === 'changed',\n    )\n    if (!hasChangedOption) {\n      enrichedClientField = {\n        ...clientField,\n        options: [\n          ...(clientField.options || []),\n          {\n            label: i18n.t('version:draftHasPublishedVersion'),\n            value: 'changed',\n          },\n        ],\n      }\n    }\n  }\n\n  const cellClientProps: DefaultCellComponentProps = {\n    ...baseCellClientProps,\n    cellData,\n    field: enrichedClientField,\n    link: shouldLink,\n    linkURL: customLinkURL,\n    rowData: doc,\n  }\n\n  const cellServerProps: DefaultServerCellComponentProps = {\n    cellData: cellClientProps.cellData,\n    className: baseCellClientProps.className,\n    collectionConfig: payload.collections[collectionSlug].config,\n    collectionSlug,\n    columnIndex,\n    customCellProps: baseCellClientProps.customCellProps,\n    field: serverField,\n    i18n,\n    link: shouldLink,\n    linkURL: customLinkURL,\n    onClick: baseCellClientProps.onClick,\n    payload,\n    rowData: doc,\n  }\n\n  let CustomCell = null\n\n  if (serverField?.type === 'richText') {\n    if (!serverField?.editor) {\n      throw new MissingEditorProp(serverField) // while we allow disabling editor functionality, you should not have any richText fields defined if you do not have an editor\n    }\n\n    if (typeof serverField?.editor === 'function') {\n      throw new Error('Attempted to access unsanitized rich text editor.')\n    }\n\n    if (!serverField.admin) {\n      serverField.admin = {}\n    }\n\n    if (!serverField.admin.components) {\n      serverField.admin.components = {}\n    }\n\n    const CustomCellComponent = serverField.admin.components.Cell\n\n    CustomCell = RenderServerComponent({\n      clientProps: cellClientProps,\n      Component: CustomCellComponent ?? serverField.editor.CellComponent,\n      importMap: payload.importMap,\n      serverProps: cellServerProps,\n    })\n  } else {\n    const CustomCellComponent = serverField?.admin?.components?.Cell\n\n    if (CustomCellComponent) {\n      CustomCell = RenderServerComponent({\n        clientProps: cellClientProps,\n        Component: CustomCellComponent,\n        importMap: payload.importMap,\n        serverProps: cellServerProps,\n      })\n    } else if (\n      cellClientProps.cellData &&\n      cellClientProps.field &&\n      hasOptionLabelJSXElement(cellClientProps)\n    ) {\n      CustomCell = RenderServerComponent({\n        clientProps: cellClientProps,\n        Component: DefaultCell,\n        importMap: payload.importMap,\n      })\n    } else {\n      const CustomCellComponent = serverField?.admin?.components?.Cell\n\n      if (CustomCellComponent) {\n        CustomCell = RenderServerComponent({\n          clientProps: cellClientProps,\n          Component: CustomCellComponent,\n          importMap: payload.importMap,\n          serverProps: cellServerProps,\n        })\n      } else {\n        CustomCell = undefined\n      }\n    }\n  }\n\n  return (\n    <RenderCustomComponent\n      CustomComponent={CustomCell}\n      Fallback={\n        <RenderDefaultCell\n          clientProps={cellClientProps}\n          columnIndex={columnIndex}\n          enableRowSelections={enableRowSelections}\n          isLinkedColumn={isLinkedColumn}\n        />\n      }\n      key={`${rowIndex}-${columnIndex}`}\n    />\n  )\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"renderCell.js","names":["MissingEditorProp","formatAdminURL","React","RenderCustomComponent","RenderServerComponent","DefaultCell","FolderIcon","RenderDefaultCell","TagIcon","hasOptionLabelJSXElement","findValueFromPath","renderCell","clientField","collectionSlug","columnIndex","customCellProps","doc","enableRowSelections","i18n","isLinkedColumn","payload","req","rowIndex","serverField","viewType","baseCellClientProps","cellData","undefined","field","rowData","accessor","name","shouldLink","customLinkURL","collectionConfig","collections","config","formatDocURL","admin","adminRoute","routes","defaultURL","path","encodeURIComponent","String","id","customURL","_displayStatus","enrichedClientField","type","hasChangedOption","options","some","opt","value","label","t","hierarchyIcon","hierarchySmallIcon","relationTo","relatedCollectionConfig","hierarchyConfig","hierarchy","iconComponent","components","Icon","smallIconComponent","SmallIcon","Component","importMap","key","allowHasMany","_jsx","cellClientProps","link","linkURL","cellServerProps","className","onClick","CustomCell","editor","Error","CustomCellComponent","Cell","clientProps","CellComponent","serverProps","CustomComponent","Fallback"],"sources":["../../../../src/providers/TableColumns/buildColumnState/renderCell.tsx"],"sourcesContent":["import type { I18nClient } from '@payloadcms/translations'\nimport type {\n  ClientField,\n  DefaultCellComponentProps,\n  DefaultServerCellComponentProps,\n  Document,\n  Field,\n  Payload,\n  PayloadRequest,\n  ViewTypes,\n} from 'payload'\n\nimport { MissingEditorProp } from 'payload'\nimport { formatAdminURL } from 'payload/shared'\nimport React from 'react'\n\nimport { RenderCustomComponent } from '../../../elements/RenderCustomComponent/index.js'\nimport { RenderServerComponent } from '../../../elements/RenderServerComponent/index.js'\nimport {\n  DefaultCell,\n  FolderIcon,\n  RenderDefaultCell,\n  TagIcon,\n  // eslint-disable-next-line payload/no-imports-from-exports-dir -- MUST reference the exports dir: https://github.com/payloadcms/payload/issues/12002#issuecomment-2791493587\n} from '../../../exports/client/index.js'\nimport { hasOptionLabelJSXElement } from '../../../utilities/hasOptionLabelJSXElement.js'\nimport { findValueFromPath } from './findValueFromPath.js'\n\ntype RenderCellArgs = {\n  readonly clientField: ClientField\n  readonly collectionSlug: string\n  readonly columnIndex: number\n  readonly customCellProps: DefaultCellComponentProps['customCellProps']\n  readonly doc: Document\n  readonly enableRowSelections: boolean\n  readonly i18n: I18nClient\n  readonly isLinkedColumn: boolean\n  readonly payload: Payload\n  readonly req?: PayloadRequest\n  readonly rowIndex: number\n  readonly serverField: Field\n  readonly viewType?: ViewTypes\n}\nexport function renderCell({\n  clientField,\n  collectionSlug,\n  columnIndex,\n  customCellProps,\n  doc,\n  enableRowSelections,\n  i18n,\n  isLinkedColumn,\n  payload,\n  req,\n  rowIndex,\n  serverField,\n  viewType,\n}: RenderCellArgs) {\n  const baseCellClientProps: DefaultCellComponentProps = {\n    cellData: undefined,\n    collectionSlug,\n    customCellProps,\n    field: clientField,\n    rowData: undefined,\n    viewType,\n  }\n\n  const accessor: string | undefined =\n    ('accessor' in clientField ? (clientField.accessor as string) : undefined) ??\n    ('name' in clientField ? clientField.name : undefined)\n\n  // Check if there's a custom formatDocURL function for this linked column\n  let shouldLink = isLinkedColumn\n  let customLinkURL: string | undefined\n\n  if (isLinkedColumn && req) {\n    const collectionConfig = payload.collections[collectionSlug]?.config\n    const formatDocURL = collectionConfig?.admin?.formatDocURL\n\n    if (typeof formatDocURL === 'function') {\n      // Generate the default URL that would normally be used\n      const adminRoute = req.payload.config.routes?.admin || '/admin'\n      const defaultURL = formatAdminURL({\n        adminRoute,\n        path: `/collections/${collectionSlug}${viewType === 'trash' ? '/trash' : ''}/${encodeURIComponent(String(doc.id))}`,\n      })\n\n      const customURL = formatDocURL({\n        collectionSlug,\n        defaultURL,\n        doc,\n        req,\n        viewType,\n      })\n\n      if (customURL === null) {\n        // formatDocURL returned null = disable linking entirely\n        shouldLink = false\n      } else if (typeof customURL === 'string') {\n        // formatDocURL returned a string = use custom URL\n        shouldLink = true\n        customLinkURL = customURL\n      } else {\n        // formatDocURL returned unexpected type = disable linking for safety\n        shouldLink = false\n      }\n    }\n  }\n\n  // For _status field, use _displayStatus if available (for showing \"changed\" status in list view)\n  const cellData =\n    'name' in clientField && accessor === '_status' && '_displayStatus' in doc\n      ? doc._displayStatus\n      : 'name' in clientField\n        ? findValueFromPath(doc, accessor)\n        : undefined\n\n  // For _status field, add 'changed' option for display purposes\n  // The 'changed' status is computed at runtime\n  let enrichedClientField = clientField\n  if ('name' in clientField && accessor === '_status' && clientField.type === 'select') {\n    const hasChangedOption = clientField.options?.some(\n      (opt) => (typeof opt === 'object' ? opt.value : opt) === 'changed',\n    )\n    if (!hasChangedOption) {\n      enrichedClientField = {\n        ...clientField,\n        options: [\n          ...(clientField.options || []),\n          {\n            label: i18n.t('version:draftHasPublishedVersion'),\n            value: 'changed',\n          },\n        ],\n      }\n    }\n  }\n\n  // Check if this is a hierarchy relationship field and pre-render the icon\n  let hierarchyIcon: React.ReactNode = undefined\n  let hierarchySmallIcon: React.ReactNode = undefined\n  if (clientField.type === 'relationship' && 'relationTo' in clientField) {\n    const relationTo = clientField.relationTo\n    if (typeof relationTo === 'string') {\n      const relatedCollectionConfig = payload.collections[relationTo]?.config\n      const hierarchyConfig = relatedCollectionConfig?.hierarchy\n      if (hierarchyConfig && typeof hierarchyConfig === 'object') {\n        const iconComponent = hierarchyConfig.admin?.components?.Icon\n        const smallIconComponent = hierarchyConfig.admin?.components?.SmallIcon\n        if (iconComponent) {\n          // Pre-render the custom icon\n          hierarchyIcon = RenderServerComponent({\n            Component: iconComponent,\n            importMap: payload.importMap,\n            key: `hierarchy-icon-${relationTo}`,\n          })\n        } else {\n          // Use default icon based on allowHasMany\n          hierarchyIcon =\n            hierarchyConfig.allowHasMany === false ? (\n              <FolderIcon key={`hierarchy-icon-${relationTo}`} />\n            ) : (\n              <TagIcon key={`hierarchy-icon-${relationTo}`} />\n            )\n        }\n        // Pre-render the small icon (used in compact display contexts)\n        if (smallIconComponent && smallIconComponent !== iconComponent) {\n          hierarchySmallIcon = RenderServerComponent({\n            Component: smallIconComponent,\n            importMap: payload.importMap,\n            key: `hierarchy-small-icon-${relationTo}`,\n          })\n        } else {\n          hierarchySmallIcon = hierarchyIcon\n        }\n      }\n    }\n  }\n\n  const cellClientProps: DefaultCellComponentProps = {\n    ...baseCellClientProps,\n    cellData,\n    customCellProps: {\n      ...baseCellClientProps.customCellProps,\n      ...(hierarchyIcon ? { hierarchyIcon } : {}),\n      ...(hierarchySmallIcon ? { hierarchySmallIcon } : {}),\n    },\n    field: enrichedClientField,\n    link: shouldLink,\n    linkURL: customLinkURL,\n    rowData: doc,\n  }\n\n  const cellServerProps: DefaultServerCellComponentProps = {\n    cellData: cellClientProps.cellData,\n    className: baseCellClientProps.className,\n    collectionConfig: payload.collections[collectionSlug].config,\n    collectionSlug,\n    columnIndex,\n    customCellProps: baseCellClientProps.customCellProps,\n    field: serverField,\n    i18n,\n    link: shouldLink,\n    linkURL: customLinkURL,\n    onClick: baseCellClientProps.onClick,\n    payload,\n    rowData: doc,\n  }\n\n  let CustomCell = null\n\n  if (serverField?.type === 'richText') {\n    if (!serverField?.editor) {\n      throw new MissingEditorProp(serverField) // while we allow disabling editor functionality, you should not have any richText fields defined if you do not have an editor\n    }\n\n    if (typeof serverField?.editor === 'function') {\n      throw new Error('Attempted to access unsanitized rich text editor.')\n    }\n\n    if (!serverField.admin) {\n      serverField.admin = {}\n    }\n\n    if (!serverField.admin.components) {\n      serverField.admin.components = {}\n    }\n\n    const CustomCellComponent = serverField.admin.components.Cell\n\n    CustomCell = RenderServerComponent({\n      clientProps: cellClientProps,\n      Component: CustomCellComponent ?? serverField.editor.CellComponent,\n      importMap: payload.importMap,\n      serverProps: cellServerProps,\n    })\n  } else {\n    const CustomCellComponent = serverField?.admin?.components?.Cell\n\n    if (CustomCellComponent) {\n      CustomCell = RenderServerComponent({\n        clientProps: cellClientProps,\n        Component: CustomCellComponent,\n        importMap: payload.importMap,\n        serverProps: cellServerProps,\n      })\n    } else if (\n      cellClientProps.cellData &&\n      cellClientProps.field &&\n      hasOptionLabelJSXElement(cellClientProps)\n    ) {\n      CustomCell = RenderServerComponent({\n        clientProps: cellClientProps,\n        Component: DefaultCell,\n        importMap: payload.importMap,\n      })\n    } else {\n      const CustomCellComponent = serverField?.admin?.components?.Cell\n\n      if (CustomCellComponent) {\n        CustomCell = RenderServerComponent({\n          clientProps: cellClientProps,\n          Component: CustomCellComponent,\n          importMap: payload.importMap,\n          serverProps: cellServerProps,\n        })\n      } else {\n        CustomCell = undefined\n      }\n    }\n  }\n\n  return (\n    <RenderCustomComponent\n      CustomComponent={CustomCell}\n      Fallback={\n        <RenderDefaultCell\n          clientProps={cellClientProps}\n          columnIndex={columnIndex}\n          enableRowSelections={enableRowSelections}\n          isLinkedColumn={isLinkedColumn}\n        />\n      }\n      key={`${rowIndex}-${columnIndex}`}\n    />\n  )\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/providers/TableColumns/getInitialColumns.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getInitialColumns.d.ts","sourceRoot":"","sources":["../../../src/providers/TableColumns/getInitialColumns.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAiC1F;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,GAAI,CAAC,SAAS,WAAW,EAAE,GAAG,KAAK,EAAE,UACzD,CAAC,cACG,gBAAgB,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,kBACnC,gBAAgB,CAAC,OAAO,CAAC,CAAC,gBAAgB,CAAC,KAC1D,qBAAqB,CAAC,SAAS,CAoBjC,CAAA"}
+{"version":3,"file":"getInitialColumns.d.ts","sourceRoot":"","sources":["../../../src/providers/TableColumns/getInitialColumns.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAiC1F;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,GAAI,CAAC,SAAS,WAAW,EAAE,GAAG,KAAK,EAAE,EACjE,QAAQ,CAAC,EACT,YAAY,gBAAgB,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,EACnD,gBAAgB,gBAAgB,CAAC,OAAO,CAAC,CAAC,gBAAgB,CAAC,KAC1D,qBAAqB,CAAC,SAAS,CAoBjC,CAAA"}

package/dist/providers/TableColumns/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/providers/TableColumns/index.tsx"],"names":[],"mappings":"AAGA,OAAO,KAA+C,MAAM,OAAO,CAAA;AAEnE,OAAO,KAAK,EAAiB,yBAAyB,EAAE,MAAM,YAAY,CAAA;AAM1E,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAE9C,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CA+FpE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/providers/TableColumns/index.tsx"],"names":[],"mappings":"AAGA,OAAO,KAA0D,MAAM,OAAO,CAAA;AAE9E,OAAO,KAAK,EAAiB,yBAAyB,EAAE,MAAM,YAAY,CAAA;AAM1E,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAE9C,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAiIpE,CAAA"}

package/dist/providers/TableColumns/index.js

@@ -2,7 +2,7 @@
 
 import { jsx as _jsx } from "react/jsx-runtime";
 import { transformColumnsToSearchParams } from 'payload/shared';
-import React, { startTransition, useCallback, useRef } from 'react';
+import React, { startTransition, useCallback, useEffect, useRef } from 'react';
 import { useConfig } from '../../providers/Config/index.js';
 import { useListQuery } from '../../providers/ListQuery/index.js';
 import { TableColumnContext } from './context.js';
@@ -28,16 +28,33 @@ export const TableColumnsProvider = ({
     collectionSlug
   });
   const [columnState, setOptimisticColumnState] = React.useOptimistic(columnStateFromProps, (state, action) => action);
+  // Sync optimistic state when props change (e.g., after preset reset)
+  const prevPropsRef = useRef(columnStateFromProps);
+  useEffect(() => {
+    if (columnStateFromProps !== prevPropsRef.current) {
+      prevPropsRef.current = columnStateFromProps;
+      // Force optimistic state to sync with new props by triggering a transition
+      startTransition(() => {
+        setOptimisticColumnState(columnStateFromProps);
+      });
+    }
+  }, [columnStateFromProps, setOptimisticColumnState]);
   const contextRef = useRef({});
   const toggleColumn = useCallback(async column => {
-    const newColumnState = (columnState || []).map(col => {
-      if (col.accessor === column) {
+    const currentColumns = columnState || [];
+    const columnIndex = currentColumns.findIndex(col => col.accessor === column);
+    if (columnIndex === -1) {
+      return;
+    }
+    // Toggle the column's active state in place, preserving its position
+    const newColumnState = currentColumns.map(col_0 => {
+      if (col_0.accessor === column) {
         return {
-          ...col,
-          active: !col.active
+          ...col_0,
+          active: !col_0.active
         };
       }
-      return col;
+      return col_0;
     });
     startTransition(() => {
       setOptimisticColumnState(newColumnState);
@@ -79,6 +96,14 @@ export const TableColumnsProvider = ({
       columns: defaultColumns || []
     });
   }, [defaultColumns, refineListData]);
+  const setColumns = useCallback(async newColumns => {
+    startTransition(() => {
+      setOptimisticColumnState(newColumns);
+    });
+    await refineListData({
+      columns: transformColumnsToSearchParams(newColumns)
+    });
+  }, [refineListData, setOptimisticColumnState]);
   return /*#__PURE__*/_jsx(TableColumnContext, {
     value: {
       columns: columnState,
@@ -86,6 +111,7 @@ export const TableColumnsProvider = ({
       moveColumn,
       resetColumnsState,
       setActiveColumns,
+      setColumns,
       toggleColumn,
       ...contextRef.current
     },

package/dist/providers/TableColumns/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["transformColumnsToSearchParams","React","startTransition","useCallback","useRef","useConfig","useListQuery","TableColumnContext","useTableColumns","TableColumnsProvider","children","collectionSlug","columnState","columnStateFromProps","LinkedCellOverride","getEntityConfig","query","currentQuery","refineListData","admin","defaultColumns","setOptimisticColumnState","useOptimistic","state","action","contextRef","toggleColumn","column","newColumnState","map","col","accessor","active","columns","moveColumn","args","fromIndex","toIndex","columnToMove","splice","setActiveColumns","forEach","colName","colIndex","findIndex","c","undefined","slice","resetColumnsState","_jsx","value","current"],"sources":["../../../src/providers/TableColumns/index.tsx"],"sourcesContent":["'use client'\nimport { type Column } from 'payload'\nimport { transformColumnsToSearchParams } from 'payload/shared'\nimport React, { startTransition, useCallback, useRef } from 'react'\n\nimport type { ITableColumns, TableColumnsProviderProps } from './types.js'\n\nimport { useConfig } from '../../providers/Config/index.js'\nimport { useListQuery } from '../../providers/ListQuery/index.js'\nimport { TableColumnContext } from './context.js'\n\nexport { useTableColumns } from './context.js'\n\nexport const TableColumnsProvider: React.FC<TableColumnsProviderProps> = ({\n  children,\n  collectionSlug,\n  columnState: columnStateFromProps,\n  LinkedCellOverride,\n}) => {\n  const { getEntityConfig } = useConfig()\n  const { query: currentQuery, refineListData } = useListQuery()\n\n  const { admin: { defaultColumns } = {} } = getEntityConfig({\n    collectionSlug,\n  })\n\n  const [columnState, setOptimisticColumnState] = React.useOptimistic(\n    columnStateFromProps,\n    (state, action: Column[]) => action,\n  )\n\n  const contextRef = useRef({} as ITableColumns)\n\n  const toggleColumn = useCallback(\n    async (column: string) => {\n      const newColumnState = (columnState || []).map((col) => {\n        if (col.accessor === column) {\n          return { ...col, active: !col.active }\n        }\n        return col\n      })\n\n      startTransition(() => {\n        setOptimisticColumnState(newColumnState)\n      })\n\n      await refineListData({\n        columns: transformColumnsToSearchParams(newColumnState),\n      })\n    },\n    [refineListData, columnState, setOptimisticColumnState],\n  )\n\n  const moveColumn = useCallback(\n    async (args: { fromIndex: number; toIndex: number }) => {\n      const { fromIndex, toIndex } = args\n      const newColumnState = [...(columnState || [])]\n      const [columnToMove] = newColumnState.splice(fromIndex, 1)\n      newColumnState.splice(toIndex, 0, columnToMove)\n\n      startTransition(() => {\n        setOptimisticColumnState(newColumnState)\n      })\n\n      await refineListData({\n        columns: transformColumnsToSearchParams(newColumnState),\n      })\n    },\n    [columnState, refineListData, setOptimisticColumnState],\n  )\n\n  const setActiveColumns = useCallback(\n    async (columns: string[]) => {\n      const newColumnState = currentQuery.columns\n\n      columns.forEach((colName) => {\n        const colIndex = newColumnState.findIndex((c) => colName === c)\n\n        // ensure the name does not begin with a `-` which denotes an inactive column\n        if (colIndex !== undefined && newColumnState[colIndex][0] === '-') {\n          newColumnState[colIndex] = colName.slice(1)\n        }\n      })\n\n      await refineListData({ columns: newColumnState })\n    },\n    [currentQuery, refineListData],\n  )\n\n  const resetColumnsState = React.useCallback(async () => {\n    await refineListData({ columns: defaultColumns || [] })\n  }, [defaultColumns, refineListData])\n\n  return (\n    <TableColumnContext\n      value={{\n        columns: columnState,\n        LinkedCellOverride,\n        moveColumn,\n        resetColumnsState,\n        setActiveColumns,\n        toggleColumn,\n        ...contextRef.current,\n      }}\n    >\n      {children}\n    </TableColumnContext>\n  )\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["transformColumnsToSearchParams","React","startTransition","useCallback","useEffect","useRef","useConfig","useListQuery","TableColumnContext","useTableColumns","TableColumnsProvider","children","collectionSlug","columnState","columnStateFromProps","LinkedCellOverride","getEntityConfig","query","currentQuery","refineListData","admin","defaultColumns","setOptimisticColumnState","useOptimistic","state","action","prevPropsRef","current","contextRef","toggleColumn","column","currentColumns","columnIndex","findIndex","col","accessor","newColumnState","map","active","columns","moveColumn","args","fromIndex","toIndex","columnToMove","splice","setActiveColumns","forEach","colName","colIndex","c","undefined","slice","resetColumnsState","setColumns","newColumns","_jsx","value"],"sources":["../../../src/providers/TableColumns/index.tsx"],"sourcesContent":["'use client'\nimport { type Column } from 'payload'\nimport { transformColumnsToSearchParams } from 'payload/shared'\nimport React, { startTransition, useCallback, useEffect, useRef } from 'react'\n\nimport type { ITableColumns, TableColumnsProviderProps } from './types.js'\n\nimport { useConfig } from '../../providers/Config/index.js'\nimport { useListQuery } from '../../providers/ListQuery/index.js'\nimport { TableColumnContext } from './context.js'\n\nexport { useTableColumns } from './context.js'\n\nexport const TableColumnsProvider: React.FC<TableColumnsProviderProps> = ({\n  children,\n  collectionSlug,\n  columnState: columnStateFromProps,\n  LinkedCellOverride,\n}) => {\n  const { getEntityConfig } = useConfig()\n  const { query: currentQuery, refineListData } = useListQuery()\n\n  const { admin: { defaultColumns } = {} } = getEntityConfig({\n    collectionSlug,\n  })\n\n  const [columnState, setOptimisticColumnState] = React.useOptimistic(\n    columnStateFromProps,\n    (state, action: Column[]) => action,\n  )\n\n  // Sync optimistic state when props change (e.g., after preset reset)\n  const prevPropsRef = useRef(columnStateFromProps)\n  useEffect(() => {\n    if (columnStateFromProps !== prevPropsRef.current) {\n      prevPropsRef.current = columnStateFromProps\n      // Force optimistic state to sync with new props by triggering a transition\n      startTransition(() => {\n        setOptimisticColumnState(columnStateFromProps)\n      })\n    }\n  }, [columnStateFromProps, setOptimisticColumnState])\n\n  const contextRef = useRef({} as ITableColumns)\n\n  const toggleColumn = useCallback(\n    async (column: string) => {\n      const currentColumns = columnState || []\n      const columnIndex = currentColumns.findIndex((col) => col.accessor === column)\n\n      if (columnIndex === -1) {\n        return\n      }\n\n      // Toggle the column's active state in place, preserving its position\n      const newColumnState = currentColumns.map((col) => {\n        if (col.accessor === column) {\n          return { ...col, active: !col.active }\n        }\n        return col\n      })\n\n      startTransition(() => {\n        setOptimisticColumnState(newColumnState)\n      })\n\n      await refineListData({\n        columns: transformColumnsToSearchParams(newColumnState),\n      })\n    },\n    [refineListData, columnState, setOptimisticColumnState],\n  )\n\n  const moveColumn = useCallback(\n    async (args: { fromIndex: number; toIndex: number }) => {\n      const { fromIndex, toIndex } = args\n      const newColumnState = [...(columnState || [])]\n      const [columnToMove] = newColumnState.splice(fromIndex, 1)\n      newColumnState.splice(toIndex, 0, columnToMove)\n\n      startTransition(() => {\n        setOptimisticColumnState(newColumnState)\n      })\n\n      await refineListData({\n        columns: transformColumnsToSearchParams(newColumnState),\n      })\n    },\n    [columnState, refineListData, setOptimisticColumnState],\n  )\n\n  const setActiveColumns = useCallback(\n    async (columns: string[]) => {\n      const newColumnState = currentQuery.columns\n\n      columns.forEach((colName) => {\n        const colIndex = newColumnState.findIndex((c) => colName === c)\n\n        // ensure the name does not begin with a `-` which denotes an inactive column\n        if (colIndex !== undefined && newColumnState[colIndex][0] === '-') {\n          newColumnState[colIndex] = colName.slice(1)\n        }\n      })\n\n      await refineListData({ columns: newColumnState })\n    },\n    [currentQuery, refineListData],\n  )\n\n  const resetColumnsState = React.useCallback(async () => {\n    await refineListData({ columns: defaultColumns || [] })\n  }, [defaultColumns, refineListData])\n\n  const setColumns = useCallback(\n    async (newColumns: Column[]) => {\n      startTransition(() => {\n        setOptimisticColumnState(newColumns)\n      })\n\n      await refineListData({\n        columns: transformColumnsToSearchParams(newColumns),\n      })\n    },\n    [refineListData, setOptimisticColumnState],\n  )\n\n  return (\n    <TableColumnContext\n      value={{\n        columns: columnState,\n        LinkedCellOverride,\n        moveColumn,\n        resetColumnsState,\n        setActiveColumns,\n        setColumns,\n        toggleColumn,\n        ...contextRef.current,\n      }}\n    >\n      {children}\n    </TableColumnContext>\n  )\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/providers/TableColumns/types.d.ts

@@ -9,6 +9,7 @@ export interface ITableColumns {
     }) => Promise<void>;
     resetColumnsState: () => Promise<void>;
     setActiveColumns: (columns: string[]) => Promise<void>;
+    setColumns: (columns: Column[]) => Promise<void>;
     toggleColumn: (column: string) => Promise<void>;
 }
 export type TableColumnsProviderProps = {

package/dist/providers/TableColumns/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/providers/TableColumns/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAE5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAA;AAEzE,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,kBAAkB,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IACpC,UAAU,EAAE,CAAC,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAC3E,iBAAiB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IACtC,gBAAgB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACtD,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAChD;AAED,MAAM,MAAM,yBAAyB,GAAG;IACtC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IAClC,QAAQ,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IAC1C,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,CAAA;IAC9B;;OAEG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAA;IACrB;;OAEG;IACH,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,CAAA;IACtC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC7C;;OAEG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,qBAAqB,CAAA;IAChD;;OAEG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAA;IAC/B;;OAEG;IACH,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAA;IACjC;;OAEG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,SAAS,KAAK,IAAI,CAAA;IACpD;;OAEG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;IACnD;;OAEG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,WAAW,GAAG,SAAS,CAAA;CACnD,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/providers/TableColumns/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAE5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAA;AAEzE,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,kBAAkB,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IACpC,UAAU,EAAE,CAAC,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAC3E,iBAAiB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IACtC,gBAAgB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACtD,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAChD,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAChD;AAED,MAAM,MAAM,yBAAyB,GAAG;IACtC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IAClC,QAAQ,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IAC1C,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,CAAA;IAC9B;;OAEG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAA;IACrB;;OAEG;IACH,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,CAAA;IACtC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC7C;;OAEG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,qBAAqB,CAAA;IAChD;;OAEG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAA;IAC/B;;OAEG;IACH,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAA;IACjC;;OAEG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,SAAS,KAAK,IAAI,CAAA;IACpD;;OAEG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;IACnD;;OAEG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,WAAW,GAAG,SAAS,CAAA;CACnD,CAAA"}

package/dist/providers/TableColumns/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../../src/providers/TableColumns/types.ts"],"sourcesContent":["import type { CollectionPreferences, Column } from 'payload'\n\nimport type { SortColumnProps } from '../../elements/SortColumn/index.js'\n\nexport interface ITableColumns {\n  columns: Column[]\n  LinkedCellOverride?: React.ReactNode\n  moveColumn: (args: { fromIndex: number; toIndex: number }) => Promise<void>\n  resetColumnsState: () => Promise<void>\n  setActiveColumns: (columns: string[]) => Promise<void>\n  toggleColumn: (column: string) => Promise<void>\n}\n\nexport type TableColumnsProviderProps = {\n  readonly children: React.ReactNode\n  readonly collectionSlug: string | string[]\n  readonly columnState: Column[]\n  /**\n   * @deprecated\n   */\n  readonly docs?: any[]\n  /**\n   * @deprecated\n   */\n  readonly enableRowSelections?: boolean\n  readonly LinkedCellOverride?: React.ReactNode\n  /**\n   * @deprecated\n   */\n  readonly listPreferences?: CollectionPreferences\n  /**\n   * @deprecated\n   */\n  readonly preferenceKey?: string\n  /**\n   * @deprecated\n   */\n  readonly renderRowTypes?: boolean\n  /**\n   * @deprecated\n   */\n  readonly setTable?: (Table: React.ReactNode) => void\n  /**\n   * @deprecated\n   */\n  readonly sortColumnProps?: Partial<SortColumnProps>\n  /**\n   * @deprecated\n   */\n  readonly tableAppearance?: 'condensed' | 'default'\n}\n"],"mappings":"AAaA","ignoreList":[]}
+{"version":3,"file":"types.js","names":[],"sources":["../../../src/providers/TableColumns/types.ts"],"sourcesContent":["import type { CollectionPreferences, Column } from 'payload'\n\nimport type { SortColumnProps } from '../../elements/SortColumn/index.js'\n\nexport interface ITableColumns {\n  columns: Column[]\n  LinkedCellOverride?: React.ReactNode\n  moveColumn: (args: { fromIndex: number; toIndex: number }) => Promise<void>\n  resetColumnsState: () => Promise<void>\n  setActiveColumns: (columns: string[]) => Promise<void>\n  setColumns: (columns: Column[]) => Promise<void>\n  toggleColumn: (column: string) => Promise<void>\n}\n\nexport type TableColumnsProviderProps = {\n  readonly children: React.ReactNode\n  readonly collectionSlug: string | string[]\n  readonly columnState: Column[]\n  /**\n   * @deprecated\n   */\n  readonly docs?: any[]\n  /**\n   * @deprecated\n   */\n  readonly enableRowSelections?: boolean\n  readonly LinkedCellOverride?: React.ReactNode\n  /**\n   * @deprecated\n   */\n  readonly listPreferences?: CollectionPreferences\n  /**\n   * @deprecated\n   */\n  readonly preferenceKey?: string\n  /**\n   * @deprecated\n   */\n  readonly renderRowTypes?: boolean\n  /**\n   * @deprecated\n   */\n  readonly setTable?: (Table: React.ReactNode) => void\n  /**\n   * @deprecated\n   */\n  readonly sortColumnProps?: Partial<SortColumnProps>\n  /**\n   * @deprecated\n   */\n  readonly tableAppearance?: 'condensed' | 'default'\n}\n"],"mappings":"AAcA","ignoreList":[]}

package/dist/providers/Theme/index.d.ts

@@ -2,12 +2,30 @@ import React from 'react';
 export type Theme = 'dark' | 'light';
 export type ThemeContext = {
     autoMode: boolean;
-    setTheme: (theme: Theme) => void;
+    highContrastMode: boolean;
+    setHighContrastMode: (isHighContrast: boolean, options?: {
+        scoped?: boolean;
+    }) => void;
+    setTheme: (theme: 'auto' | Theme, options?: {
+        scoped?: boolean;
+    }) => void;
     theme: Theme;
 };
-export declare const defaultTheme = "light";
+export declare const defaultTheme: Theme;
+/**
+ * Provides theme context to its children.
+ *
+ * At the root (no parent ThemeProvider): reads/writes cookies, responds to
+ * OS preference, owns setTheme and setHighContrastMode.
+ *
+ * When nested inside another ThemeProvider (e.g. inside a Popup): acts as a
+ * scoped visual  the `theme` prop sets the local theme, but setThemeoverride
+ * and setHighContrastMode bubble up through each level to the root provider so
+ * mutations always affect the global user preference.
+ */
 export declare const ThemeProvider: React.FC<{
     children?: React.ReactNode;
+    highContrastMode?: boolean;
     theme?: Theme;
 }>;
 export declare const useTheme: () => ThemeContext;

package/dist/providers/Theme/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/providers/Theme/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAA+D,MAAM,OAAO,CAAA;AAInF,MAAM,MAAM,KAAK,GAAG,MAAM,GAAG,OAAO,CAAA;AAEpC,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,EAAE,OAAO,CAAA;IACjB,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAA;IAChC,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AA4CD,eAAO,MAAM,YAAY,UAAU,CAAA;AAEnC,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC;IACnC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,KAAK,CAAC,EAAE,KAAK,CAAA;CACd,CA2CA,CAAA;AAED,eAAO,MAAM,QAAQ,QAAO,YAA4B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/providers/Theme/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAA+D,MAAM,OAAO,CAAA;AAInF,MAAM,MAAM,KAAK,GAAG,MAAM,GAAG,OAAO,CAAA;AAEpC,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,EAAE,OAAO,CAAA;IACjB,gBAAgB,EAAE,OAAO,CAAA;IACzB,mBAAmB,EAAE,CAAC,cAAc,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,KAAK,IAAI,CAAA;IACtF,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,KAAK,IAAI,CAAA;IACzE,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AA4DD,eAAO,MAAM,YAAY,EAAE,KAAe,CAAA;AAE1C;;;;;;;;;;GAUG;AACH,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC;IACnC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,KAAK,CAAC,EAAE,KAAK,CAAA;CACd,CAgGA,CAAA;AAED,eAAO,MAAM,QAAQ,QAAO,YAA8C,CAAA"}

package/dist/providers/Theme/index.js

@@ -6,111 +6,208 @@ import React, { createContext, use, useCallback, useEffect, useState } from 'rea
 import { useConfig } from '../Config/index.js';
 const initialContext = {
   autoMode: true,
+  highContrastMode: false,
+  setHighContrastMode: () => null,
   setTheme: () => null,
   theme: 'light'
 };
-const Context = /*#__PURE__*/createContext(initialContext);
+const Context = /*#__PURE__*/createContext(undefined);
 function setCookie(cname, cvalue, exdays) {
   const d = new Date();
   d.setTime(d.getTime() + exdays * 24 * 60 * 60 * 1000);
   const expires = 'expires=' + d.toUTCString();
   document.cookie = cname + '=' + cvalue + ';' + expires + ';path=/';
 }
-const getTheme = cookieKey => {
-  let theme;
-  const themeFromCookies = window.document.cookie.split('; ').find(row => row.startsWith(`${cookieKey}=`))?.split('=')[1];
-  if (themeFromCookies === 'light' || themeFromCookies === 'dark') {
-    theme = themeFromCookies;
-  } else {
-    theme = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
-  }
+const detectTheme = cookieKey => {
+  const fromCookie = window.document.cookie.split('; ').find(row => row.startsWith(`${cookieKey}=`))?.split('=')[1];
+  const theme = fromCookie === 'light' || fromCookie === 'dark' ? fromCookie : window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
   document.documentElement.setAttribute('data-theme', theme);
   return {
-    theme,
-    themeFromCookies
+    isAutoMode: fromCookie !== 'light' && fromCookie !== 'dark',
+    theme
   };
 };
+const detectHighContrastMode = cookieKey => {
+  const fromCookie = window.document.cookie.split('; ').find(row => row.startsWith(`${cookieKey}=`))?.split('=')[1] ?? null;
+  const isHighContrast = fromCookie === 'true' ? true : fromCookie === 'false' ? false : !!(window.matchMedia && window.matchMedia('(prefers-contrast: more)').matches);
+  if (isHighContrast) {
+    document.documentElement.setAttribute('data-enhanced-contrast', '');
+  } else {
+    document.documentElement.removeAttribute('data-enhanced-contrast');
+  }
+  return isHighContrast;
+};
 export const defaultTheme = 'light';
+/**
+ * Provides theme context to its children.
+ *
+ * At the root (no parent ThemeProvider): reads/writes cookies, responds to
+ * OS preference, owns setTheme and setHighContrastMode.
+ *
+ * When nested inside another ThemeProvider (e.g. inside a Popup): acts as a
+ * scoped visual  the `theme` prop sets the local theme, but setThemeoverride
+ * and setHighContrastMode bubble up through each level to the root provider so
+ * mutations always affect the global user preference.
+ */
 export const ThemeProvider = t0 => {
-  const $ = _c(11);
+  const $ = _c(30);
   const {
     children,
-    theme: initialTheme
+    highContrastMode: initialHighContrastMode,
+    theme: themeOverride
   } = t0;
+  const outerContext = use(Context);
+  const isScoped = outerContext !== undefined;
   const {
     config
   } = useConfig();
   const preselectedTheme = config.admin.theme;
-  const cookieKey = `${config.cookiePrefix || "payload"}-theme`;
-  const [theme, setThemeState] = useState(initialTheme || defaultTheme);
-  const [autoMode, setAutoMode] = useState();
+  const themeCookieKey = `${config.cookiePrefix || "payload"}-theme`;
+  const contrastCookieKey = `${config.cookiePrefix || "payload"}-high-contrast-mode`;
+  const [theme, setThemeState] = useState(themeOverride ?? defaultTheme);
+  const [autoMode, setAutoMode] = useState(!isScoped);
+  const [highContrastMode, setHighContrastModeState] = useState(isScoped ? outerContext.highContrastMode ?? false : initialHighContrastMode ?? false);
   let t1;
-  let t2;
-  if ($[0] !== cookieKey || $[1] !== preselectedTheme) {
+  if ($[0] !== isScoped || $[1] !== outerContext) {
     t1 = () => {
-      if (preselectedTheme !== "all") {
-        return;
+      if (isScoped) {
+        setHighContrastModeState(outerContext.highContrastMode);
       }
-      const {
-        theme: theme_0,
-        themeFromCookies
-      } = getTheme(cookieKey);
-      setThemeState(theme_0);
-      setAutoMode(!themeFromCookies);
     };
-    t2 = [preselectedTheme, cookieKey];
-    $[0] = cookieKey;
-    $[1] = preselectedTheme;
+    $[0] = isScoped;
+    $[1] = outerContext;
     $[2] = t1;
-    $[3] = t2;
   } else {
     t1 = $[2];
-    t2 = $[3];
   }
-  useEffect(t1, t2);
+  const t2 = outerContext?.highContrastMode;
   let t3;
-  if ($[4] !== cookieKey) {
-    t3 = themeToSet => {
-      if (themeToSet === "light" || themeToSet === "dark") {
-        setThemeState(themeToSet);
-        setAutoMode(false);
-        setCookie(cookieKey, themeToSet, 365);
-        document.documentElement.setAttribute("data-theme", themeToSet);
-      } else {
-        if (themeToSet === "auto") {
-          setCookie(cookieKey, themeToSet, -1);
-          const themeFromOS = window.matchMedia && window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light";
-          document.documentElement.setAttribute("data-theme", themeFromOS);
-          setAutoMode(true);
-          setThemeState(themeFromOS);
-        }
-      }
-    };
-    $[4] = cookieKey;
+  if ($[3] !== isScoped || $[4] !== t2) {
+    t3 = [isScoped, t2];
+    $[3] = isScoped;
+    $[4] = t2;
     $[5] = t3;
   } else {
     t3 = $[5];
   }
-  const setTheme = t3;
+  useEffect(t1, t3);
   let t4;
-  if ($[6] !== autoMode || $[7] !== children || $[8] !== setTheme || $[9] !== theme) {
-    t4 = _jsx(Context, {
+  let t5;
+  if ($[6] !== isScoped || $[7] !== preselectedTheme || $[8] !== themeCookieKey) {
+    t4 = () => {
+      if (isScoped || preselectedTheme !== "all") {
+        return;
+      }
+      const {
+        isAutoMode,
+        theme: detectedTheme
+      } = detectTheme(themeCookieKey);
+      setThemeState(detectedTheme);
+      setAutoMode(isAutoMode);
+    };
+    t5 = [isScoped, preselectedTheme, themeCookieKey];
+    $[6] = isScoped;
+    $[7] = preselectedTheme;
+    $[8] = themeCookieKey;
+    $[9] = t4;
+    $[10] = t5;
+  } else {
+    t4 = $[9];
+    t5 = $[10];
+  }
+  useEffect(t4, t5);
+  let t6;
+  let t7;
+  if ($[11] !== contrastCookieKey || $[12] !== isScoped) {
+    t6 = () => {
+      if (isScoped) {
+        return;
+      }
+      setHighContrastModeState(detectHighContrastMode(contrastCookieKey));
+    };
+    t7 = [isScoped, contrastCookieKey];
+    $[11] = contrastCookieKey;
+    $[12] = isScoped;
+    $[13] = t6;
+    $[14] = t7;
+  } else {
+    t6 = $[13];
+    t7 = $[14];
+  }
+  useEffect(t6, t7);
+  let t8;
+  if ($[15] !== isScoped || $[16] !== outerContext || $[17] !== themeCookieKey) {
+    t8 = (themeToSet, options) => {
+      if (isScoped && !options?.scoped) {
+        outerContext.setTheme(themeToSet, options);
+        return;
+      }
+      const resolvedTheme = themeToSet === "auto" ? window.matchMedia?.("(prefers-color-scheme: dark)").matches ? "dark" : "light" : themeToSet;
+      setThemeState(resolvedTheme);
+      setAutoMode(themeToSet === "auto");
+      if (!isScoped) {
+        setCookie(themeCookieKey, themeToSet, themeToSet === "auto" ? -1 : 365);
+        document.documentElement.setAttribute("data-theme", resolvedTheme);
+      }
+    };
+    $[15] = isScoped;
+    $[16] = outerContext;
+    $[17] = themeCookieKey;
+    $[18] = t8;
+  } else {
+    t8 = $[18];
+  }
+  const setTheme = t8;
+  let t9;
+  if ($[19] !== contrastCookieKey || $[20] !== isScoped || $[21] !== outerContext) {
+    t9 = (isHighContrast, options_0) => {
+      if (isScoped && !options_0?.scoped) {
+        outerContext.setHighContrastMode(isHighContrast, options_0);
+        return;
+      }
+      setHighContrastModeState(isHighContrast);
+      if (!isScoped) {
+        setCookie(contrastCookieKey, String(isHighContrast), 365);
+        if (isHighContrast) {
+          document.documentElement.setAttribute("data-enhanced-contrast", "");
+        } else {
+          document.documentElement.removeAttribute("data-enhanced-contrast");
+        }
+      }
+    };
+    $[19] = contrastCookieKey;
+    $[20] = isScoped;
+    $[21] = outerContext;
+    $[22] = t9;
+  } else {
+    t9 = $[22];
+  }
+  const setHighContrastMode = t9;
+  const t10 = isScoped ? outerContext.autoMode : autoMode;
+  const t11 = isScoped ? outerContext.theme : theme;
+  let t12;
+  if ($[23] !== children || $[24] !== highContrastMode || $[25] !== setHighContrastMode || $[26] !== setTheme || $[27] !== t10 || $[28] !== t11) {
+    t12 = _jsx(Context, {
       value: {
-        autoMode,
+        autoMode: t10,
+        highContrastMode,
+        setHighContrastMode,
         setTheme,
-        theme
+        theme: t11
       },
       children
     });
-    $[6] = autoMode;
-    $[7] = children;
-    $[8] = setTheme;
-    $[9] = theme;
-    $[10] = t4;
+    $[23] = children;
+    $[24] = highContrastMode;
+    $[25] = setHighContrastMode;
+    $[26] = setTheme;
+    $[27] = t10;
+    $[28] = t11;
+    $[29] = t12;
   } else {
-    t4 = $[10];
+    t12 = $[29];
   }
-  return t4;
+  return t12;
 };
-export const useTheme = () => use(Context);
+export const useTheme = () => use(Context) ?? initialContext;
 //# sourceMappingURL=index.js.map