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

package/lib/hooks/useARIAButton.js.map

@@ -1 +1 @@
-{"version":3,"file":"useARIAButton.js","sourceRoot":"../src/","sources":["hooks/useARIAButton.ts"],"names":[],"mappings":"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","sourcesContent":["import * as React from 'react';\nimport { ObjectShorthandProps, useEventCallback } from '@fluentui/react-utilities';\nimport { getCode, SpacebarKey, EnterKey } from '@fluentui/keyboard-key';\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 function useARIAButton(\n  shorthand: ObjectShorthandProps<React.ButtonHTMLAttributes<HTMLElement>>,\n): ObjectShorthandProps<React.ButtonHTMLAttributes<HTMLElement>> {\n  const { onClick, onKeyDown, onKeyUp, disabled: defaultDisabled, ['aria-disabled']: ariaDisabled } = shorthand;\n  const disabled = mergeARIADisabled(defaultDisabled ?? ariaDisabled);\n\n  const onClickHandler = useEventCallback((ev: React.MouseEvent<HTMLElement>) => {\n    if (disabled) {\n      ev.preventDefault();\n      ev.stopPropagation();\n    } else {\n      if (typeof onClick === 'function') {\n        onClick(ev);\n      }\n    }\n  });\n\n  const onKeyDownHandler = useEventCallback((ev: React.KeyboardEvent<HTMLElement>) => {\n    const code = getCode(ev);\n    if (typeof onKeyDown === 'function') {\n      onKeyDown(ev);\n    }\n    if (ev.isDefaultPrevented()) {\n      return;\n    }\n    if (disabled && (code === EnterKey || code === SpacebarKey)) {\n      ev.preventDefault();\n      ev.stopPropagation();\n      return;\n    }\n    if (code === SpacebarKey) {\n      ev.preventDefault();\n      return;\n    }\n    // If enter is pressed, activate the button\n    else if (code === EnterKey) {\n      ev.preventDefault();\n      ev.currentTarget.click();\n    }\n  });\n\n  const onKeyupHandler = useEventCallback((ev: React.KeyboardEvent<HTMLElement>) => {\n    const code = getCode(ev);\n    if (typeof onKeyUp === 'function') {\n      onKeyUp(ev);\n    }\n    if (ev.isDefaultPrevented()) {\n      return;\n    }\n    if (disabled && (code === EnterKey || code === SpacebarKey)) {\n      ev.preventDefault();\n      ev.stopPropagation();\n      return;\n    }\n    if (code === SpacebarKey) {\n      ev.preventDefault();\n      ev.currentTarget.click();\n    }\n  });\n\n  if (!shorthand.hasOwnProperty('children')) {\n    shorthand.children = null;\n  }\n\n  if (!shorthand.hasOwnProperty('as') || shorthand.as === 'button') {\n    shorthand.as = 'button';\n    return shorthand; // there's nothing to be done if as prop === 'button'\n  }\n\n  /**\n   * TODO: Ideally this is unnecessary after implementation of as-prop RFC.\n   * The way to go is to have an assertion method to ensure types,\n   * in the case of button we'd like to limit it for: button, div, span, a\n   */\n  if (typeof shorthand.as !== 'string') {\n    return shorthand;\n  }\n\n  if (!shorthand.hasOwnProperty('role')) {\n    shorthand.role = 'button';\n  }\n  if (!shorthand.hasOwnProperty('aria-disabled')) {\n    shorthand['aria-disabled'] = disabled;\n  }\n\n  shorthand.onClick = onClickHandler;\n  shorthand.onKeyDown = onKeyDownHandler;\n  shorthand.onKeyUp = onKeyupHandler;\n\n  // Add keydown event handler for all other non-anchor elements.\n  if (shorthand.as !== 'a') {\n    if (!shorthand.hasOwnProperty('tabIndex')) {\n      shorthand.tabIndex = disabled ? undefined : 0;\n    }\n  }\n  return shorthand;\n}\n\nfunction mergeARIADisabled(disabled?: boolean | 'false' | 'true'): boolean {\n  if (typeof disabled === 'string') {\n    return disabled === 'false' ? false : true;\n  }\n  return disabled ?? false;\n}\n"]}
+{"version":3,"sources":["hooks/useARIAButton.ts"],"names":[],"mappings":"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","sourcesContent":["import { Enter, Space } from '@fluentui/keyboard-keys';\nimport { ObjectShorthandProps, resolveShorthand, useEventCallback } from '@fluentui/react-utilities';\nimport type { IntrinsicShorthandProps, ResolveShorthandOptions, ShorthandProps } from '@fluentui/react-utilities';\nimport { mergeARIADisabled } from '../utils/index';\n\nexport type ARIAButtonShorthandProps = IntrinsicShorthandProps<'button', 'div' | 'span' | 'a'>;\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 function useARIAButton<Required extends boolean = false>(\n  value: ShorthandProps<ARIAButtonShorthandProps>,\n  options?: ResolveShorthandOptions<ARIAButtonShorthandProps, Required>,\n): Required extends false ? ARIAButtonShorthandProps | undefined : ARIAButtonShorthandProps {\n  const shorthand = resolveShorthand(value, options);\n\n  const { onClick, onKeyDown, onKeyUp } = (shorthand || {}) as ARIAButtonShorthandProps;\n\n  const disabled = mergeARIADisabled(shorthand as ObjectShorthandProps<ARIAButtonShorthandProps>);\n\n  const onClickHandler: ARIAButtonShorthandProps['onClick'] = useEventCallback(ev => {\n    if (disabled) {\n      ev.preventDefault();\n      ev.stopPropagation();\n    } else {\n      if (typeof onClick === 'function') {\n        onClick(ev);\n      }\n    }\n  });\n\n  const onKeyDownHandler: ARIAButtonShorthandProps['onKeyDown'] = useEventCallback(ev => {\n    if (typeof onKeyDown === 'function') {\n      onKeyDown(ev);\n    }\n    if (ev.isDefaultPrevented()) {\n      return;\n    }\n    if (disabled && (ev.key === Enter || ev.key === Space)) {\n      ev.preventDefault();\n      ev.stopPropagation();\n      return;\n    }\n    if (ev.key === Space) {\n      ev.preventDefault();\n      return;\n    }\n    // If enter is pressed, activate the button\n    else if (ev.key === Enter) {\n      ev.preventDefault();\n      ev.currentTarget.click();\n    }\n  });\n\n  const onKeyupHandler: ARIAButtonShorthandProps['onKeyUp'] = useEventCallback(ev => {\n    if (typeof onKeyUp === 'function') {\n      onKeyUp(ev);\n    }\n    if (ev.isDefaultPrevented()) {\n      return;\n    }\n    if (disabled && (ev.key === Enter || ev.key === Space)) {\n      ev.preventDefault();\n      ev.stopPropagation();\n      return;\n    }\n    if (ev.key === Space) {\n      ev.preventDefault();\n      ev.currentTarget.click();\n    }\n  });\n\n  if (shorthand) {\n    if (shorthand.as === 'button' || shorthand.as === undefined) {\n      return shorthand; // there's nothing to be done if as prop === 'button' or undefined\n    }\n\n    if (!shorthand.hasOwnProperty('role')) {\n      shorthand.role = 'button';\n    }\n    if (!shorthand.hasOwnProperty('aria-disabled')) {\n      shorthand['aria-disabled'] = disabled;\n    }\n\n    shorthand.onClick = onClickHandler;\n    shorthand.onKeyDown = onKeyDownHandler;\n    shorthand.onKeyUp = onKeyupHandler;\n\n    // Add keydown event handler for all other non-anchor elements.\n    if (shorthand.as !== 'a') {\n      if (!shorthand.hasOwnProperty('tabIndex')) {\n        shorthand.tabIndex = disabled ? undefined : 0;\n      }\n    }\n  }\n\n  return shorthand;\n}\n"],"sourceRoot":"../src/"}

