@spaced-out/ui-design-system 0.6.36 → 0.6.37

package/.cspell/custom-words.txt

@@ -163,3 +163,12 @@ Yuzhno
 yxxx
 normalised
 analyse
+activedescendant
+focusable
+focusables
+tabbable
+tabbables
+idref
+stylesheet
+haspopup
+labelledby

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.6.37](https://github.com/spaced-out/ui-design-system/compare/v0.6.37-beta.0...v0.6.37) (2026-10-01)
+
+### [0.6.37-beta.0](https://github.com/spaced-out/ui-design-system/compare/v0.6.36...v0.6.37-beta.0) (2026-09-29)
+
+
+### Features
+
+* **menu:** add opt-in accessibility to the Menu and dropdown family ([#509](https://github.com/spaced-out/ui-design-system/issues/509)) ([c7be045](https://github.com/spaced-out/ui-design-system/commit/c7be0452e8016f87904b57cfdf737d79ac172b0c)), closes [#504](https://github.com/spaced-out/ui-design-system/issues/504) [#508](https://github.com/spaced-out/ui-design-system/issues/508) [#500](https://github.com/spaced-out/ui-design-system/issues/500) [#500](https://github.com/spaced-out/ui-design-system/issues/500)
+
 ### [0.6.36](https://github.com/spaced-out/ui-design-system/compare/v0.6.35...v0.6.36) (2026-09-28)
 
 

package/lib/components/ButtonDropdown/ButtonDropdown.d.ts

@@ -33,6 +33,16 @@ export interface ButtonDropdownProps extends Omit<ButtonProps, 'classNames' | 'm
     onMenuClose?: () => unknown;
     tooltip?: BaseTooltipProps;
     elevation?: ElevationType;
+    /**
+     * Opt in to the accessibility behavior: `aria-haspopup` / `aria-expanded` /
+     * `aria-controls` on the trigger, the arrow key that opens the popup, focus
+     * moving into the menu and back to the trigger, and the roving tab stop
+     * inside it. Forwarded to the `Menu` this opens.
+     *
+     * Off by default, and off is this component exactly as it behaved before any
+     * of it existed.
+     */
+    enableA11y?: boolean;
     clickAwayRef?: React.RefObject<ClickAwayRefType | null>;
     testId?: string;
 }

package/lib/components/ButtonDropdown/ButtonDropdown.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ButtonDropdown.d.ts","sourceRoot":"","sources":["../../../src/components/ButtonDropdown/ButtonDropdown.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAW/B,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,4BAA4B,CAAC;AAKrD,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAK3D,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAGvD,OAAO,KAAK,EAAC,UAAU,EAAE,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE/D,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAM5E,eAAO,MAAM,oBAAoB;;;;;;;EAO/B,CAAC;AAEH,eAAO,MAAM,aAAa;;;EAGxB,CAAC;AAEH,MAAM,MAAM,UAAU,GACpB,CAAC,OAAO,oBAAoB,CAAC,CAAC,MAAM,OAAO,oBAAoB,CAAC,CAAC;AACnE,MAAM,MAAM,QAAQ,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,OAAO,aAAa,CAAC,CAAC;AAE1E,KAAK,UAAU,GAAG,QAAQ,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC,CAAC;AAEH,MAAM,WAAW,mBACf,SAAQ,IAAI,CACV,WAAW,EACT,YAAY,GACZ,MAAM,GACN,kBAAkB,GAClB,gBAAgB,GAChB,gBAAgB,GAChB,YAAY,GACZ,aAAa,GACb,SAAS,GACT,WAAW,GACX,cAAc,CACjB;IACD,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,gBAAgB,CAAC,EAAE,QAAQ,CAAC;IAC5B,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B,cAAc,CAAC,EAAE,CACf,MAAM,EAAE,UAAU,EAClB,IAAI,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,GAAG,IAAI,GAAG,SAAS,KACxD,OAAO,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC;IAC5B,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,YAAY,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC;IACxD,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,cAAc,EAAE,IAAI,CAAC,iBAAiB,CACjD,mBAAmB,EACnB,cAAc,CAiKf,CAAC"}
+{"version":3,"file":"ButtonDropdown.d.ts","sourceRoot":"","sources":["../../../src/components/ButtonDropdown/ButtonDropdown.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAU/B,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,4BAA4B,CAAC;AAKrD,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAK3D,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAGvD,OAAO,KAAK,EAAC,UAAU,EAAE,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAI/D,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAM5E,eAAO,MAAM,oBAAoB;;;;;;;EAO/B,CAAC;AAEH,eAAO,MAAM,aAAa;;;EAGxB,CAAC;AAEH,MAAM,MAAM,UAAU,GACpB,CAAC,OAAO,oBAAoB,CAAC,CAAC,MAAM,OAAO,oBAAoB,CAAC,CAAC;AACnE,MAAM,MAAM,QAAQ,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,OAAO,aAAa,CAAC,CAAC;AAE1E,KAAK,UAAU,GAAG,QAAQ,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC,CAAC;AAEH,MAAM,WAAW,mBACf,SAAQ,IAAI,CACV,WAAW,EACT,YAAY,GACZ,MAAM,GACN,kBAAkB,GAClB,gBAAgB,GAChB,gBAAgB,GAChB,YAAY,GACZ,aAAa,GACb,SAAS,GACT,WAAW,GACX,cAAc,CACjB;IACD,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,gBAAgB,CAAC,EAAE,QAAQ,CAAC;IAC5B,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B,cAAc,CAAC,EAAE,CACf,MAAM,EAAE,UAAU,EAClB,IAAI,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,GAAG,IAAI,GAAG,SAAS,KACxD,OAAO,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC;IAC5B,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B;;;;;;;;OAQG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC;IACxD,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,cAAc,EAAE,IAAI,CAAC,iBAAiB,CACjD,mBAAmB,EACnB,cAAc,CAyLf,CAAC"}

package/lib/components/ButtonDropdown/ButtonDropdown.js

@@ -15,6 +15,8 @@ var _qa = require("../../utils/qa");
 var _Button = require("../Button");
 var _ConditionalWrapper = require("../ConditionalWrapper");
 var _Menu = require("../Menu");
+var _MenuFocusScope = require("../Menu/MenuFocusScope");
+var _useMenuTrigger = require("../Menu/useMenuTrigger");
 var _Tooltip = require("../Tooltip");
 var _ButtonDropdownModule = _interopRequireDefault(require("./ButtonDropdown.module.css"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -51,10 +53,22 @@ const ButtonDropdown = exports.ButtonDropdown = /*#__PURE__*/React.forwardRef((_
     onClick,
     elevation = 'modal',
     clickAwayRef,
+    enableA11y = false,
     testId,
     ...restButtonProps
   } = _ref;
   const [isMenuOpen, setIsMenuOpen] = React.useState(false);
+  const menuTrigger = (0, _useMenuTrigger.useMenuTrigger)({
+    enabled: enableA11y,
+    // A consumer's own `id` is kept rather than replaced by a generated one:
+    // it is what their label, their `aria-labelledby` elsewhere, or their
+    // tests already point at. Same for the menu's naming — what the consumer
+    // said about the listbox wins over naming it after the trigger.
+    id: restButtonProps.id,
+    menuId: menu?.menuId,
+    ariaLabel: menu?.ariaLabel,
+    ariaLabelledBy: menu?.ariaLabelledBy
+  });
   const {
     x,
     y,
@@ -81,6 +95,7 @@ const ButtonDropdown = exports.ButtonDropdown = /*#__PURE__*/React.forwardRef((_
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_clickAway.ClickAway, {
     onChange: onMenuToggle,
     clickAwayRef: clickAwayRef,
+    restoreFocusOnClose: enableA11y,
     children: _ref2 => {
       let {
         isOpen,
@@ -111,6 +126,12 @@ const ButtonDropdown = exports.ButtonDropdown = /*#__PURE__*/React.forwardRef((_
           }),
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.Button, {
             ...restButtonProps,
+            ...menuTrigger.getTriggerProps({
+              // With no `menu` there is no popup to advertise or to open.
+              isOpen: isOpen && Boolean(menu),
+              onOpen,
+              onKeyDown: restButtonProps.onKeyDown
+            }),
             iconRightName: children ? iconRightName || (isOpen ? 'caret-up' : 'caret-down') : iconRightName,
             iconRightType: iconRightType,
             disabled: disabled,
@@ -133,8 +154,8 @@ const ButtonDropdown = exports.ButtonDropdown = /*#__PURE__*/React.forwardRef((_
             children: children
           })
         }), isOpen && menu && /*#__PURE__*/(0, _jsxRuntime.jsx)(_react2.FloatingPortal, {
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_react2.FloatingFocusManager, {
-            modal: false,
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_MenuFocusScope.MenuFocusScope, {
+            enabled: !enableA11y,
             context: context,
             initialFocus: refs.reference,
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -161,6 +182,7 @@ const ButtonDropdown = exports.ButtonDropdown = /*#__PURE__*/React.forwardRef((_
               },
               children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Menu.Menu, {
                 ...menu,
+                ...menuTrigger.menuProps,
                 testId: (0, _qa.generateTestId)({
                   base: testId,
                   slot: 'menu'
@@ -174,7 +196,8 @@ const ButtonDropdown = exports.ButtonDropdown = /*#__PURE__*/React.forwardRef((_
                   }
                 },
                 size: menu.size || size,
-                onTabOut: clickAway
+                onTabOut: clickAway,
+                enableA11y: enableA11y
               })
             })
           })

package/lib/components/ButtonTabs/ButtonTab/ButtonTab.d.ts

@@ -4,7 +4,15 @@ import type { IconType } from '../../../components/Icon';
 type ClassNames = Readonly<{
     wrapper?: string;
 }>;
-export interface ButtonTabProps {
+/**
+ * Attributes forwarded straight to the underlying `<button>`. Declared rather
+ * than relied on: `ButtonTab` spreads its rest props, so these reached the DOM
+ * whether or not the type mentioned them. `id` is NOT among them — this
+ * component takes `id` as the tab's own identity, which is why a menu trigger
+ * names its listbox with `ariaLabel` instead.
+ */
+type ForwardedButtonProps = Pick<React.ButtonHTMLAttributes<HTMLButtonElement>, 'aria-haspopup' | 'aria-expanded' | 'aria-controls' | 'onKeyDown'>;
+export interface ButtonTabProps extends ForwardedButtonProps {
     classNames?: ClassNames;
     children?: React.ReactNode;
     disabled?: boolean;

package/lib/components/ButtonTabs/ButtonTab/ButtonTab.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ButtonTab.d.ts","sourceRoot":"","sources":["../../../../src/components/ButtonTabs/ButtonTab/ButtonTab.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,4BAA4B,CAAC;AAKrD,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,qBAAqB,CAAC;AAKlD,KAAK,UAAU,GAAG,QAAQ,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC,CAAC;AAEH,MAAM,WAAW,cAAc;IAC7B,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,iBAAiB,CAAC,EACd,CAAC,CACC,EAAE,EAAE,MAAM,EACV,CAAC,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,GAAG,IAAI,GAAG,SAAS,KACrD,OAAO,CAAC,GACb,IAAI,GACJ,SAAS,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,IAAI,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,SAAS,EAAE,IAAI,CAAC,iBAAiB,CAC5C,cAAc,EACd,iBAAiB,CAkDlB,CAAC"}
+{"version":3,"file":"ButtonTab.d.ts","sourceRoot":"","sources":["../../../../src/components/ButtonTabs/ButtonTab/ButtonTab.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,4BAA4B,CAAC;AAKrD,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,qBAAqB,CAAC;AAKlD,KAAK,UAAU,GAAG,QAAQ,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC,CAAC;AAEH;;;;;;GAMG;AACH,KAAK,oBAAoB,GAAG,IAAI,CAC9B,KAAK,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,EAC7C,eAAe,GAAG,eAAe,GAAG,eAAe,GAAG,WAAW,CAClE,CAAC;AAEF,MAAM,WAAW,cAAe,SAAQ,oBAAoB;IAC1D,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,iBAAiB,CAAC,EACd,CAAC,CACC,EAAE,EAAE,MAAM,EACV,CAAC,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,GAAG,IAAI,GAAG,SAAS,KACrD,OAAO,CAAC,GACb,IAAI,GACJ,SAAS,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,IAAI,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,SAAS,EAAE,IAAI,CAAC,iBAAiB,CAC5C,cAAc,EACd,iBAAiB,CAkDlB,CAAC"}

package/lib/components/ButtonTabs/ButtonTab/ButtonTab.js

@@ -11,6 +11,14 @@ var _ButtonTabModule = _interopRequireDefault(require("./ButtonTab.module.css"))
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+/**
+ * Attributes forwarded straight to the underlying `<button>`. Declared rather
+ * than relied on: `ButtonTab` spreads its rest props, so these reached the DOM
+ * whether or not the type mentioned them. `id` is NOT among them — this
+ * component takes `id` as the tab's own identity, which is why a menu trigger
+ * names its listbox with `ariaLabel` instead.
+ */
+
 const ButtonTab = exports.ButtonTab = /*#__PURE__*/React.forwardRef((_ref, ref) => {
   let {
     classNames,

package/lib/components/ButtonTabs/ButtonTabDropdown.d.ts

@@ -6,8 +6,17 @@ export interface ButtonTabDropdownProps extends Omit<ButtonTabProps, 'title' | '
     title: string;
     elevation?: ElevationType;
     dropdownClass?: string;
+    /**
+     * Opt in to the accessibility behavior: `aria-haspopup` / `aria-expanded` /
+     * `aria-controls` on the tab, the arrow key that opens the popup, and focus
+     * moving into the menu and back. Forwarded to the `Menu` this opens.
+     *
+     * Off by default, and off is this component exactly as it behaved before any
+     * of it existed.
+     */
+    enableA11y?: boolean;
     anchorPosition?: AnchorType;
     testId?: string;
 }
-export declare const ButtonTabDropdown: ({ title, elevation, anchorPosition, testId, ...buttonTabProps }: ButtonTabDropdownProps) => React.JSX.Element;
+export declare const ButtonTabDropdown: ({ title, elevation, anchorPosition, enableA11y, testId, ...buttonTabProps }: ButtonTabDropdownProps) => React.JSX.Element;
 //# sourceMappingURL=ButtonTabDropdown.d.ts.map

package/lib/components/ButtonTabs/ButtonTabDropdown.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ButtonTabDropdown.d.ts","sourceRoot":"","sources":["../../../src/components/ButtonTabs/ButtonTabDropdown.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAmB/B,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,+BAA+B,CAAC;AAC9D,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,qCAAqC,CAAC;AAKxE,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAM1D,MAAM,WAAW,sBACf,SAAQ,IAAI,CACV,cAAc,EACd,OAAO,GAAG,WAAW,GAAG,eAAe,GAAG,gBAAgB,CAC3D;IACD,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAcD,eAAO,MAAM,iBAAiB,GAAI,iEAM/B,sBAAsB,sBA2GxB,CAAC"}
+{"version":3,"file":"ButtonTabDropdown.d.ts","sourceRoot":"","sources":["../../../src/components/ButtonTabs/ButtonTabDropdown.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAkB/B,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,+BAA+B,CAAC;AAC9D,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,qCAAqC,CAAC;AAOxE,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAM1D,MAAM,WAAW,sBACf,SAAQ,IAAI,CACV,cAAc,EACd,OAAO,GAAG,WAAW,GAAG,eAAe,GAAG,gBAAgB,CAC3D;IACD,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAcD,eAAO,MAAM,iBAAiB,GAAI,6EAO/B,sBAAsB,sBAoIxB,CAAC"}

package/lib/components/ButtonTabs/ButtonTabDropdown.js

@@ -14,6 +14,8 @@ var _mergeRefs = require("../../utils/merge-refs");
 var _qa = require("../../utils/qa");
 var _ButtonTab = require("./ButtonTab");
 var _Menu = require("../Menu");
+var _MenuFocusScope = require("../Menu/MenuFocusScope");
+var _useMenuTrigger = require("../Menu/useMenuTrigger");
 var _Tooltip = require("../Tooltip");
 var _ButtonTabDropdownModule = _interopRequireDefault(require("./ButtonTabDropdown.module.css"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -24,6 +26,7 @@ const ButtonTabDropdown = _ref => {
     title,
     elevation = 'modal',
     anchorPosition = 'bottom-end',
+    enableA11y = false,
     testId,
     ...buttonTabProps
   } = _ref;
@@ -62,6 +65,12 @@ const ButtonTabDropdown = _ref => {
     } = _ref2;
     return key;
   }), selectedButtonTabId) ? 'more-tab' : selectedButtonTabId;
+  const menuTrigger = (0, _useMenuTrigger.useMenuTrigger)({
+    enabled: enableA11y,
+    // `ButtonTab` takes `id` as the tab's own identity, so the listbox is named
+    // after the tab title instead of after the trigger element.
+    ariaLabel: title
+  });
   const {
     x,
     y,
@@ -76,6 +85,7 @@ const ButtonTabDropdown = _ref => {
     middleware: [(0, _react2.shift)(), (0, _react2.flip)(), (0, _react2.offset)(parseInt(_space.spaceXXSmall))]
   });
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_clickAway.ClickAway, {
+    restoreFocusOnClose: enableA11y,
     children: _ref3 => {
       let {
         isOpen,
@@ -84,6 +94,21 @@ const ButtonTabDropdown = _ref => {
         boundaryRef,
         triggerRef
       } = _ref3;
+      // `id` is dropped: `ButtonTab` uses it as the tab's identity, so the
+      // hook's generated trigger id would break selection. The listbox is
+      // named by `ariaLabel` above instead.
+      const {
+        id: _triggerId,
+        ...triggerProps
+      } = menuTrigger.getTriggerProps({
+        // With no options there is no popup to advertise or to open.
+        isOpen: isOpen && menuOptions.length > 0,
+        onOpen,
+        // Chained rather than replaced: these props are spread AFTER the
+        // consumer's, so without this the hook's own handler would take the
+        // place of theirs.
+        onKeyDown: buttonTabProps.onKeyDown
+      });
       return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         "data-testid": (0, _qa.generateTestId)({
           base: testId,
@@ -94,6 +119,7 @@ const ButtonTabDropdown = _ref => {
           ...buttonTabProps,
           ref: (0, _mergeRefs.mergeRefs)([refs.setReference, triggerRef]),
           selectedButtonTabId: moreTabSelectedId,
+          ...triggerProps,
           onButtonTabSelect: (_id, e) => {
             e?.stopPropagation();
             onOpen();
@@ -104,8 +130,8 @@ const ButtonTabDropdown = _ref => {
           }),
           children: title
         }), isOpen && /*#__PURE__*/(0, _jsxRuntime.jsx)(_react2.FloatingPortal, {
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_react2.FloatingFocusManager, {
-            modal: false,
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_MenuFocusScope.MenuFocusScope, {
+            enabled: !enableA11y,
             context: context,
             initialFocus: refs.reference,
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -123,6 +149,7 @@ const ButtonTabDropdown = _ref => {
                 '--menu-elevation': (0, _Tooltip.getElevationValue)(elevation)
               },
               children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Menu.Menu, {
+                ...menuTrigger.menuProps,
                 onSelect: (option, e) => {
                   onTabSelect?.(option.key, e);
                   clickAway();
@@ -134,7 +161,8 @@ const ButtonTabDropdown = _ref => {
                 testId: (0, _qa.generateTestId)({
                   base: testId,
                   slot: 'menu'
-                })
+                }),
+                enableA11y: enableA11y
               })
             })
           })

package/lib/components/ButtonTabs/ButtonTabs.d.ts

@@ -17,6 +17,12 @@ export interface ButtonTabsProps {
     wrapAfter?: number;
     elevation?: ElevationType;
     wrapTabTitle?: string;
+    /**
+     * Opt in to the accessibility behavior for the overflow tab and the menu it
+     * opens. Off by default, and off is this component exactly as it behaved
+     * before any of it existed.
+     */
+    enableA11y?: boolean;
     anchorPosition?: AnchorType;
     testId?: string;
 }

package/lib/components/ButtonTabs/ButtonTabs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ButtonTabs.d.ts","sourceRoot":"","sources":["../../../src/components/ButtonTabs/ButtonTabs.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,4BAA4B,CAAC;AAKrD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,+BAA+B,CAAC;AAE9D,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAc1D,KAAK,UAAU,GAAG,QAAQ,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,wBAAwB,CAAC,EAAE,MAAM,CAAC;CACnC,CAAC,CAAC;AAEH,MAAM,WAAW,eAAe;IAC9B,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,iBAAiB,CAAC,EACd,CAAC,CACC,EAAE,EAAE,MAAM,EACV,CAAC,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,GAAG,IAAI,GAAG,SAAS,KACrD,OAAO,CAAC,GACb,IAAI,GACJ,SAAS,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,UAAU,EAAE,IAAI,CAAC,iBAAiB,CAC7C,eAAe,EACf,cAAc,CAkGf,CAAC"}
+{"version":3,"file":"ButtonTabs.d.ts","sourceRoot":"","sources":["../../../src/components/ButtonTabs/ButtonTabs.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,4BAA4B,CAAC;AAKrD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,+BAA+B,CAAC;AAE9D,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAc1D,KAAK,UAAU,GAAG,QAAQ,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,wBAAwB,CAAC,EAAE,MAAM,CAAC;CACnC,CAAC,CAAC;AAEH,MAAM,WAAW,eAAe;IAC9B,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,iBAAiB,CAAC,EACd,CAAC,CACC,EAAE,EAAE,MAAM,EACV,CAAC,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,GAAG,IAAI,GAAG,SAAS,KACrD,OAAO,CAAC,GACb,IAAI,GACJ,SAAS,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,UAAU,EAAE,IAAI,CAAC,iBAAiB,CAC7C,eAAe,EACf,cAAc,CAoGf,CAAC"}

package/lib/components/ButtonTabs/ButtonTabs.js

@@ -26,6 +26,7 @@ const ButtonTabs = exports.ButtonTabs = /*#__PURE__*/React.forwardRef((_ref, ref
     wrapAfter,
     elevation = 'modal',
     wrapTabTitle = 'more',
+    enableA11y = false,
     anchorPosition,
     testId
   } = _ref;
@@ -43,6 +44,7 @@ const ButtonTabs = exports.ButtonTabs = /*#__PURE__*/React.forwardRef((_ref, ref
         elevation: elevation,
         anchorPosition: anchorPosition,
         dropdownClass: classNames?.buttonTabDropdownWrapper,
+        enableA11y: enableA11y,
         testId: (0, _qa.generateTestId)({
           base: testId,
           slot: 'dropdown'

package/lib/components/Combobox/Combobox.d.ts

@@ -65,6 +65,15 @@ export interface ComboboxProps {
     onMenuOpen?: () => unknown;
     onMenuClose?: () => unknown;
     scrollMenuToBottom?: boolean;
+    /**
+     * Opt in to the accessibility behavior: the label and helper/error text
+     * programmatically associated with both fields, and the `combobox` wiring in
+     * the `Dropdown` this renders.
+     *
+     * Off by default, and off is this component exactly as it behaved before any
+     * of it existed.
+     */
+    enableA11y?: boolean;
     onDropdownFocus?: React.FocusEventHandler<HTMLInputElement>;
     onDropdownBlur?: React.FocusEventHandler<HTMLInputElement>;
     onDropdownKeyDown?: React.KeyboardEventHandler<HTMLInputElement>;

package/lib/components/Combobox/Combobox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Combobox.d.ts","sourceRoot":"","sources":["../../../src/components/Combobox/Combobox.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Combobox.d.ts","sourceRoot":"","sources":["../../../src/components/Combobox/Combobox.tsx"],"names":[],"mappings":"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"}

package/lib/components/Combobox/Combobox.js

@@ -52,6 +52,7 @@ const Combobox = exports.Combobox = /*#__PURE__*/React.forwardRef((props, ref) =
     onMenuOpen,
     onMenuClose,
     scrollMenuToBottom,
+    enableA11y = false,
     onDropdownFocus,
     onDropdownBlur,
     onDropdownKeyDown,
@@ -63,6 +64,12 @@ const Combobox = exports.Combobox = /*#__PURE__*/React.forwardRef((props, ref) =
   } = props;
   const inputRef = React.useRef(null);
   const dropdownRef = React.useRef(null);
+
+  // Programmatic associations: the visible label names both fields, and the
+  // helper/error text describes them (WCAG 1.3.1 / 3.3.1 / 3.3.2 / 4.1.2).
+  const labelId = React.useId();
+  const descriptionId = React.useId();
+  const hasDescription = Boolean(helperText) || Boolean(error);
   const {
     input: inputValue,
     dropdown: dropdownInputText
@@ -118,6 +125,7 @@ const Combobox = exports.Combobox = /*#__PURE__*/React.forwardRef((props, ref) =
       }),
       children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: _ComboboxModule.default.infoContent,
+        id: enableA11y ? labelId : undefined,
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Text.FormLabelSmall, {
           color: "secondary",
           testId: (0, _qa.generateTestId)({
@@ -135,6 +143,8 @@ const Combobox = exports.Combobox = /*#__PURE__*/React.forwardRef((props, ref) =
         })]
       })
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      role: enableA11y ? 'group' : undefined,
+      "aria-labelledby": enableA11y && label ? labelId : undefined,
       className: (0, _classify.default)(_ComboboxModule.default.box, {
         [_ComboboxModule.default.withError]: error ?? false
       }, classNames?.box),
@@ -147,6 +157,11 @@ const Combobox = exports.Combobox = /*#__PURE__*/React.forwardRef((props, ref) =
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Dropdown.Dropdown, {
         ref: dropdownRef,
         menu: menu,
+        "aria-labelledby": enableA11y && label ? labelId : undefined,
+        "aria-required": enableA11y && required || undefined,
+        "aria-invalid": enableA11y && error || undefined,
+        "aria-describedby": enableA11y && hasDescription ? descriptionId : undefined,
+        error: error,
         boxRef: dropdownBoxRef,
         placeholder: dropdownPlaceholder,
         readOnly: readOnly,
@@ -164,6 +179,7 @@ const Combobox = exports.Combobox = /*#__PURE__*/React.forwardRef((props, ref) =
         onMenuClose: onMenuClose,
         onChange: handleDropdownChange,
         scrollMenuToBottom: scrollMenuToBottom,
+        enableA11y: enableA11y,
         dropdownInputText: dropdownInputText,
         onFocus: onDropdownFocus,
         onBlur: onDropdownBlur,
@@ -177,6 +193,10 @@ const Combobox = exports.Combobox = /*#__PURE__*/React.forwardRef((props, ref) =
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Input.Input, {
         ref: inputRef,
         boxRef: inputBoxRef,
+        "aria-labelledby": enableA11y && label ? labelId : undefined,
+        "aria-required": enableA11y && required || undefined,
+        "aria-invalid": enableA11y && error || undefined,
+        "aria-describedby": enableA11y && hasDescription ? descriptionId : undefined,
         name: inputName,
         placeholder: inputPlaceholder,
         onFocus: onInputFocus,
@@ -215,6 +235,7 @@ const Combobox = exports.Combobox = /*#__PURE__*/React.forwardRef((props, ref) =
         })
       })]
     }), (Boolean(helperText) || error) && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      id: enableA11y ? descriptionId : undefined,
       className: _ComboboxModule.default.info,
       "data-testid": (0, _qa.generateTestId)({
         base: testId,

package/lib/components/Combobox/helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../../../src/components/Combobox/helper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAGpD,eAAO,MAAM,cAAc,EAAE,UAAU,EAmCtC,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,UAAU,EAyCvC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,UAAU,EA6B1C,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,GAC5B,aAAa,MAAM,EACnB,eAAa,KACZ,MA+EF,CAAC"}
+{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../../../src/components/Combobox/helper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAGpD,eAAO,MAAM,cAAc,EAAE,UAAU,EAmCtC,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,UAAU,EAoCvC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,UAAU,EA6B1C,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,GAC5B,aAAa,MAAM,EACnB,eAAa,KACZ,MA+EF,CAAC"}

package/lib/components/Combobox/helper.js

@@ -51,10 +51,6 @@ const currencyOptions = exports.currencyOptions = [{
   key: 'KRW',
   label: 'KRW',
   iconLeft: 'won-sign'
-}, {
-  key: 'KRW',
-  label: 'KRW',
-  iconLeft: 'won-sign'
 }, {
   key: 'GBP',
   label: 'GBP',

package/lib/components/Dropdown/Dropdown.d.ts

@@ -19,6 +19,15 @@ export interface DropdownProps extends Omit<InputProps, 'classNames' | 'onChange
     menu?: MenuProps;
     elevation?: ElevationType;
     clickAwayRef?: React.RefObject<ClickAwayRefType | null>;
+    /**
+     * Opt in to the accessibility behavior: the `combobox` role and its ARIA,
+     * keyboard navigation of the options from the input, and focus returning to
+     * the input on close. Forwarded to the `Menu` this opens.
+     *
+     * Off by default, and off is this component exactly as it behaved before any
+     * of it existed.
+     */
+    enableA11y?: boolean;
     testId?: string;
 }
 export declare const Dropdown: Flow.AbstractComponent<DropdownProps, HTMLInputElement>;

package/lib/components/Dropdown/Dropdown.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Dropdown.d.ts","sourceRoot":"","sources":["../../../src/components/Dropdown/Dropdown.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAU/B,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,4BAA4B,CAAC;AAKrD,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAK3D,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAErD,OAAO,KAAK,EAAC,UAAU,EAAE,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE/D,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAM1D,KAAK,UAAU,GAAG,QAAQ,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC,CAAC;AAEH,MAAM,WAAW,aACf,SAAQ,IAAI,CACV,UAAU,EACR,YAAY,GACZ,UAAU,GACV,YAAY,GACZ,aAAa,GACb,oBAAoB,GACpB,mBAAmB,GACnB,MAAM,GACN,WAAW,GACX,cAAc,CACjB;IACD,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,QAAQ,CAAC,EAAE,CACT,MAAM,EAAE,UAAU,EAClB,IAAI,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,GAAG,IAAI,GAAG,SAAS,KACxD,OAAO,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC;IAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,YAAY,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC;IACxD,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,gBAAgB,CAgJ1E,CAAC"}
+{"version":3,"file":"Dropdown.d.ts","sourceRoot":"","sources":["../../../src/components/Dropdown/Dropdown.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAS/B,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,4BAA4B,CAAC;AAKrD,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAK3D,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAErD,OAAO,KAAK,EAAC,UAAU,EAAE,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAI/D,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAM1D,KAAK,UAAU,GAAG,QAAQ,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC,CAAC;AAEH,MAAM,WAAW,aACf,SAAQ,IAAI,CACV,UAAU,EACR,YAAY,GACZ,UAAU,GACV,YAAY,GACZ,aAAa,GACb,oBAAoB,GACpB,mBAAmB,GACnB,MAAM,GACN,WAAW,GACX,cAAc,CACjB;IACD,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,QAAQ,CAAC,EAAE,CACT,MAAM,EAAE,UAAU,EAClB,IAAI,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,GAAG,IAAI,GAAG,SAAS,KACxD,OAAO,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC;IAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,YAAY,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC;IACxD;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,gBAAgB,CAyO1E,CAAC"}