@payloadcms/ui 4.0.0-internal.d21c039 → 4.0.0-internal.d3909a9

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":"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","ignoreList":[]}

package/dist/elements/Pill/index.css

@@ -6,7 +6,6 @@
     --pill-icon-size: var(--spacer-4);
     padding: var(--pill-padding-block) var(--pill-padding-inline-end) var(--pill-padding-block)
       var(--pill-padding-inline-start);
-    font-family: var(--text-body-medium-font-family);
     font-size: var(--text-body-medium-font-size);
     font-style: normal;
     font-weight: var(--text-body-medium-font-weight);

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

@@ -0,0 +1,53 @@
+@layer payload-default {
+  .popup-button-list__submenu-trigger {
+    --color-bg-selected: var(--color-bg-selected-strong);
+    --color-text-selected: var(--color-text-onselected-strong);
+
+    width: 100%;
+    text-align: start;
+  }
+
+  .popup-button-list__submenu-trigger.btn--style-ghost:hover {
+    background-color: var(--color-bg-selected-strong);
+    color: var(--color-text-onselected-strong);
+  }
+
+  .popup__content[role='menu']:has(
+      > .popup__scroll-container
+        > .popup-button-list
+        > .popup
+        > .popup__trigger-wrap
+        [aria-expanded='true']
+    )
+    > .popup__scroll-container
+    > .popup-button-list
+    > .popup
+    > .popup__trigger-wrap
+    .popup-button-list__submenu-trigger[aria-expanded='false']:hover {
+    background-color: transparent;
+    color: var(--color-text);
+  }
+
+  .popup-button-list__submenu-trigger .btn__content,
+  .popup-button-list__submenu-trigger .btn__label,
+  .popup-button-list__submenu-trigger__content {
+    width: 100%;
+  }
+
+  .popup-button-list__submenu-trigger__content {
+    display: flex;
+    align-items: center;
+    gap: var(--spacer-1);
+  }
+
+  .popup-button-list__submenu-trigger__icon,
+  .popup-button-list__submenu-trigger__trailing-icon {
+    display: flex;
+    align-items: center;
+    flex-shrink: 0;
+  }
+
+  .popup-button-list__submenu-trigger__trailing-icon {
+    margin-inline-start: auto;
+  }
+}

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

@@ -0,0 +1,13 @@
+import type { ReactNode } from 'react';
+import type { PopupButtonRenderProps } from '../../PopupTrigger/index.js';
+import './index.css';
+type SubmenuTriggerProps = {
+    buttonProps: PopupButtonRenderProps;
+    children: ReactNode;
+    className?: string;
+    icon?: ReactNode;
+    trailingIcon?: ReactNode;
+};
+export declare const SubmenuTrigger: React.FC<SubmenuTriggerProps>;
+export {};
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/elements/Popup/PopupButtonList/SubmenuTrigger/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAEtC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAGzE,OAAO,aAAa,CAAA;AAIpB,KAAK,mBAAmB,GAAG;IACzB,WAAW,EAAE,sBAAsB,CAAA;IACnC,QAAQ,EAAE,SAAS,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,SAAS,CAAA;IAChB,YAAY,CAAC,EAAE,SAAS,CAAA;CACzB,CAAA;AAED,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CA6BxD,CAAA"}

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