package/lib/index.d.ts

@@ -1 +1,2 @@
 export * from './hooks/index';
+export * from './utils/index';

package/lib/index.js

@@ -1,2 +1,3 @@
 export * from './hooks/index';
+export * from './utils/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,cAAc,eAAe,CAAC","sourcesContent":["export * from './hooks/index';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"../src/","sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC","sourcesContent":["export * from './hooks/index';\nexport * from './utils/index';\n"]}

package/lib/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.13.0"
+      "packageVersion": "7.18.1"
     }
   ]
 }

package/lib/utils/index.d.ts

@@ -0,0 +1 @@
+export * from './mergeARIADisabled';

package/lib/utils/index.js

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

package/lib/utils/index.js.map

@@ -0,0 +1 @@
+{"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.d.ts

@@ -0,0 +1,10 @@
+import * as React from 'react';
+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;
+}>): boolean;

package/lib/utils/mergeARIADisabled.js

@@ -0,0 +1,15 @@
+/**
+ * Merges disabled declaration with `aria-disabled`
+ */
+export function mergeARIADisabled(shorthand) {
+  var _a, _b;
+
+  var disabled = (_b = (_a = shorthand.disabled) !== null && _a !== void 0 ? _a : shorthand['aria-disabled']) !== null && _b !== void 0 ? _b : undefined;
+
+  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

@@ -0,0 +1 @@
+{"version":3,"sources":["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","sourcesContent":["import * as React from 'react';\nimport { ObjectShorthandProps } from '@fluentui/react-utilities';\n\n/**\n * Merges disabled declaration with `aria-disabled`\n */\nexport function mergeARIADisabled(\n  shorthand: ObjectShorthandProps<{\n    disabled?: boolean;\n    'aria-disabled'?: string | boolean;\n    children?: React.ReactNode;\n  }>,\n) {\n  const disabled = shorthand.disabled ?? shorthand['aria-disabled'] ?? undefined;\n  if (typeof disabled === 'string') {\n    return disabled === 'false' ? false : true;\n  }\n  return disabled ?? false;\n}\n"],"sourceRoot":"../src/"}

package/lib-amd/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-amd/hooks/useARIAButton.js

@@ -1,4 +1,4 @@
-define(["require", "exports", "@fluentui/react-utilities", "@fluentui/keyboard-key"], function (require, exports, react_utilities_1, keyboard_key_1) {
+define(["require", "exports", "@fluentui/keyboard-keys", "@fluentui/react-utilities", "../utils/index"], function (require, exports, keyboard_keys_1, react_utilities_1, index_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.useARIAButton = void 0;
@@ -7,9 +7,10 @@ define(["require", "exports", "@fluentui/react-utilities", "@fluentui/keyboard-k
      * for multiple scenarios of shorthand properties. Ensuring 1st rule of ARIA for cases
      * where no attribute addition is required
      */
-    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);
+    function useARIAButton(value, options) {
+        var shorthand = react_utilities_1.resolveShorthand(value, options);
+        var _a = (shorthand || {}), onClick = _a.onClick, onKeyDown = _a.onKeyDown, onKeyUp = _a.onKeyUp;
+        var disabled = index_1.mergeARIADisabled(shorthand);
         var onClickHandler = react_utilities_1.useEventCallback(function (ev) {
             if (disabled) {
                 ev.preventDefault();
@@ -22,84 +23,66 @@ define(["require", "exports", "@fluentui/react-utilities", "@fluentui/keyboard-k
             }
         });
         var onKeyDownHandler = react_utilities_1.useEventCallback(function (ev) {
-            var code = keyboard_key_1.getCode(ev);
             if (typeof onKeyDown === 'function') {
                 onKeyDown(ev);
             }
             if (ev.isDefaultPrevented()) {
                 return;
             }
-            if (disabled && (code === keyboard_key_1.EnterKey || code === keyboard_key_1.SpacebarKey)) {
+            if (disabled && (ev.key === keyboard_keys_1.Enter || ev.key === keyboard_keys_1.Space)) {
                 ev.preventDefault();
                 ev.stopPropagation();
                 return;
             }
-            if (code === keyboard_key_1.SpacebarKey) {
+            if (ev.key === keyboard_keys_1.Space) {
                 ev.preventDefault();
                 return;
             }
             // If enter is pressed, activate the button
-            else if (code === keyboard_key_1.EnterKey) {
+            else if (ev.key === keyboard_keys_1.Enter) {
                 ev.preventDefault();
                 ev.currentTarget.click();
             }
         });
         var onKeyupHandler = react_utilities_1.useEventCallback(function (ev) {
-            var code = keyboard_key_1.getCode(ev);
             if (typeof onKeyUp === 'function') {
                 onKeyUp(ev);
             }
             if (ev.isDefaultPrevented()) {
                 return;
             }
-            if (disabled && (code === keyboard_key_1.EnterKey || code === keyboard_key_1.SpacebarKey)) {
+            if (disabled && (ev.key === keyboard_keys_1.Enter || ev.key === keyboard_keys_1.Space)) {
                 ev.preventDefault();
                 ev.stopPropagation();
                 return;
             }
-            if (code === keyboard_key_1.SpacebarKey) {
+            if (ev.key === keyboard_keys_1.Space) {
                 ev.preventDefault();
                 ev.currentTarget.click();
             }
         });
-        if (!shorthand.hasOwnProperty('children')) {
-            shorthand.children = null;
-        }
-        if (!shorthand.hasOwnProperty('as') || shorthand.as === 'button') {
-            shorthand.as = 'button';
-            return shorthand; // there's nothing to be done if as prop === 'button'
-        }
-        /**
-         * 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 (!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 (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;
+                }
             }
         }
         return shorthand;
     }
     exports.useARIAButton = useARIAButton;
-    function mergeARIADisabled(disabled) {
-        if (typeof disabled === 'string') {
-            return disabled === 'false' ? false : true;
-        }
-        return disabled !== null && disabled !== void 0 ? disabled : false;
-    }
 });
 //# sourceMappingURL=useARIAButton.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useARIAButton.js","sourceRoot":"../src/","sources":["hooks/useARIAButton.ts"],"names":[],"mappings":"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","sourcesContent":["import * as React from 'react';\nimport { ObjectShorthandProps, useEventCallback } from '@fluentui/react-utilities';\nimport { getCode, SpacebarKey, EnterKey } from '@fluentui/keyboard-key';\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 function useARIAButton(\n  shorthand: ObjectShorthandProps<React.ButtonHTMLAttributes<HTMLElement>>,\n): ObjectShorthandProps<React.ButtonHTMLAttributes<HTMLElement>> {\n  const { onClick, onKeyDown, onKeyUp, disabled: defaultDisabled, ['aria-disabled']: ariaDisabled } = shorthand;\n  const disabled = mergeARIADisabled(defaultDisabled ?? ariaDisabled);\n\n  const onClickHandler = useEventCallback((ev: React.MouseEvent<HTMLElement>) => {\n    if (disabled) {\n      ev.preventDefault();\n      ev.stopPropagation();\n    } else {\n      if (typeof onClick === 'function') {\n        onClick(ev);\n      }\n    }\n  });\n\n  const onKeyDownHandler = useEventCallback((ev: React.KeyboardEvent<HTMLElement>) => {\n    const code = getCode(ev);\n    if (typeof onKeyDown === 'function') {\n      onKeyDown(ev);\n    }\n    if (ev.isDefaultPrevented()) {\n      return;\n    }\n    if (disabled && (code === EnterKey || code === SpacebarKey)) {\n      ev.preventDefault();\n      ev.stopPropagation();\n      return;\n    }\n    if (code === SpacebarKey) {\n      ev.preventDefault();\n      return;\n    }\n    // If enter is pressed, activate the button\n    else if (code === EnterKey) {\n      ev.preventDefault();\n      ev.currentTarget.click();\n    }\n  });\n\n  const onKeyupHandler = useEventCallback((ev: React.KeyboardEvent<HTMLElement>) => {\n    const code = getCode(ev);\n    if (typeof onKeyUp === 'function') {\n      onKeyUp(ev);\n    }\n    if (ev.isDefaultPrevented()) {\n      return;\n    }\n    if (disabled && (code === EnterKey || code === SpacebarKey)) {\n      ev.preventDefault();\n      ev.stopPropagation();\n      return;\n    }\n    if (code === SpacebarKey) {\n      ev.preventDefault();\n      ev.currentTarget.click();\n    }\n  });\n\n  if (!shorthand.hasOwnProperty('children')) {\n    shorthand.children = null;\n  }\n\n  if (!shorthand.hasOwnProperty('as') || shorthand.as === 'button') {\n    shorthand.as = 'button';\n    return shorthand; // there's nothing to be done if as prop === 'button'\n  }\n\n  /**\n   * TODO: Ideally this is unnecessary after implementation of as-prop RFC.\n   * The way to go is to have an assertion method to ensure types,\n   * in the case of button we'd like to limit it for: button, div, span, a\n   */\n  if (typeof shorthand.as !== 'string') {\n    return shorthand;\n  }\n\n  if (!shorthand.hasOwnProperty('role')) {\n    shorthand.role = 'button';\n  }\n  if (!shorthand.hasOwnProperty('aria-disabled')) {\n    shorthand['aria-disabled'] = disabled;\n  }\n\n  shorthand.onClick = onClickHandler;\n  shorthand.onKeyDown = onKeyDownHandler;\n  shorthand.onKeyUp = onKeyupHandler;\n\n  // Add keydown event handler for all other non-anchor elements.\n  if (shorthand.as !== 'a') {\n    if (!shorthand.hasOwnProperty('tabIndex')) {\n      shorthand.tabIndex = disabled ? undefined : 0;\n    }\n  }\n  return shorthand;\n}\n\nfunction mergeARIADisabled(disabled?: boolean | 'false' | 'true'): boolean {\n  if (typeof disabled === 'string') {\n    return disabled === 'false' ? false : true;\n  }\n  return disabled ?? false;\n}\n"]}
+{"version":3,"file":"useARIAButton.js","sourceRoot":"../src/","sources":["hooks/useARIAButton.ts"],"names":[],"mappings":"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","sourcesContent":["import { Enter, Space } from '@fluentui/keyboard-keys';\nimport { ObjectShorthandProps, resolveShorthand, useEventCallback } from '@fluentui/react-utilities';\nimport type { IntrinsicShorthandProps, ResolveShorthandOptions, ShorthandProps } from '@fluentui/react-utilities';\nimport { mergeARIADisabled } from '../utils/index';\n\nexport type ARIAButtonShorthandProps = IntrinsicShorthandProps<'button', 'div' | 'span' | 'a'>;\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 function useARIAButton<Required extends boolean = false>(\n  value: ShorthandProps<ARIAButtonShorthandProps>,\n  options?: ResolveShorthandOptions<ARIAButtonShorthandProps, Required>,\n): Required extends false ? ARIAButtonShorthandProps | undefined : ARIAButtonShorthandProps {\n  const shorthand = resolveShorthand(value, options);\n\n  const { onClick, onKeyDown, onKeyUp } = (shorthand || {}) as ARIAButtonShorthandProps;\n\n  const disabled = mergeARIADisabled(shorthand as ObjectShorthandProps<ARIAButtonShorthandProps>);\n\n  const onClickHandler: ARIAButtonShorthandProps['onClick'] = useEventCallback(ev => {\n    if (disabled) {\n      ev.preventDefault();\n      ev.stopPropagation();\n    } else {\n      if (typeof onClick === 'function') {\n        onClick(ev);\n      }\n    }\n  });\n\n  const onKeyDownHandler: ARIAButtonShorthandProps['onKeyDown'] = useEventCallback(ev => {\n    if (typeof onKeyDown === 'function') {\n      onKeyDown(ev);\n    }\n    if (ev.isDefaultPrevented()) {\n      return;\n    }\n    if (disabled && (ev.key === Enter || ev.key === Space)) {\n      ev.preventDefault();\n      ev.stopPropagation();\n      return;\n    }\n    if (ev.key === Space) {\n      ev.preventDefault();\n      return;\n    }\n    // If enter is pressed, activate the button\n    else if (ev.key === Enter) {\n      ev.preventDefault();\n      ev.currentTarget.click();\n    }\n  });\n\n  const onKeyupHandler: ARIAButtonShorthandProps['onKeyUp'] = useEventCallback(ev => {\n    if (typeof onKeyUp === 'function') {\n      onKeyUp(ev);\n    }\n    if (ev.isDefaultPrevented()) {\n      return;\n    }\n    if (disabled && (ev.key === Enter || ev.key === Space)) {\n      ev.preventDefault();\n      ev.stopPropagation();\n      return;\n    }\n    if (ev.key === Space) {\n      ev.preventDefault();\n      ev.currentTarget.click();\n    }\n  });\n\n  if (shorthand) {\n    if (shorthand.as === 'button' || shorthand.as === undefined) {\n      return shorthand; // there's nothing to be done if as prop === 'button' or undefined\n    }\n\n    if (!shorthand.hasOwnProperty('role')) {\n      shorthand.role = 'button';\n    }\n    if (!shorthand.hasOwnProperty('aria-disabled')) {\n      shorthand['aria-disabled'] = disabled;\n    }\n\n    shorthand.onClick = onClickHandler;\n    shorthand.onKeyDown = onKeyDownHandler;\n    shorthand.onKeyUp = onKeyupHandler;\n\n    // Add keydown event handler for all other non-anchor elements.\n    if (shorthand.as !== 'a') {\n      if (!shorthand.hasOwnProperty('tabIndex')) {\n        shorthand.tabIndex = disabled ? undefined : 0;\n      }\n    }\n  }\n\n  return shorthand;\n}\n"]}

package/lib-amd/index.d.ts

@@ -1 +1,2 @@
 export * from './hooks/index';
+export * from './utils/index';

package/lib-amd/index.js

@@ -1,6 +1,7 @@
-define(["require", "exports", "tslib", "./hooks/index"], function (require, exports, tslib_1, index_1) {
+define(["require", "exports", "tslib", "./hooks/index", "./utils/index"], function (require, exports, tslib_1, index_1, index_2) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     tslib_1.__exportStar(index_1, exports);
+    tslib_1.__exportStar(index_2, exports);
 });
 //# sourceMappingURL=index.js.map

package/lib-amd/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"../src/","sources":["index.ts"],"names":[],"mappings":";;;IAAA,uCAA8B","sourcesContent":["export * from './hooks/index';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"../src/","sources":["index.ts"],"names":[],"mappings":";;;IAAA,uCAA8B;IAC9B,uCAA8B","sourcesContent":["export * from './hooks/index';\nexport * from './utils/index';\n"]}

package/lib-amd/utils/index.d.ts

@@ -0,0 +1 @@
+export * from './mergeARIADisabled';

package/lib-amd/utils/index.js

@@ -0,0 +1,6 @@
+define(["require", "exports", "tslib", "./mergeARIADisabled"], function (require, exports, tslib_1, mergeARIADisabled_1) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    tslib_1.__exportStar(mergeARIADisabled_1, exports);
+});
+//# sourceMappingURL=index.js.map

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

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

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

@@ -0,0 +1,10 @@
+import * as React from 'react';
+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;
+}>): boolean;

package/lib-amd/utils/mergeARIADisabled.js

@@ -0,0 +1,18 @@
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.mergeARIADisabled = void 0;
+    /**
+     * Merges disabled declaration with `aria-disabled`
+     */
+    function mergeARIADisabled(shorthand) {
+        var _a, _b;
+        var disabled = (_b = (_a = shorthand.disabled) !== null && _a !== void 0 ? _a : shorthand['aria-disabled']) !== null && _b !== void 0 ? _b : undefined;
+        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-amd/utils/mergeARIADisabled.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergeARIADisabled.js","sourceRoot":"../src/","sources":["utils/mergeARIADisabled.ts"],"names":[],"mappings":";;;;IAGA;;OAEG;IACH,SAAgB,iBAAiB,CAC/B,SAIE;;QAEF,IAAM,QAAQ,eAAG,SAAS,CAAC,QAAQ,mCAAI,SAAS,CAAC,eAAe,CAAC,mCAAI,SAAS,CAAC;QAC/E,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;YAChC,OAAO,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;SAC5C;QACD,OAAO,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,KAAK,CAAC;IAC3B,CAAC;IAZD,8CAYC","sourcesContent":["import * as React from 'react';\nimport { ObjectShorthandProps } from '@fluentui/react-utilities';\n\n/**\n * Merges disabled declaration with `aria-disabled`\n */\nexport function mergeARIADisabled(\n  shorthand: ObjectShorthandProps<{\n    disabled?: boolean;\n    'aria-disabled'?: string | boolean;\n    children?: React.ReactNode;\n  }>,\n) {\n  const disabled = shorthand.disabled ?? shorthand['aria-disabled'] ?? undefined;\n  if (typeof disabled === 'string') {\n    return disabled === 'false' ? false : true;\n  }\n  return disabled ?? false;\n}\n"]}

package/lib-commonjs/hooks/index.js

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

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

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

package/lib-commonjs/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-commonjs/hooks/useARIAButton.js

@@ -1,105 +1,112 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.useARIAButton = void 0;
-var react_utilities_1 = require("@fluentui/react-utilities");
-var keyboard_key_1 = require("@fluentui/keyboard-key");
+
+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
  * for multiple scenarios of shorthand properties. Ensuring 1st rule of ARIA for cases
  * where no attribute addition is required
  */
-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 = react_utilities_1.useEventCallback(function (ev) {
-        if (disabled) {
-            ev.preventDefault();
-            ev.stopPropagation();
-        }
-        else {
-            if (typeof onClick === 'function') {
-                onClick(ev);
-            }
-        }
-    });
-    var onKeyDownHandler = react_utilities_1.useEventCallback(function (ev) {
-        var code = keyboard_key_1.getCode(ev);
-        if (typeof onKeyDown === 'function') {
-            onKeyDown(ev);
-        }
-        if (ev.isDefaultPrevented()) {
-            return;
-        }
-        if (disabled && (code === keyboard_key_1.EnterKey || code === keyboard_key_1.SpacebarKey)) {
-            ev.preventDefault();
-            ev.stopPropagation();
-            return;
-        }
-        if (code === keyboard_key_1.SpacebarKey) {
-            ev.preventDefault();
-            return;
-        }
-        // If enter is pressed, activate the button
-        else if (code === keyboard_key_1.EnterKey) {
-            ev.preventDefault();
-            ev.currentTarget.click();
-        }
-    });
-    var onKeyupHandler = react_utilities_1.useEventCallback(function (ev) {
-        var code = keyboard_key_1.getCode(ev);
-        if (typeof onKeyUp === 'function') {
-            onKeyUp(ev);
-        }
-        if (ev.isDefaultPrevented()) {
-            return;
-        }
-        if (disabled && (code === keyboard_key_1.EnterKey || code === keyboard_key_1.SpacebarKey)) {
-            ev.preventDefault();
-            ev.stopPropagation();
-            return;
-        }
-        if (code === keyboard_key_1.SpacebarKey) {
-            ev.preventDefault();
-            ev.currentTarget.click();
-        }
-    });
-    if (!shorthand.hasOwnProperty('children')) {
-        shorthand.children = null;
+
+
+function useARIAButton(value, options) {
+  var shorthand = react_utilities_1.resolveShorthand(value, options);
+
+  var _a = shorthand || {},
+      onClick = _a.onClick,
+      onKeyDown = _a.onKeyDown,
+      onKeyUp = _a.onKeyUp;
+
+  var disabled = index_1.mergeARIADisabled(shorthand);
+  var onClickHandler = react_utilities_1.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 = react_utilities_1.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 === keyboard_keys_1.Enter || ev.key === keyboard_keys_1.Space)) {
+      ev.preventDefault();
+      ev.stopPropagation();
+      return;
+    }
+
+    if (ev.key === keyboard_keys_1.Space) {
+      ev.preventDefault();
+      return;
+    } // If enter is pressed, activate the button
+    else if (ev.key === keyboard_keys_1.Enter) {
+      ev.preventDefault();
+      ev.currentTarget.click();
+    }
+  });
+  var onKeyupHandler = react_utilities_1.useEventCallback(function (ev) {
+    if (typeof onKeyUp === 'function') {
+      onKeyUp(ev);
+    }
+
+    if (ev.isDefaultPrevented()) {
+      return;
+    }
+
+    if (disabled && (ev.key === keyboard_keys_1.Enter || ev.key === keyboard_keys_1.Space)) {
+      ev.preventDefault();
+      ev.stopPropagation();
+      return;
+    }
+
+    if (ev.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';
+      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;
-        }
+      if (!shorthand.hasOwnProperty('tabIndex')) {
+        shorthand.tabIndex = disabled ? undefined : 0;
+      }
     }
-    return shorthand;
+  }
+
+  return shorthand;
 }
+
 exports.useARIAButton = useARIAButton;
-function mergeARIADisabled(disabled) {
-    if (typeof disabled === 'string') {
-        return disabled === 'false' ? false : true;
-    }
-    return disabled !== null && disabled !== void 0 ? disabled : false;
-}
 //# sourceMappingURL=useARIAButton.js.map