@fluentui/react-aria 9.0.0-alpha.9 → 9.0.0-beta.4

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, resolveShorthand, ShorthandProps, useEventCallback } from '@fluentui/react-utilities';\nimport { EnterKey, getCode, SpacebarKey } from '@fluentui/keyboard-key';\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\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<T extends React.ButtonHTMLAttributes<HTMLElement>>(\n  value: ShorthandProps<T>,\n  defaultProps?: T,\n): ObjectShorthandProps<T> {\n  const shorthand = resolveShorthand(value, defaultProps);\n\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('as') || shorthand.as === 'button') {\n    shorthand.as = 'button';\n    return shorthand; // there's nothing to be done if as prop === 'button'\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"]}
+{"version":3,"sources":["../../src/hooks/useARIAButton.ts"],"names":[],"mappings":"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","sourceRoot":""}

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":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC"}

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":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC"}

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<{
+    'aria-disabled'?: string | boolean;
+    children?: React.ReactNode;
+    disabled?: boolean;
+}>): boolean;

package/lib/utils/mergeARIADisabled.js

@@ -0,0 +1,15 @@
+/**
+ * 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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utils/mergeARIADisabled.ts"],"names":[],"mappings":"AAGA;;AAEG;AACH,OAAM,SAAU,iBAAV,CACJ,SADI,EAKF;;;AAEF,QAAM,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/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
+});
+
+const 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":["../../src/hooks/index.ts"],"names":[],"mappings":";;;;;;;;AAAA,OAAA,CAAA,YAAA,CAAA,OAAA,CAAA,iBAAA,CAAA,EAAA,OAAA","sourceRoot":""}

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

@@ -1,8 +1,11 @@
-import * as React from 'react';
-import { ObjectShorthandProps, ShorthandProps } from '@fluentui/react-utilities';
+import type { IntrinsicShorthandProps, ResolveShorthandOptions, ShorthandProps } from '@fluentui/react-utilities';
+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<T extends React.ButtonHTMLAttributes<HTMLElement>>(value: ShorthandProps<T>, defaultProps?: T): ObjectShorthandProps<T>;
+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

@@ -1,95 +1,114 @@
 "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");
-function mergeARIADisabled(disabled) {
-    if (typeof disabled === 'string') {
-        return disabled === 'false' ? false : true;
-    }
-    return disabled !== null && disabled !== void 0 ? disabled : false;
-}
+
+const keyboard_keys_1 = /*#__PURE__*/require("@fluentui/keyboard-keys");
+
+const react_utilities_1 = /*#__PURE__*/require("@fluentui/react-utilities");
 /**
- * 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, defaultProps) {
-    var shorthand = react_utilities_1.resolveShorthand(value, defaultProps);
-    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('as') || shorthand.as === 'button') {
-        shorthand.as = 'button';
-        return shorthand; // there's nothing to be done if as prop === 'button'
+
+
+function useARIAButton(shorthand, options) {
+  var _a;
+
+  const shorthandProps = react_utilities_1.resolveShorthand(shorthand, options);
+  const {
+    disabled,
+    disabledFocusable,
+    onClick,
+    onKeyDown,
+    onKeyUp,
+    tabIndex
+  } = shorthandProps || {};
+  const onClickHandler = react_utilities_1.useEventCallback(ev => {
+    if (disabled || disabledFocusable) {
+      ev.preventDefault();
+      ev.stopPropagation();
+    } else {
+      onClick === null || onClick === void 0 ? void 0 : onClick(ev);
+    }
+  });
+  const onKeyDownHandler = react_utilities_1.useEventCallback(ev => {
+    onKeyDown === null || onKeyDown === void 0 ? void 0 : onKeyDown(ev);
+
+    if (ev.isDefaultPrevented()) {
+      return;
+    }
+
+    const key = ev.key;
+
+    if ((disabled || disabledFocusable) && (key === keyboard_keys_1.Enter || key === keyboard_keys_1.Space)) {
+      ev.preventDefault();
+      ev.stopPropagation();
+      return;
+    }
+
+    if (key === keyboard_keys_1.Space) {
+      ev.preventDefault();
+      return;
+    } // If enter is pressed, activate the button
+    else if (key === keyboard_keys_1.Enter) {
+      ev.preventDefault();
+      ev.currentTarget.click();
     }
-    if (!shorthand.hasOwnProperty('role')) {
-        shorthand.role = 'button';
+  });
+  const onKeyupHandler = react_utilities_1.useEventCallback(ev => {
+    onKeyUp === null || onKeyUp === void 0 ? void 0 : onKeyUp(ev);
+
+    if (ev.isDefaultPrevented()) {
+      return;
     }
-    if (!shorthand.hasOwnProperty('aria-disabled')) {
-        shorthand['aria-disabled'] = disabled;
+
+    const key = ev.key;
+
+    if ((disabled || disabledFocusable) && (key === keyboard_keys_1.Enter || key === keyboard_keys_1.Space)) {
+      ev.preventDefault();
+      ev.stopPropagation();
+      return;
     }
-    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 (key === keyboard_keys_1.Space) {
+      ev.preventDefault();
+      ev.currentTarget.click();
     }
-    return shorthand;
+  });
+
+  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; // 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 shorthandProps;
 }
+
 exports.useARIAButton = useARIAButton;
 //# sourceMappingURL=useARIAButton.js.map

package/lib-commonjs/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, resolveShorthand, ShorthandProps, useEventCallback } from '@fluentui/react-utilities';\nimport { EnterKey, getCode, SpacebarKey } from '@fluentui/keyboard-key';\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\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<T extends React.ButtonHTMLAttributes<HTMLElement>>(\n  value: ShorthandProps<T>,\n  defaultProps?: T,\n): ObjectShorthandProps<T> {\n  const shorthand = resolveShorthand(value, defaultProps);\n\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('as') || shorthand.as === 'button') {\n    shorthand.as = 'button';\n    return shorthand; // there's nothing to be done if as prop === 'button'\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"]}
+{"version":3,"sources":["../../src/hooks/useARIAButton.ts"],"names":[],"mappings":"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","sourceRoot":""}

package/lib-commonjs/index.d.ts

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

package/lib-commonjs/index.js

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

package/lib-commonjs/index.js.map

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

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

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

package/lib-commonjs/utils/index.js

@@ -0,0 +1,10 @@
+"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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;AAAA,OAAA,CAAA,YAAA,CAAA,OAAA,CAAA,qBAAA,CAAA,EAAA,OAAA","sourceRoot":""}

package/lib-commonjs/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<{
+    'aria-disabled'?: string | boolean;
+    children?: React.ReactNode;
+    disabled?: boolean;
+}>): boolean;

package/lib-commonjs/utils/mergeARIADisabled.js

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.mergeARIADisabled = void 0;
+/**
+ * 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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utils/mergeARIADisabled.ts"],"names":[],"mappings":";;;;;;AAGA;;AAEG;;AACH,SAAgB,iBAAhB,CACE,SADF,EAKI;;;AAEF,QAAM,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.9",
+  "version": "9.0.0-beta.4",
   "description": "React helper to ensure ARIA",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
@@ -20,13 +20,14 @@
     "start": "yarn storybook",
     "test": "jest",
     "docs": "api-extractor run --config=config/api-extractor.local.json --local",
-    "build:local": "tsc -p . --module esnext --emitDeclarationOnly && node ../../scripts/typescript/normalize-import --output dist/react-aria/src && yarn docs",
-    "storybook": "start-storybook"
+    "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../scripts/typescript/normalize-import --output ./dist/packages/react-aria/src && yarn docs",
+    "storybook": "start-storybook",
+    "type-check": "tsc -b tsconfig.json"
   },
   "devDependencies": {
-    "@fluentui/eslint-plugin": "^1.3.2",
-    "@fluentui/jest-serializer-make-styles": "^9.0.0-alpha.23",
-    "@fluentui/react-conformance": "^0.4.2",
+    "@fluentui/eslint-plugin": "*",
+    "@fluentui/jest-serializer-make-styles": "9.0.0-beta.4",
+    "@fluentui/react-conformance": "*",
     "@fluentui/scripts": "^1.0.0",
     "@types/enzyme": "3.10.3",
     "@types/enzyme-adapter-react-16": "1.0.3",
@@ -37,12 +38,13 @@
     "enzyme-adapter-react-16": "^1.15.0",
     "react": "16.8.6",
     "react-dom": "16.8.6",
-    "react-test-renderer": "^16.3.0"
+    "react-test-renderer": "^16.3.0",
+    "@fluentui/babel-make-styles": "9.0.0-beta.4"
   },
   "dependencies": {
-    "@fluentui/keyboard-key": "^0.3.3",
-    "@fluentui/react-make-styles": "^9.0.0-alpha.47",
-    "@fluentui/react-utilities": "^9.0.0-alpha.32",
+    "@fluentui/keyboard-keys": "9.0.0-beta.1",
+    "@fluentui/react-make-styles": "9.0.0-beta.4",
+    "@fluentui/react-utilities": "9.0.0-beta.4",
     "tslib": "^2.1.0"
   },
   "peerDependencies": {
@@ -52,7 +54,6 @@
     "react-dom": ">=16.8.0 <18.0.0"
   },
   "beachball": {
-    "tag": "alpha",
     "disallowedChangeTypes": [
       "major",
       "minor",

package/.cache/jest/jest-transform-cache-5910cb8bb0969758e45676749a8c9efc-d0e7c439bf6eb5a4bf3a6371fdd259d1/06/resolveShorthand_06a403a4ab9de2a8de33f5437347a9d8

@@ -1,28 +0,0 @@
-dc4f399d2f827fd011bae6ab44b1bded
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveShorthand = void 0;
-var tslib_1 = require("tslib");
-var react_1 = require("react");
-/**
- * Resolves ShorthandProps into ObjectShorthandProps, to ensure normalization of the signature
- * being passed down to getSlots method
- * @param value - the base ShorthandProps
- * @param defaultProps - base properties to be merged with the end ObjectShorthandProps
- */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function resolveShorthand(value, defaultProps) {
-    var resolvedShorthand = {};
-    if (typeof value === 'string' || typeof value === 'number' || react_1.isValidElement(value)) {
-        resolvedShorthand = { children: value };
-    }
-    else if (isObjectShorthandProps(value)) {
-        resolvedShorthand = value;
-    }
-    return defaultProps ? tslib_1.__assign(tslib_1.__assign({}, defaultProps), resolvedShorthand) : resolvedShorthand;
-}
-exports.resolveShorthand = resolveShorthand;
-function isObjectShorthandProps(value) {
-    return typeof value === 'object';
-}
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJmaWxlIjoiL21udC93b3JrLzYvcy9wYWNrYWdlcy9yZWFjdC11dGlsaXRpZXMvc3JjL2NvbXBvc2UvcmVzb2x2ZVNob3J0aGFuZC50cyIsIm1hcHBpbmdzIjoiOzs7O0FBQUEsK0JBQXVDO0FBR3ZDOzs7OztHQUtHO0FBQ0gsOERBQThEO0FBQzlELFNBQWdCLGdCQUFnQixDQUM5QixLQUE0QixFQUM1QixZQUFvQjtJQUVwQixJQUFJLGlCQUFpQixHQUFnQyxFQUFXLENBQUM7SUFFakUsSUFBSSxPQUFPLEtBQUssS0FBSyxRQUFRLElBQUksT0FBTyxLQUFLLEtBQUssUUFBUSxJQUFJLHNCQUFjLENBQUMsS0FBSyxDQUFDLEVBQUU7UUFDbkYsaUJBQWlCLEdBQUcsRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFpQyxDQUFDO0tBQ3hFO1NBQU0sSUFBSSxzQkFBc0IsQ0FBQyxLQUFLLENBQUMsRUFBRTtRQUN4QyxpQkFBaUIsR0FBRyxLQUFLLENBQUM7S0FDM0I7SUFDRCxPQUFPLFlBQVksQ0FBQyxDQUFDLHVDQUFNLFlBQVksR0FBSyxpQkFBaUIsRUFBRyxDQUFDLENBQUMsaUJBQWlCLENBQUM7QUFDdEYsQ0FBQztBQVpELDRDQVlDO0FBRUQsU0FBUyxzQkFBc0IsQ0FBUSxLQUE0QjtJQUNqRSxPQUFPLE9BQU8sS0FBSyxLQUFLLFFBQVEsQ0FBQztBQUNuQyxDQUFDIiwibmFtZXMiOltdLCJzb3VyY2VzIjpbIi9tbnQvd29yay82L3MvcGFja2FnZXMvcmVhY3QtdXRpbGl0aWVzL3NyYy9jb21wb3NlL3Jlc29sdmVTaG9ydGhhbmQudHMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgaXNWYWxpZEVsZW1lbnQgfSBmcm9tICdyZWFjdCc7XG5pbXBvcnQgeyBPYmplY3RTaG9ydGhhbmRQcm9wcywgU2hvcnRoYW5kUHJvcHMgfSBmcm9tICcuL3R5cGVzJztcblxuLyoqXG4gKiBSZXNvbHZlcyBTaG9ydGhhbmRQcm9wcyBpbnRvIE9iamVjdFNob3J0aGFuZFByb3BzLCB0byBlbnN1cmUgbm9ybWFsaXphdGlvbiBvZiB0aGUgc2lnbmF0dXJlXG4gKiBiZWluZyBwYXNzZWQgZG93biB0byBnZXRTbG90cyBtZXRob2RcbiAqIEBwYXJhbSB2YWx1ZSAtIHRoZSBiYXNlIFNob3J0aGFuZFByb3BzXG4gKiBAcGFyYW0gZGVmYXVsdFByb3BzIC0gYmFzZSBwcm9wZXJ0aWVzIHRvIGJlIG1lcmdlZCB3aXRoIHRoZSBlbmQgT2JqZWN0U2hvcnRoYW5kUHJvcHNcbiAqL1xuLy8gZXNsaW50LWRpc2FibGUtbmV4dC1saW5lIEB0eXBlc2NyaXB0LWVzbGludC9uby1leHBsaWNpdC1hbnlcbmV4cG9ydCBmdW5jdGlvbiByZXNvbHZlU2hvcnRoYW5kPFByb3BzIGV4dGVuZHMgUmVjb3JkPHN0cmluZywgYW55Pj4oXG4gIHZhbHVlOiBTaG9ydGhhbmRQcm9wczxQcm9wcz4sXG4gIGRlZmF1bHRQcm9wcz86IFByb3BzLFxuKTogT2JqZWN0U2hvcnRoYW5kUHJvcHM8UHJvcHM+IHtcbiAgbGV0IHJlc29sdmVkU2hvcnRoYW5kOiBPYmplY3RTaG9ydGhhbmRQcm9wczxQcm9wcz4gPSB7fSBhcyBQcm9wcztcblxuICBpZiAodHlwZW9mIHZhbHVlID09PSAnc3RyaW5nJyB8fCB0eXBlb2YgdmFsdWUgPT09ICdudW1iZXInIHx8IGlzVmFsaWRFbGVtZW50KHZhbHVlKSkge1xuICAgIHJlc29sdmVkU2hvcnRoYW5kID0geyBjaGlsZHJlbjogdmFsdWUgfSBhcyBPYmplY3RTaG9ydGhhbmRQcm9wczxQcm9wcz47XG4gIH0gZWxzZSBpZiAoaXNPYmplY3RTaG9ydGhhbmRQcm9wcyh2YWx1ZSkpIHtcbiAgICByZXNvbHZlZFNob3J0aGFuZCA9IHZhbHVlO1xuICB9XG4gIHJldHVybiBkZWZhdWx0UHJvcHMgPyB7IC4uLmRlZmF1bHRQcm9wcywgLi4ucmVzb2x2ZWRTaG9ydGhhbmQgfSA6IHJlc29sdmVkU2hvcnRoYW5kO1xufVxuXG5mdW5jdGlvbiBpc09iamVjdFNob3J0aGFuZFByb3BzPFByb3BzPih2YWx1ZTogU2hvcnRoYW5kUHJvcHM8UHJvcHM+KTogdmFsdWUgaXMgT2JqZWN0U2hvcnRoYW5kUHJvcHM8UHJvcHM+IHtcbiAgcmV0dXJuIHR5cGVvZiB2YWx1ZSA9PT0gJ29iamVjdCc7XG59XG4iXSwidmVyc2lvbiI6M30=

