@fluentui/react-aria 9.0.0-alpha.3 → 9.0.0-alpha.33

package/CHANGELOG.md

@@ -1,12 +1,297 @@
 # Change Log - @fluentui/react-aria
 
-This log was last generated on Tue, 29 Jun 2021 07:29:59 GMT and should not be manually modified.
+This log was last generated on Fri, 17 Sep 2021 07:32:57 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## [9.0.0-alpha.33](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.33)
+
+Fri, 17 Sep 2021 07:32:57 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.32..@fluentui/react-aria_v9.0.0-alpha.33)
+
+### Changes
+
+- Bump @fluentui/react-aria to v9.0.0-alpha.33 ([PR #19840](https://github.com/microsoft/fluentui/pull/19840) by Humberto.Morimoto@microsoft.com)
+
+## [9.0.0-alpha.32](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.32)
+
+Thu, 16 Sep 2021 07:38:39 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.31..@fluentui/react-aria_v9.0.0-alpha.32)
+
+### Changes
+
+- Bump @fluentui/react-aria to v9.0.0-alpha.32 ([PR #19815](https://github.com/microsoft/fluentui/pull/19815) by behowell@microsoft.com)
+
+## [9.0.0-alpha.31](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.31)
+
+Tue, 14 Sep 2021 20:09:02 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.30..@fluentui/react-aria_v9.0.0-alpha.31)
+
+### Changes
+
+- Bump @fluentui/react-aria to v9.0.0-alpha.31 ([PR #19155](https://github.com/microsoft/fluentui/pull/19155) by bsunderhus@microsoft.com)
+
+## [9.0.0-alpha.30](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.30)
+
+Tue, 14 Sep 2021 07:38:18 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.29..@fluentui/react-aria_v9.0.0-alpha.30)
+
+### Changes
+
+- Generalize mergeARIADisabled ([PR #19605](https://github.com/microsoft/fluentui/pull/19605) by bsunderhus@microsoft.com)
+
+## [9.0.0-alpha.29](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.29)
+
+Fri, 10 Sep 2021 16:31:53 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.28..@fluentui/react-aria_v9.0.0-alpha.29)
+
+### Changes
+
+- chore(v9): Move all internal v9 dependencies from caret to fixed version ([PR #19748](https://github.com/microsoft/fluentui/pull/19748) by lingfangao@hotmail.com)
+- Bump @fluentui/react-aria to v9.0.0-alpha.29 ([PR #19748](https://github.com/microsoft/fluentui/pull/19748) by lingfangao@hotmail.com)
+
+## [9.0.0-alpha.28](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.28)
+
+Fri, 10 Sep 2021 07:39:51 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.27..@fluentui/react-aria_v9.0.0-alpha.28)
+
+### Changes
+
+- Refactor ObjectShorthandProps into IntrinsicShorthandProps ([PR #19642](https://github.com/microsoft/fluentui/pull/19642) by behowell@microsoft.com)
+
+## [9.0.0-alpha.27](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.27)
+
+Mon, 06 Sep 2021 07:34:53 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.26..@fluentui/react-aria_v9.0.0-alpha.27)
+
+### Changes
+
+- Bump @fluentui/react-utilities to v9.0.0-alpha.44 ([PR #19640](https://github.com/microsoft/fluentui/pull/19640) by lingfangao@hotmail.com)
+
+## [9.0.0-alpha.26](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.26)
+
+Thu, 02 Sep 2021 07:36:46 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.25..@fluentui/react-aria_v9.0.0-alpha.26)
+
+### Patches
+
+- Bump @fluentui/react-conformance to v0.4.5 ([PR #19590](https://github.com/microsoft/fluentui/pull/19590) by olfedias@microsoft.com)
+
+## [9.0.0-alpha.25](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.25)
+
+Wed, 01 Sep 2021 07:39:56 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.24..@fluentui/react-aria_v9.0.0-alpha.25)
+
+### Changes
+
+- Updates react-aria to use root as slot ([PR #19483](https://github.com/microsoft/fluentui/pull/19483) by bsunderhus@microsoft.com)
+
+## [9.0.0-alpha.24](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.24)
+
+Tue, 31 Aug 2021 07:37:47 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.23..@fluentui/react-aria_v9.0.0-alpha.24)
+
+### Changes
+
+- Bump @fluentui/react-utilities to v9.0.0-alpha.42 ([PR #19556](https://github.com/microsoft/fluentui/pull/19556) by lingfan.gao@microsoft.com)
+
+## [9.0.0-alpha.23](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.23)
+
+Mon, 30 Aug 2021 07:35:05 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.22..@fluentui/react-aria_v9.0.0-alpha.23)
+
+### Changes
+
+- Updating TypeScript type-only imports/exports to use import/export type syntax. ([PR #19485](https://github.com/microsoft/fluentui/pull/19485) by dzearing@hotmail.com)
+
+## [9.0.0-alpha.22](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.22)
+
+Fri, 20 Aug 2021 07:37:28 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.21..@fluentui/react-aria_v9.0.0-alpha.22)
+
+### Changes
+
+- Update .npmignore ([PR #19441](https://github.com/microsoft/fluentui/pull/19441) by elcraig@microsoft.com)
+
+## [9.0.0-alpha.21](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.21)
+
+Thu, 19 Aug 2021 07:41:35 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.20..@fluentui/react-aria_v9.0.0-alpha.21)
+
+### Changes
+
+- Updates react-aria on slot null rendering ([PR #19273](https://github.com/microsoft/fluentui/pull/19273) by bsunderhus@microsoft.com)
+
+## [9.0.0-alpha.20](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.20)
+
+Fri, 13 Aug 2021 07:36:34 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.19..@fluentui/react-aria_v9.0.0-alpha.20)
+
+### Changes
+
+- Bump @fluentui/jest-serializer-make-styles to v9.0.0-alpha.32 ([PR #19341](https://github.com/microsoft/fluentui/pull/19341) by olfedias@microsoft.com)
+
+## [9.0.0-alpha.19](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.19)
+
+Fri, 06 Aug 2021 07:35:14 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.18..@fluentui/react-aria_v9.0.0-alpha.19)
+
+### Changes
+
+- Bump @fluentui/jest-serializer-make-styles to v9.0.0-alpha.31 ([PR #19281](https://github.com/microsoft/fluentui/pull/19281) by jspurlin@microsoft.com)
+
+## [9.0.0-alpha.18](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.18)
+
+Tue, 03 Aug 2021 07:39:30 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.17..@fluentui/react-aria_v9.0.0-alpha.18)
+
+### Patches
+
+- Bump @fluentui/eslint-plugin to v1.3.3 ([PR #19169](https://github.com/microsoft/fluentui/pull/19169) by behowell@microsoft.com)
+- Bump @fluentui/react-conformance to v0.4.4 ([PR #19169](https://github.com/microsoft/fluentui/pull/19169) by behowell@microsoft.com)
+- Bump @fluentui/scripts to v1.0.0 ([PR #19169](https://github.com/microsoft/fluentui/pull/19169) by behowell@microsoft.com)
+
+### Changes
+
+- Bump @fluentui/jest-serializer-make-styles to v9.0.0-alpha.30 ([PR #19169](https://github.com/microsoft/fluentui/pull/19169) by behowell@microsoft.com)
+
+## [9.0.0-alpha.17](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.17)
+
+Mon, 02 Aug 2021 07:36:20 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.16..@fluentui/react-aria_v9.0.0-alpha.17)
+
+### Changes
+
+- Bump @fluentui/react-utilities to v9.0.0-alpha.36 ([PR #19204](https://github.com/microsoft/fluentui/pull/19204) by lingfan.gao@microsoft.com)
+
+## [9.0.0-alpha.16](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.16)
+
+Mon, 26 Jul 2021 07:37:30 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.15..@fluentui/react-aria_v9.0.0-alpha.16)
+
+### Changes
+
+- add Babel plugins to build pipeline ([PR #18968](https://github.com/microsoft/fluentui/pull/18968) by olfedias@microsoft.com)
+
+## [9.0.0-alpha.15](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.15)
+
+Fri, 23 Jul 2021 07:38:19 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.14..@fluentui/react-aria_v9.0.0-alpha.15)
+
+### Changes
+
+- Bump @fluentui/jest-serializer-make-styles to v9.0.0-alpha.27 ([PR #19041](https://github.com/microsoft/fluentui/pull/19041) by miroslav.stastny@microsoft.com)
+
+## [9.0.0-alpha.14](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.14)
+
+Thu, 22 Jul 2021 07:36:55 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.13..@fluentui/react-aria_v9.0.0-alpha.14)
+
+### Changes
+
+- Bump @fluentui/react-utilities to v9.0.0-alpha.34 ([PR #19023](https://github.com/microsoft/fluentui/pull/19023) by behowell@microsoft.com)
+
+## [9.0.0-alpha.13](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.13)
+
+Tue, 20 Jul 2021 22:23:17 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.12..@fluentui/react-aria_v9.0.0-alpha.13)
+
+### Changes
+
+- chore(react-aria): Replace keyboard-key with keyboard-keys ([PR #19016](https://github.com/microsoft/fluentui/pull/19016) by lingfan.gao@microsoft.com)
+
+## [9.0.0-alpha.12](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.12)
+
+Thu, 15 Jul 2021 07:36:18 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.11..@fluentui/react-aria_v9.0.0-alpha.12)
+
+### Changes
+
+- Fix react-aria due to changes on slots typings ([PR #18861](https://github.com/microsoft/fluentui/pull/18861) by bsunderhus@microsoft.com)
+
+## [9.0.0-alpha.11](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.11)
+
+Tue, 13 Jul 2021 22:32:58 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.10..@fluentui/react-aria_v9.0.0-alpha.11)
+
+### Patches
+
+- Bump @fluentui/react-conformance to v0.4.3 ([PR #18925](https://github.com/microsoft/fluentui/pull/18925) by elcraig@microsoft.com)
+
+## [9.0.0-alpha.10](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.10)
+
+Tue, 13 Jul 2021 07:35:36 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.9..@fluentui/react-aria_v9.0.0-alpha.10)
+
+### Changes
+
+- Bump @fluentui/jest-serializer-make-styles to v9.0.0-alpha.24 ([PR #18560](https://github.com/microsoft/fluentui/pull/18560) by behowell@microsoft.com)
+
+## [9.0.0-alpha.9](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.9)
+
+Mon, 12 Jul 2021 07:33:23 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.8..@fluentui/react-aria_v9.0.0-alpha.9)
+
+### Changes
+
+- Update prop merging mechanism ([PR #18813](https://github.com/microsoft/fluentui/pull/18813) by bsunderhus@microsoft.com)
+- Removes forcing children on useARIAButton ([PR #18879](https://github.com/microsoft/fluentui/pull/18879) by bsunderhus@microsoft.com)
+
+## [9.0.0-alpha.8](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.8)
+
+Fri, 09 Jul 2021 07:39:31 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.7..@fluentui/react-aria_v9.0.0-alpha.8)
+
+### Patches
+
+- Bump @fluentui/eslint-plugin to v1.3.2 ([PR #18808](https://github.com/microsoft/fluentui/pull/18808) by martinhochel@microsoft.com)
+- Bump @fluentui/keyboard-key to v0.3.3 ([PR #18808](https://github.com/microsoft/fluentui/pull/18808) by martinhochel@microsoft.com)
+- Bump @fluentui/react-conformance to v0.4.2 ([PR #18808](https://github.com/microsoft/fluentui/pull/18808) by martinhochel@microsoft.com)
+- Bump @fluentui/scripts to v1.0.0 ([PR #18808](https://github.com/microsoft/fluentui/pull/18808) by martinhochel@microsoft.com)
+
+### Changes
+
+- Bump @fluentui/jest-serializer-make-styles to v9.0.0-alpha.23 ([PR #18808](https://github.com/microsoft/fluentui/pull/18808) by martinhochel@microsoft.com)
+
+## [9.0.0-alpha.7](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.7)
+
+Fri, 02 Jul 2021 23:15:55 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.6..@fluentui/react-aria_v9.0.0-alpha.7)
+
+### Changes
+
+- Bump @fluentui/react-utilities to v9.0.0-alpha.31 ([PR #18721](https://github.com/microsoft/fluentui/pull/18721) by bsunderhus@microsoft.com)
+
+## [9.0.0-alpha.6](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.6)
+
+Fri, 02 Jul 2021 07:37:06 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.5..@fluentui/react-aria_v9.0.0-alpha.6)
+
+### Changes
+
+- Rename typings and getSlots to have the Compat Suffix ([PR #18796](https://github.com/microsoft/fluentui/pull/18796) by bsunderhus@microsoft.com)
+
+## [9.0.0-alpha.5](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.5)
+
+Thu, 01 Jul 2021 07:35:05 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.4..@fluentui/react-aria_v9.0.0-alpha.5)
+
+### Changes
+
+- Fixing bug in start script of converged packages. ([PR #18768](https://github.com/microsoft/fluentui/pull/18768) by Humberto.Morimoto@microsoft.com)
+
+## [9.0.0-alpha.4](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.4)
+
+Wed, 30 Jun 2021 07:38:35 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.3..@fluentui/react-aria_v9.0.0-alpha.4)
+
+### Changes
+
+- Bump @fluentui/jest-serializer-make-styles to v9.0.0-alpha.20 ([PR #18695](https://github.com/microsoft/fluentui/pull/18695) by tristan.watanabe@gmail.com)
+
 ## [9.0.0-alpha.3](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-alpha.3)
 
-Tue, 29 Jun 2021 07:29:59 GMT 
+Tue, 29 Jun 2021 07:33:32 GMT 
 [Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-alpha.2..@fluentui/react-aria_v9.0.0-alpha.3)
 
 ### Changes

package/dist/react-aria.d.ts

@@ -1,11 +1,25 @@
+import type { IntrinsicShorthandProps } from '@fluentui/react-utilities';
 import { ObjectShorthandProps } from '@fluentui/react-utilities';
 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'>;
+
+/**
+ * Merges disabled declaration with `aria-disabled`
+ */
+export declare function mergeARIADisabled(shorthand: ObjectShorthandProps<{
+    disabled?: boolean;
+    'aria-disabled'?: string | boolean;
+    children?: React_2.ReactNode;
+}>): boolean;
 
 /**
  * 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 useARIAButton(shorthand: ObjectShorthandProps<React_2.ButtonHTMLAttributes<HTMLElement>>): ObjectShorthandProps<React_2.ButtonHTMLAttributes<HTMLElement>>;
+export declare function useARIAButton<Required extends boolean = false>(value: ShorthandProps<ARIAButtonShorthandProps>, options?: ResolveShorthandOptions<ARIAButtonShorthandProps, Required>): Required extends false ? ARIAButtonShorthandProps | undefined : ARIAButtonShorthandProps;
 
 export { }

package/lib/hooks/useARIAButton.d.ts

@@ -1,8 +1,8 @@
-import * as React from 'react';
-import { ObjectShorthandProps } from '@fluentui/react-utilities';
+import type { IntrinsicShorthandProps, ResolveShorthandOptions, ShorthandProps } from '@fluentui/react-utilities';
+export declare type ARIAButtonShorthandProps = IntrinsicShorthandProps<'button', 'div' | 'span' | 'a'>;
 /**
  * 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 useARIAButton(shorthand: ObjectShorthandProps<React.ButtonHTMLAttributes<HTMLElement>>): ObjectShorthandProps<React.ButtonHTMLAttributes<HTMLElement>>;
+export declare function useARIAButton<Required extends boolean = false>(value: ShorthandProps<ARIAButtonShorthandProps>, options?: ResolveShorthandOptions<ARIAButtonShorthandProps, Required>): Required extends false ? ARIAButtonShorthandProps | undefined : ARIAButtonShorthandProps;

package/lib/hooks/useARIAButton.js

@@ -1,101 +1,100 @@
-import { useEventCallback } from '@fluentui/react-utilities';
-import { getCode, SpacebarKey, EnterKey } from '@fluentui/keyboard-key';
+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
  * for multiple scenarios of shorthand properties. Ensuring 1st rule of ARIA for cases
  * where no attribute addition is required
  */
-export function useARIAButton(shorthand) {
-    var onClick = shorthand.onClick, onKeyDown = shorthand.onKeyDown, onKeyUp = shorthand.onKeyUp, defaultDisabled = shorthand.disabled, ariaDisabled = shorthand["aria-disabled"];
-    var disabled = mergeARIADisabled(defaultDisabled !== null && defaultDisabled !== void 0 ? defaultDisabled : ariaDisabled);
-    var onClickHandler = useEventCallback(function (ev) {
-        if (disabled) {
-            ev.preventDefault();
-            ev.stopPropagation();
-        }
-        else {
-            if (typeof onClick === 'function') {
-                onClick(ev);
-            }
-        }
-    });
-    var onKeyDownHandler = useEventCallback(function (ev) {
-        var code = getCode(ev);
-        if (typeof onKeyDown === 'function') {
-            onKeyDown(ev);
-        }
-        if (ev.isDefaultPrevented()) {
-            return;
-        }
-        if (disabled && (code === EnterKey || code === SpacebarKey)) {
-            ev.preventDefault();
-            ev.stopPropagation();
-            return;
-        }
-        if (code === SpacebarKey) {
-            ev.preventDefault();
-            return;
-        }
-        // If enter is pressed, activate the button
-        else if (code === EnterKey) {
-            ev.preventDefault();
-            ev.currentTarget.click();
-        }
-    });
-    var onKeyupHandler = useEventCallback(function (ev) {
-        var code = getCode(ev);
-        if (typeof onKeyUp === 'function') {
-            onKeyUp(ev);
-        }
-        if (ev.isDefaultPrevented()) {
-            return;
-        }
-        if (disabled && (code === EnterKey || code === SpacebarKey)) {
-            ev.preventDefault();
-            ev.stopPropagation();
-            return;
-        }
-        if (code === SpacebarKey) {
-            ev.preventDefault();
-            ev.currentTarget.click();
-        }
-    });
-    if (!shorthand.hasOwnProperty('children')) {
-        shorthand.children = null;
+
+export function useARIAButton(value, options) {
+  var shorthand = resolveShorthand(value, options);
+
+  var _a = shorthand || {},
+      onClick = _a.onClick,
+      onKeyDown = _a.onKeyDown,
+      onKeyUp = _a.onKeyUp;
+
+  var disabled = mergeARIADisabled(shorthand);
+  var onClickHandler = useEventCallback(function (ev) {
+    if (disabled) {
+      ev.preventDefault();
+      ev.stopPropagation();
+    } else {
+      if (typeof onClick === 'function') {
+        onClick(ev);
+      }
     }
-    if (!shorthand.hasOwnProperty('as') || shorthand.as === 'button') {
-        shorthand.as = 'button';
-        return shorthand; // there's nothing to be done if as prop === 'button'
+  });
+  var onKeyDownHandler = useEventCallback(function (ev) {
+    if (typeof onKeyDown === 'function') {
+      onKeyDown(ev);
     }
-    /**
-     * TODO: Ideally this is unnecessary after implementation of as-prop RFC.
-     * The way to go is to have an assertion method to ensure types,
-     * in the case of button we'd like to limit it for: button, div, span, a
-     */
-    if (typeof shorthand.as !== 'string') {
-        return shorthand;
+
+    if (ev.isDefaultPrevented()) {
+      return;
     }
+
+    if (disabled && (ev.key === Enter || ev.key === Space)) {
+      ev.preventDefault();
+      ev.stopPropagation();
+      return;
+    }
+
+    if (ev.key === Space) {
+      ev.preventDefault();
+      return;
+    } // If enter is pressed, activate the button
+    else if (ev.key === Enter) {
+      ev.preventDefault();
+      ev.currentTarget.click();
+    }
+  });
+  var onKeyupHandler = useEventCallback(function (ev) {
+    if (typeof onKeyUp === 'function') {
+      onKeyUp(ev);
+    }
+
+    if (ev.isDefaultPrevented()) {
+      return;
+    }
+
+    if (disabled && (ev.key === Enter || ev.key === Space)) {
+      ev.preventDefault();
+      ev.stopPropagation();
+      return;
+    }
+
+    if (ev.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 (!shorthand.hasOwnProperty('role')) {
-        shorthand.role = 'button';
+      shorthand.role = 'button';
     }
+
     if (!shorthand.hasOwnProperty('aria-disabled')) {
-        shorthand['aria-disabled'] = disabled;
+      shorthand['aria-disabled'] = disabled;
     }
+
     shorthand.onClick = onClickHandler;
     shorthand.onKeyDown = onKeyDownHandler;
-    shorthand.onKeyUp = onKeyupHandler;
-    // Add keydown event handler for all other non-anchor elements.
+    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;
-        }
-    }
-    return shorthand;
-}
-function mergeARIADisabled(disabled) {
-    if (typeof disabled === 'string') {
-        return disabled === 'false' ? false : true;
+      if (!shorthand.hasOwnProperty('tabIndex')) {
+        shorthand.tabIndex = disabled ? undefined : 0;
+      }
     }
-    return disabled !== null && disabled !== void 0 ? disabled : false;
+  }
+
+  return shorthand;
 }
 //# sourceMappingURL=useARIAButton.js.map