@payloadcms/ui 4.0.0-internal.c7d5de4 → 4.0.0-internal.cb69780

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["c","_c","React","useCallback","useState","ClickableArrow","baseClass","Pagination","props","$","hasNextPage","t0","hasPrevPage","t1","nextPage","t2","onChange","page","t3","prevPage","t4","totalPages","t5","undefined","currentPage","inputValue","setInputValue","String","t6","t7","useEffect","t8","updatePage","t9","Symbol","for","e","target","value","handleInputChange","t10","parsed","parseInt","isNaN","clamped","Math","max","min","handleInputBlur","t11","e_0","key","currentTarget","blur","preventDefault","parsed_0","parsed_1","handleInputKeyDown","isSinglePage","t12","t13","t14","t15","_jsxs","className","children","_jsx","direction","isDisabled","disabled","inputMode","onBlur","onKeyDown","style","width","length","type"],"sources":["../../../src/elements/Pagination/index.tsx"],"sourcesContent":["'use client'\nimport React, { useCallback, useState } from 'react'\n\nimport { ClickableArrow } from './ClickableArrow/index.js'\nimport './index.css'\n\nconst baseClass = 'paginator'\n\nexport type PaginationProps = {\n  hasNextPage?: boolean\n  hasPrevPage?: boolean\n  limit?: number\n  nextPage?: number\n  numberOfNeighbors?: number\n  onChange?: (page: number) => void\n  page?: number\n  prevPage?: number\n  totalPages?: number\n}\n\nexport const Pagination: React.FC<PaginationProps> = (props) => {\n  const {\n    hasNextPage = false,\n    hasPrevPage = false,\n    nextPage = null,\n    onChange,\n    page: currentPage = 1,\n    prevPage = null,\n    totalPages = 1,\n  } = props\n\n  const [inputValue, setInputValue] = useState(String(currentPage))\n\n  // Sync input value when currentPage changes externally\n  React.useEffect(() => {\n    setInputValue(String(currentPage))\n  }, [currentPage])\n\n  const updatePage = useCallback(\n    (page: number) => {\n      if (typeof onChange === 'function') {\n        onChange(page)\n      }\n    },\n    [onChange],\n  )\n\n  const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {\n    setInputValue(e.target.value)\n  }\n\n  const handleInputBlur = () => {\n    const parsed = parseInt(inputValue, 10)\n    if (!isNaN(parsed)) {\n      // Clamp to valid range\n      const clamped = Math.max(1, Math.min(parsed, totalPages))\n      if (clamped !== currentPage) {\n        updatePage(clamped)\n      } else {\n        setInputValue(String(currentPage))\n      }\n    } else {\n      // Reset to current page if not a number\n      setInputValue(String(currentPage))\n    }\n  }\n\n  const handleInputKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {\n    if (e.key === 'Enter') {\n      e.currentTarget.blur()\n    } else if (e.key === 'Escape') {\n      setInputValue(String(currentPage))\n      e.currentTarget.blur()\n    } else if (e.key === 'ArrowUp') {\n      e.preventDefault()\n      const parsed = parseInt(inputValue, 10)\n      if (!isNaN(parsed) && parsed < totalPages) {\n        setInputValue(String(parsed + 1))\n      }\n    } else if (e.key === 'ArrowDown') {\n      e.preventDefault()\n      const parsed = parseInt(inputValue, 10)\n      if (!isNaN(parsed) && parsed > 1) {\n        setInputValue(String(parsed - 1))\n      }\n    }\n  }\n\n  const isSinglePage = !totalPages || totalPages <= 1\n\n  return (\n    <div className={baseClass}>\n      <ClickableArrow\n        direction=\"left\"\n        isDisabled={isSinglePage || !hasPrevPage}\n        updatePage={() => updatePage(prevPage ?? Math.max(1, currentPage - 1))}\n      />\n      <ClickableArrow\n        direction=\"right\"\n        isDisabled={isSinglePage || !hasNextPage}\n        updatePage={() => updatePage(nextPage ?? currentPage + 1)}\n      />\n      <div className={`${baseClass}__page-input-wrapper`}>\n        <input\n          aria-label=\"Go to page\"\n          className={`${baseClass}__page-input`}\n          disabled={isSinglePage}\n          inputMode=\"numeric\"\n          max={totalPages}\n          min={1}\n          onBlur={handleInputBlur}\n          onChange={handleInputChange}\n          onKeyDown={handleInputKeyDown}\n          style={{ width: `${Math.max(inputValue.length, 1)}ch` }}\n          type=\"text\"\n          value={inputValue}\n        />\n        <span className={`${baseClass}__page-total`}>of {isSinglePage ? 1 : totalPages}</span>\n      </div>\n    </div>\n  )\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["c","_c","React","useCallback","useId","useState","useTranslation","ClickableArrow","baseClass","Pagination","props","$","hasNextPage","t0","hasPrevPage","t1","nextPage","t2","onChange","page","t3","prevPage","t4","tableId","totalPages","t5","undefined","currentPage","pageDescriptionID","t","inputValue","setInputValue","String","t6","t7","useEffect","t8","updatePage","t9","Symbol","for","e","target","value","handleInputChange","t10","parsed","parseInt","isNaN","clamped","Math","max","min","handleInputBlur","t11","e_0","key","currentTarget","blur","preventDefault","parsed_0","parsed_1","handleInputKeyDown","isSinglePage","t12","t13","t14","t15","_jsxs","className","children","_jsx","ariaControls","direction","isDisabled","disabled","inputMode","onBlur","onKeyDown","style","width","length","type","id"],"sources":["../../../src/elements/Pagination/index.tsx"],"sourcesContent":["'use client'\nimport React, { useCallback, useId, useState } from 'react'\n\nimport { useTranslation } from '../../providers/Translation/index.js'\nimport { ClickableArrow } from './ClickableArrow/index.js'\nimport './index.css'\n\nconst baseClass = 'paginator'\n\nexport type PaginationProps = {\n  hasNextPage?: boolean\n  hasPrevPage?: boolean\n  limit?: number\n  nextPage?: number\n  numberOfNeighbors?: number\n  onChange?: (page: number) => void\n  page?: number\n  prevPage?: number\n  tableId?: string\n  totalPages?: number\n}\n\nexport const Pagination: React.FC<PaginationProps> = (props) => {\n  const {\n    hasNextPage = false,\n    hasPrevPage = false,\n    nextPage = null,\n    onChange,\n    page: currentPage = 1,\n    prevPage = null,\n    tableId,\n    totalPages = 1,\n  } = props\n\n  const pageDescriptionID = useId()\n  const { t } = useTranslation()\n  const [inputValue, setInputValue] = useState(String(currentPage))\n\n  // Sync input value when currentPage changes externally\n  React.useEffect(() => {\n    setInputValue(String(currentPage))\n  }, [currentPage])\n\n  const updatePage = useCallback(\n    (page: number) => {\n      if (typeof onChange === 'function') {\n        onChange(page)\n      }\n    },\n    [onChange],\n  )\n\n  const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {\n    setInputValue(e.target.value)\n  }\n\n  const handleInputBlur = () => {\n    const parsed = parseInt(inputValue, 10)\n    if (!isNaN(parsed)) {\n      // Clamp to valid range\n      const clamped = Math.max(1, Math.min(parsed, totalPages))\n      if (clamped !== currentPage) {\n        updatePage(clamped)\n      } else {\n        setInputValue(String(currentPage))\n      }\n    } else {\n      // Reset to current page if not a number\n      setInputValue(String(currentPage))\n    }\n  }\n\n  const handleInputKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {\n    if (e.key === 'Enter') {\n      e.currentTarget.blur()\n    } else if (e.key === 'Escape') {\n      setInputValue(String(currentPage))\n      e.currentTarget.blur()\n    } else if (e.key === 'ArrowUp') {\n      e.preventDefault()\n      const parsed = parseInt(inputValue, 10)\n      if (!isNaN(parsed) && parsed < totalPages) {\n        setInputValue(String(parsed + 1))\n      }\n    } else if (e.key === 'ArrowDown') {\n      e.preventDefault()\n      const parsed = parseInt(inputValue, 10)\n      if (!isNaN(parsed) && parsed > 1) {\n        setInputValue(String(parsed - 1))\n      }\n    }\n  }\n\n  const isSinglePage = !totalPages || totalPages <= 1\n\n  return (\n    <div className={baseClass}>\n      <ClickableArrow\n        ariaControls={tableId}\n        direction=\"left\"\n        isDisabled={isSinglePage || !hasPrevPage}\n        updatePage={() => updatePage(prevPage ?? Math.max(1, currentPage - 1))}\n      />\n      <ClickableArrow\n        ariaControls={tableId}\n        direction=\"right\"\n        isDisabled={isSinglePage || !hasNextPage}\n        updatePage={() => updatePage(nextPage ?? currentPage + 1)}\n      />\n      <div className={`${baseClass}__page-input-wrapper`}>\n        <input\n          aria-controls={tableId}\n          aria-describedby={pageDescriptionID}\n          aria-label={t('general:goToPage')}\n          className={`${baseClass}__page-input`}\n          disabled={isSinglePage}\n          inputMode=\"numeric\"\n          max={totalPages}\n          min={1}\n          onBlur={handleInputBlur}\n          onChange={handleInputChange}\n          onKeyDown={handleInputKeyDown}\n          style={{ width: `${Math.max(inputValue.length, 1)}ch` }}\n          type=\"text\"\n          value={inputValue}\n        />\n        <span className=\"sr-only\" id={pageDescriptionID}>\n          {t('general:pageNumberRange', { totalPages: isSinglePage ? 1 : totalPages })}\n        </span>\n        <span className={`${baseClass}__page-total`}>\n          {t('general:of')} {isSinglePage ? 1 : totalPages}\n        </span>\n      </div>\n    </div>\n  )\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/elements/PerPage/index.d.ts

@@ -6,6 +6,7 @@ export type PerPageProps = {
     readonly limit: number;
     readonly limits: number[];
     readonly resetPage?: boolean;
+    readonly tableId?: string;
 };
 export declare const PerPage: React.FC<PerPageProps>;
 //# sourceMappingURL=index.d.ts.map

package/dist/elements/PerPage/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/elements/PerPage/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAA;AAMzB,OAAO,aAAa,CAAA;AAMpB,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAA;IAC9B,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IAC/C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,CAAA;IACzB,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAA;CAC7B,CAAA;AAED,eAAO,MAAM,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CAkD1C,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/elements/PerPage/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAA;AAMzB,OAAO,aAAa,CAAA;AAMpB,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAA;IAC9B,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IAC/C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,CAAA;IACzB,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAA;IAC5B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAC1B,CAAA;AAED,eAAO,MAAM,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CAwD1C,CAAA"}

package/dist/elements/PerPage/index.js

@@ -12,12 +12,13 @@ import './index.css';
 const baseClass = 'per-page';
 const defaultLimits = collectionDefaults.admin.pagination.limits;
 export const PerPage = t0 => {
-  const $ = _c(11);
+  const $ = _c(14);
   const {
     defaultLimit: t1,
     handleChange,
     limit,
-    limits: t2
+    limits: t2,
+    tableId
   } = t0;
   const defaultLimit = t1 === undefined ? 10 : t1;
   const limits = t2 === undefined ? defaultLimits : t2;
@@ -26,9 +27,9 @@ export const PerPage = t0 => {
   } = useTranslation();
   const limitToUse = isNumber(limit) ? limit : defaultLimit;
   let t3;
-  if ($[0] !== handleChange || $[1] !== limitToUse || $[2] !== limits || $[3] !== t) {
+  if ($[0] !== handleChange || $[1] !== limitToUse || $[2] !== limits || $[3] !== t || $[4] !== tableId) {
     let t4;
-    if ($[5] !== handleChange || $[6] !== limitToUse || $[7] !== limits) {
+    if ($[6] !== handleChange || $[7] !== limitToUse || $[8] !== limits) {
       t4 = t5 => {
         const {
           close
@@ -46,15 +47,15 @@ export const PerPage = t0 => {
           }, i))
         });
       };
-      $[5] = handleChange;
-      $[6] = limitToUse;
-      $[7] = limits;
-      $[8] = t4;
+      $[6] = handleChange;
+      $[7] = limitToUse;
+      $[8] = limits;
+      $[9] = t4;
     } else {
-      t4 = $[8];
+      t4 = $[9];
     }
     let t5;
-    if ($[9] !== limitToUse) {
+    if ($[10] !== limitToUse || $[11] !== t || $[12] !== tableId) {
       t5 = t6 => {
         const {
           active,
@@ -64,9 +65,13 @@ export const PerPage = t0 => {
         } = t6;
         return _jsx(Button, {
           ...ariaProps,
+          "aria-label": t("general:perPage", {
+            limit: limitToUse
+          }),
           buttonStyle: "secondary",
           className: [active && `${baseClass}--active`].filter(Boolean).join(" "),
           extraButtonProps: {
+            "aria-controls": [ariaProps["aria-controls"], tableId].filter(Boolean).join(" "),
             onKeyDown
           },
           icon: _jsx(ChevronIcon, {
@@ -78,10 +83,12 @@ export const PerPage = t0 => {
           children: limitToUse
         });
       };
-      $[9] = limitToUse;
-      $[10] = t5;
+      $[10] = limitToUse;
+      $[11] = t;
+      $[12] = tableId;
+      $[13] = t5;
     } else {
-      t5 = $[10];
+      t5 = $[13];
     }
     t3 = _jsxs("div", {
       className: baseClass,
@@ -90,6 +97,7 @@ export const PerPage = t0 => {
         children: t("general:perPageLabel")
       }), _jsx(Popup, {
         horizontalAlign: "right",
+        popupType: "menu",
         render: t4,
         renderButton: t5,
         size: "small"
@@ -99,9 +107,10 @@ export const PerPage = t0 => {
     $[1] = limitToUse;
     $[2] = limits;
     $[3] = t;
-    $[4] = t3;
+    $[4] = tableId;
+    $[5] = t3;
   } else {
-    t3 = $[4];
+    t3 = $[5];
   }
   return t3;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["c","_c","collectionDefaults","isNumber","React","ChevronIcon","useTranslation","Button","Popup","PopupList","baseClass","defaultLimits","admin","pagination","limits","PerPage","t0","$","defaultLimit","t1","handleChange","limit","t2","undefined","t","limitToUse","t3","t4","t5","close","_jsx","RadioGroup","children","map","limitNumber","i","RadioGroupItem","active","onClick","t6","onKeyDown","ariaProps","buttonStyle","className","filter","Boolean","join","extraButtonProps","icon","size","_jsxs","horizontalAlign","render"],"sources":["../../../src/elements/PerPage/index.tsx"],"sourcesContent":["'use client'\nimport { collectionDefaults, isNumber } from 'payload/shared'\nimport React from 'react'\n\nimport { ChevronIcon } from '../../icons/Chevron/index.js'\nimport { useTranslation } from '../../providers/Translation/index.js'\nimport { Button } from '../Button/index.js'\nimport { Popup, PopupList } from '../Popup/index.js'\nimport './index.css'\n\nconst baseClass = 'per-page'\n\nconst defaultLimits = collectionDefaults.admin.pagination.limits\n\nexport type PerPageProps = {\n  readonly defaultLimit?: number\n  readonly handleChange?: (limit: number) => void\n  readonly limit: number\n  readonly limits: number[]\n  readonly resetPage?: boolean\n}\n\nexport const PerPage: React.FC<PerPageProps> = ({\n  defaultLimit = 10,\n  handleChange,\n  limit,\n  limits = defaultLimits,\n}) => {\n  const { t } = useTranslation()\n\n  const limitToUse = isNumber(limit) ? limit : defaultLimit\n\n  return (\n    <div className={baseClass}>\n      <span className={`${baseClass}__label`}>{t('general:perPageLabel')}</span>\n      <Popup\n        horizontalAlign=\"right\"\n        render={({ close }) => (\n          <PopupList.RadioGroup>\n            {limits.map((limitNumber, i) => (\n              <PopupList.RadioGroupItem\n                active={limitNumber === limitToUse}\n                key={i}\n                onClick={() => {\n                  close()\n                  if (handleChange) {\n                    handleChange(limitNumber)\n                  }\n                }}\n              >\n                {limitNumber}\n              </PopupList.RadioGroupItem>\n            ))}\n          </PopupList.RadioGroup>\n        )}\n        renderButton={({ active, onClick, onKeyDown, ...ariaProps }) => (\n          <Button\n            {...ariaProps}\n            buttonStyle=\"secondary\"\n            className={[active && `${baseClass}--active`].filter(Boolean).join(' ')}\n            extraButtonProps={{ onKeyDown }}\n            icon={<ChevronIcon className={`${baseClass}__icon`} size={16} />}\n            iconPosition=\"right\"\n            onClick={onClick}\n          >\n            {limitToUse}\n          </Button>\n        )}\n        size=\"small\"\n      />\n    </div>\n  )\n}\n"],"mappings":"AAAA;;AAAA,SAAAA,CAAA,IAAAC,EAAA;;AACA,SAASC,kBAAkB,EAAEC,QAAQ,QAAQ;AAC7C,OAAOC,KAAA,MAAW;AAElB,SAASC,WAAW,QAAQ;AAC5B,SAASC,cAAc,QAAQ;AAC/B,SAASC,MAAM,QAAQ;AACvB,SAASC,KAAK,EAAEC,SAAS,QAAQ;AACjC,OAAO;AAEP,MAAMC,SAAA,GAAY;AAElB,MAAMC,aAAA,GAAgBT,kBAAA,CAAmBU,KAAK,CAACC,UAAU,CAACC,MAAM;AAUhE,OAAO,MAAMC,OAAA,GAAkCC,EAAA;EAAA,MAAAC,CAAA,GAAAhB,EAAA;EAAC;IAAAiB,YAAA,EAAAC,EAAA;IAAAC,YAAA;IAAAC,KAAA;IAAAP,MAAA,EAAAQ;EAAA,IAAAN,EAK/C;EAJC,MAAAE,YAAA,GAAAC,EAAiB,KAAAI,SAAA,QAAjBJ,EAAiB;EAGjB,MAAAL,MAAA,GAAAQ,EAAsB,KAAAC,SAAA,GAAAZ,aAAA,GAAtBW,EAAsB;EAEtB;IAAAE;EAAA,IAAclB,cAAA;EAEd,MAAAmB,UAAA,GAAmBtB,QAAA,CAASkB,KAAA,IAASA,KAAA,GAAQH,YAAA;EAAA,IAAAQ,EAAA;EAAA,IAAAT,CAAA,QAAAG,YAAA,IAAAH,CAAA,QAAAQ,UAAA,IAAAR,CAAA,QAAAH,MAAA,IAAAG,CAAA,QAAAO,CAAA;IAAA,IAAAG,EAAA;IAAA,IAAAV,CAAA,QAAAG,YAAA,IAAAH,CAAA,QAAAQ,UAAA,IAAAR,CAAA,QAAAH,MAAA;MAO/Ba,EAAA,GAAAC,EAAA;QAAC;UAAAC;QAAA,IAAAD,EAAS;QAAA,OAChBE,IAAA,CAAArB,SAAA,CAAAsB,UAAA;UAAAC,QAAA,EACGlB,MAAA,CAAAmB,GAAA,EAAAC,WAAA,EAAAC,CAAA,KACCL,IAAA,CAAArB,SAAA,CAAA2B,cAAA;YAAAC,MAAA,EACUH,WAAA,KAAgBT,UAAA;YAAAa,OAAA,EAAAA,CAAA;cAGtBT,KAAA;cAAA,IACIT,YAAA;gBACFA,YAAA,CAAac,WAAA;cAAA;YAAA;YAAAF,QAAA,EAIhBE;UAAA,GARIC,CAAA;QAAA,C;;;;;;;;;;;MAaCP,EAAA,GAAAW,EAAA;QAAC;UAAAF,MAAA;UAAAC,OAAA;UAAAE,SAAA;UAAA,GAAAC;QAAA,IAAAF,EAA4C;QAAA,OACzDT,IAAA,CAAAvB,MAAA;UAAA,GACMkC,SAAS;UAAAC,WAAA,EACD;UAAAC,SAAA,EACD,CAACN,MAAA,IAAU,GAAA3B,SAAA,UAAsB,EAAAkC,MAAA,CAAAC,OAAS,EAAAC,IAAA,CAAc;UAAAC,gBAAA;YAAAP;UAAA;UAAAQ,IAAA,EAE7DlB,IAAA,CAAAzB,WAAA;YAAAsC,SAAA,EAAwB,GAAAjC,SAAA,QAAoB;YAAAuC,IAAA;UAAA,C;wBACrC;UAAAX,OAAA;UAAAN,QAAA,EAGZP;QAAA,C;;;;;;;IAhCTC,EAAA,GAAAwB,KAAA,CAAC;MAAAP,SAAA,EAAAjC,SAAA;MAAAsB,QAAA,GACCF,IAAA,CAAC;QAAAa,SAAA,EAAgB,GAAAjC,SAAA,SAAqB;QAAAsB,QAAA,EAAGR,CAAA,CAAE;MAAA,C,GAC3CM,IAAA,CAAAtB,KAAA;QAAA2C,eAAA,EACkB;QAAAC,MAAA,EACRzB,E;sBAkBMC,E;cAaT;MAAA,C;;;;;;;;;;SAnCTF,E;CAuCJ","ignoreList":[]}
+{"version":3,"file":"index.js","names":["c","_c","collectionDefaults","isNumber","React","ChevronIcon","useTranslation","Button","Popup","PopupList","baseClass","defaultLimits","admin","pagination","limits","PerPage","t0","$","defaultLimit","t1","handleChange","limit","t2","tableId","undefined","t","limitToUse","t3","t4","t5","close","_jsx","RadioGroup","children","map","limitNumber","i","RadioGroupItem","active","onClick","t6","onKeyDown","ariaProps","buttonStyle","className","filter","Boolean","join","extraButtonProps","icon","size","_jsxs","horizontalAlign","popupType","render"],"sources":["../../../src/elements/PerPage/index.tsx"],"sourcesContent":["'use client'\nimport { collectionDefaults, isNumber } from 'payload/shared'\nimport React from 'react'\n\nimport { ChevronIcon } from '../../icons/Chevron/index.js'\nimport { useTranslation } from '../../providers/Translation/index.js'\nimport { Button } from '../Button/index.js'\nimport { Popup, PopupList } from '../Popup/index.js'\nimport './index.css'\n\nconst baseClass = 'per-page'\n\nconst defaultLimits = collectionDefaults.admin.pagination.limits\n\nexport type PerPageProps = {\n  readonly defaultLimit?: number\n  readonly handleChange?: (limit: number) => void\n  readonly limit: number\n  readonly limits: number[]\n  readonly resetPage?: boolean\n  readonly tableId?: string\n}\n\nexport const PerPage: React.FC<PerPageProps> = ({\n  defaultLimit = 10,\n  handleChange,\n  limit,\n  limits = defaultLimits,\n  tableId,\n}) => {\n  const { t } = useTranslation()\n\n  const limitToUse = isNumber(limit) ? limit : defaultLimit\n\n  return (\n    <div className={baseClass}>\n      <span className={`${baseClass}__label`}>{t('general:perPageLabel')}</span>\n      <Popup\n        horizontalAlign=\"right\"\n        popupType=\"menu\"\n        render={({ close }) => (\n          <PopupList.RadioGroup>\n            {limits.map((limitNumber, i) => (\n              <PopupList.RadioGroupItem\n                active={limitNumber === limitToUse}\n                key={i}\n                onClick={() => {\n                  close()\n                  if (handleChange) {\n                    handleChange(limitNumber)\n                  }\n                }}\n              >\n                {limitNumber}\n              </PopupList.RadioGroupItem>\n            ))}\n          </PopupList.RadioGroup>\n        )}\n        renderButton={({ active, onClick, onKeyDown, ...ariaProps }) => (\n          <Button\n            {...ariaProps}\n            aria-label={t('general:perPage', { limit: limitToUse })}\n            buttonStyle=\"secondary\"\n            className={[active && `${baseClass}--active`].filter(Boolean).join(' ')}\n            extraButtonProps={{\n              'aria-controls': [ariaProps['aria-controls'], tableId].filter(Boolean).join(' '),\n              onKeyDown,\n            }}\n            icon={<ChevronIcon className={`${baseClass}__icon`} size={16} />}\n            iconPosition=\"right\"\n            onClick={onClick}\n          >\n            {limitToUse}\n          </Button>\n        )}\n        size=\"small\"\n      />\n    </div>\n  )\n}\n"],"mappings":"AAAA;;AAAA,SAAAA,CAAA,IAAAC,EAAA;;AACA,SAASC,kBAAkB,EAAEC,QAAQ,QAAQ;AAC7C,OAAOC,KAAA,MAAW;AAElB,SAASC,WAAW,QAAQ;AAC5B,SAASC,cAAc,QAAQ;AAC/B,SAASC,MAAM,QAAQ;AACvB,SAASC,KAAK,EAAEC,SAAS,QAAQ;AACjC,OAAO;AAEP,MAAMC,SAAA,GAAY;AAElB,MAAMC,aAAA,GAAgBT,kBAAA,CAAmBU,KAAK,CAACC,UAAU,CAACC,MAAM;AAWhE,OAAO,MAAMC,OAAA,GAAkCC,EAAA;EAAA,MAAAC,CAAA,GAAAhB,EAAA;EAAC;IAAAiB,YAAA,EAAAC,EAAA;IAAAC,YAAA;IAAAC,KAAA;IAAAP,MAAA,EAAAQ,EAAA;IAAAC;EAAA,IAAAP,EAM/C;EALC,MAAAE,YAAA,GAAAC,EAAiB,KAAAK,SAAA,QAAjBL,EAAiB;EAGjB,MAAAL,MAAA,GAAAQ,EAAsB,KAAAE,SAAA,GAAAb,aAAA,GAAtBW,EAAsB;EAGtB;IAAAG;EAAA,IAAcnB,cAAA;EAEd,MAAAoB,UAAA,GAAmBvB,QAAA,CAASkB,KAAA,IAASA,KAAA,GAAQH,YAAA;EAAA,IAAAS,EAAA;EAAA,IAAAV,CAAA,QAAAG,YAAA,IAAAH,CAAA,QAAAS,UAAA,IAAAT,CAAA,QAAAH,MAAA,IAAAG,CAAA,QAAAQ,CAAA,IAAAR,CAAA,QAAAM,OAAA;IAAA,IAAAK,EAAA;IAAA,IAAAX,CAAA,QAAAG,YAAA,IAAAH,CAAA,QAAAS,UAAA,IAAAT,CAAA,QAAAH,MAAA;MAQ/Bc,EAAA,GAAAC,EAAA;QAAC;UAAAC;QAAA,IAAAD,EAAS;QAAA,OAChBE,IAAA,CAAAtB,SAAA,CAAAuB,UAAA;UAAAC,QAAA,EACGnB,MAAA,CAAAoB,GAAA,EAAAC,WAAA,EAAAC,CAAA,KACCL,IAAA,CAAAtB,SAAA,CAAA4B,cAAA;YAAAC,MAAA,EACUH,WAAA,KAAgBT,UAAA;YAAAa,OAAA,EAAAA,CAAA;cAGtBT,KAAA;cAAA,IACIV,YAAA;gBACFA,YAAA,CAAae,WAAA;cAAA;YAAA;YAAAF,QAAA,EAIhBE;UAAA,GARIC,CAAA;QAAA,C;;;;;;;;;;;MAaCP,EAAA,GAAAW,EAAA;QAAC;UAAAF,MAAA;UAAAC,OAAA;UAAAE,SAAA;UAAA,GAAAC;QAAA,IAAAF,EAA4C;QAAA,OACzDT,IAAA,CAAAxB,MAAA;UAAA,GACMmC,SAAS;UAAA,cACDjB,CAAA,CAAE;YAAAJ,KAAA,EAA4BK;UAAA,CAAW;UAAAiB,WAAA,EACzC;UAAAC,SAAA,EACD,CAACN,MAAA,IAAU,GAAA5B,SAAA,UAAsB,EAAAmC,MAAA,CAAAC,OAAS,EAAAC,IAAA,CAAc;UAAAC,gBAAA;YAAA,iBAEhD,CAACN,SAAS,CAAC,kBAAkBnB,OAAA,EAAAsB,MAAA,CAAAC,OAAgB,EAAAC,IAAA,CAAc;YAAAN;UAAA;UAAAQ,IAAA,EAGxElB,IAAA,CAAA1B,WAAA;YAAAuC,SAAA,EAAwB,GAAAlC,SAAA,QAAoB;YAAAwC,IAAA;UAAA,C;wBACrC;UAAAX,OAAA;UAAAN,QAAA,EAGZP;QAAA,C;;;;;;;;;IArCTC,EAAA,GAAAwB,KAAA,CAAC;MAAAP,SAAA,EAAAlC,SAAA;MAAAuB,QAAA,GACCF,IAAA,CAAC;QAAAa,SAAA,EAAgB,GAAAlC,SAAA,SAAqB;QAAAuB,QAAA,EAAGR,CAAA,CAAE;MAAA,C,GAC3CM,IAAA,CAAAvB,KAAA;QAAA4C,eAAA,EACkB;QAAAC,SAAA,EACN;QAAAC,MAAA,EACF1B,E;sBAkBMC,E;cAiBT;MAAA,C;;;;;;;;;;;SAxCTF,E;CA4CJ","ignoreList":[]}

package/dist/elements/PillSelector/index.css

@@ -25,6 +25,7 @@
     padding: 0;
   }
 
+  /* stylelint-disable-next-line plugin/no-max-width-media-query -- TODO: pre-existing; migrate to a mobile-first min-width query */
   @media (max-width: 768px) {
     .pill-selector {
       padding: var(--spacer-2-5);

package/dist/elements/Popup/PopupButtonList/index.css

@@ -51,7 +51,7 @@
     font-weight: var(--text-body-medium-font-weight);
     letter-spacing: var(--text-body-medium-letter-spacing);
     line-height: var(--text-body-medium-line-height);
-    padding: var(--spacer-1) var(--spacer-2) var(--spacer-1) var(--spacer-1);
+    padding: var(--spacer-1) var(--spacer-2);
   }
 
   .popup-button-list__button:focus-visible {

package/dist/elements/Popup/PopupButtonList/index.d.ts

@@ -26,8 +26,13 @@ export declare const RadioGroup: React.FC<{
     children: React.ReactNode;
     className?: string;
 }>;
+export declare const CheckboxGroup: React.FC<{
+    children: React.ReactNode;
+    className?: string;
+}>;
 type MenuButtonProps = {
     active?: boolean;
+    ariaChecked?: boolean;
     children: React.ReactNode;
     className?: string;
     disabled?: boolean;
@@ -35,6 +40,7 @@ type MenuButtonProps = {
     icon?: React.ReactNode;
     id?: string;
     onClick?: (e?: React.MouseEvent) => void;
+    role?: 'menuitem' | 'menuitemcheckbox' | 'menuitemradio';
 };
 export declare const Button: React.FC<MenuButtonProps>;
 /**
@@ -42,4 +48,6 @@ export declare const Button: React.FC<MenuButtonProps>;
  * Automatically shows a checkmark icon when active.
  */
 export declare const RadioGroupItem: React.FC<Omit<MenuButtonProps, 'icon'>>;
+/** A Button variant for independently selectable items within CheckboxGroup. */
+export declare const CheckboxGroupItem: React.FC<Omit<MenuButtonProps, 'icon'>>;
 //# sourceMappingURL=index.d.ts.map

package/dist/elements/Popup/PopupButtonList/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/elements/Popup/PopupButtonList/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAE/C,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAI9B,OAAO,aAAa,CAAA;AAIpB,OAAO,EAAE,gBAAgB,IAAI,OAAO,EAAE,MAAM,0BAA0B,CAAA;AACtE,OAAO,EAAE,mBAAmB,IAAI,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAE/E,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC;IACjC,UAAU,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAA;IACjC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,OAAO,CAAA;CACxC,CAUA,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC;IAC9B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,CAAA;CACzB,CAUA,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC;IAChC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAGA,CAAA;AAED,KAAK,eAAe,GAAG;IACrB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,IAAI,CAAC,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAA;IAC/B,IAAI,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IACtB,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,KAAK,IAAI,CAAA;CACzC,CAAA;AAED,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAmE5C,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,CAUlE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/elements/Popup/PopupButtonList/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAE/C,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAI9B,OAAO,aAAa,CAAA;AAcpB,OAAO,EAAE,gBAAgB,IAAI,OAAO,EAAE,MAAM,0BAA0B,CAAA;AACtE,OAAO,EAAE,mBAAmB,IAAI,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAE/E,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC;IACjC,UAAU,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAA;IACjC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,OAAO,CAAA;CACxC,CAUA,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC;IAC9B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,CAAA;CACzB,CAUA,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC;IAChC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAOA,CAAA;AAED,eAAO,MAAM,aAAa;cAXd,KAAK,CAAC,SAAS;gBACb,MAAM;EAUmB,CAAA;AAEvC,KAAK,eAAe,GAAG;IACrB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,IAAI,CAAC,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAA;IAC/B,IAAI,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IACtB,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,KAAK,IAAI,CAAA;IACxC,IAAI,CAAC,EAAE,UAAU,GAAG,kBAAkB,GAAG,eAAe,CAAA;CACzD,CAAA;AAED,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAyF5C,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,CAYlE,CAAA;AAED,gFAAgF;AAChF,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,CAYrE,CAAA"}

package/dist/elements/Popup/PopupButtonList/index.js

@@ -6,6 +6,15 @@ import { CheckIcon } from '../../../icons/Check/index.js';
 import { Link } from '../../Link/index.js';
 import './index.css';
 const baseClass = 'popup-button-list';
+const Group = ({
+  children,
+  className,
+  role
+}) => /*#__PURE__*/_jsx("div", {
+  className: className,
+  role: role,
+  children: children
+});
 export { PopupListDivider as Divider } from '../PopupDivider/index.js';
 export { PopupListGroupLabel as GroupLabel } from '../PopupGroupLabel/index.js';
 export const ButtonGroup = ({
@@ -15,7 +24,7 @@ export const ButtonGroup = ({
   textAlign = 'left'
 }) => {
   const classes = [baseClass, className, `${baseClass}__text-align--${textAlign}`, `${baseClass}__button-size--${buttonSize}`].filter(Boolean).join(' ');
-  return /*#__PURE__*/_jsx("div", {
+  return /*#__PURE__*/_jsx(Group, {
     className: classes,
     children: children
   });
@@ -30,7 +39,7 @@ export const MenuItem = ({
   size = 'large'
 }) => {
   const classes = [baseClass, className, `${baseClass}--with-actions`, size === 'large' && `${baseClass}--large`].filter(Boolean).join(' ');
-  return /*#__PURE__*/_jsx("div", {
+  return /*#__PURE__*/_jsx(Group, {
     className: classes,
     children: children
   });
@@ -44,20 +53,24 @@ export const RadioGroup = ({
   className
 }) => {
   const classes = [baseClass, className, `${baseClass}--with-icons`].filter(Boolean).join(' ');
-  return /*#__PURE__*/_jsx("div", {
+  return /*#__PURE__*/_jsx(Group, {
     className: classes,
+    role: "group",
     children: children
   });
 };
+export const CheckboxGroup = RadioGroup;
 export const Button = ({
   id,
   active,
+  ariaChecked,
   children,
   className,
   disabled,
   href,
   icon,
-  onClick
+  onClick,
+  role
 }) => {
   const classes = [`${baseClass}__button`, disabled && `${baseClass}__disabled`, active && `${baseClass}__button--selected`, className].filter(Boolean).join(' ');
   // Always render icon element - CSS hides it outside RadioGroup/MenuItem
@@ -68,6 +81,7 @@ export const Button = ({
   if (!disabled) {
     if (href) {
       return /*#__PURE__*/_jsxs(Link, {
+        "aria-checked": ariaChecked,
         className: classes,
         href: href,
         id: id,
@@ -77,6 +91,8 @@ export const Button = ({
           }
         },
         prefetch: false,
+        role: role ?? 'menuitem',
+        tabIndex: -1,
         children: [iconElement, /*#__PURE__*/_jsx("span", {
           className: `${baseClass}__label`,
           children: children
@@ -85,6 +101,7 @@ export const Button = ({
     }
     if (onClick) {
       return /*#__PURE__*/_jsxs("button", {
+        "aria-checked": ariaChecked,
         className: classes,
         id: id,
         onClick: e => {
@@ -92,6 +109,8 @@ export const Button = ({
             onClick(e);
           }
         },
+        role: role ?? 'menuitem',
+        tabIndex: -1,
         type: "button",
         children: [iconElement, /*#__PURE__*/_jsx("span", {
           className: `${baseClass}__label`,
@@ -100,9 +119,20 @@ export const Button = ({
       });
     }
   }
-  return /*#__PURE__*/_jsxs("div", {
+  return /*#__PURE__*/_jsxs("button", {
+    "aria-disabled": "true",
     className: classes,
+    "data-popup-prevent-close": true,
     id: id,
+    onClick: event => event.preventDefault(),
+    onKeyDown: event => {
+      if (event.key === 'Enter' || event.key === ' ') {
+        event.preventDefault();
+      }
+    },
+    role: role ?? 'menuitem',
+    tabIndex: -1,
+    type: "button",
     children: [iconElement, /*#__PURE__*/_jsx("span", {
       className: `${baseClass}__label`,
       children: children
@@ -116,10 +146,24 @@ export const Button = ({
 export const RadioGroupItem = props => {
   return /*#__PURE__*/_jsx(Button, {
     ...props,
+    ariaChecked: Boolean(props.active),
+    className: [`${baseClass}__button--radio-group-item`, props.className].filter(Boolean).join(' '),
+    icon: props.active ? /*#__PURE__*/_jsx(CheckIcon, {
+      size: 16
+    }) : undefined,
+    role: "menuitemradio"
+  });
+};
+/** A Button variant for independently selectable items within CheckboxGroup. */
+export const CheckboxGroupItem = props => {
+  return /*#__PURE__*/_jsx(Button, {
+    ...props,
+    ariaChecked: Boolean(props.active),
     className: [`${baseClass}__button--radio-group-item`, props.className].filter(Boolean).join(' '),
     icon: props.active ? /*#__PURE__*/_jsx(CheckIcon, {
       size: 16
-    }) : undefined
+    }) : undefined,
+    role: "menuitemcheckbox"
   });
 };
 //# sourceMappingURL=index.js.map

package/dist/elements/Popup/PopupButtonList/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["React","CheckIcon","Link","baseClass","PopupListDivider","Divider","PopupListGroupLabel","GroupLabel","ButtonGroup","buttonSize","children","className","textAlign","classes","filter","Boolean","join","_jsx","MenuItem","size","RadioGroup","Button","id","active","disabled","href","icon","onClick","iconElement","_jsxs","e","prefetch","type","RadioGroupItem","props","undefined"],"sources":["../../../../src/elements/Popup/PopupButtonList/index.tsx"],"sourcesContent":["'use client'\nimport type { LinkAdapterProps } from 'payload'\n\nimport * as React from 'react'\n\nimport { CheckIcon } from '../../../icons/Check/index.js'\nimport { Link } from '../../Link/index.js'\nimport './index.css'\n\nconst baseClass = 'popup-button-list'\n\nexport { PopupListDivider as Divider } from '../PopupDivider/index.js'\nexport { PopupListGroupLabel as GroupLabel } from '../PopupGroupLabel/index.js'\n\nexport const ButtonGroup: React.FC<{\n  buttonSize?: 'default' | 'medium'\n  children: React.ReactNode\n  className?: string\n  textAlign?: 'center' | 'left' | 'right'\n}> = ({ buttonSize = 'default', children, className, textAlign = 'left' }) => {\n  const classes = [\n    baseClass,\n    className,\n    `${baseClass}__text-align--${textAlign}`,\n    `${baseClass}__button-size--${buttonSize}`,\n  ]\n    .filter(Boolean)\n    .join(' ')\n  return <div className={classes}>{children}</div>\n}\n\n/**\n * A ButtonGroup variant for action menu items.\n * @param size - 'large' for 24px icons (default), 'small' for 16px icons\n */\nexport const MenuItem: React.FC<{\n  children: React.ReactNode\n  className?: string\n  size?: 'large' | 'small'\n}> = ({ children, className, size = 'large' }) => {\n  const classes = [\n    baseClass,\n    className,\n    `${baseClass}--with-actions`,\n    size === 'large' && `${baseClass}--large`,\n  ]\n    .filter(Boolean)\n    .join(' ')\n  return <div className={classes}>{children}</div>\n}\n\n/**\n * A ButtonGroup variant for radio-style selection items.\n * Uses 16px icons with padding on label - ideal for checkbox/selection rows.\n */\nexport const RadioGroup: React.FC<{\n  children: React.ReactNode\n  className?: string\n}> = ({ children, className }) => {\n  const classes = [baseClass, className, `${baseClass}--with-icons`].filter(Boolean).join(' ')\n  return <div className={classes}>{children}</div>\n}\n\ntype MenuButtonProps = {\n  active?: boolean\n  children: React.ReactNode\n  className?: string\n  disabled?: boolean\n  href?: LinkAdapterProps['href']\n  icon?: React.ReactNode\n  id?: string\n  onClick?: (e?: React.MouseEvent) => void\n}\n\nexport const Button: React.FC<MenuButtonProps> = ({\n  id,\n  active,\n  children,\n  className,\n  disabled,\n  href,\n  icon,\n  onClick,\n}) => {\n  const classes = [\n    `${baseClass}__button`,\n    disabled && `${baseClass}__disabled`,\n    active && `${baseClass}__button--selected`,\n    className,\n  ]\n    .filter(Boolean)\n    .join(' ')\n\n  // Always render icon element - CSS hides it outside RadioGroup/MenuItem\n  const iconElement = <span className={`${baseClass}__icon`}>{icon}</span>\n\n  if (!disabled) {\n    if (href) {\n      return (\n        <Link\n          className={classes}\n          href={href}\n          id={id}\n          onClick={(e) => {\n            if (onClick) {\n              onClick(e)\n            }\n          }}\n          prefetch={false}\n        >\n          {iconElement}\n          <span className={`${baseClass}__label`}>{children}</span>\n        </Link>\n      )\n    }\n\n    if (onClick) {\n      return (\n        <button\n          className={classes}\n          id={id}\n          onClick={(e) => {\n            if (onClick) {\n              onClick(e)\n            }\n          }}\n          type=\"button\"\n        >\n          {iconElement}\n          <span className={`${baseClass}__label`}>{children}</span>\n        </button>\n      )\n    }\n  }\n\n  return (\n    <div className={classes} id={id}>\n      {iconElement}\n      <span className={`${baseClass}__label`}>{children}</span>\n    </div>\n  )\n}\n\n/**\n * A Button variant for use within RadioGroup.\n * Automatically shows a checkmark icon when active.\n */\nexport const RadioGroupItem: React.FC<Omit<MenuButtonProps, 'icon'>> = (props) => {\n  return (\n    <Button\n      {...props}\n      className={[`${baseClass}__button--radio-group-item`, props.className]\n        .filter(Boolean)\n        .join(' ')}\n      icon={props.active ? <CheckIcon size={16} /> : undefined}\n    />\n  )\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["React","CheckIcon","Link","baseClass","Group","children","className","role","_jsx","PopupListDivider","Divider","PopupListGroupLabel","GroupLabel","ButtonGroup","buttonSize","textAlign","classes","filter","Boolean","join","MenuItem","size","RadioGroup","CheckboxGroup","Button","id","active","ariaChecked","disabled","href","icon","onClick","iconElement","_jsxs","e","prefetch","tabIndex","type","event","preventDefault","onKeyDown","key","RadioGroupItem","props","undefined","CheckboxGroupItem"],"sources":["../../../../src/elements/Popup/PopupButtonList/index.tsx"],"sourcesContent":["'use client'\nimport type { LinkAdapterProps } from 'payload'\n\nimport * as React from 'react'\n\nimport { CheckIcon } from '../../../icons/Check/index.js'\nimport { Link } from '../../Link/index.js'\nimport './index.css'\n\nconst baseClass = 'popup-button-list'\n\nconst Group: React.FC<{\n  children: React.ReactNode\n  className?: string\n  role?: 'group'\n}> = ({ children, className, role }) => (\n  <div className={className} role={role}>\n    {children}\n  </div>\n)\n\nexport { PopupListDivider as Divider } from '../PopupDivider/index.js'\nexport { PopupListGroupLabel as GroupLabel } from '../PopupGroupLabel/index.js'\n\nexport const ButtonGroup: React.FC<{\n  buttonSize?: 'default' | 'medium'\n  children: React.ReactNode\n  className?: string\n  textAlign?: 'center' | 'left' | 'right'\n}> = ({ buttonSize = 'default', children, className, textAlign = 'left' }) => {\n  const classes = [\n    baseClass,\n    className,\n    `${baseClass}__text-align--${textAlign}`,\n    `${baseClass}__button-size--${buttonSize}`,\n  ]\n    .filter(Boolean)\n    .join(' ')\n  return <Group className={classes}>{children}</Group>\n}\n\n/**\n * A ButtonGroup variant for action menu items.\n * @param size - 'large' for 24px icons (default), 'small' for 16px icons\n */\nexport const MenuItem: React.FC<{\n  children: React.ReactNode\n  className?: string\n  size?: 'large' | 'small'\n}> = ({ children, className, size = 'large' }) => {\n  const classes = [\n    baseClass,\n    className,\n    `${baseClass}--with-actions`,\n    size === 'large' && `${baseClass}--large`,\n  ]\n    .filter(Boolean)\n    .join(' ')\n  return <Group className={classes}>{children}</Group>\n}\n\n/**\n * A ButtonGroup variant for radio-style selection items.\n * Uses 16px icons with padding on label - ideal for checkbox/selection rows.\n */\nexport const RadioGroup: React.FC<{\n  children: React.ReactNode\n  className?: string\n}> = ({ children, className }) => {\n  const classes = [baseClass, className, `${baseClass}--with-icons`].filter(Boolean).join(' ')\n  return (\n    <Group className={classes} role=\"group\">\n      {children}\n    </Group>\n  )\n}\n\nexport const CheckboxGroup = RadioGroup\n\ntype MenuButtonProps = {\n  active?: boolean\n  ariaChecked?: boolean\n  children: React.ReactNode\n  className?: string\n  disabled?: boolean\n  href?: LinkAdapterProps['href']\n  icon?: React.ReactNode\n  id?: string\n  onClick?: (e?: React.MouseEvent) => void\n  role?: 'menuitem' | 'menuitemcheckbox' | 'menuitemradio'\n}\n\nexport const Button: React.FC<MenuButtonProps> = ({\n  id,\n  active,\n  ariaChecked,\n  children,\n  className,\n  disabled,\n  href,\n  icon,\n  onClick,\n  role,\n}) => {\n  const classes = [\n    `${baseClass}__button`,\n    disabled && `${baseClass}__disabled`,\n    active && `${baseClass}__button--selected`,\n    className,\n  ]\n    .filter(Boolean)\n    .join(' ')\n\n  // Always render icon element - CSS hides it outside RadioGroup/MenuItem\n  const iconElement = <span className={`${baseClass}__icon`}>{icon}</span>\n\n  if (!disabled) {\n    if (href) {\n      return (\n        <Link\n          aria-checked={ariaChecked}\n          className={classes}\n          href={href}\n          id={id}\n          onClick={(e) => {\n            if (onClick) {\n              onClick(e)\n            }\n          }}\n          prefetch={false}\n          role={role ?? 'menuitem'}\n          tabIndex={-1}\n        >\n          {iconElement}\n          <span className={`${baseClass}__label`}>{children}</span>\n        </Link>\n      )\n    }\n\n    if (onClick) {\n      return (\n        <button\n          aria-checked={ariaChecked}\n          className={classes}\n          id={id}\n          onClick={(e) => {\n            if (onClick) {\n              onClick(e)\n            }\n          }}\n          role={role ?? 'menuitem'}\n          tabIndex={-1}\n          type=\"button\"\n        >\n          {iconElement}\n          <span className={`${baseClass}__label`}>{children}</span>\n        </button>\n      )\n    }\n  }\n\n  return (\n    <button\n      aria-disabled=\"true\"\n      className={classes}\n      data-popup-prevent-close\n      id={id}\n      onClick={(event) => event.preventDefault()}\n      onKeyDown={(event) => {\n        if (event.key === 'Enter' || event.key === ' ') {\n          event.preventDefault()\n        }\n      }}\n      role={role ?? 'menuitem'}\n      tabIndex={-1}\n      type=\"button\"\n    >\n      {iconElement}\n      <span className={`${baseClass}__label`}>{children}</span>\n    </button>\n  )\n}\n\n/**\n * A Button variant for use within RadioGroup.\n * Automatically shows a checkmark icon when active.\n */\nexport const RadioGroupItem: React.FC<Omit<MenuButtonProps, 'icon'>> = (props) => {\n  return (\n    <Button\n      {...props}\n      ariaChecked={Boolean(props.active)}\n      className={[`${baseClass}__button--radio-group-item`, props.className]\n        .filter(Boolean)\n        .join(' ')}\n      icon={props.active ? <CheckIcon size={16} /> : undefined}\n      role=\"menuitemradio\"\n    />\n  )\n}\n\n/** A Button variant for independently selectable items within CheckboxGroup. */\nexport const CheckboxGroupItem: React.FC<Omit<MenuButtonProps, 'icon'>> = (props) => {\n  return (\n    <Button\n      {...props}\n      ariaChecked={Boolean(props.active)}\n      className={[`${baseClass}__button--radio-group-item`, props.className]\n        .filter(Boolean)\n        .join(' ')}\n      icon={props.active ? <CheckIcon size={16} /> : undefined}\n      role=\"menuitemcheckbox\"\n    />\n  )\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/elements/Popup/PopupTrigger/index.d.ts

@@ -1,11 +1,15 @@
+import type { AriaAttributes } from 'react';
 import React from 'react';
 import './index.css';
 export type PopupButtonRenderProps = {
     active: boolean;
-    'aria-expanded': boolean;
-    'aria-haspopup': true;
+    'aria-controls': AriaAttributes['aria-controls'];
+    'aria-expanded': AriaAttributes['aria-expanded'];
+    'aria-haspopup'?: AriaAttributes['aria-haspopup'];
     onClick: React.MouseEventHandler;
     onKeyDown: React.KeyboardEventHandler;
+    role?: 'menuitem';
+    tabIndex?: -1;
 };
 export type PopupTriggerProps = {
     active: boolean;
@@ -13,8 +17,11 @@ export type PopupTriggerProps = {
     buttonAriaLabel?: string;
     buttonType: 'custom' | 'default';
     className?: string;
+    contentId: string;
     disabled?: boolean;
+    isMenuItem?: boolean;
     noBackground?: boolean;
+    popupType?: AriaAttributes['aria-haspopup'];
     renderButton?: (props: PopupButtonRenderProps) => React.ReactNode;
     setActive: (active: boolean, viaKeyboard?: boolean) => void;
     size?: 'large' | 'medium';

package/dist/elements/Popup/PopupTrigger/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/elements/Popup/PopupTrigger/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,aAAa,CAAA;AAIpB,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EAAE,OAAO,CAAA;IACf,eAAe,EAAE,OAAO,CAAA;IACxB,eAAe,EAAE,IAAI,CAAA;IACrB,OAAO,EAAE,KAAK,CAAC,iBAAiB,CAAA;IAChC,SAAS,EAAE,KAAK,CAAC,oBAAoB,CAAA;CACtC,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IACxB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,UAAU,EAAE,QAAQ,GAAG,SAAS,CAAA;IAChC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,KAAK,CAAC,SAAS,CAAA;IACjE,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;IAC3D,IAAI,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAA;CAC1B,CAAA;AAED,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAgFpD,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/elements/Popup/PopupTrigger/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,aAAa,CAAA;AAIpB,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EAAE,OAAO,CAAA;IACf,eAAe,EAAE,cAAc,CAAC,eAAe,CAAC,CAAA;IAChD,eAAe,EAAE,cAAc,CAAC,eAAe,CAAC,CAAA;IAChD,eAAe,CAAC,EAAE,cAAc,CAAC,eAAe,CAAC,CAAA;IACjD,OAAO,EAAE,KAAK,CAAC,iBAAiB,CAAA;IAChC,SAAS,EAAE,KAAK,CAAC,oBAAoB,CAAA;IACrC,IAAI,CAAC,EAAE,UAAU,CAAA;IACjB,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAA;CACd,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IACxB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,UAAU,EAAE,QAAQ,GAAG,SAAS,CAAA;IAChC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,SAAS,CAAC,EAAE,cAAc,CAAC,eAAe,CAAC,CAAA;IAC3C,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,KAAK,CAAC,SAAS,CAAA;IACjE,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;IAC3D,IAAI,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAA;CAC1B,CAAA;AAED,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAkJpD,CAAA"}

package/dist/elements/Popup/PopupTrigger/index.js

@@ -11,17 +11,36 @@ export const PopupTrigger = props => {
     buttonAriaLabel,
     buttonType,
     className,
+    contentId,
     disabled,
+    isMenuItem,
     noBackground,
+    popupType,
     renderButton,
     setActive,
     size
   } = props;
   const classes = [baseClass, className, `${baseClass}--${buttonType}`, !noBackground && `${baseClass}--background`, size && `${baseClass}--size-${size}`, disabled && `${baseClass}--disabled`, active && `${baseClass}--active`].filter(Boolean).join(' ');
-  const handleClick = () => {
+  const handleClick = event => {
+    if (disabled) {
+      event.preventDefault();
+      return;
+    }
     setActive(!active, false);
   };
   const handleKeyDown = e => {
+    if (e.key === 'Escape' && active) {
+      e.preventDefault();
+      e.stopPropagation();
+      setActive(false);
+      return;
+    }
+    if (disabled) {
+      if (e.key === 'Enter' || e.key === ' ') {
+        e.preventDefault();
+      }
+      return;
+    }
     if (e.key === 'Enter' || e.key === ' ') {
       e.preventDefault();
       setActive(!active, true);
@@ -32,31 +51,64 @@ export const PopupTrigger = props => {
     return /*#__PURE__*/_jsx(_Fragment, {
       children: renderButton({
         active,
+        'aria-controls': contentId,
         'aria-expanded': active,
-        'aria-haspopup': true,
+        'aria-haspopup': popupType,
         onClick: handleClick,
-        onKeyDown: handleKeyDown
+        onKeyDown: handleKeyDown,
+        role: isMenuItem ? 'menuitem' : undefined,
+        tabIndex: isMenuItem ? -1 : undefined
       })
     });
   }
   if (buttonType === 'custom') {
+    if (/*#__PURE__*/React.isValidElement(button)) {
+      const originalOnClick = button.props.onClick;
+      const originalOnKeyDown = button.props.onKeyDown;
+      // Apply the trigger contract to the supplied control instead of adding another interactive wrapper.
+      // eslint-disable-next-line @eslint-react/no-clone-element
+      return /*#__PURE__*/React.cloneElement(button, {
+        'aria-controls': contentId,
+        'aria-expanded': active,
+        'aria-haspopup': popupType,
+        'aria-label': buttonAriaLabel ?? button.props['aria-label'],
+        className: [classes, button.props.className].filter(Boolean).join(' '),
+        onClick: event => {
+          originalOnClick?.(event);
+          handleClick(event);
+        },
+        onKeyDown: event => {
+          originalOnKeyDown?.(event);
+          handleKeyDown(event);
+        },
+        role: isMenuItem ? 'menuitem' : button.props.role,
+        tabIndex: isMenuItem ? -1 : button.props.tabIndex ?? 0
+      });
+    }
     return /*#__PURE__*/_jsx("div", {
+      "aria-controls": contentId,
+      "aria-expanded": active,
+      "aria-haspopup": popupType,
       "aria-label": buttonAriaLabel,
       className: classes,
       onClick: handleClick,
       onKeyDown: handleKeyDown,
-      role: "button",
-      tabIndex: 0,
+      role: isMenuItem ? 'menuitem' : 'button',
+      tabIndex: isMenuItem ? -1 : 0,
       children: button
     });
   }
   return /*#__PURE__*/_jsx("button", {
+    "aria-controls": contentId,
+    "aria-expanded": active,
+    "aria-haspopup": popupType,
     "aria-label": buttonAriaLabel,
     className: classes,
     disabled: disabled,
     onClick: handleClick,
     onKeyDown: handleKeyDown,
-    tabIndex: 0,
+    role: isMenuItem ? 'menuitem' : undefined,
+    tabIndex: isMenuItem ? -1 : 0,
     type: "button",
     children: button
   });

package/dist/elements/Popup/PopupTrigger/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["React","baseClass","PopupTrigger","props","active","button","buttonAriaLabel","buttonType","className","disabled","noBackground","renderButton","setActive","size","classes","filter","Boolean","join","handleClick","handleKeyDown","e","key","preventDefault","_jsx","_Fragment","onClick","onKeyDown","role","tabIndex","type"],"sources":["../../../../src/elements/Popup/PopupTrigger/index.tsx"],"sourcesContent":["'use client'\nimport React from 'react'\n\nimport './index.css'\n\nconst baseClass = 'popup-button'\n\nexport type PopupButtonRenderProps = {\n  active: boolean\n  'aria-expanded': boolean\n  'aria-haspopup': true\n  onClick: React.MouseEventHandler\n  onKeyDown: React.KeyboardEventHandler\n}\n\nexport type PopupTriggerProps = {\n  active: boolean\n  button?: React.ReactNode\n  buttonAriaLabel?: string\n  buttonType: 'custom' | 'default'\n  className?: string\n  disabled?: boolean\n  noBackground?: boolean\n  renderButton?: (props: PopupButtonRenderProps) => React.ReactNode\n  setActive: (active: boolean, viaKeyboard?: boolean) => void\n  size?: 'large' | 'medium'\n}\n\nexport const PopupTrigger: React.FC<PopupTriggerProps> = (props) => {\n  const {\n    active,\n    button,\n    buttonAriaLabel,\n    buttonType,\n    className,\n    disabled,\n    noBackground,\n    renderButton,\n    setActive,\n    size,\n  } = props\n\n  const classes = [\n    baseClass,\n    className,\n    `${baseClass}--${buttonType}`,\n    !noBackground && `${baseClass}--background`,\n    size && `${baseClass}--size-${size}`,\n    disabled && `${baseClass}--disabled`,\n    active && `${baseClass}--active`,\n  ]\n    .filter(Boolean)\n    .join(' ')\n\n  const handleClick: React.MouseEventHandler = () => {\n    setActive(!active, false)\n  }\n\n  const handleKeyDown: React.KeyboardEventHandler = (e) => {\n    if (e.key === 'Enter' || e.key === ' ') {\n      e.preventDefault()\n      setActive(!active, true)\n    }\n  }\n\n  // Render prop mode: consumer provides the button, we provide the handlers\n  if (renderButton) {\n    return (\n      <>\n        {renderButton({\n          active,\n          'aria-expanded': active,\n          'aria-haspopup': true,\n          onClick: handleClick,\n          onKeyDown: handleKeyDown,\n        })}\n      </>\n    )\n  }\n\n  if (buttonType === 'custom') {\n    return (\n      <div\n        aria-label={buttonAriaLabel}\n        className={classes}\n        onClick={handleClick}\n        onKeyDown={handleKeyDown}\n        role=\"button\"\n        tabIndex={0}\n      >\n        {button}\n      </div>\n    )\n  }\n\n  return (\n    <button\n      aria-label={buttonAriaLabel}\n      className={classes}\n      disabled={disabled}\n      onClick={handleClick}\n      onKeyDown={handleKeyDown}\n      tabIndex={0}\n      type=\"button\"\n    >\n      {button}\n    </button>\n  )\n}\n"],"mappings":"AAAA;;;AACA,OAAOA,KAAA,MAAW;AAElB,OAAO;AAEP,MAAMC,SAAA,GAAY;AAuBlB,OAAO,MAAMC,YAAA,GAA6CC,KAAA;EACxD,MAAM;IACJC,MAAM;IACNC,MAAM;IACNC,eAAe;IACfC,UAAU;IACVC,SAAS;IACTC,QAAQ;IACRC,YAAY;IACZC,YAAY;IACZC,SAAS;IACTC;EAAI,CACL,GAAGV,KAAA;EAEJ,MAAMW,OAAA,GAAU,CACdb,SAAA,EACAO,SAAA,EACA,GAAGP,SAAA,KAAcM,UAAA,EAAY,EAC7B,CAACG,YAAA,IAAgB,GAAGT,SAAA,cAAuB,EAC3CY,IAAA,IAAQ,GAAGZ,SAAA,UAAmBY,IAAA,EAAM,EACpCJ,QAAA,IAAY,GAAGR,SAAA,YAAqB,EACpCG,MAAA,IAAU,GAAGH,SAAA,UAAmB,CACjC,CACEc,MAAM,CAACC,OAAA,EACPC,IAAI,CAAC;EAER,MAAMC,WAAA,GAAuCA,CAAA;IAC3CN,SAAA,CAAU,CAACR,MAAA,EAAQ;EACrB;EAEA,MAAMe,aAAA,GAA6CC,CAAA;IACjD,IAAIA,CAAA,CAAEC,GAAG,KAAK,WAAWD,CAAA,CAAEC,GAAG,KAAK,KAAK;MACtCD,CAAA,CAAEE,cAAc;MAChBV,SAAA,CAAU,CAACR,MAAA,EAAQ;IACrB;EACF;EAEA;EACA,IAAIO,YAAA,EAAc;IAChB,oBACEY,IAAA,CAAAC,SAAA;gBACGb,YAAA,CAAa;QACZP,MAAA;QACA,iBAAiBA,MAAA;QACjB,iBAAiB;QACjBqB,OAAA,EAASP,WAAA;QACTQ,SAAA,EAAWP;MACb;;EAGN;EAEA,IAAIZ,UAAA,KAAe,UAAU;IAC3B,oBACEgB,IAAA,CAAC;MACC,cAAYjB,eAAA;MACZE,SAAA,EAAWM,OAAA;MACXW,OAAA,EAASP,WAAA;MACTQ,SAAA,EAAWP,aAAA;MACXQ,IAAA,EAAK;MACLC,QAAA,EAAU;gBAETvB;;EAGP;EAEA,oBACEkB,IAAA,CAAC;IACC,cAAYjB,eAAA;IACZE,SAAA,EAAWM,OAAA;IACXL,QAAA,EAAUA,QAAA;IACVgB,OAAA,EAASP,WAAA;IACTQ,SAAA,EAAWP,aAAA;IACXS,QAAA,EAAU;IACVC,IAAA,EAAK;cAEJxB;;AAGP","ignoreList":[]}
+{"version":3,"file":"index.js","names":["React","baseClass","PopupTrigger","props","active","button","buttonAriaLabel","buttonType","className","contentId","disabled","isMenuItem","noBackground","popupType","renderButton","setActive","size","classes","filter","Boolean","join","handleClick","event","preventDefault","handleKeyDown","e","key","stopPropagation","_jsx","_Fragment","onClick","onKeyDown","role","undefined","tabIndex","isValidElement","originalOnClick","originalOnKeyDown","cloneElement","type"],"sources":["../../../../src/elements/Popup/PopupTrigger/index.tsx"],"sourcesContent":["'use client'\nimport type { AriaAttributes } from 'react'\n\nimport React from 'react'\n\nimport './index.css'\n\nconst baseClass = 'popup-button'\n\nexport type PopupButtonRenderProps = {\n  active: boolean\n  'aria-controls': AriaAttributes['aria-controls']\n  'aria-expanded': AriaAttributes['aria-expanded']\n  'aria-haspopup'?: AriaAttributes['aria-haspopup']\n  onClick: React.MouseEventHandler\n  onKeyDown: React.KeyboardEventHandler\n  role?: 'menuitem'\n  tabIndex?: -1\n}\n\nexport type PopupTriggerProps = {\n  active: boolean\n  button?: React.ReactNode\n  buttonAriaLabel?: string\n  buttonType: 'custom' | 'default'\n  className?: string\n  contentId: string\n  disabled?: boolean\n  isMenuItem?: boolean\n  noBackground?: boolean\n  popupType?: AriaAttributes['aria-haspopup']\n  renderButton?: (props: PopupButtonRenderProps) => React.ReactNode\n  setActive: (active: boolean, viaKeyboard?: boolean) => void\n  size?: 'large' | 'medium'\n}\n\nexport const PopupTrigger: React.FC<PopupTriggerProps> = (props) => {\n  const {\n    active,\n    button,\n    buttonAriaLabel,\n    buttonType,\n    className,\n    contentId,\n    disabled,\n    isMenuItem,\n    noBackground,\n    popupType,\n    renderButton,\n    setActive,\n    size,\n  } = props\n\n  const classes = [\n    baseClass,\n    className,\n    `${baseClass}--${buttonType}`,\n    !noBackground && `${baseClass}--background`,\n    size && `${baseClass}--size-${size}`,\n    disabled && `${baseClass}--disabled`,\n    active && `${baseClass}--active`,\n  ]\n    .filter(Boolean)\n    .join(' ')\n\n  const handleClick: React.MouseEventHandler = (event) => {\n    if (disabled) {\n      event.preventDefault()\n      return\n    }\n    setActive(!active, false)\n  }\n\n  const handleKeyDown: React.KeyboardEventHandler = (e) => {\n    if (e.key === 'Escape' && active) {\n      e.preventDefault()\n      e.stopPropagation()\n      setActive(false)\n      return\n    }\n    if (disabled) {\n      if (e.key === 'Enter' || e.key === ' ') {\n        e.preventDefault()\n      }\n      return\n    }\n    if (e.key === 'Enter' || e.key === ' ') {\n      e.preventDefault()\n      setActive(!active, true)\n    }\n  }\n\n  // Render prop mode: consumer provides the button, we provide the handlers\n  if (renderButton) {\n    return (\n      <>\n        {renderButton({\n          active,\n          'aria-controls': contentId,\n          'aria-expanded': active,\n          'aria-haspopup': popupType,\n          onClick: handleClick,\n          onKeyDown: handleKeyDown,\n          role: isMenuItem ? 'menuitem' : undefined,\n          tabIndex: isMenuItem ? -1 : undefined,\n        })}\n      </>\n    )\n  }\n\n  if (buttonType === 'custom') {\n    if (\n      React.isValidElement<{\n        'aria-controls'?: AriaAttributes['aria-controls']\n        'aria-expanded'?: AriaAttributes['aria-expanded']\n        'aria-haspopup'?: AriaAttributes['aria-haspopup']\n        'aria-label'?: string\n        className?: string\n        onClick?: React.MouseEventHandler\n        onKeyDown?: React.KeyboardEventHandler\n        role?: React.AriaRole\n        tabIndex?: number\n      }>(button)\n    ) {\n      const originalOnClick = button.props.onClick\n      const originalOnKeyDown = button.props.onKeyDown\n\n      // Apply the trigger contract to the supplied control instead of adding another interactive wrapper.\n      // eslint-disable-next-line @eslint-react/no-clone-element\n      return React.cloneElement(button, {\n        'aria-controls': contentId,\n        'aria-expanded': active,\n        'aria-haspopup': popupType,\n        'aria-label': buttonAriaLabel ?? button.props['aria-label'],\n        className: [classes, button.props.className].filter(Boolean).join(' '),\n        onClick: (event) => {\n          originalOnClick?.(event)\n          handleClick(event)\n        },\n        onKeyDown: (event) => {\n          originalOnKeyDown?.(event)\n          handleKeyDown(event)\n        },\n        role: isMenuItem ? 'menuitem' : button.props.role,\n        tabIndex: isMenuItem ? -1 : (button.props.tabIndex ?? 0),\n      })\n    }\n\n    return (\n      <div\n        aria-controls={contentId}\n        aria-expanded={active}\n        aria-haspopup={popupType}\n        aria-label={buttonAriaLabel}\n        className={classes}\n        onClick={handleClick}\n        onKeyDown={handleKeyDown}\n        role={isMenuItem ? 'menuitem' : 'button'}\n        tabIndex={isMenuItem ? -1 : 0}\n      >\n        {button}\n      </div>\n    )\n  }\n\n  return (\n    <button\n      aria-controls={contentId}\n      aria-expanded={active}\n      aria-haspopup={popupType}\n      aria-label={buttonAriaLabel}\n      className={classes}\n      disabled={disabled}\n      onClick={handleClick}\n      onKeyDown={handleKeyDown}\n      role={isMenuItem ? 'menuitem' : undefined}\n      tabIndex={isMenuItem ? -1 : 0}\n      type=\"button\"\n    >\n      {button}\n    </button>\n  )\n}\n"],"mappings":"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","ignoreList":[]}