package/.cache/jest/jest-transform-cache-5910cb8bb0969758e45676749a8c9efc-d0e7c439bf6eb5a4bf3a6371fdd259d1/06/resolveShorthand_06a403a4ab9de2a8de33f5437347a9d8.map

@@ -1 +0,0 @@
-{"file":"/mnt/work/6/s/packages/react-utilities/src/compose/resolveShorthand.ts","mappings":";;;;AAAA,+BAAuC;AAGvC;;;;;GAKG;AACH,8DAA8D;AAC9D,SAAgB,gBAAgB,CAC9B,KAA4B,EAC5B,YAAoB;IAEpB,IAAI,iBAAiB,GAAgC,EAAW,CAAC;IAEjE,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,sBAAc,CAAC,KAAK,CAAC,EAAE;QACnF,iBAAiB,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAiC,CAAC;KACxE;SAAM,IAAI,sBAAsB,CAAC,KAAK,CAAC,EAAE;QACxC,iBAAiB,GAAG,KAAK,CAAC;KAC3B;IACD,OAAO,YAAY,CAAC,CAAC,uCAAM,YAAY,GAAK,iBAAiB,EAAG,CAAC,CAAC,iBAAiB,CAAC;AACtF,CAAC;AAZD,4CAYC;AAED,SAAS,sBAAsB,CAAQ,KAA4B;IACjE,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC;AACnC,CAAC","names":[],"sources":["/mnt/work/6/s/packages/react-utilities/src/compose/resolveShorthand.ts"],"sourcesContent":["import { isValidElement } from 'react';\nimport { ObjectShorthandProps, ShorthandProps } from './types';\n\n/**\n * Resolves ShorthandProps into ObjectShorthandProps, to ensure normalization of the signature\n * being passed down to getSlots method\n * @param value - the base ShorthandProps\n * @param defaultProps - base properties to be merged with the end ObjectShorthandProps\n */\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport function resolveShorthand<Props extends Record<string, any>>(\n  value: ShorthandProps<Props>,\n  defaultProps?: Props,\n): ObjectShorthandProps<Props> {\n  let resolvedShorthand: ObjectShorthandProps<Props> = {} as Props;\n\n  if (typeof value === 'string' || typeof value === 'number' || isValidElement(value)) {\n    resolvedShorthand = { children: value } as ObjectShorthandProps<Props>;\n  } else if (isObjectShorthandProps(value)) {\n    resolvedShorthand = value;\n  }\n  return defaultProps ? { ...defaultProps, ...resolvedShorthand } : resolvedShorthand;\n}\n\nfunction isObjectShorthandProps<Props>(value: ShorthandProps<Props>): value is ObjectShorthandProps<Props> {\n  return typeof value === 'object';\n}\n"],"version":3}