@@ -0,0 +1,44 @@
+'use client';
+
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Button } from '../../../Button/index.js';
+import './index.css';
+const baseClass = 'popup-button-list__submenu-trigger';
+export const SubmenuTrigger = ({
+  buttonProps: {
+    active,
+    role,
+    tabIndex,
+    ...triggerProps
+  },
+  children,
+  className,
+  icon,
+  trailingIcon
+}) => /*#__PURE__*/_jsx(Button, {
+  ...triggerProps,
+  buttonStyle: "ghost",
+  className: [baseClass, className].filter(Boolean).join(' '),
+  extraButtonProps: {
+    role,
+    tabIndex
+  },
+  margin: false,
+  selected: active,
+  children: /*#__PURE__*/_jsxs("span", {
+    className: `${baseClass}__content`,
+    children: [icon ? /*#__PURE__*/_jsx("span", {
+      "aria-hidden": "true",
+      className: `${baseClass}__icon`,
+      children: icon
+    }) : null, /*#__PURE__*/_jsx("span", {
+      className: `${baseClass}__label`,
+      children: children
+    }), trailingIcon ? /*#__PURE__*/_jsx("span", {
+      "aria-hidden": "true",
+      className: `${baseClass}__trailing-icon`,
+      children: trailingIcon
+    }) : null]
+  })
+});
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","names":["Button","baseClass","SubmenuTrigger","buttonProps","active","role","tabIndex","triggerProps","children","className","icon","trailingIcon","_jsx","buttonStyle","filter","Boolean","join","extraButtonProps","margin","selected","_jsxs"],"sources":["../../../../../src/elements/Popup/PopupButtonList/SubmenuTrigger/index.tsx"],"sourcesContent":["'use client'\nimport type { ReactNode } from 'react'\n\nimport type { PopupButtonRenderProps } from '../../PopupTrigger/index.js'\n\nimport { Button } from '../../../Button/index.js'\nimport './index.css'\n\nconst baseClass = 'popup-button-list__submenu-trigger'\n\ntype SubmenuTriggerProps = {\n  buttonProps: PopupButtonRenderProps\n  children: ReactNode\n  className?: string\n  icon?: ReactNode\n  trailingIcon?: ReactNode\n}\n\nexport const SubmenuTrigger: React.FC<SubmenuTriggerProps> = ({\n  buttonProps: { active, role, tabIndex, ...triggerProps },\n  children,\n  className,\n  icon,\n  trailingIcon,\n}) => (\n  <Button\n    {...triggerProps}\n    buttonStyle=\"ghost\"\n    className={[baseClass, className].filter(Boolean).join(' ')}\n    extraButtonProps={{ role, tabIndex }}\n    margin={false}\n    selected={active}\n  >\n    <span className={`${baseClass}__content`}>\n      {icon ? (\n        <span aria-hidden=\"true\" className={`${baseClass}__icon`}>\n          {icon}\n        </span>\n      ) : null}\n      <span className={`${baseClass}__label`}>{children}</span>\n      {trailingIcon ? (\n        <span aria-hidden=\"true\" className={`${baseClass}__trailing-icon`}>\n          {trailingIcon}\n        </span>\n      ) : null}\n    </span>\n  </Button>\n)\n"],"mappings":"AAAA;;;AAKA,SAASA,MAAM,QAAQ;AACvB,OAAO;AAEP,MAAMC,SAAA,GAAY;AAUlB,OAAO,MAAMC,cAAA,GAAgDA,CAAC;EAC5DC,WAAA,EAAa;IAAEC,MAAM;IAAEC,IAAI;IAAEC,QAAQ;IAAE,GAAGC;EAAA,CAAc;EACxDC,QAAQ;EACRC,SAAS;EACTC,IAAI;EACJC;AAAY,CACb,kBACCC,IAAA,CAACZ,MAAA;EACE,GAAGO,YAAY;EAChBM,WAAA,EAAY;EACZJ,SAAA,EAAW,CAACR,SAAA,EAAWQ,SAAA,CAAU,CAACK,MAAM,CAACC,OAAA,EAASC,IAAI,CAAC;EACvDC,gBAAA,EAAkB;IAAEZ,IAAA;IAAMC;EAAS;EACnCY,MAAA,EAAQ;EACRC,QAAA,EAAUf,MAAA;YAEV,aAAAgB,KAAA,CAAC;IAAKX,SAAA,EAAW,GAAGR,SAAA,WAAoB;eACrCS,IAAA,gBACCE,IAAA,CAAC;MAAK,eAAY;MAAOH,SAAA,EAAW,GAAGR,SAAA,QAAiB;gBACrDS;SAED,M,aACJE,IAAA,CAAC;MAAKH,SAAA,EAAW,GAAGR,SAAA,SAAkB;gBAAGO;QACxCG,YAAA,gBACCC,IAAA,CAAC;MAAK,eAAY;MAAOH,SAAA,EAAW,GAAGR,SAAA,iBAA0B;gBAC9DU;SAED","ignoreList":[]}

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

@@ -6,6 +6,14 @@
     text-align: left;
   }
 
+  .popup-button-list > .popup {
+    align-self: stretch;
+  }
+
+  .popup-button-list > .popup-divider:first-child {
+    display: none;
+  }
+
   [dir='rtl'] .popup-button-list__text-align--left {
     text-align: right;
   }
@@ -35,8 +43,8 @@
     display: flex;
     align-items: stretch;
     flex: 1;
+    width: 100%;
     color: var(--popup-item-color, var(--color-text));
-    font-family: var(--text-body-medium-font-family);
     font-size: var(--text-body-medium-font-size);
     font-weight: var(--text-body-medium-font-weight);
     line-height: var(--text-body-medium-line-height);
@@ -46,7 +54,6 @@
   .popup-button-list__label {
     display: flex;
     align-items: center;
-    font-family: var(--text-body-medium-font-family);
     font-size: var(--text-body-medium-font-size);
     font-weight: var(--text-body-medium-font-weight);
     letter-spacing: var(--text-body-medium-letter-spacing);
@@ -65,6 +72,20 @@
     color: var(--popup-item-color-hover, var(--color-text-onselected-strong));
   }
 
