@fluentui/react-aria 9.0.0-alpha.40 → 9.0.0-alpha.45

package/CHANGELOG.json

@@ -2,7 +2,109 @@
   "name": "@fluentui/react-aria",
   "entries": [
     {
-      "date": "Wed, 29 Sep 2021 08:05:12 GMT",
+      "date": "Tue, 05 Oct 2021 12:47:00 GMT",
+      "tag": "@fluentui/react-aria_v9.0.0-alpha.45",
+      "version": "9.0.0-alpha.45",
+      "comments": {
+        "prerelease": [
+          {
+            "author": "beachball",
+            "package": "@fluentui/react-aria",
+            "comment": "Bump @fluentui/react-make-styles to v9.0.0-alpha.78",
+            "commit": "c41b8f8996acd5b970d894fc910cc4d661f8e3cb"
+          },
+          {
+            "author": "beachball",
+            "package": "@fluentui/react-aria",
+            "comment": "Bump @fluentui/jest-serializer-make-styles to v9.0.0-alpha.53",
+            "commit": "c41b8f8996acd5b970d894fc910cc4d661f8e3cb"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 05 Oct 2021 09:28:07 GMT",
+      "tag": "@fluentui/react-aria_v9.0.0-alpha.44",
+      "version": "9.0.0-alpha.44",
+      "comments": {
+        "prerelease": [
+          {
+            "author": "beachball",
+            "package": "@fluentui/react-aria",
+            "comment": "Bump @fluentui/react-make-styles to v9.0.0-alpha.77",
+            "commit": "3b16677a03035dcf03c1297268b85c6d4bd3f839"
+          },
+          {
+            "author": "beachball",
+            "package": "@fluentui/react-aria",
+            "comment": "Bump @fluentui/react-utilities to v9.0.0-alpha.56",
+            "commit": "3b16677a03035dcf03c1297268b85c6d4bd3f839"
+          },
+          {
+            "author": "beachball",
+            "package": "@fluentui/react-aria",
+            "comment": "Bump @fluentui/jest-serializer-make-styles to v9.0.0-alpha.52",
+            "commit": "3b16677a03035dcf03c1297268b85c6d4bd3f839"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Fri, 01 Oct 2021 14:13:08 GMT",
+      "tag": "@fluentui/react-aria_v9.0.0-alpha.43",
+      "version": "9.0.0-alpha.43",
+      "comments": {
+        "prerelease": [
+          {
+            "author": "lingfangao@hotmail.com",
+            "package": "@fluentui/react-aria",
+            "comment": "Bump v9 prerelease versions to rerelease",
+            "commit": "4fa0856ad0353b787b8ae59229e6f64ef0719824"
+          },
+          {
+            "author": "beachball",
+            "package": "@fluentui/react-aria",
+            "comment": "Bump @fluentui/keyboard-keys to v9.0.0-alpha.5",
+            "commit": "4fa0856ad0353b787b8ae59229e6f64ef0719824"
+          },
+          {
+            "author": "beachball",
+            "package": "@fluentui/react-aria",
+            "comment": "Bump @fluentui/react-make-styles to v9.0.0-alpha.76",
+            "commit": "4fa0856ad0353b787b8ae59229e6f64ef0719824"
+          },
+          {
+            "author": "beachball",
+            "package": "@fluentui/react-aria",
+            "comment": "Bump @fluentui/react-utilities to v9.0.0-alpha.55",
+            "commit": "4fa0856ad0353b787b8ae59229e6f64ef0719824"
+          },
+          {
+            "author": "beachball",
+            "package": "@fluentui/react-aria",
+            "comment": "Bump @fluentui/jest-serializer-make-styles to v9.0.0-alpha.51",
+            "commit": "4fa0856ad0353b787b8ae59229e6f64ef0719824"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Fri, 01 Oct 2021 12:30:46 GMT",
+      "tag": "@fluentui/react-aria_v9.0.0-alpha.41",
+      "version": "9.0.0-alpha.41",
+      "comments": {
+        "prerelease": [
+          {
+            "author": "bsunderhus@microsoft.com",
+            "package": "@fluentui/react-aria",
+            "comment": "Removes disabled attribute when not required",
+            "commit": "c5f91bfccb65073eb01e4b4aa0b720bb6bf06b5d"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Wed, 29 Sep 2021 08:06:11 GMT",
       "tag": "@fluentui/react-aria_v9.0.0-alpha.40",
       "version": "9.0.0-alpha.40",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,55 @@
 # Change Log - @fluentui/react-aria
 
-This log was last generated on Wed, 29 Sep 2021 08:05:12 GMT and should not be manually modified.
+This log was last generated on Tue, 05 Oct 2021 12:47:00 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## [9.0.0-alpha.45](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.45)
+
+Tue, 05 Oct 2021 12:47:00 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.44..@fluentui/react-aria_v9.0.0-alpha.45)
+
+### Changes
+
+- Bump @fluentui/react-make-styles to v9.0.0-alpha.78 ([PR #20108](https://github.com/microsoft/fluentui/pull/20108) by beachball)
+- Bump @fluentui/jest-serializer-make-styles to v9.0.0-alpha.53 ([PR #20108](https://github.com/microsoft/fluentui/pull/20108) by beachball)
+
+## [9.0.0-alpha.44](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.44)
+
+Tue, 05 Oct 2021 09:28:07 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.43..@fluentui/react-aria_v9.0.0-alpha.44)
+
+### Changes
+
+- Bump @fluentui/react-make-styles to v9.0.0-alpha.77 ([PR #20081](https://github.com/microsoft/fluentui/pull/20081) by beachball)
+- Bump @fluentui/react-utilities to v9.0.0-alpha.56 ([PR #20081](https://github.com/microsoft/fluentui/pull/20081) by beachball)
+- Bump @fluentui/jest-serializer-make-styles to v9.0.0-alpha.52 ([PR #20081](https://github.com/microsoft/fluentui/pull/20081) by beachball)
+
+## [9.0.0-alpha.43](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.43)
+
+Fri, 01 Oct 2021 14:13:08 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.41..@fluentui/react-aria_v9.0.0-alpha.43)
+
+### Changes
+
+- Bump v9 prerelease versions to rerelease ([PR #20069](https://github.com/microsoft/fluentui/pull/20069) by lingfangao@hotmail.com)
+- Bump @fluentui/keyboard-keys to v9.0.0-alpha.5 ([PR #20069](https://github.com/microsoft/fluentui/pull/20069) by beachball)
+- Bump @fluentui/react-make-styles to v9.0.0-alpha.76 ([PR #20069](https://github.com/microsoft/fluentui/pull/20069) by beachball)
+- Bump @fluentui/react-utilities to v9.0.0-alpha.55 ([PR #20069](https://github.com/microsoft/fluentui/pull/20069) by beachball)
+- Bump @fluentui/jest-serializer-make-styles to v9.0.0-alpha.51 ([PR #20069](https://github.com/microsoft/fluentui/pull/20069) by beachball)
+
+## [9.0.0-alpha.41](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.41)
+
+Fri, 01 Oct 2021 12:30:46 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.40..@fluentui/react-aria_v9.0.0-alpha.41)
+
+### Changes
+
+- Removes disabled attribute when not required ([PR #18814](https://github.com/microsoft/fluentui/pull/18814) by bsunderhus@microsoft.com)
+
 ## [9.0.0-alpha.40](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.40)
 
-Wed, 29 Sep 2021 08:05:12 GMT 
+Wed, 29 Sep 2021 08:06:11 GMT 
 [Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.39..@fluentui/react-aria_v9.0.0-alpha.40)
 
 ### Changes

package/dist/react-aria.d.ts

@@ -4,22 +4,25 @@ import * as React_2 from 'react';
 import type { ResolveShorthandOptions } from '@fluentui/react-utilities';
 import type { ShorthandProps } from '@fluentui/react-utilities';
 
-export declare type ARIAButtonShorthandProps = IntrinsicShorthandProps<'button', 'div' | 'span' | 'a'>;
+export declare type ARIAButtonShorthandProps = IntrinsicShorthandProps<'button', 'a'> & {
+    disabled?: boolean;
+    disabledFocusable?: boolean;
+};
 
 /**
  * Merges disabled declaration with `aria-disabled`
  */
 export declare function mergeARIADisabled(shorthand: ObjectShorthandProps<{
-    disabled?: boolean;
     'aria-disabled'?: string | boolean;
     children?: React_2.ReactNode;
+    disabled?: boolean;
 }>): boolean;
 
 /**
- * button keyboard handling, role, disabled and tabIndex implementation that ensures ARIA spec
+ * 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
+ * where no attribute addition is required.
  */
-export declare function useARIAButton<Required extends boolean = false>(value: ShorthandProps<ARIAButtonShorthandProps>, options?: ResolveShorthandOptions<ARIAButtonShorthandProps, Required>): Required extends false ? ARIAButtonShorthandProps | undefined : ARIAButtonShorthandProps;
+export declare function useARIAButton<Required extends boolean = false>(shorthand: ShorthandProps<ARIAButtonShorthandProps>, options?: ResolveShorthandOptions<ARIAButtonShorthandProps, Required>): Required extends false ? ARIAButtonShorthandProps | undefined : ARIAButtonShorthandProps;
 
 export { }

package/lib/hooks/useARIAButton.d.ts

@@ -1,8 +1,11 @@
 import type { IntrinsicShorthandProps, ResolveShorthandOptions, ShorthandProps } from '@fluentui/react-utilities';
-export declare type ARIAButtonShorthandProps = IntrinsicShorthandProps<'button', 'div' | 'span' | 'a'>;
+export declare type ARIAButtonShorthandProps = IntrinsicShorthandProps<'button', 'a'> & {
+    disabled?: boolean;
+    disabledFocusable?: boolean;
+};
 /**
- * button keyboard handling, role, disabled and tabIndex implementation that ensures ARIA spec
+ * 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
+ * where no attribute addition is required.
  */
-export declare function useARIAButton<Required extends boolean = false>(value: ShorthandProps<ARIAButtonShorthandProps>, options?: ResolveShorthandOptions<ARIAButtonShorthandProps, Required>): Required extends false ? ARIAButtonShorthandProps | undefined : ARIAButtonShorthandProps;
+export declare function useARIAButton<Required extends boolean = false>(shorthand: ShorthandProps<ARIAButtonShorthandProps>, options?: ResolveShorthandOptions<ARIAButtonShorthandProps, Required>): Required extends false ? ARIAButtonShorthandProps | undefined : ARIAButtonShorthandProps;

package/lib/hooks/useARIAButton.js

@@ -1,100 +1,98 @@
 import { Enter, Space } from '@fluentui/keyboard-keys';
 import { resolveShorthand, useEventCallback } from '@fluentui/react-utilities';
-import { mergeARIADisabled } from '../utils/index';
 /**
- * button keyboard handling, role, disabled and tabIndex implementation that ensures ARIA spec
+ * 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
+ * where no attribute addition is required.
  */
 
-export function useARIAButton(value, options) {
-  var shorthand = resolveShorthand(value, options);
+export function useARIAButton(shorthand, options) {
+  var _a;
 
-  var _a = shorthand || {},
-      onClick = _a.onClick,
-      onKeyDown = _a.onKeyDown,
-      onKeyUp = _a.onKeyUp;
+  var shorthandProps = resolveShorthand(shorthand, options);
+
+  var _b = shorthandProps || {},
+      disabled = _b.disabled,
+      disabledFocusable = _b.disabledFocusable,
+      onClick = _b.onClick,
+      onKeyDown = _b.onKeyDown,
+      onKeyUp = _b.onKeyUp,
+      tabIndex = _b.tabIndex;
 
-  var disabled = mergeARIADisabled(shorthand);
   var onClickHandler = useEventCallback(function (ev) {
-    if (disabled) {
+    if (disabled || disabledFocusable) {
       ev.preventDefault();
       ev.stopPropagation();
     } else {
-      if (typeof onClick === 'function') {
-        onClick(ev);
-      }
+      onClick === null || onClick === void 0 ? void 0 : onClick(ev);
     }
   });
   var onKeyDownHandler = useEventCallback(function (ev) {
-    if (typeof onKeyDown === 'function') {
-      onKeyDown(ev);
-    }
+    onKeyDown === null || onKeyDown === void 0 ? void 0 : onKeyDown(ev);
 
     if (ev.isDefaultPrevented()) {
       return;
     }
 
-    if (disabled && (ev.key === Enter || ev.key === Space)) {
+    var key = ev.key;
+
+    if ((disabled || disabledFocusable) && (key === Enter || key === Space)) {
       ev.preventDefault();
       ev.stopPropagation();
       return;
     }
 
-    if (ev.key === Space) {
+    if (key === Space) {
       ev.preventDefault();
       return;
     } // If enter is pressed, activate the button
-    else if (ev.key === Enter) {
+    else if (key === Enter) {
       ev.preventDefault();
       ev.currentTarget.click();
     }
   });
   var onKeyupHandler = useEventCallback(function (ev) {
-    if (typeof onKeyUp === 'function') {
-      onKeyUp(ev);
-    }
+    onKeyUp === null || onKeyUp === void 0 ? void 0 : onKeyUp(ev);
 
     if (ev.isDefaultPrevented()) {
       return;
     }
 
-    if (disabled && (ev.key === Enter || ev.key === Space)) {
+    var key = ev.key;
+
+    if ((disabled || disabledFocusable) && (key === Enter || key === Space)) {
       ev.preventDefault();
       ev.stopPropagation();
       return;
     }
 
-    if (ev.key === Space) {
+    if (key === Space) {
       ev.preventDefault();
       ev.currentTarget.click();
     }
   });
 
-  if (shorthand) {
-    if (shorthand.as === 'button' || shorthand.as === undefined) {
-      return shorthand; // there's nothing to be done if as prop === 'button' or 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;
+    } // If an <a> tag is to be rendered we have to remove disabled and set aria-disabled, role and tabIndex as well as
+    // some event handlers.
+    else {
+      delete shorthandProps.disabled;
+      shorthandProps['aria-disabled'] = disabled || disabledFocusable;
+      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 (!shorthand.hasOwnProperty('role')) {
-      shorthand.role = 'button';
-    }
-
-    if (!shorthand.hasOwnProperty('aria-disabled')) {
-      shorthand['aria-disabled'] = disabled;
-    }
 
-    shorthand.onClick = onClickHandler;
-    shorthand.onKeyDown = onKeyDownHandler;
-    shorthand.onKeyUp = onKeyupHandler; // Add keydown event handler for all other non-anchor elements.
-
-    if (shorthand.as !== 'a') {
-      if (!shorthand.hasOwnProperty('tabIndex')) {
-        shorthand.tabIndex = disabled ? undefined : 0;
-      }
-    }
+    delete shorthandProps.disabledFocusable;
   }
 
-  return shorthand;
+  return shorthandProps;
 }
 //# sourceMappingURL=useARIAButton.js.map

package/lib/hooks/useARIAButton.js.map

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

package/lib/utils/mergeARIADisabled.d.ts

@@ -4,7 +4,7 @@ import { ObjectShorthandProps } from '@fluentui/react-utilities';
  * Merges disabled declaration with `aria-disabled`
  */
 export declare function mergeARIADisabled(shorthand: ObjectShorthandProps<{
-    disabled?: boolean;
     'aria-disabled'?: string | boolean;
     children?: React.ReactNode;
+    disabled?: boolean;
 }>): boolean;

package/lib/utils/mergeARIADisabled.js

@@ -2,9 +2,9 @@
  * Merges disabled declaration with `aria-disabled`
  */
 export function mergeARIADisabled(shorthand) {
-  var _a, _b;
+  var _a;
 
-  var disabled = (_b = (_a = shorthand.disabled) !== null && _a !== void 0 ? _a : shorthand['aria-disabled']) !== null && _b !== void 0 ? _b : undefined;
+  var disabled = (_a = shorthand.disabled) !== null && _a !== void 0 ? _a : shorthand['aria-disabled'];
 
   if (typeof disabled === 'string') {
     return disabled === 'false' ? false : true;

package/lib/utils/mergeARIADisabled.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/mergeARIADisabled.ts"],"names":[],"mappings":"AAGA;;AAEG;AACH,OAAM,SAAU,iBAAV,CACJ,SADI,EAKF;;;AAEF,MAAM,QAAQ,GAAA,CAAA,EAAA,GAAA,CAAA,EAAA,GAAG,SAAS,CAAC,QAAb,MAAqB,IAArB,IAAqB,EAAA,KAAA,KAAA,CAArB,GAAqB,EAArB,GAAyB,SAAS,CAAC,eAAD,CAAlC,MAAmD,IAAnD,IAAmD,EAAA,KAAA,KAAA,CAAnD,GAAmD,EAAnD,GAAuD,SAArE;;AACA,MAAI,OAAO,QAAP,KAAoB,QAAxB,EAAkC;AAChC,WAAO,QAAQ,KAAK,OAAb,GAAuB,KAAvB,GAA+B,IAAtC;AACD;;AACD,SAAO,QAAQ,KAAA,IAAR,IAAA,QAAQ,KAAA,KAAA,CAAR,GAAA,QAAA,GAAY,KAAnB;AACD","sourceRoot":""}
+{"version":3,"sources":["../../src/utils/mergeARIADisabled.ts"],"names":[],"mappings":"AAGA;;AAEG;AACH,OAAM,SAAU,iBAAV,CACJ,SADI,EAKF;;;AAEF,MAAM,QAAQ,GAAA,CAAA,EAAA,GAAG,SAAS,CAAC,QAAb,MAAqB,IAArB,IAAqB,EAAA,KAAA,KAAA,CAArB,GAAqB,EAArB,GAAyB,SAAS,CAAC,eAAD,CAAhD;;AACA,MAAI,OAAO,QAAP,KAAoB,QAAxB,EAAkC;AAChC,WAAO,QAAQ,KAAK,OAAb,GAAuB,KAAvB,GAA+B,IAAtC;AACD;;AACD,SAAO,QAAQ,KAAA,IAAR,IAAA,QAAQ,KAAA,KAAA,CAAR,GAAA,QAAA,GAAY,KAAnB;AACD","sourceRoot":""}

package/lib-commonjs/hooks/useARIAButton.d.ts

@@ -1,8 +1,11 @@
 import type { IntrinsicShorthandProps, ResolveShorthandOptions, ShorthandProps } from '@fluentui/react-utilities';
-export declare type ARIAButtonShorthandProps = IntrinsicShorthandProps<'button', 'div' | 'span' | 'a'>;
+export declare type ARIAButtonShorthandProps = IntrinsicShorthandProps<'button', 'a'> & {
+    disabled?: boolean;
+    disabledFocusable?: boolean;
+};
 /**
- * button keyboard handling, role, disabled and tabIndex implementation that ensures ARIA spec
+ * 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
+ * where no attribute addition is required.
  */
-export declare function useARIAButton<Required extends boolean = false>(value: ShorthandProps<ARIAButtonShorthandProps>, options?: ResolveShorthandOptions<ARIAButtonShorthandProps, Required>): Required extends false ? ARIAButtonShorthandProps | undefined : ARIAButtonShorthandProps;
+export declare function useARIAButton<Required extends boolean = false>(shorthand: ShorthandProps<ARIAButtonShorthandProps>, options?: ResolveShorthandOptions<ARIAButtonShorthandProps, Required>): Required extends false ? ARIAButtonShorthandProps | undefined : ARIAButtonShorthandProps;

package/lib-commonjs/hooks/useARIAButton.js

@@ -8,104 +8,101 @@ exports.useARIAButton = void 0;
 var keyboard_keys_1 = /*#__PURE__*/require("@fluentui/keyboard-keys");
 
 var react_utilities_1 = /*#__PURE__*/require("@fluentui/react-utilities");
-
-var index_1 = /*#__PURE__*/require("../utils/index");
 /**
- * button keyboard handling, role, disabled and tabIndex implementation that ensures ARIA spec
+ * 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
+ * where no attribute addition is required.
  */
 
 
-function useARIAButton(value, options) {
-  var shorthand = react_utilities_1.resolveShorthand(value, options);
+function useARIAButton(shorthand, options) {
+  var _a;
+
+  var shorthandProps = react_utilities_1.resolveShorthand(shorthand, options);
 
-  var _a = shorthand || {},
-      onClick = _a.onClick,
-      onKeyDown = _a.onKeyDown,
-      onKeyUp = _a.onKeyUp;
+  var _b = shorthandProps || {},
+      disabled = _b.disabled,
+      disabledFocusable = _b.disabledFocusable,
+      onClick = _b.onClick,
+      onKeyDown = _b.onKeyDown,
+      onKeyUp = _b.onKeyUp,
+      tabIndex = _b.tabIndex;
 
-  var disabled = index_1.mergeARIADisabled(shorthand);
   var onClickHandler = react_utilities_1.useEventCallback(function (ev) {
-    if (disabled) {
+    if (disabled || disabledFocusable) {
       ev.preventDefault();
       ev.stopPropagation();
     } else {
-      if (typeof onClick === 'function') {
-        onClick(ev);
-      }
+      onClick === null || onClick === void 0 ? void 0 : onClick(ev);
     }
   });
   var onKeyDownHandler = react_utilities_1.useEventCallback(function (ev) {
-    if (typeof onKeyDown === 'function') {
-      onKeyDown(ev);
-    }
+    onKeyDown === null || onKeyDown === void 0 ? void 0 : onKeyDown(ev);
 
     if (ev.isDefaultPrevented()) {
       return;
     }
 
-    if (disabled && (ev.key === keyboard_keys_1.Enter || ev.key === keyboard_keys_1.Space)) {
+    var key = ev.key;
+
+    if ((disabled || disabledFocusable) && (key === keyboard_keys_1.Enter || key === keyboard_keys_1.Space)) {
       ev.preventDefault();
       ev.stopPropagation();
       return;
     }
 
-    if (ev.key === keyboard_keys_1.Space) {
+    if (key === keyboard_keys_1.Space) {
       ev.preventDefault();
       return;
     } // If enter is pressed, activate the button
-    else if (ev.key === keyboard_keys_1.Enter) {
+    else if (key === keyboard_keys_1.Enter) {
       ev.preventDefault();
       ev.currentTarget.click();
     }
   });
   var onKeyupHandler = react_utilities_1.useEventCallback(function (ev) {
-    if (typeof onKeyUp === 'function') {
-      onKeyUp(ev);
-    }
+    onKeyUp === null || onKeyUp === void 0 ? void 0 : onKeyUp(ev);
 
     if (ev.isDefaultPrevented()) {
       return;
     }
 
-    if (disabled && (ev.key === keyboard_keys_1.Enter || ev.key === keyboard_keys_1.Space)) {
+    var key = ev.key;
+
+    if ((disabled || disabledFocusable) && (key === keyboard_keys_1.Enter || key === keyboard_keys_1.Space)) {
       ev.preventDefault();
       ev.stopPropagation();
       return;
     }
 
-    if (ev.key === keyboard_keys_1.Space) {
+    if (key === keyboard_keys_1.Space) {
       ev.preventDefault();
       ev.currentTarget.click();
     }
   });
 
-  if (shorthand) {
-    if (shorthand.as === 'button' || shorthand.as === undefined) {
-      return shorthand; // there's nothing to be done if as prop === 'button' or undefined
-    }
-
-    if (!shorthand.hasOwnProperty('role')) {
-      shorthand.role = 'button';
-    }
-
-    if (!shorthand.hasOwnProperty('aria-disabled')) {
-      shorthand['aria-disabled'] = disabled;
-    }
-
-    shorthand.onClick = onClickHandler;
-    shorthand.onKeyDown = onKeyDownHandler;
-    shorthand.onKeyUp = onKeyupHandler; // Add keydown event handler for all other non-anchor elements.
-
-    if (shorthand.as !== 'a') {
-      if (!shorthand.hasOwnProperty('tabIndex')) {
-        shorthand.tabIndex = disabled ? undefined : 0;
-      }
-    }
+  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;
+    } // If an <a> tag is to be rendered we have to remove disabled and set aria-disabled, role and tabIndex as well as
+    // some event handlers.
+    else {
+      delete shorthandProps.disabled;
+      shorthandProps['aria-disabled'] = disabled || disabledFocusable;
+      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 shorthand;
+  return shorthandProps;
 }
 
 exports.useARIAButton = useARIAButton;

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/hooks/useARIAButton.ts"],"names":[],"mappings":";;;;;;;AAAA,IAAA,eAAA,gBAAA,OAAA,CAAA,yBAAA,CAAA;;AACA,IAAA,iBAAA,gBAAA,OAAA,CAAA,2BAAA,CAAA;;AAEA,IAAA,OAAA,gBAAA,OAAA,CAAA,gBAAA,CAAA;AAIA;;;;AAIG;;;AACH,SAAgB,aAAhB,CACE,KADF,EAEE,OAFF,EAEuE;AAErE,MAAM,SAAS,GAAG,iBAAA,CAAA,gBAAA,CAAiB,KAAjB,EAAwB,OAAxB,CAAlB;;AAEM,MAAA,EAAA,GAAmC,SAAS,IAAI,EAAhD;AAAA,MAAE,OAAO,GAAA,EAAA,CAAA,OAAT;AAAA,MAAW,SAAS,GAAA,EAAA,CAAA,SAApB;AAAA,MAAsB,OAAO,GAAA,EAAA,CAAA,OAA7B;;AAEN,MAAM,QAAQ,GAAG,OAAA,CAAA,iBAAA,CAAkB,SAAlB,CAAjB;AAEA,MAAM,cAAc,GAAwC,iBAAA,CAAA,gBAAA,CAAiB,UAAA,EAAA,EAAE;AAC7E,QAAI,QAAJ,EAAc;AACZ,MAAA,EAAE,CAAC,cAAH;AACA,MAAA,EAAE,CAAC,eAAH;AACD,KAHD,MAGO;AACL,UAAI,OAAO,OAAP,KAAmB,UAAvB,EAAmC;AACjC,QAAA,OAAO,CAAC,EAAD,CAAP;AACD;AACF;AACF,GAT2D,CAA5D;AAWA,MAAM,gBAAgB,GAA0C,iBAAA,CAAA,gBAAA,CAAiB,UAAA,EAAA,EAAE;AACjF,QAAI,OAAO,SAAP,KAAqB,UAAzB,EAAqC;AACnC,MAAA,SAAS,CAAC,EAAD,CAAT;AACD;;AACD,QAAI,EAAE,CAAC,kBAAH,EAAJ,EAA6B;AAC3B;AACD;;AACD,QAAI,QAAQ,KAAK,EAAE,CAAC,GAAH,KAAW,eAAA,CAAA,KAAX,IAAoB,EAAE,CAAC,GAAH,KAAW,eAAA,CAAA,KAApC,CAAZ,EAAwD;AACtD,MAAA,EAAE,CAAC,cAAH;AACA,MAAA,EAAE,CAAC,eAAH;AACA;AACD;;AACD,QAAI,EAAE,CAAC,GAAH,KAAW,eAAA,CAAA,KAAf,EAAsB;AACpB,MAAA,EAAE,CAAC,cAAH;AACA;AACD,KAHD,CAIA;AAJA,SAKK,IAAI,EAAE,CAAC,GAAH,KAAW,eAAA,CAAA,KAAf,EAAsB;AACzB,MAAA,EAAE,CAAC,cAAH;AACA,MAAA,EAAE,CAAC,aAAH,CAAiB,KAAjB;AACD;AACF,GArB+D,CAAhE;AAuBA,MAAM,cAAc,GAAwC,iBAAA,CAAA,gBAAA,CAAiB,UAAA,EAAA,EAAE;AAC7E,QAAI,OAAO,OAAP,KAAmB,UAAvB,EAAmC;AACjC,MAAA,OAAO,CAAC,EAAD,CAAP;AACD;;AACD,QAAI,EAAE,CAAC,kBAAH,EAAJ,EAA6B;AAC3B;AACD;;AACD,QAAI,QAAQ,KAAK,EAAE,CAAC,GAAH,KAAW,eAAA,CAAA,KAAX,IAAoB,EAAE,CAAC,GAAH,KAAW,eAAA,CAAA,KAApC,CAAZ,EAAwD;AACtD,MAAA,EAAE,CAAC,cAAH;AACA,MAAA,EAAE,CAAC,eAAH;AACA;AACD;;AACD,QAAI,EAAE,CAAC,GAAH,KAAW,eAAA,CAAA,KAAf,EAAsB;AACpB,MAAA,EAAE,CAAC,cAAH;AACA,MAAA,EAAE,CAAC,aAAH,CAAiB,KAAjB;AACD;AACF,GAhB2D,CAA5D;;AAkBA,MAAI,SAAJ,EAAe;AACb,QAAI,SAAS,CAAC,EAAV,KAAiB,QAAjB,IAA6B,SAAS,CAAC,EAAV,KAAiB,SAAlD,EAA6D;AAC3D,aAAO,SAAP,CAD2D,CACzC;AACnB;;AAED,QAAI,CAAC,SAAS,CAAC,cAAV,CAAyB,MAAzB,CAAL,EAAuC;AACrC,MAAA,SAAS,CAAC,IAAV,GAAiB,QAAjB;AACD;;AACD,QAAI,CAAC,SAAS,CAAC,cAAV,CAAyB,eAAzB,CAAL,EAAgD;AAC9C,MAAA,SAAS,CAAC,eAAD,CAAT,GAA6B,QAA7B;AACD;;AAED,IAAA,SAAS,CAAC,OAAV,GAAoB,cAApB;AACA,IAAA,SAAS,CAAC,SAAV,GAAsB,gBAAtB;AACA,IAAA,SAAS,CAAC,OAAV,GAAoB,cAApB,CAda,CAgBb;;AACA,QAAI,SAAS,CAAC,EAAV,KAAiB,GAArB,EAA0B;AACxB,UAAI,CAAC,SAAS,CAAC,cAAV,CAAyB,UAAzB,CAAL,EAA2C;AACzC,QAAA,SAAS,CAAC,QAAV,GAAqB,QAAQ,GAAG,SAAH,GAAe,CAA5C;AACD;AACF;AACF;;AAED,SAAO,SAAP;AACD;;AAvFD,OAAA,CAAA,aAAA,GAAA,aAAA","sourceRoot":""}
+{"version":3,"sources":["../../src/hooks/useARIAButton.ts"],"names":[],"mappings":"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","sourceRoot":""}

package/lib-commonjs/utils/mergeARIADisabled.d.ts

@@ -4,7 +4,7 @@ import { ObjectShorthandProps } from '@fluentui/react-utilities';
  * Merges disabled declaration with `aria-disabled`
  */
 export declare function mergeARIADisabled(shorthand: ObjectShorthandProps<{
-    disabled?: boolean;
     'aria-disabled'?: string | boolean;
     children?: React.ReactNode;
+    disabled?: boolean;
 }>): boolean;

package/lib-commonjs/utils/mergeARIADisabled.js

@@ -9,9 +9,9 @@ exports.mergeARIADisabled = void 0;
  */
 
 function mergeARIADisabled(shorthand) {
-  var _a, _b;
+  var _a;
 
-  var disabled = (_b = (_a = shorthand.disabled) !== null && _a !== void 0 ? _a : shorthand['aria-disabled']) !== null && _b !== void 0 ? _b : undefined;
+  var disabled = (_a = shorthand.disabled) !== null && _a !== void 0 ? _a : shorthand['aria-disabled'];
 
   if (typeof disabled === 'string') {
     return disabled === 'false' ? false : true;

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/mergeARIADisabled.ts"],"names":[],"mappings":";;;;;;AAGA;;AAEG;;AACH,SAAgB,iBAAhB,CACE,SADF,EAKI;;;AAEF,MAAM,QAAQ,GAAA,CAAA,EAAA,GAAA,CAAA,EAAA,GAAG,SAAS,CAAC,QAAb,MAAqB,IAArB,IAAqB,EAAA,KAAA,KAAA,CAArB,GAAqB,EAArB,GAAyB,SAAS,CAAC,eAAD,CAAlC,MAAmD,IAAnD,IAAmD,EAAA,KAAA,KAAA,CAAnD,GAAmD,EAAnD,GAAuD,SAArE;;AACA,MAAI,OAAO,QAAP,KAAoB,QAAxB,EAAkC;AAChC,WAAO,QAAQ,KAAK,OAAb,GAAuB,KAAvB,GAA+B,IAAtC;AACD;;AACD,SAAO,QAAQ,KAAA,IAAR,IAAA,QAAQ,KAAA,KAAA,CAAR,GAAA,QAAA,GAAY,KAAnB;AACD;;AAZD,OAAA,CAAA,iBAAA,GAAA,iBAAA","sourceRoot":""}
+{"version":3,"sources":["../../src/utils/mergeARIADisabled.ts"],"names":[],"mappings":";;;;;;AAGA;;AAEG;;AACH,SAAgB,iBAAhB,CACE,SADF,EAKI;;;AAEF,MAAM,QAAQ,GAAA,CAAA,EAAA,GAAG,SAAS,CAAC,QAAb,MAAqB,IAArB,IAAqB,EAAA,KAAA,KAAA,CAArB,GAAqB,EAArB,GAAyB,SAAS,CAAC,eAAD,CAAhD;;AACA,MAAI,OAAO,QAAP,KAAoB,QAAxB,EAAkC;AAChC,WAAO,QAAQ,KAAK,OAAb,GAAuB,KAAvB,GAA+B,IAAtC;AACD;;AACD,SAAO,QAAQ,KAAA,IAAR,IAAA,QAAQ,KAAA,KAAA,CAAR,GAAA,QAAA,GAAY,KAAnB;AACD;;AAZD,OAAA,CAAA,iBAAA,GAAA,iBAAA","sourceRoot":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluentui/react-aria",
-  "version": "9.0.0-alpha.40",
+  "version": "9.0.0-alpha.45",
   "description": "React helper to ensure ARIA",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
@@ -25,7 +25,7 @@
   },
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
-    "@fluentui/jest-serializer-make-styles": "9.0.0-alpha.49",
+    "@fluentui/jest-serializer-make-styles": "9.0.0-alpha.53",
     "@fluentui/react-conformance": "*",
     "@fluentui/scripts": "^1.0.0",
     "@types/enzyme": "3.10.3",
@@ -40,9 +40,9 @@
     "react-test-renderer": "^16.3.0"
   },
   "dependencies": {
-    "@fluentui/keyboard-keys": "9.0.0-alpha.3",
-    "@fluentui/react-make-styles": "9.0.0-alpha.74",
-    "@fluentui/react-utilities": "9.0.0-alpha.53",
+    "@fluentui/keyboard-keys": "9.0.0-alpha.5",
+    "@fluentui/react-make-styles": "9.0.0-alpha.78",
+    "@fluentui/react-utilities": "9.0.0-alpha.56",
     "tslib": "^2.1.0"
   },
   "peerDependencies": {