@fluentui/react-aria 9.0.0 → 9.1.0

package/CHANGELOG.json

@@ -2,7 +2,74 @@
   "name": "@fluentui/react-aria",
   "entries": [
     {
-      "date": "Tue, 28 Jun 2022 15:09:25 GMT",
+      "date": "Wed, 03 Aug 2022 16:00:04 GMT",
+      "tag": "@fluentui/react-aria_v9.1.0",
+      "version": "9.1.0",
+      "comments": {
+        "none": [
+          {
+            "author": "lingfangao@hotmail.com",
+            "package": "@fluentui/react-aria",
+            "commit": "99cc385631d04a76ee10ebc143cb9fecd99640b6",
+            "comment": "chore: Add `prerelease` as disallowed changetype for 9.0.0 packages"
+          }
+        ],
+        "patch": [
+          {
+            "author": "bernardo.sunderhus@gmail.com",
+            "package": "@fluentui/react-aria",
+            "commit": "a0e1e0c2780ad6ba73aaeee1aa1525168a4d4045",
+            "comment": "feat: treats aria-disabled as disabled state on useARIAButtonProps"
+          }
+        ],
+        "minor": [
+          {
+            "author": "bernardo.sunderhus@gmail.com",
+            "package": "@fluentui/react-aria",
+            "commit": "1293f53f79ea1dc7429f77e174b2dfdaffa99558",
+            "comment": "chore: Splits useARIAButton into useARIAButtonProps and useARIAButtonShorthand."
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 14 Jul 2022 21:21:08 GMT",
+      "tag": "@fluentui/react-aria_v9.0.2",
+      "version": "9.0.2",
+      "comments": {
+        "patch": [
+          {
+            "author": "Humberto.Morimoto@microsoft.com",
+            "package": "@fluentui/react-aria",
+            "commit": "802bc4e3730a88b0fc61b5bf42ef7fc6b6543fe2",
+            "comment": "fix: Fixing bad version bump of @fluentui/react-utilities."
+          },
+          {
+            "author": "beachball",
+            "package": "@fluentui/react-aria",
+            "comment": "Bump @fluentui/react-utilities to v9.0.2",
+            "commit": "79b513146194367544160f364b0a7dd749ed93e4"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 14 Jul 2022 17:06:26 GMT",
+      "tag": "@fluentui/react-aria_v9.0.1",
+      "version": "9.0.1",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@fluentui/react-aria",
+            "comment": "Bump @fluentui/react-utilities to v9.0.1-0",
+            "commit": "35237381e941c8935b1892c9217096cea3e5601f"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 28 Jun 2022 15:14:13 GMT",
       "tag": "@fluentui/react-aria_v9.0.0",
       "version": "9.0.0",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,44 @@
 # Change Log - @fluentui/react-aria
 
-This log was last generated on Tue, 28 Jun 2022 15:09:25 GMT and should not be manually modified.
+This log was last generated on Wed, 03 Aug 2022 16:00:04 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## [9.1.0](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.1.0)
+
+Wed, 03 Aug 2022 16:00:04 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.2..@fluentui/react-aria_v9.1.0)
+
+### Minor changes
+
+- chore: Splits useARIAButton into useARIAButtonProps and useARIAButtonShorthand. ([PR #24032](https://github.com/microsoft/fluentui/pull/24032) by bernardo.sunderhus@gmail.com)
+
+### Patches
+
+- feat: treats aria-disabled as disabled state on useARIAButtonProps ([PR #24197](https://github.com/microsoft/fluentui/pull/24197) by bernardo.sunderhus@gmail.com)
+
+## [9.0.2](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.2)
+
+Thu, 14 Jul 2022 21:21:08 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.1..@fluentui/react-aria_v9.0.2)
+
+### Patches
+
+- fix: Fixing bad version bump of @fluentui/react-utilities. ([PR #23920](https://github.com/microsoft/fluentui/pull/23920) by Humberto.Morimoto@microsoft.com)
+- Bump @fluentui/react-utilities to v9.0.2 ([PR #23918](https://github.com/microsoft/fluentui/pull/23918) by beachball)
+
+## [9.0.1](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.1)
+
+Thu, 14 Jul 2022 17:06:26 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0..@fluentui/react-aria_v9.0.1)
+
+### Patches
+
+- Bump @fluentui/react-utilities to v9.0.1-0 ([PR #23897](https://github.com/microsoft/fluentui/pull/23897) by beachball)
+
 ## [9.0.0](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0)
 
-Tue, 28 Jun 2022 15:09:25 GMT 
+Tue, 28 Jun 2022 15:14:13 GMT 
 [Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-rc.10..@fluentui/react-aria_v9.0.0)
 
 ### Patches

package/dist/index.d.ts

@@ -1,26 +1,41 @@
 import type { ExtractSlotProps } from '@fluentui/react-utilities';
+import * as React_2 from 'react';
 import type { ResolveShorthandFunction } from '@fluentui/react-utilities';
 import type { Slot } from '@fluentui/react-utilities';
 
-export declare type ARIAButtonSlotProps = ExtractSlotProps<Slot<'button', 'a'>> & {
+export declare type ARIAButtonProps<Type extends 'a' | 'div' | 'button' = 'a' | 'div' | 'button'> = React_2.PropsWithRef<JSX.IntrinsicElements[Type]> & Pick<ARIAButtonSlotProps, 'disabled' | 'disabledFocusable'>;
+
+export declare type ARIAButtonSlotProps<AlternateAs extends 'a' | 'div' = 'a' | 'div'> = ExtractSlotProps<Slot<'button', AlternateAs>> & {
     disabled?: boolean;
+    /**
+     * When set, allows the button to be focusable even when it has been disabled.
+     * This is used in scenarios where it is important to keep a consistent tab order
+     * for screen reader and keyboard users. The primary example of this
+     * pattern is when the disabled button is in a menu or a commandbar and is seldom used for standalone buttons.
+     *
+     * @default false
+     */
     disabledFocusable?: boolean;
 };
 
 /**
  * @internal
- * Merges disabled declaration with `aria-disabled`
+ *
+ * Button keyboard handling, role, disabled and tabIndex implementation that ensures ARIA spec
+ * for multiple scenarios of shorthand properties. Ensuring 1st rule of ARIA for cases
+ * where no attribute addition is required.
  */
-export declare function mergeARIADisabled(shorthand: {
-    'aria-disabled'?: string | boolean;
-    disabled?: boolean;
-}): boolean;
+export declare function useARIAButtonProps<Type extends NonNullable<ARIAButtonSlotProps['as']>>(type?: Type, props?: ARIAButtonProps): React_2.PropsWithRef<JSX.IntrinsicElements[Type]>;
 
 /**
+ * @internal
+ *
+ * This function expects to receive a slot, if `as` property is not desired use `useARIAButtonProps` instead
+ *
  * Button keyboard handling, role, disabled and tabIndex implementation that ensures ARIA spec
  * for multiple scenarios of shorthand properties. Ensuring 1st rule of ARIA for cases
  * where no attribute addition is required.
  */
-export declare const useARIAButton: ResolveShorthandFunction<ARIAButtonSlotProps>;
+export declare const useARIAButtonShorthand: ResolveShorthandFunction<ARIAButtonSlotProps>;
 
 export { }

package/lib/hooks/useARIAButton.js

@@ -1,32 +1,35 @@
 import { Enter, Space } from '@fluentui/keyboard-keys';
 import { resolveShorthand, useEventCallback } from '@fluentui/react-utilities';
 /**
+ * @internal
+ *
  * Button keyboard handling, role, disabled and tabIndex implementation that ensures ARIA spec
  * for multiple scenarios of shorthand properties. Ensuring 1st rule of ARIA for cases
  * where no attribute addition is required.
  */
 
-export const useARIAButton = (shorthand, options) => {
-  var _a;
-
-  const shorthandProps = resolveShorthand(shorthand, options);
+export function useARIAButtonProps(type, props) {
   const {
     disabled,
-    disabledFocusable,
+    tabIndex,
+    disabledFocusable = false,
     onClick,
     onKeyDown,
     onKeyUp,
-    tabIndex
-  } = shorthandProps || {};
-  const onClickHandler = useEventCallback(ev => {
-    if (disabled || disabledFocusable) {
+    ['aria-disabled']: ariaDisabled,
+    ...rest
+  } = props !== null && props !== void 0 ? props : {};
+  const normalizedARIADisabled = typeof ariaDisabled === 'string' ? ariaDisabled === 'true' : ariaDisabled;
+  const isDisabled = disabled || disabledFocusable || normalizedARIADisabled;
+  const handleClick = useEventCallback(ev => {
+    if (isDisabled) {
       ev.preventDefault();
       ev.stopPropagation();
     } else {
       onClick === null || onClick === void 0 ? void 0 : onClick(ev);
     }
   });
-  const onKeyDownHandler = useEventCallback(ev => {
+  const handleKeyDown = useEventCallback(ev => {
     onKeyDown === null || onKeyDown === void 0 ? void 0 : onKeyDown(ev);
 
     if (ev.isDefaultPrevented()) {
@@ -35,7 +38,7 @@ export const useARIAButton = (shorthand, options) => {
 
     const key = ev.key;
 
-    if ((disabled || disabledFocusable) && (key === Enter || key === Space)) {
+    if (isDisabled && (key === Enter || key === Space)) {
       ev.preventDefault();
       ev.stopPropagation();
       return;
@@ -50,7 +53,7 @@ export const useARIAButton = (shorthand, options) => {
       ev.currentTarget.click();
     }
   });
-  const onKeyupHandler = useEventCallback(ev => {
+  const handleKeyUp = useEventCallback(ev => {
     onKeyUp === null || onKeyUp === void 0 ? void 0 : onKeyUp(ev);
 
     if (ev.isDefaultPrevented()) {
@@ -59,7 +62,7 @@ export const useARIAButton = (shorthand, options) => {
 
     const key = ev.key;
 
-    if ((disabled || disabledFocusable) && (key === Enter || key === Space)) {
+    if (isDisabled && (key === Enter || key === Space)) {
       ev.preventDefault();
       ev.stopPropagation();
       return;
@@ -69,35 +72,57 @@ export const useARIAButton = (shorthand, options) => {
       ev.preventDefault();
       ev.currentTarget.click();
     }
-  });
+  }); // If a <button> tag is to be rendered we just need to set disabled and aria-disabled correctly
 
-  if (shorthandProps) {
-    // If a <button> tag is to be rendered we just need to set disabled and aria-disabled correctly
-    if (shorthandProps.as === 'button' || shorthandProps.as === undefined) {
-      shorthandProps.disabled = disabled && !disabledFocusable;
-      shorthandProps['aria-disabled'] = disabledFocusable ? true : undefined; // Undefine events if disabledFocusable is passed in
-
-      if (disabledFocusable) {
-        shorthandProps.onClick = undefined;
-        shorthandProps.onKeyDown = undefined;
-        shorthandProps.onKeyUp = undefined;
-      }
-    } // If an <a> tag is to be rendered we have to remove disabled and type, and set aria-disabled, role and tabIndex.
-    else {
-      delete shorthandProps.disabled;
-      shorthandProps['aria-disabled'] = disabled || disabledFocusable;
-      shorthandProps.href = disabled ? undefined : shorthandProps.href;
-      shorthandProps.onClick = onClickHandler;
-      shorthandProps.onKeyDown = onKeyDownHandler;
-      shorthandProps.onKeyUp = onKeyupHandler;
-      shorthandProps.role = (_a = shorthandProps.role) !== null && _a !== void 0 ? _a : 'button';
-      shorthandProps.tabIndex = disabled && !disabledFocusable ? undefined : tabIndex !== null && tabIndex !== void 0 ? tabIndex : 0;
-    } // Remove non-DOM disabledFocusable prop
+  if (type === 'button' || type === undefined) {
+    return { ...rest,
+      tabIndex,
+      disabled: disabled && !disabledFocusable,
+      'aria-disabled': disabledFocusable ? true : normalizedARIADisabled,
+      // onclick should still use internal handler to ensure prevention if disabled
+      // if disabledFocusable then there's no requirement for handlers as those events should not be propagated
+      onClick: disabledFocusable ? undefined : handleClick,
+      onKeyUp: disabledFocusable ? undefined : onKeyUp,
+      onKeyDown: disabledFocusable ? undefined : onKeyDown
+    };
+  } // If an <a> or <div> tag is to be rendered we have to remove disabled and type,
+  // and set aria-disabled, role and tabIndex.
+  else {
+    const nextProps = {
+      role: 'button',
+      ...rest,
+      // If it's not a <button> than listeners are required even with disabledFocusable
+      // Since you cannot assure the default behavior of the element
+      // E.g: <a> will redirect on click
+      onClick: handleClick,
+      onKeyUp: handleKeyUp,
+      onKeyDown: handleKeyDown,
+      'aria-disabled': disabled || disabledFocusable || normalizedARIADisabled,
+      tabIndex: disabled && !disabledFocusable ? undefined : tabIndex !== null && tabIndex !== void 0 ? tabIndex : 0
+    };
 
+    if (type === 'a' && isDisabled) {
+      nextProps.href = undefined;
+    }
 
-    delete shorthandProps.disabledFocusable;
+    return nextProps;
   }
+}
+/**
+ * @internal
+ *
+ * This function expects to receive a slot, if `as` property is not desired use `useARIAButtonProps` instead
+ *
+ * Button keyboard handling, role, disabled and tabIndex implementation that ensures ARIA spec
+ * for multiple scenarios of shorthand properties. Ensuring 1st rule of ARIA for cases
+ * where no attribute addition is required.
+ */
+
+export const useARIAButtonShorthand = (slot, options) => {
+  var _a;
 
-  return shorthandProps;
+  const shorthand = resolveShorthand(slot, options);
+  const shorthandARIAButton = useARIAButtonProps((_a = shorthand === null || shorthand === void 0 ? void 0 : shorthand.as) !== null && _a !== void 0 ? _a : 'button', shorthand);
+  return shorthand && shorthandARIAButton;
 };
 //# sourceMappingURL=useARIAButton.js.map

package/lib/hooks/useARIAButton.js.map

@@ -1 +1 @@
-{"version":3,"sources":["hooks/useARIAButton.ts"],"names":[],"mappings":"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","sourcesContent":["import { Enter, Space } from '@fluentui/keyboard-keys';\nimport { resolveShorthand, useEventCallback } from '@fluentui/react-utilities';\nimport type { ExtractSlotProps, ResolveShorthandFunction, Slot } from '@fluentui/react-utilities';\n\nexport type ARIAButtonSlotProps = ExtractSlotProps<Slot<'button', 'a'>> & {\n  disabled?: boolean;\n  disabledFocusable?: boolean;\n};\n\n/**\n * Button keyboard handling, role, disabled and tabIndex implementation that ensures ARIA spec\n * for multiple scenarios of shorthand properties. Ensuring 1st rule of ARIA for cases\n * where no attribute addition is required.\n */\nexport const useARIAButton: ResolveShorthandFunction<ARIAButtonSlotProps> = (shorthand, options) => {\n  const shorthandProps = resolveShorthand(shorthand, options);\n\n  const { disabled, disabledFocusable, onClick, onKeyDown, onKeyUp, tabIndex } = (shorthandProps ||\n    {}) as ARIAButtonSlotProps;\n\n  const onClickHandler: ARIAButtonSlotProps['onClick'] = useEventCallback(ev => {\n    if (disabled || disabledFocusable) {\n      ev.preventDefault();\n      ev.stopPropagation();\n    } else {\n      onClick?.(ev);\n    }\n  });\n\n  const onKeyDownHandler: ARIAButtonSlotProps['onKeyDown'] = useEventCallback(ev => {\n    onKeyDown?.(ev);\n\n    if (ev.isDefaultPrevented()) {\n      return;\n    }\n\n    const key = ev.key;\n\n    if ((disabled || disabledFocusable) && (key === Enter || key === Space)) {\n      ev.preventDefault();\n      ev.stopPropagation();\n      return;\n    }\n\n    if (key === Space) {\n      ev.preventDefault();\n      return;\n    }\n\n    // If enter is pressed, activate the button\n    else if (key === Enter) {\n      ev.preventDefault();\n      ev.currentTarget.click();\n    }\n  });\n\n  const onKeyupHandler: ARIAButtonSlotProps['onKeyUp'] = useEventCallback(ev => {\n    onKeyUp?.(ev);\n\n    if (ev.isDefaultPrevented()) {\n      return;\n    }\n\n    const key = ev.key;\n\n    if ((disabled || disabledFocusable) && (key === Enter || key === Space)) {\n      ev.preventDefault();\n      ev.stopPropagation();\n      return;\n    }\n\n    if (key === Space) {\n      ev.preventDefault();\n      ev.currentTarget.click();\n    }\n  });\n\n  if (shorthandProps) {\n    // If a <button> tag is to be rendered we just need to set disabled and aria-disabled correctly\n    if (shorthandProps.as === 'button' || shorthandProps.as === undefined) {\n      shorthandProps.disabled = disabled && !disabledFocusable;\n      shorthandProps['aria-disabled'] = disabledFocusable ? true : undefined;\n\n      // Undefine events if disabledFocusable is passed in\n      if (disabledFocusable) {\n        shorthandProps.onClick = undefined;\n        shorthandProps.onKeyDown = undefined;\n        shorthandProps.onKeyUp = undefined;\n      }\n    }\n\n    // If an <a> tag is to be rendered we have to remove disabled and type, and set aria-disabled, role and tabIndex.\n    else {\n      delete shorthandProps.disabled;\n      shorthandProps['aria-disabled'] = disabled || disabledFocusable;\n      (shorthandProps as JSX.IntrinsicElements['a']).href = disabled\n        ? undefined\n        : (shorthandProps as JSX.IntrinsicElements['a']).href;\n      shorthandProps.onClick = onClickHandler;\n      shorthandProps.onKeyDown = onKeyDownHandler;\n      shorthandProps.onKeyUp = onKeyupHandler;\n      shorthandProps.role = shorthandProps.role ?? 'button';\n      shorthandProps.tabIndex = disabled && !disabledFocusable ? undefined : tabIndex ?? 0;\n    }\n\n    // Remove non-DOM disabledFocusable prop\n    delete shorthandProps.disabledFocusable;\n  }\n\n  return shorthandProps;\n};\n"],"sourceRoot":"../src/"}
+{"version":3,"sources":["hooks/useARIAButton.ts"],"names":[],"mappings":"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","sourcesContent":["import { Enter, Space } from '@fluentui/keyboard-keys';\nimport { resolveShorthand, useEventCallback } from '@fluentui/react-utilities';\nimport type { ExtractSlotProps, ResolveShorthandFunction, Slot } from '@fluentui/react-utilities';\nimport * as React from 'react';\n\nexport type ARIAButtonSlotProps<AlternateAs extends 'a' | 'div' = 'a' | 'div'> = ExtractSlotProps<\n  Slot<'button', AlternateAs>\n> & {\n  disabled?: boolean;\n  /**\n   * When set, allows the button to be focusable even when it has been disabled.\n   * This is used in scenarios where it is important to keep a consistent tab order\n   * for screen reader and keyboard users. The primary example of this\n   * pattern is when the disabled button is in a menu or a commandbar and is seldom used for standalone buttons.\n   *\n   * @default false\n   */\n  disabledFocusable?: boolean;\n};\n\nexport type ARIAButtonProps<Type extends 'a' | 'div' | 'button' = 'a' | 'div' | 'button'> = React.PropsWithRef<\n  JSX.IntrinsicElements[Type]\n> &\n  Pick<ARIAButtonSlotProps, 'disabled' | 'disabledFocusable'>;\n\n/**\n * @internal\n *\n * Button keyboard handling, role, disabled and tabIndex implementation that ensures ARIA spec\n * for multiple scenarios of shorthand properties. Ensuring 1st rule of ARIA for cases\n * where no attribute addition is required.\n */\nexport function useARIAButtonProps<Type extends NonNullable<ARIAButtonSlotProps['as']>>(\n  type?: Type,\n  props?: ARIAButtonProps,\n): React.PropsWithRef<JSX.IntrinsicElements[Type]> {\n  const {\n    disabled,\n    tabIndex,\n    disabledFocusable = false,\n    onClick,\n    onKeyDown,\n    onKeyUp,\n    ['aria-disabled']: ariaDisabled,\n    ...rest\n  } = props ?? {};\n\n  const normalizedARIADisabled = typeof ariaDisabled === 'string' ? ariaDisabled === 'true' : ariaDisabled;\n\n  const isDisabled = disabled || disabledFocusable || normalizedARIADisabled;\n\n  const handleClick: ARIAButtonProps['onClick'] = useEventCallback(ev => {\n    if (isDisabled) {\n      ev.preventDefault();\n      ev.stopPropagation();\n    } else {\n      onClick?.(ev);\n    }\n  });\n\n  const handleKeyDown: ARIAButtonProps['onKeyDown'] = useEventCallback(ev => {\n    onKeyDown?.(ev);\n\n    if (ev.isDefaultPrevented()) {\n      return;\n    }\n\n    const key = ev.key;\n\n    if (isDisabled && (key === Enter || key === Space)) {\n      ev.preventDefault();\n      ev.stopPropagation();\n      return;\n    }\n\n    if (key === Space) {\n      ev.preventDefault();\n      return;\n    }\n\n    // If enter is pressed, activate the button\n    else if (key === Enter) {\n      ev.preventDefault();\n      ev.currentTarget.click();\n    }\n  });\n\n  const handleKeyUp: ARIAButtonProps['onKeyUp'] = useEventCallback(ev => {\n    onKeyUp?.(ev);\n\n    if (ev.isDefaultPrevented()) {\n      return;\n    }\n\n    const key = ev.key;\n\n    if (isDisabled && (key === Enter || key === Space)) {\n      ev.preventDefault();\n      ev.stopPropagation();\n      return;\n    }\n\n    if (key === Space) {\n      ev.preventDefault();\n      ev.currentTarget.click();\n    }\n  });\n\n  // If a <button> tag is to be rendered we just need to set disabled and aria-disabled correctly\n  if (type === 'button' || type === undefined) {\n    return {\n      ...rest,\n      tabIndex,\n      disabled: disabled && !disabledFocusable,\n      'aria-disabled': disabledFocusable ? true : normalizedARIADisabled,\n      // onclick should still use internal handler to ensure prevention if disabled\n      // if disabledFocusable then there's no requirement for handlers as those events should not be propagated\n      onClick: disabledFocusable ? undefined : handleClick,\n      onKeyUp: disabledFocusable ? undefined : onKeyUp,\n      onKeyDown: disabledFocusable ? undefined : onKeyDown,\n    } as React.PropsWithRef<JSX.IntrinsicElements[Type]>;\n  }\n\n  // If an <a> or <div> tag is to be rendered we have to remove disabled and type,\n  // and set aria-disabled, role and tabIndex.\n  else {\n    const nextProps = {\n      role: 'button',\n      ...rest,\n      // If it's not a <button> than listeners are required even with disabledFocusable\n      // Since you cannot assure the default behavior of the element\n      // E.g: <a> will redirect on click\n      onClick: handleClick,\n      onKeyUp: handleKeyUp,\n      onKeyDown: handleKeyDown,\n      'aria-disabled': disabled || disabledFocusable || normalizedARIADisabled,\n      tabIndex: disabled && !disabledFocusable ? undefined : tabIndex ?? 0,\n    } as React.PropsWithRef<JSX.IntrinsicElements[Type]>;\n\n    if (type === 'a' && isDisabled) {\n      (nextProps as JSX.IntrinsicElements['a']).href = undefined;\n    }\n\n    return nextProps;\n  }\n}\n\n/**\n * @internal\n *\n * This function expects to receive a slot, if `as` property is not desired use `useARIAButtonProps` instead\n *\n * Button keyboard handling, role, disabled and tabIndex implementation that ensures ARIA spec\n * for multiple scenarios of shorthand properties. Ensuring 1st rule of ARIA for cases\n * where no attribute addition is required.\n */\nexport const useARIAButtonShorthand: ResolveShorthandFunction<ARIAButtonSlotProps> = (slot, options) => {\n  const shorthand = resolveShorthand(slot, options);\n  const shorthandARIAButton = useARIAButtonProps(shorthand?.as ?? 'button', shorthand);\n  return shorthand && shorthandARIAButton;\n};\n"],"sourceRoot":"../src/"}

package/lib/index.js

@@ -1,3 +1,2 @@
-export { useARIAButton } from './hooks/index';
-export { mergeARIADisabled } from './utils/index';
+export { useARIAButtonShorthand, useARIAButtonProps } from './hooks/index';
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"../src/","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC","sourcesContent":["export { useARIAButton } from './hooks/index';\nexport type { ARIAButtonSlotProps } from './hooks/index';\nexport { mergeARIADisabled } from './utils/index';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"../src/","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC","sourcesContent":["export { useARIAButtonShorthand, useARIAButtonProps } from './hooks/index';\nexport type { ARIAButtonSlotProps, ARIAButtonProps } from './hooks/index';\n"]}

package/lib-commonjs/hooks/useARIAButton.js

@@ -3,39 +3,42 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useARIAButton = void 0;
+exports.useARIAButtonShorthand = exports.useARIAButtonProps = void 0;
 
 const keyboard_keys_1 = /*#__PURE__*/require("@fluentui/keyboard-keys");
 
 const react_utilities_1 = /*#__PURE__*/require("@fluentui/react-utilities");
 /**
+ * @internal
+ *
  * Button keyboard handling, role, disabled and tabIndex implementation that ensures ARIA spec
  * for multiple scenarios of shorthand properties. Ensuring 1st rule of ARIA for cases
  * where no attribute addition is required.
  */
 
 
-const useARIAButton = (shorthand, options) => {
-  var _a;
-
-  const shorthandProps = react_utilities_1.resolveShorthand(shorthand, options);
+function useARIAButtonProps(type, props) {
   const {
     disabled,
-    disabledFocusable,
+    tabIndex,
+    disabledFocusable = false,
     onClick,
     onKeyDown,
     onKeyUp,
-    tabIndex
-  } = shorthandProps || {};
-  const onClickHandler = react_utilities_1.useEventCallback(ev => {
-    if (disabled || disabledFocusable) {
+    ['aria-disabled']: ariaDisabled,
+    ...rest
+  } = props !== null && props !== void 0 ? props : {};
+  const normalizedARIADisabled = typeof ariaDisabled === 'string' ? ariaDisabled === 'true' : ariaDisabled;
+  const isDisabled = disabled || disabledFocusable || normalizedARIADisabled;
+  const handleClick = react_utilities_1.useEventCallback(ev => {
+    if (isDisabled) {
       ev.preventDefault();
       ev.stopPropagation();
     } else {
       onClick === null || onClick === void 0 ? void 0 : onClick(ev);
     }
   });
-  const onKeyDownHandler = react_utilities_1.useEventCallback(ev => {
+  const handleKeyDown = react_utilities_1.useEventCallback(ev => {
     onKeyDown === null || onKeyDown === void 0 ? void 0 : onKeyDown(ev);
 
     if (ev.isDefaultPrevented()) {
@@ -44,7 +47,7 @@ const useARIAButton = (shorthand, options) => {
 
     const key = ev.key;
 
-    if ((disabled || disabledFocusable) && (key === keyboard_keys_1.Enter || key === keyboard_keys_1.Space)) {
+    if (isDisabled && (key === keyboard_keys_1.Enter || key === keyboard_keys_1.Space)) {
       ev.preventDefault();
       ev.stopPropagation();
       return;
@@ -59,7 +62,7 @@ const useARIAButton = (shorthand, options) => {
       ev.currentTarget.click();
     }
   });
-  const onKeyupHandler = react_utilities_1.useEventCallback(ev => {
+  const handleKeyUp = react_utilities_1.useEventCallback(ev => {
     onKeyUp === null || onKeyUp === void 0 ? void 0 : onKeyUp(ev);
 
     if (ev.isDefaultPrevented()) {
@@ -68,7 +71,7 @@ const useARIAButton = (shorthand, options) => {
 
     const key = ev.key;
 
-    if ((disabled || disabledFocusable) && (key === keyboard_keys_1.Enter || key === keyboard_keys_1.Space)) {
+    if (isDisabled && (key === keyboard_keys_1.Enter || key === keyboard_keys_1.Space)) {
       ev.preventDefault();
       ev.stopPropagation();
       return;
@@ -78,37 +81,61 @@ const useARIAButton = (shorthand, options) => {
       ev.preventDefault();
       ev.currentTarget.click();
     }
-  });
+  }); // If a <button> tag is to be rendered we just need to set disabled and aria-disabled correctly
+
+  if (type === 'button' || type === undefined) {
+    return { ...rest,
+      tabIndex,
+      disabled: disabled && !disabledFocusable,
+      'aria-disabled': disabledFocusable ? true : normalizedARIADisabled,
+      // onclick should still use internal handler to ensure prevention if disabled
+      // if disabledFocusable then there's no requirement for handlers as those events should not be propagated
+      onClick: disabledFocusable ? undefined : handleClick,
+      onKeyUp: disabledFocusable ? undefined : onKeyUp,
+      onKeyDown: disabledFocusable ? undefined : onKeyDown
+    };
+  } // If an <a> or <div> tag is to be rendered we have to remove disabled and type,
+  // and set aria-disabled, role and tabIndex.
+  else {
+    const nextProps = {
+      role: 'button',
+      ...rest,
+      // If it's not a <button> than listeners are required even with disabledFocusable
+      // Since you cannot assure the default behavior of the element
+      // E.g: <a> will redirect on click
+      onClick: handleClick,
+      onKeyUp: handleKeyUp,
+      onKeyDown: handleKeyDown,
+      'aria-disabled': disabled || disabledFocusable || normalizedARIADisabled,
+      tabIndex: disabled && !disabledFocusable ? undefined : tabIndex !== null && tabIndex !== void 0 ? tabIndex : 0
+    };
+
+    if (type === 'a' && isDisabled) {
+      nextProps.href = undefined;
+    }
 
-  if (shorthandProps) {
-    // If a <button> tag is to be rendered we just need to set disabled and aria-disabled correctly
-    if (shorthandProps.as === 'button' || shorthandProps.as === undefined) {
-      shorthandProps.disabled = disabled && !disabledFocusable;
-      shorthandProps['aria-disabled'] = disabledFocusable ? true : undefined; // Undefine events if disabledFocusable is passed in
-
-      if (disabledFocusable) {
-        shorthandProps.onClick = undefined;
-        shorthandProps.onKeyDown = undefined;
-        shorthandProps.onKeyUp = undefined;
-      }
-    } // If an <a> tag is to be rendered we have to remove disabled and type, and set aria-disabled, role and tabIndex.
-    else {
-      delete shorthandProps.disabled;
-      shorthandProps['aria-disabled'] = disabled || disabledFocusable;
-      shorthandProps.href = disabled ? undefined : shorthandProps.href;
-      shorthandProps.onClick = onClickHandler;
-      shorthandProps.onKeyDown = onKeyDownHandler;
-      shorthandProps.onKeyUp = onKeyupHandler;
-      shorthandProps.role = (_a = shorthandProps.role) !== null && _a !== void 0 ? _a : 'button';
-      shorthandProps.tabIndex = disabled && !disabledFocusable ? undefined : tabIndex !== null && tabIndex !== void 0 ? tabIndex : 0;
-    } // Remove non-DOM disabledFocusable prop
-
-
-    delete shorthandProps.disabledFocusable;
+    return nextProps;
   }
+}
+
+exports.useARIAButtonProps = useARIAButtonProps;
+/**
+ * @internal
+ *
+ * This function expects to receive a slot, if `as` property is not desired use `useARIAButtonProps` instead
+ *
+ * Button keyboard handling, role, disabled and tabIndex implementation that ensures ARIA spec
+ * for multiple scenarios of shorthand properties. Ensuring 1st rule of ARIA for cases
+ * where no attribute addition is required.
+ */
+
+const useARIAButtonShorthand = (slot, options) => {
+  var _a;
 
-  return shorthandProps;
+  const shorthand = react_utilities_1.resolveShorthand(slot, options);
+  const shorthandARIAButton = useARIAButtonProps((_a = shorthand === null || shorthand === void 0 ? void 0 : shorthand.as) !== null && _a !== void 0 ? _a : 'button', shorthand);
+  return shorthand && shorthandARIAButton;
 };
 
-exports.useARIAButton = useARIAButton;
+exports.useARIAButtonShorthand = useARIAButtonShorthand;
 //# sourceMappingURL=useARIAButton.js.map

package/lib-commonjs/hooks/useARIAButton.js.map

@@ -1 +1 @@
-{"version":3,"sources":["hooks/useARIAButton.ts"],"names":[],"mappings":"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","sourcesContent":["import { Enter, Space } from '@fluentui/keyboard-keys';\nimport { resolveShorthand, useEventCallback } from '@fluentui/react-utilities';\nimport type { ExtractSlotProps, ResolveShorthandFunction, Slot } from '@fluentui/react-utilities';\n\nexport type ARIAButtonSlotProps = ExtractSlotProps<Slot<'button', 'a'>> & {\n  disabled?: boolean;\n  disabledFocusable?: boolean;\n};\n\n/**\n * Button keyboard handling, role, disabled and tabIndex implementation that ensures ARIA spec\n * for multiple scenarios of shorthand properties. Ensuring 1st rule of ARIA for cases\n * where no attribute addition is required.\n */\nexport const useARIAButton: ResolveShorthandFunction<ARIAButtonSlotProps> = (shorthand, options) => {\n  const shorthandProps = resolveShorthand(shorthand, options);\n\n  const { disabled, disabledFocusable, onClick, onKeyDown, onKeyUp, tabIndex } = (shorthandProps ||\n    {}) as ARIAButtonSlotProps;\n\n  const onClickHandler: ARIAButtonSlotProps['onClick'] = useEventCallback(ev => {\n    if (disabled || disabledFocusable) {\n      ev.preventDefault();\n      ev.stopPropagation();\n    } else {\n      onClick?.(ev);\n    }\n  });\n\n  const onKeyDownHandler: ARIAButtonSlotProps['onKeyDown'] = useEventCallback(ev => {\n    onKeyDown?.(ev);\n\n    if (ev.isDefaultPrevented()) {\n      return;\n    }\n\n    const key = ev.key;\n\n    if ((disabled || disabledFocusable) && (key === Enter || key === Space)) {\n      ev.preventDefault();\n      ev.stopPropagation();\n      return;\n    }\n\n    if (key === Space) {\n      ev.preventDefault();\n      return;\n    }\n\n    // If enter is pressed, activate the button\n    else if (key === Enter) {\n      ev.preventDefault();\n      ev.currentTarget.click();\n    }\n  });\n\n  const onKeyupHandler: ARIAButtonSlotProps['onKeyUp'] = useEventCallback(ev => {\n    onKeyUp?.(ev);\n\n    if (ev.isDefaultPrevented()) {\n      return;\n    }\n\n    const key = ev.key;\n\n    if ((disabled || disabledFocusable) && (key === Enter || key === Space)) {\n      ev.preventDefault();\n      ev.stopPropagation();\n      return;\n    }\n\n    if (key === Space) {\n      ev.preventDefault();\n      ev.currentTarget.click();\n    }\n  });\n\n  if (shorthandProps) {\n    // If a <button> tag is to be rendered we just need to set disabled and aria-disabled correctly\n    if (shorthandProps.as === 'button' || shorthandProps.as === undefined) {\n      shorthandProps.disabled = disabled && !disabledFocusable;\n      shorthandProps['aria-disabled'] = disabledFocusable ? true : undefined;\n\n      // Undefine events if disabledFocusable is passed in\n      if (disabledFocusable) {\n        shorthandProps.onClick = undefined;\n        shorthandProps.onKeyDown = undefined;\n        shorthandProps.onKeyUp = undefined;\n      }\n    }\n\n    // If an <a> tag is to be rendered we have to remove disabled and type, and set aria-disabled, role and tabIndex.\n    else {\n      delete shorthandProps.disabled;\n      shorthandProps['aria-disabled'] = disabled || disabledFocusable;\n      (shorthandProps as JSX.IntrinsicElements['a']).href = disabled\n        ? undefined\n        : (shorthandProps as JSX.IntrinsicElements['a']).href;\n      shorthandProps.onClick = onClickHandler;\n      shorthandProps.onKeyDown = onKeyDownHandler;\n      shorthandProps.onKeyUp = onKeyupHandler;\n      shorthandProps.role = shorthandProps.role ?? 'button';\n      shorthandProps.tabIndex = disabled && !disabledFocusable ? undefined : tabIndex ?? 0;\n    }\n\n    // Remove non-DOM disabledFocusable prop\n    delete shorthandProps.disabledFocusable;\n  }\n\n  return shorthandProps;\n};\n"],"sourceRoot":"../src/"}
+{"version":3,"sources":["hooks/useARIAButton.ts"],"names":[],"mappings":"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","sourcesContent":["import { Enter, Space } from '@fluentui/keyboard-keys';\nimport { resolveShorthand, useEventCallback } from '@fluentui/react-utilities';\nimport type { ExtractSlotProps, ResolveShorthandFunction, Slot } from '@fluentui/react-utilities';\nimport * as React from 'react';\n\nexport type ARIAButtonSlotProps<AlternateAs extends 'a' | 'div' = 'a' | 'div'> = ExtractSlotProps<\n  Slot<'button', AlternateAs>\n> & {\n  disabled?: boolean;\n  /**\n   * When set, allows the button to be focusable even when it has been disabled.\n   * This is used in scenarios where it is important to keep a consistent tab order\n   * for screen reader and keyboard users. The primary example of this\n   * pattern is when the disabled button is in a menu or a commandbar and is seldom used for standalone buttons.\n   *\n   * @default false\n   */\n  disabledFocusable?: boolean;\n};\n\nexport type ARIAButtonProps<Type extends 'a' | 'div' | 'button' = 'a' | 'div' | 'button'> = React.PropsWithRef<\n  JSX.IntrinsicElements[Type]\n> &\n  Pick<ARIAButtonSlotProps, 'disabled' | 'disabledFocusable'>;\n\n/**\n * @internal\n *\n * Button keyboard handling, role, disabled and tabIndex implementation that ensures ARIA spec\n * for multiple scenarios of shorthand properties. Ensuring 1st rule of ARIA for cases\n * where no attribute addition is required.\n */\nexport function useARIAButtonProps<Type extends NonNullable<ARIAButtonSlotProps['as']>>(\n  type?: Type,\n  props?: ARIAButtonProps,\n): React.PropsWithRef<JSX.IntrinsicElements[Type]> {\n  const {\n    disabled,\n    tabIndex,\n    disabledFocusable = false,\n    onClick,\n    onKeyDown,\n    onKeyUp,\n    ['aria-disabled']: ariaDisabled,\n    ...rest\n  } = props ?? {};\n\n  const normalizedARIADisabled = typeof ariaDisabled === 'string' ? ariaDisabled === 'true' : ariaDisabled;\n\n  const isDisabled = disabled || disabledFocusable || normalizedARIADisabled;\n\n  const handleClick: ARIAButtonProps['onClick'] = useEventCallback(ev => {\n    if (isDisabled) {\n      ev.preventDefault();\n      ev.stopPropagation();\n    } else {\n      onClick?.(ev);\n    }\n  });\n\n  const handleKeyDown: ARIAButtonProps['onKeyDown'] = useEventCallback(ev => {\n    onKeyDown?.(ev);\n\n    if (ev.isDefaultPrevented()) {\n      return;\n    }\n\n    const key = ev.key;\n\n    if (isDisabled && (key === Enter || key === Space)) {\n      ev.preventDefault();\n      ev.stopPropagation();\n      return;\n    }\n\n    if (key === Space) {\n      ev.preventDefault();\n      return;\n    }\n\n    // If enter is pressed, activate the button\n    else if (key === Enter) {\n      ev.preventDefault();\n      ev.currentTarget.click();\n    }\n  });\n\n  const handleKeyUp: ARIAButtonProps['onKeyUp'] = useEventCallback(ev => {\n    onKeyUp?.(ev);\n\n    if (ev.isDefaultPrevented()) {\n      return;\n    }\n\n    const key = ev.key;\n\n    if (isDisabled && (key === Enter || key === Space)) {\n      ev.preventDefault();\n      ev.stopPropagation();\n      return;\n    }\n\n    if (key === Space) {\n      ev.preventDefault();\n      ev.currentTarget.click();\n    }\n  });\n\n  // If a <button> tag is to be rendered we just need to set disabled and aria-disabled correctly\n  if (type === 'button' || type === undefined) {\n    return {\n      ...rest,\n      tabIndex,\n      disabled: disabled && !disabledFocusable,\n      'aria-disabled': disabledFocusable ? true : normalizedARIADisabled,\n      // onclick should still use internal handler to ensure prevention if disabled\n      // if disabledFocusable then there's no requirement for handlers as those events should not be propagated\n      onClick: disabledFocusable ? undefined : handleClick,\n      onKeyUp: disabledFocusable ? undefined : onKeyUp,\n      onKeyDown: disabledFocusable ? undefined : onKeyDown,\n    } as React.PropsWithRef<JSX.IntrinsicElements[Type]>;\n  }\n\n  // If an <a> or <div> tag is to be rendered we have to remove disabled and type,\n  // and set aria-disabled, role and tabIndex.\n  else {\n    const nextProps = {\n      role: 'button',\n      ...rest,\n      // If it's not a <button> than listeners are required even with disabledFocusable\n      // Since you cannot assure the default behavior of the element\n      // E.g: <a> will redirect on click\n      onClick: handleClick,\n      onKeyUp: handleKeyUp,\n      onKeyDown: handleKeyDown,\n      'aria-disabled': disabled || disabledFocusable || normalizedARIADisabled,\n      tabIndex: disabled && !disabledFocusable ? undefined : tabIndex ?? 0,\n    } as React.PropsWithRef<JSX.IntrinsicElements[Type]>;\n\n    if (type === 'a' && isDisabled) {\n      (nextProps as JSX.IntrinsicElements['a']).href = undefined;\n    }\n\n    return nextProps;\n  }\n}\n\n/**\n * @internal\n *\n * This function expects to receive a slot, if `as` property is not desired use `useARIAButtonProps` instead\n *\n * Button keyboard handling, role, disabled and tabIndex implementation that ensures ARIA spec\n * for multiple scenarios of shorthand properties. Ensuring 1st rule of ARIA for cases\n * where no attribute addition is required.\n */\nexport const useARIAButtonShorthand: ResolveShorthandFunction<ARIAButtonSlotProps> = (slot, options) => {\n  const shorthand = resolveShorthand(slot, options);\n  const shorthandARIAButton = useARIAButtonProps(shorthand?.as ?? 'button', shorthand);\n  return shorthand && shorthandARIAButton;\n};\n"],"sourceRoot":"../src/"}

package/lib-commonjs/index.js

@@ -3,23 +3,20 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.mergeARIADisabled = exports.useARIAButton = void 0;
+exports.useARIAButtonProps = exports.useARIAButtonShorthand = void 0;
 
 var index_1 = /*#__PURE__*/require("./hooks/index");
 
-Object.defineProperty(exports, "useARIAButton", {
+Object.defineProperty(exports, "useARIAButtonShorthand", {
   enumerable: true,
   get: function () {
-    return index_1.useARIAButton;
+    return index_1.useARIAButtonShorthand;
   }
 });
-
-var index_2 = /*#__PURE__*/require("./utils/index");
-
-Object.defineProperty(exports, "mergeARIADisabled", {
+Object.defineProperty(exports, "useARIAButtonProps", {
   enumerable: true,
   get: function () {
-    return index_2.mergeARIADisabled;
+    return index_1.useARIAButtonProps;
   }
 });
 //# sourceMappingURL=index.js.map

package/lib-commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["index.ts"],"names":[],"mappings":";;;;;;;AAAA,IAAA,OAAA,gBAAA,OAAA,CAAA,eAAA,CAAA;;AAAS,MAAA,CAAA,cAAA,CAAA,OAAA,EAAA,eAAA,EAAA;EAAA,UAAA,EAAA,IAAA;EAAA,GAAA,EAAA,YAAA;IAAA,OAAA,OAAA,CAAA,aAAA;EAAa;AAAb,CAAA;;AAET,IAAA,OAAA,gBAAA,OAAA,CAAA,eAAA,CAAA;;AAAS,MAAA,CAAA,cAAA,CAAA,OAAA,EAAA,mBAAA,EAAA;EAAA,UAAA,EAAA,IAAA;EAAA,GAAA,EAAA,YAAA;IAAA,OAAA,OAAA,CAAA,iBAAA;EAAiB;AAAjB,CAAA","sourcesContent":["export { useARIAButton } from './hooks/index';\nexport type { ARIAButtonSlotProps } from './hooks/index';\nexport { mergeARIADisabled } from './utils/index';\n"],"sourceRoot":"../src/"}
+{"version":3,"sources":["index.ts"],"names":[],"mappings":";;;;;;;AAAA,IAAA,OAAA,gBAAA,OAAA,CAAA,eAAA,CAAA;;AAAS,MAAA,CAAA,cAAA,CAAA,OAAA,EAAA,wBAAA,EAAA;EAAA,UAAA,EAAA,IAAA;EAAA,GAAA,EAAA,YAAA;IAAA,OAAA,OAAA,CAAA,sBAAA;EAAsB;AAAtB,CAAA;AAAwB,MAAA,CAAA,cAAA,CAAA,OAAA,EAAA,oBAAA,EAAA;EAAA,UAAA,EAAA,IAAA;EAAA,GAAA,EAAA,YAAA;IAAA,OAAA,OAAA,CAAA,kBAAA;EAAkB;AAAlB,CAAA","sourcesContent":["export { useARIAButtonShorthand, useARIAButtonProps } from './hooks/index';\nexport type { ARIAButtonSlotProps, ARIAButtonProps } from './hooks/index';\n"],"sourceRoot":"../src/"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluentui/react-aria",
-  "version": "9.0.0",
+  "version": "9.1.0",
   "description": "React helper to ensure ARIA",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@fluentui/keyboard-keys": "^9.0.0",
-    "@fluentui/react-utilities": "^9.0.0",
+    "@fluentui/react-utilities": "^9.0.2",
     "tslib": "^2.1.0"
   },
   "peerDependencies": {
@@ -42,7 +42,8 @@
   },
   "beachball": {
     "disallowedChangeTypes": [
-      "major"
+      "major",
+      "prerelease"
     ]
   },
   "exports": {

package/lib/utils/index.js

@@ -1,2 +0,0 @@
-export * from './mergeARIADisabled';
-//# sourceMappingURL=index.js.map

package/lib/utils/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"../src/","sources":["utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC","sourcesContent":["export * from './mergeARIADisabled';\n"]}

package/lib/utils/mergeARIADisabled.js

@@ -1,16 +0,0 @@
-/**
- * @internal
- * Merges disabled declaration with `aria-disabled`
- */
-export function mergeARIADisabled(shorthand) {
-  var _a;
-
-  const disabled = (_a = shorthand.disabled) !== null && _a !== void 0 ? _a : shorthand['aria-disabled'];
-
-  if (typeof disabled === 'string') {
-    return disabled === 'false' ? false : true;
-  }
-
-  return disabled !== null && disabled !== void 0 ? disabled : false;
-}
-//# sourceMappingURL=mergeARIADisabled.js.map

package/lib/utils/mergeARIADisabled.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["utils/mergeARIADisabled.ts"],"names":[],"mappings":"AAAA;;;AAGG;AACH,OAAM,SAAU,iBAAV,CAA4B,SAA5B,EAAiG;;;EACrG,MAAM,QAAQ,GAAG,CAAA,EAAA,GAAA,SAAS,CAAC,QAAV,MAAkB,IAAlB,IAAkB,EAAA,KAAA,KAAA,CAAlB,GAAkB,EAAlB,GAAsB,SAAS,CAAC,eAAD,CAAhD;;EACA,IAAI,OAAO,QAAP,KAAoB,QAAxB,EAAkC;IAChC,OAAO,QAAQ,KAAK,OAAb,GAAuB,KAAvB,GAA+B,IAAtC;EACD;;EACD,OAAO,QAAQ,KAAA,IAAR,IAAA,QAAQ,KAAA,KAAA,CAAR,GAAA,QAAA,GAAY,KAAnB;AACD","sourcesContent":["/**\n * @internal\n * Merges disabled declaration with `aria-disabled`\n */\nexport function mergeARIADisabled(shorthand: { 'aria-disabled'?: string | boolean; disabled?: boolean }) {\n  const disabled = shorthand.disabled ?? shorthand['aria-disabled'];\n  if (typeof disabled === 'string') {\n    return disabled === 'false' ? false : true;\n  }\n  return disabled ?? false;\n}\n"],"sourceRoot":"../src/"}

package/lib-commonjs/utils/index.js

@@ -1,10 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-const tslib_1 = /*#__PURE__*/require("tslib");
-
-tslib_1.__exportStar(require("./mergeARIADisabled"), exports);
-//# sourceMappingURL=index.js.map

package/lib-commonjs/utils/index.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["utils/index.ts"],"names":[],"mappings":";;;;;;;;AAAA,OAAA,CAAA,YAAA,CAAA,OAAA,CAAA,qBAAA,CAAA,EAAA,OAAA","sourcesContent":["export * from './mergeARIADisabled';\n"],"sourceRoot":"../src/"}

package/lib-commonjs/utils/mergeARIADisabled.js

@@ -1,25 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.mergeARIADisabled = void 0;
-/**
- * @internal
- * Merges disabled declaration with `aria-disabled`
- */
-
-function mergeARIADisabled(shorthand) {
-  var _a;
-
-  const disabled = (_a = shorthand.disabled) !== null && _a !== void 0 ? _a : shorthand['aria-disabled'];
-
-  if (typeof disabled === 'string') {
-    return disabled === 'false' ? false : true;
-  }
-
-  return disabled !== null && disabled !== void 0 ? disabled : false;
-}
-
-exports.mergeARIADisabled = mergeARIADisabled;
-//# sourceMappingURL=mergeARIADisabled.js.map

package/lib-commonjs/utils/mergeARIADisabled.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["utils/mergeARIADisabled.ts"],"names":[],"mappings":";;;;;;AAAA;;;AAGG;;AACH,SAAgB,iBAAhB,CAAkC,SAAlC,EAAuG;;;EACrG,MAAM,QAAQ,GAAG,CAAA,EAAA,GAAA,SAAS,CAAC,QAAV,MAAkB,IAAlB,IAAkB,EAAA,KAAA,KAAA,CAAlB,GAAkB,EAAlB,GAAsB,SAAS,CAAC,eAAD,CAAhD;;EACA,IAAI,OAAO,QAAP,KAAoB,QAAxB,EAAkC;IAChC,OAAO,QAAQ,KAAK,OAAb,GAAuB,KAAvB,GAA+B,IAAtC;EACD;;EACD,OAAO,QAAQ,KAAA,IAAR,IAAA,QAAQ,KAAA,KAAA,CAAR,GAAA,QAAA,GAAY,KAAnB;AACD;;AAND,OAAA,CAAA,iBAAA,GAAA,iBAAA","sourcesContent":["/**\n * @internal\n * Merges disabled declaration with `aria-disabled`\n */\nexport function mergeARIADisabled(shorthand: { 'aria-disabled'?: string | boolean; disabled?: boolean }) {\n  const disabled = shorthand.disabled ?? shorthand['aria-disabled'];\n  if (typeof disabled === 'string') {\n    return disabled === 'false' ? false : true;\n  }\n  return disabled ?? false;\n}\n"],"sourceRoot":"../src/"}