+  .popup__content[role='menu']:has(
+      > .popup__scroll-container
+        > .popup-button-list
+        > .popup
+        > .popup__trigger-wrap
+        [aria-expanded='true']
+    )
+    > .popup__scroll-container
+    > .popup-button-list
+    > .popup-button-list__button:not(.popup-button-list__button--selected):hover {
+    background-color: transparent;
+    color: var(--popup-item-color, var(--color-text));
+  }
+
   .popup-button-list__disabled {
     cursor: not-allowed;
     color: var(--color-text-disabled);
@@ -153,6 +174,13 @@
     align-items: center;
   }
 
+  .popup-button-list__button--submenu-trigger:hover,
+  .popup-button-list__button--submenu-trigger.popup-button-list__button--selected,
+  .popup-button-list__button--submenu-trigger.popup-button-list__button--selected:hover {
+    background-color: var(--popup-item-bg-hover, var(--color-bg-brand));
+    color: var(--popup-item-color-hover, var(--color-text-onbrand));
+  }
+
   .popup-button-list__submenu-icon {
     display: flex;
     align-items: center;
@@ -164,11 +192,5 @@
     display: flex;
     align-items: center;
     margin-left: auto;
-    opacity: 0.5;
-  }
-
-  .popup-button-list__button--submenu-trigger:hover .popup-button-list__chevron,
-  .popup-button-list__button--selected .popup-button-list__chevron {
-    opacity: 1;
   }
 }

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

@@ -3,6 +3,7 @@ import * as React from 'react';
 import './index.css';
 export { PopupListDivider as Divider } from '../PopupDivider/index.js';
 export { PopupListGroupLabel as GroupLabel } from '../PopupGroupLabel/index.js';
+export { SubmenuTrigger } from './SubmenuTrigger/index.js';
 export declare const ButtonGroup: React.FC<{
     buttonSize?: 'default' | 'medium';
     children: React.ReactNode;
@@ -26,8 +27,14 @@ 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;
+    ariaCurrent?: React.AriaAttributes['aria-current'];
     children: React.ReactNode;
     className?: string;
     disabled?: boolean;
@@ -35,6 +42,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 +50,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;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAE1D,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,WAAW,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,CAAA;IAClD,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,CA6F5C,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,8 +6,18 @@ 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 { SubmenuTrigger } from './SubmenuTrigger/index.js';
 export const ButtonGroup = ({
   buttonSize = 'default',
   children,
@@ -15,7 +25,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 +40,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 +54,25 @@ 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,
+  ariaCurrent,
   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 +83,8 @@ export const Button = ({
   if (!disabled) {
     if (href) {
       return /*#__PURE__*/_jsxs(Link, {
+        "aria-checked": ariaChecked,
+        "aria-current": ariaCurrent,
         className: classes,
         href: href,
         id: id,
@@ -77,6 +94,8 @@ export const Button = ({
           }
         },
         prefetch: false,
+        role: role ?? 'menuitem',
+        tabIndex: -1,
         children: [iconElement, /*#__PURE__*/_jsx("span", {
           className: `${baseClass}__label`,
           children: children
@@ -85,6 +104,8 @@ export const Button = ({
     }
     if (onClick) {
       return /*#__PURE__*/_jsxs("button", {
+        "aria-checked": ariaChecked,
+        "aria-current": ariaCurrent,
         className: classes,
         id: id,
         onClick: e => {
@@ -92,6 +113,8 @@ export const Button = ({
             onClick(e);
           }
         },
+        role: role ?? 'menuitem',
+        tabIndex: -1,
         type: "button",
         children: [iconElement, /*#__PURE__*/_jsx("span", {
           className: `${baseClass}__label`,
@@ -100,9 +123,21 @@ export const Button = ({
       });
     }
   }
-  return /*#__PURE__*/_jsxs("div", {
+  return /*#__PURE__*/_jsxs("button", {
+    "aria-current": ariaCurrent,
+    "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 +151,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","SubmenuTrigger","ButtonGroup","buttonSize","textAlign","classes","filter","Boolean","join","MenuItem","size","RadioGroup","CheckboxGroup","Button","id","active","ariaChecked","ariaCurrent","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'\nexport { SubmenuTrigger } from './SubmenuTrigger/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  ariaCurrent?: React.AriaAttributes['aria-current']\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  ariaCurrent,\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          aria-current={ariaCurrent}\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          aria-current={ariaCurrent}\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-current={ariaCurrent}\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/PopupGroupLabel/index.css

@@ -1,7 +1,6 @@
 @layer payload-default {
   .popup-list-group-label {
     color: var(--color-text-secondary);
-    font-family: var(--text-body-medium-font-family);
     font-size: var(--text-body-medium-font-size);
     font-weight: var(--text-body-medium-font-weight);
     letter-spacing: var(--text-body-medium-letter-spacing);

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
   });