@fluentui/react-aria 0.0.0-nightlyb8663b78ad20220207.1 → 0.0.0-nightlyc0e3a0a1f320220217.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.json +61 -22
- package/CHANGELOG.md +20 -7
- package/dist/react-aria.d.ts +7 -10
- package/lib/hooks/useARIAButton.d.ts +3 -3
- package/lib/hooks/useARIAButton.js +3 -3
- package/lib/hooks/useARIAButton.js.map +1 -1
- package/lib/utils/mergeARIADisabled.d.ts +2 -5
- package/lib/utils/mergeARIADisabled.js.map +1 -1
- package/lib-commonjs/hooks/useARIAButton.d.ts +3 -3
- package/lib-commonjs/hooks/useARIAButton.js +3 -3
- package/lib-commonjs/hooks/useARIAButton.js.map +1 -1
- package/lib-commonjs/utils/mergeARIADisabled.d.ts +2 -5
- package/lib-commonjs/utils/mergeARIADisabled.js.map +1 -1
- package/package.json +3 -3
package/CHANGELOG.json
CHANGED
|
@@ -2,23 +2,70 @@
|
|
|
2
2
|
"name": "@fluentui/react-aria",
|
|
3
3
|
"entries": [
|
|
4
4
|
{
|
|
5
|
-
"date": "
|
|
6
|
-
"tag": "@fluentui/react-aria_v0.0.0-
|
|
7
|
-
"version": "0.0.0-
|
|
5
|
+
"date": "Thu, 17 Feb 2022 04:12:35 GMT",
|
|
6
|
+
"tag": "@fluentui/react-aria_v0.0.0-nightlyc0e3a0a1f320220217.1",
|
|
7
|
+
"version": "0.0.0-nightlyc0e3a0a1f320220217.1",
|
|
8
8
|
"comments": {
|
|
9
9
|
"prerelease": [
|
|
10
10
|
{
|
|
11
11
|
"author": "email not defined",
|
|
12
12
|
"package": "@fluentui/react-aria",
|
|
13
|
-
"commit": "
|
|
13
|
+
"commit": "4df2a77ff1d0255eee60fa6109174a7cb44dcbe6",
|
|
14
14
|
"comment": "Release nightly v9"
|
|
15
15
|
},
|
|
16
|
+
{
|
|
17
|
+
"author": "Humberto.Morimoto@microsoft.com",
|
|
18
|
+
"package": "@fluentui/react-aria",
|
|
19
|
+
"commit": "ca590a438b12b85d32fdf8b592ada3b0e7b2314c",
|
|
20
|
+
"comment": "Fixing issue in useAriaButton where passing disabledFocusable=false caused aria-disabled to be set to false and appear in DOM instead of just be undefined for that element."
|
|
21
|
+
},
|
|
22
|
+
{
|
|
23
|
+
"author": "beachball",
|
|
24
|
+
"package": "@fluentui/react-aria",
|
|
25
|
+
"comment": "Bump @fluentui/keyboard-keys to v0.0.0-nightlyc0e3a0a1f320220217.1",
|
|
26
|
+
"commit": "4df2a77ff1d0255eee60fa6109174a7cb44dcbe6"
|
|
27
|
+
},
|
|
28
|
+
{
|
|
29
|
+
"author": "beachball",
|
|
30
|
+
"package": "@fluentui/react-aria",
|
|
31
|
+
"comment": "Bump @fluentui/react-utilities to v0.0.0-nightlyc0e3a0a1f320220217.1",
|
|
32
|
+
"commit": "4df2a77ff1d0255eee60fa6109174a7cb44dcbe6"
|
|
33
|
+
}
|
|
34
|
+
]
|
|
35
|
+
}
|
|
36
|
+
},
|
|
37
|
+
{
|
|
38
|
+
"date": "Thu, 10 Feb 2022 08:52:17 GMT",
|
|
39
|
+
"tag": "@fluentui/react-aria_v9.0.0-rc.1",
|
|
40
|
+
"version": "9.0.0-rc.1",
|
|
41
|
+
"comments": {
|
|
42
|
+
"none": [
|
|
43
|
+
{
|
|
44
|
+
"author": "olfedias@microsoft.com",
|
|
45
|
+
"package": "@fluentui/react-aria",
|
|
46
|
+
"commit": "c061e98be4b4a718c72a144a1f60bb5515824612",
|
|
47
|
+
"comment": "remove inline-style-expand-shorthand from tsconfigs"
|
|
48
|
+
},
|
|
49
|
+
{
|
|
50
|
+
"author": "martinhochel@microsoft.com",
|
|
51
|
+
"package": "@fluentui/react-aria",
|
|
52
|
+
"commit": "8dfa712156b70414205b87b5b6d099367b0c297d",
|
|
53
|
+
"comment": "chore: use storybook runner for all vNext packages"
|
|
54
|
+
}
|
|
55
|
+
],
|
|
56
|
+
"prerelease": [
|
|
16
57
|
{
|
|
17
58
|
"author": "olfedias@microsoft.com",
|
|
18
59
|
"package": "@fluentui/react-aria",
|
|
19
60
|
"commit": "f4eafee2c3b8d85b3a267d6b155f0f5585a435fd",
|
|
20
61
|
"comment": "remove Griffel packages"
|
|
21
62
|
},
|
|
63
|
+
{
|
|
64
|
+
"author": "lingfangao@hotmail.com",
|
|
65
|
+
"package": "@fluentui/react-aria",
|
|
66
|
+
"commit": "c00913d50e2dd15bbfbb0757cefe43b192ff1d7f",
|
|
67
|
+
"comment": "Bump Fluent UI packages to 9.0.0-rc"
|
|
68
|
+
},
|
|
22
69
|
{
|
|
23
70
|
"author": "Humberto.Morimoto@microsoft.com",
|
|
24
71
|
"package": "@fluentui/react-aria",
|
|
@@ -28,34 +75,26 @@
|
|
|
28
75
|
{
|
|
29
76
|
"author": "behowell@microsoft.com",
|
|
30
77
|
"package": "@fluentui/react-aria",
|
|
31
|
-
"commit": "
|
|
32
|
-
"comment": "
|
|
78
|
+
"commit": "53b01d71e335715fda91b33e3d7bbd9d471d5ed3",
|
|
79
|
+
"comment": "Refactor component Slot typings"
|
|
33
80
|
},
|
|
34
81
|
{
|
|
35
|
-
"author": "
|
|
82
|
+
"author": "behowell@microsoft.com",
|
|
36
83
|
"package": "@fluentui/react-aria",
|
|
37
|
-
"
|
|
38
|
-
"
|
|
84
|
+
"commit": "7cc28ed8320b00f42d91c63882f10316db2205c5",
|
|
85
|
+
"comment": "Remove component's shorthandProps array"
|
|
39
86
|
},
|
|
40
87
|
{
|
|
41
88
|
"author": "beachball",
|
|
42
89
|
"package": "@fluentui/react-aria",
|
|
43
|
-
"comment": "Bump @fluentui/
|
|
44
|
-
"commit": "
|
|
45
|
-
}
|
|
46
|
-
],
|
|
47
|
-
"none": [
|
|
48
|
-
{
|
|
49
|
-
"author": "olfedias@microsoft.com",
|
|
50
|
-
"package": "@fluentui/react-aria",
|
|
51
|
-
"commit": "c061e98be4b4a718c72a144a1f60bb5515824612",
|
|
52
|
-
"comment": "remove inline-style-expand-shorthand from tsconfigs"
|
|
90
|
+
"comment": "Bump @fluentui/keyboard-keys to v9.0.0-rc.1",
|
|
91
|
+
"commit": "e6c855f6d9019d6c73668d15fc9bc3a13291a6c8"
|
|
53
92
|
},
|
|
54
93
|
{
|
|
55
|
-
"author": "
|
|
94
|
+
"author": "beachball",
|
|
56
95
|
"package": "@fluentui/react-aria",
|
|
57
|
-
"
|
|
58
|
-
"
|
|
96
|
+
"comment": "Bump @fluentui/react-utilities to v9.0.0-rc.1",
|
|
97
|
+
"commit": "e6c855f6d9019d6c73668d15fc9bc3a13291a6c8"
|
|
59
98
|
}
|
|
60
99
|
]
|
|
61
100
|
}
|
package/CHANGELOG.md
CHANGED
|
@@ -1,22 +1,35 @@
|
|
|
1
1
|
# Change Log - @fluentui/react-aria
|
|
2
2
|
|
|
3
|
-
This log was last generated on
|
|
3
|
+
This log was last generated on Thu, 17 Feb 2022 04:12:35 GMT and should not be manually modified.
|
|
4
4
|
|
|
5
5
|
<!-- Start content -->
|
|
6
6
|
|
|
7
|
-
## [0.0.0-
|
|
7
|
+
## [0.0.0-nightlyc0e3a0a1f320220217.1](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v0.0.0-nightlyc0e3a0a1f320220217.1)
|
|
8
8
|
|
|
9
|
-
|
|
10
|
-
[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-
|
|
9
|
+
Thu, 17 Feb 2022 04:12:35 GMT
|
|
10
|
+
[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-rc.1..@fluentui/react-aria_v0.0.0-nightlyc0e3a0a1f320220217.1)
|
|
11
|
+
|
|
12
|
+
### Changes
|
|
13
|
+
|
|
14
|
+
- Release nightly v9 ([commit](https://github.com/microsoft/fluentui/commit/4df2a77ff1d0255eee60fa6109174a7cb44dcbe6) by email not defined)
|
|
15
|
+
- Fixing issue in useAriaButton where passing disabledFocusable=false caused aria-disabled to be set to false and appear in DOM instead of just be undefined for that element. ([PR #21703](https://github.com/microsoft/fluentui/pull/21703) by Humberto.Morimoto@microsoft.com)
|
|
16
|
+
- Bump @fluentui/keyboard-keys to v0.0.0-nightlyc0e3a0a1f320220217.1 ([commit](https://github.com/microsoft/fluentui/commit/4df2a77ff1d0255eee60fa6109174a7cb44dcbe6) by beachball)
|
|
17
|
+
- Bump @fluentui/react-utilities to v0.0.0-nightlyc0e3a0a1f320220217.1 ([commit](https://github.com/microsoft/fluentui/commit/4df2a77ff1d0255eee60fa6109174a7cb44dcbe6) by beachball)
|
|
18
|
+
|
|
19
|
+
## [9.0.0-rc.1](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-rc.1)
|
|
20
|
+
|
|
21
|
+
Thu, 10 Feb 2022 08:52:17 GMT
|
|
22
|
+
[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-beta.4..@fluentui/react-aria_v9.0.0-rc.1)
|
|
11
23
|
|
|
12
24
|
### Changes
|
|
13
25
|
|
|
14
|
-
- Release nightly v9 ([commit](https://github.com/microsoft/fluentui/commit/2e460da7ff58924597e3137a784dc897fd174d71) by email not defined)
|
|
15
26
|
- remove Griffel packages ([PR #21440](https://github.com/microsoft/fluentui/pull/21440) by olfedias@microsoft.com)
|
|
27
|
+
- Bump Fluent UI packages to 9.0.0-rc ([PR #21623](https://github.com/microsoft/fluentui/pull/21623) by lingfangao@hotmail.com)
|
|
16
28
|
- Updating based on changes to composition types. ([PR #20891](https://github.com/microsoft/fluentui/pull/20891) by Humberto.Morimoto@microsoft.com)
|
|
29
|
+
- Refactor component Slot typings ([PR #21518](https://github.com/microsoft/fluentui/pull/21518) by behowell@microsoft.com)
|
|
17
30
|
- Remove component's shorthandProps array ([PR #21134](https://github.com/microsoft/fluentui/pull/21134) by behowell@microsoft.com)
|
|
18
|
-
- Bump @fluentui/keyboard-keys to
|
|
19
|
-
- Bump @fluentui/react-utilities to
|
|
31
|
+
- Bump @fluentui/keyboard-keys to v9.0.0-rc.1 ([commit](https://github.com/microsoft/fluentui/commit/e6c855f6d9019d6c73668d15fc9bc3a13291a6c8) by beachball)
|
|
32
|
+
- Bump @fluentui/react-utilities to v9.0.0-rc.1 ([commit](https://github.com/microsoft/fluentui/commit/e6c855f6d9019d6c73668d15fc9bc3a13291a6c8) by beachball)
|
|
20
33
|
|
|
21
34
|
## [9.0.0-beta.4](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-beta.4)
|
|
22
35
|
|
package/dist/react-aria.d.ts
CHANGED
|
@@ -1,10 +1,8 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
import
|
|
3
|
-
import type {
|
|
4
|
-
import type { ShorthandProps } from '@fluentui/react-utilities';
|
|
5
|
-
import { SlotProps } from '@fluentui/react-utilities';
|
|
1
|
+
import type { ExtractSlotProps } from '@fluentui/react-utilities';
|
|
2
|
+
import type { ResolveShorthandFunction } from '@fluentui/react-utilities';
|
|
3
|
+
import type { Slot } from '@fluentui/react-utilities';
|
|
6
4
|
|
|
7
|
-
export declare type ARIAButtonSlotProps =
|
|
5
|
+
export declare type ARIAButtonSlotProps = ExtractSlotProps<Slot<'button', 'a'>> & {
|
|
8
6
|
disabled?: boolean;
|
|
9
7
|
disabledFocusable?: boolean;
|
|
10
8
|
};
|
|
@@ -12,17 +10,16 @@ export declare type ARIAButtonSlotProps = IntrinsicSlotProps<'button', 'a'> & {
|
|
|
12
10
|
/**
|
|
13
11
|
* Merges disabled declaration with `aria-disabled`
|
|
14
12
|
*/
|
|
15
|
-
export declare function mergeARIADisabled(shorthand:
|
|
13
|
+
export declare function mergeARIADisabled(shorthand: {
|
|
16
14
|
'aria-disabled'?: string | boolean;
|
|
17
|
-
children?: React_2.ReactNode;
|
|
18
15
|
disabled?: boolean;
|
|
19
|
-
}
|
|
16
|
+
}): boolean;
|
|
20
17
|
|
|
21
18
|
/**
|
|
22
19
|
* Button keyboard handling, role, disabled and tabIndex implementation that ensures ARIA spec
|
|
23
20
|
* for multiple scenarios of shorthand properties. Ensuring 1st rule of ARIA for cases
|
|
24
21
|
* where no attribute addition is required.
|
|
25
22
|
*/
|
|
26
|
-
export declare
|
|
23
|
+
export declare const useARIAButton: ResolveShorthandFunction<ARIAButtonSlotProps>;
|
|
27
24
|
|
|
28
25
|
export { }
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare type ARIAButtonSlotProps =
|
|
1
|
+
import type { ExtractSlotProps, ResolveShorthandFunction, Slot } from '@fluentui/react-utilities';
|
|
2
|
+
export declare type ARIAButtonSlotProps = ExtractSlotProps<Slot<'button', 'a'>> & {
|
|
3
3
|
disabled?: boolean;
|
|
4
4
|
disabledFocusable?: boolean;
|
|
5
5
|
};
|
|
@@ -8,4 +8,4 @@ export declare type ARIAButtonSlotProps = IntrinsicSlotProps<'button', 'a'> & {
|
|
|
8
8
|
* for multiple scenarios of shorthand properties. Ensuring 1st rule of ARIA for cases
|
|
9
9
|
* where no attribute addition is required.
|
|
10
10
|
*/
|
|
11
|
-
export declare
|
|
11
|
+
export declare const useARIAButton: ResolveShorthandFunction<ARIAButtonSlotProps>;
|
|
@@ -6,7 +6,7 @@ import { resolveShorthand, useEventCallback } from '@fluentui/react-utilities';
|
|
|
6
6
|
* where no attribute addition is required.
|
|
7
7
|
*/
|
|
8
8
|
|
|
9
|
-
export
|
|
9
|
+
export const useARIAButton = (shorthand, options) => {
|
|
10
10
|
var _a;
|
|
11
11
|
|
|
12
12
|
const shorthandProps = resolveShorthand(shorthand, options);
|
|
@@ -75,7 +75,7 @@ export function useARIAButton(shorthand, options) {
|
|
|
75
75
|
// If a <button> tag is to be rendered we just need to set disabled and aria-disabled correctly
|
|
76
76
|
if (shorthandProps.as === 'button' || shorthandProps.as === undefined) {
|
|
77
77
|
shorthandProps.disabled = disabled && !disabledFocusable;
|
|
78
|
-
shorthandProps['aria-disabled'] = disabledFocusable; // Undefine events if disabledFocusable is passed in
|
|
78
|
+
shorthandProps['aria-disabled'] = disabledFocusable ? true : undefined; // Undefine events if disabledFocusable is passed in
|
|
79
79
|
|
|
80
80
|
if (disabledFocusable) {
|
|
81
81
|
shorthandProps.onClick = undefined;
|
|
@@ -99,5 +99,5 @@ export function useARIAButton(shorthand, options) {
|
|
|
99
99
|
}
|
|
100
100
|
|
|
101
101
|
return shorthandProps;
|
|
102
|
-
}
|
|
102
|
+
};
|
|
103
103
|
//# sourceMappingURL=useARIAButton.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/hooks/useARIAButton.ts"],"names":[],"mappings":"AAAA,SAAS,KAAT,EAAgB,KAAhB,QAA6B,yBAA7B;AACA,SAAS,gBAAT,EAA2B,gBAA3B,QAAmD,2BAAnD;AAQA;;;;AAIG;;AACH,
|
|
1
|
+
{"version":3,"sources":["../../src/hooks/useARIAButton.ts"],"names":[],"mappings":"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","sourceRoot":""}
|
|
@@ -1,10 +1,7 @@
|
|
|
1
|
-
import * as React from 'react';
|
|
2
|
-
import { SlotProps } from '@fluentui/react-utilities';
|
|
3
1
|
/**
|
|
4
2
|
* Merges disabled declaration with `aria-disabled`
|
|
5
3
|
*/
|
|
6
|
-
export declare function mergeARIADisabled(shorthand:
|
|
4
|
+
export declare function mergeARIADisabled(shorthand: {
|
|
7
5
|
'aria-disabled'?: string | boolean;
|
|
8
|
-
children?: React.ReactNode;
|
|
9
6
|
disabled?: boolean;
|
|
10
|
-
}
|
|
7
|
+
}): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/utils/mergeARIADisabled.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"sources":["../../src/utils/mergeARIADisabled.ts"],"names":[],"mappings":"AAAA;;AAEG;AACH,OAAM,SAAU,iBAAV,CAA4B,SAA5B,EAAiG;;;AACrG,QAAM,QAAQ,GAAG,CAAA,EAAA,GAAA,SAAS,CAAC,QAAV,MAAkB,IAAlB,IAAkB,EAAA,KAAA,KAAA,CAAlB,GAAkB,EAAlB,GAAsB,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":""}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare type ARIAButtonSlotProps =
|
|
1
|
+
import type { ExtractSlotProps, ResolveShorthandFunction, Slot } from '@fluentui/react-utilities';
|
|
2
|
+
export declare type ARIAButtonSlotProps = ExtractSlotProps<Slot<'button', 'a'>> & {
|
|
3
3
|
disabled?: boolean;
|
|
4
4
|
disabledFocusable?: boolean;
|
|
5
5
|
};
|
|
@@ -8,4 +8,4 @@ export declare type ARIAButtonSlotProps = IntrinsicSlotProps<'button', 'a'> & {
|
|
|
8
8
|
* for multiple scenarios of shorthand properties. Ensuring 1st rule of ARIA for cases
|
|
9
9
|
* where no attribute addition is required.
|
|
10
10
|
*/
|
|
11
|
-
export declare
|
|
11
|
+
export declare const useARIAButton: ResolveShorthandFunction<ARIAButtonSlotProps>;
|
|
@@ -15,7 +15,7 @@ const react_utilities_1 = /*#__PURE__*/require("@fluentui/react-utilities");
|
|
|
15
15
|
*/
|
|
16
16
|
|
|
17
17
|
|
|
18
|
-
|
|
18
|
+
const useARIAButton = (shorthand, options) => {
|
|
19
19
|
var _a;
|
|
20
20
|
|
|
21
21
|
const shorthandProps = react_utilities_1.resolveShorthand(shorthand, options);
|
|
@@ -84,7 +84,7 @@ function useARIAButton(shorthand, options) {
|
|
|
84
84
|
// If a <button> tag is to be rendered we just need to set disabled and aria-disabled correctly
|
|
85
85
|
if (shorthandProps.as === 'button' || shorthandProps.as === undefined) {
|
|
86
86
|
shorthandProps.disabled = disabled && !disabledFocusable;
|
|
87
|
-
shorthandProps['aria-disabled'] = disabledFocusable; // Undefine events if disabledFocusable is passed in
|
|
87
|
+
shorthandProps['aria-disabled'] = disabledFocusable ? true : undefined; // Undefine events if disabledFocusable is passed in
|
|
88
88
|
|
|
89
89
|
if (disabledFocusable) {
|
|
90
90
|
shorthandProps.onClick = undefined;
|
|
@@ -108,7 +108,7 @@ function useARIAButton(shorthand, options) {
|
|
|
108
108
|
}
|
|
109
109
|
|
|
110
110
|
return shorthandProps;
|
|
111
|
-
}
|
|
111
|
+
};
|
|
112
112
|
|
|
113
113
|
exports.useARIAButton = useARIAButton;
|
|
114
114
|
//# sourceMappingURL=useARIAButton.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/hooks/useARIAButton.ts"],"names":[],"mappings":";;;;;;;AAAA,MAAA,eAAA,gBAAA,OAAA,CAAA,yBAAA,CAAA;;AACA,MAAA,iBAAA,gBAAA,OAAA,CAAA,2BAAA,CAAA;AAQA;;;;AAIG;;;
|
|
1
|
+
{"version":3,"sources":["../../src/hooks/useARIAButton.ts"],"names":[],"mappings":"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","sourceRoot":""}
|
|
@@ -1,10 +1,7 @@
|
|
|
1
|
-
import * as React from 'react';
|
|
2
|
-
import { SlotProps } from '@fluentui/react-utilities';
|
|
3
1
|
/**
|
|
4
2
|
* Merges disabled declaration with `aria-disabled`
|
|
5
3
|
*/
|
|
6
|
-
export declare function mergeARIADisabled(shorthand:
|
|
4
|
+
export declare function mergeARIADisabled(shorthand: {
|
|
7
5
|
'aria-disabled'?: string | boolean;
|
|
8
|
-
children?: React.ReactNode;
|
|
9
6
|
disabled?: boolean;
|
|
10
|
-
}
|
|
7
|
+
}): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/utils/mergeARIADisabled.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"sources":["../../src/utils/mergeARIADisabled.ts"],"names":[],"mappings":";;;;;;AAAA;;AAEG;;AACH,SAAgB,iBAAhB,CAAkC,SAAlC,EAAuG;;;AACrG,QAAM,QAAQ,GAAG,CAAA,EAAA,GAAA,SAAS,CAAC,QAAV,MAAkB,IAAlB,IAAkB,EAAA,KAAA,KAAA,CAAlB,GAAkB,EAAlB,GAAsB,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;;AAND,OAAA,CAAA,iBAAA,GAAA,iBAAA","sourceRoot":""}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fluentui/react-aria",
|
|
3
|
-
"version": "0.0.0-
|
|
3
|
+
"version": "0.0.0-nightlyc0e3a0a1f320220217.1",
|
|
4
4
|
"description": "React helper to ensure ARIA",
|
|
5
5
|
"main": "lib-commonjs/index.js",
|
|
6
6
|
"module": "lib/index.js",
|
|
@@ -40,8 +40,8 @@
|
|
|
40
40
|
"react-test-renderer": "^16.3.0"
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"@fluentui/keyboard-keys": "0.0.0-
|
|
44
|
-
"@fluentui/react-utilities": "0.0.0-
|
|
43
|
+
"@fluentui/keyboard-keys": "0.0.0-nightlyc0e3a0a1f320220217.1",
|
|
44
|
+
"@fluentui/react-utilities": "0.0.0-nightlyc0e3a0a1f320220217.1",
|
|
45
45
|
"tslib": "^2.1.0"
|
|
46
46
|
},
|
|
47
47
|
"peerDependencies": {
|