@fluentui/react-aria 9.0.0-nightly.46b9ea7036.0 → 9.0.0-rc.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 +158 -17
- package/CHANGELOG.md +48 -10
- package/dist/react-aria.d.ts +7 -10
- package/lib/hooks/useARIAButton.d.ts +3 -3
- package/lib/hooks/useARIAButton.js +25 -20
- package/lib/hooks/useARIAButton.js.map +1 -1
- package/lib/utils/mergeARIADisabled.d.ts +2 -5
- package/lib/utils/mergeARIADisabled.js +1 -1
- package/lib/utils/mergeARIADisabled.js.map +1 -1
- package/lib-commonjs/hooks/index.js +1 -1
- package/lib-commonjs/hooks/useARIAButton.d.ts +3 -3
- package/lib-commonjs/hooks/useARIAButton.js +27 -22
- package/lib-commonjs/hooks/useARIAButton.js.map +1 -1
- package/lib-commonjs/index.js +1 -1
- package/lib-commonjs/utils/index.js +1 -1
- package/lib-commonjs/utils/mergeARIADisabled.d.ts +2 -5
- package/lib-commonjs/utils/mergeARIADisabled.js +1 -1
- package/lib-commonjs/utils/mergeARIADisabled.js.map +1 -1
- package/package.json +7 -9
package/CHANGELOG.json
CHANGED
|
@@ -2,46 +2,187 @@
|
|
|
2
2
|
"name": "@fluentui/react-aria",
|
|
3
3
|
"entries": [
|
|
4
4
|
{
|
|
5
|
-
"date": "
|
|
6
|
-
"tag": "@fluentui/react-aria_v9.0.0-
|
|
7
|
-
"version": "9.0.0-
|
|
5
|
+
"date": "Thu, 10 Feb 2022 08:45:31 GMT",
|
|
6
|
+
"tag": "@fluentui/react-aria_v9.0.0-rc.1",
|
|
7
|
+
"version": "9.0.0-rc.1",
|
|
8
8
|
"comments": {
|
|
9
|
+
"none": [
|
|
10
|
+
{
|
|
11
|
+
"author": "olfedias@microsoft.com",
|
|
12
|
+
"package": "@fluentui/react-aria",
|
|
13
|
+
"commit": "c061e98be4b4a718c72a144a1f60bb5515824612",
|
|
14
|
+
"comment": "remove inline-style-expand-shorthand from tsconfigs"
|
|
15
|
+
},
|
|
16
|
+
{
|
|
17
|
+
"author": "martinhochel@microsoft.com",
|
|
18
|
+
"package": "@fluentui/react-aria",
|
|
19
|
+
"commit": "8dfa712156b70414205b87b5b6d099367b0c297d",
|
|
20
|
+
"comment": "chore: use storybook runner for all vNext packages"
|
|
21
|
+
}
|
|
22
|
+
],
|
|
9
23
|
"prerelease": [
|
|
10
24
|
{
|
|
11
|
-
"author": "
|
|
25
|
+
"author": "olfedias@microsoft.com",
|
|
12
26
|
"package": "@fluentui/react-aria",
|
|
13
|
-
"
|
|
14
|
-
"
|
|
27
|
+
"commit": "f4eafee2c3b8d85b3a267d6b155f0f5585a435fd",
|
|
28
|
+
"comment": "remove Griffel packages"
|
|
15
29
|
},
|
|
16
30
|
{
|
|
17
|
-
"author": "
|
|
31
|
+
"author": "lingfangao@hotmail.com",
|
|
32
|
+
"package": "@fluentui/react-aria",
|
|
33
|
+
"commit": "c00913d50e2dd15bbfbb0757cefe43b192ff1d7f",
|
|
34
|
+
"comment": "Bump Fluent UI packages to 9.0.0-rc"
|
|
35
|
+
},
|
|
36
|
+
{
|
|
37
|
+
"author": "Humberto.Morimoto@microsoft.com",
|
|
38
|
+
"package": "@fluentui/react-aria",
|
|
39
|
+
"commit": "e0b8e1fa6980077e7b311fd1c72c28d3e4305db0",
|
|
40
|
+
"comment": "Updating based on changes to composition types."
|
|
41
|
+
},
|
|
42
|
+
{
|
|
43
|
+
"author": "behowell@microsoft.com",
|
|
44
|
+
"package": "@fluentui/react-aria",
|
|
45
|
+
"commit": "53b01d71e335715fda91b33e3d7bbd9d471d5ed3",
|
|
46
|
+
"comment": "Refactor component Slot typings"
|
|
47
|
+
},
|
|
48
|
+
{
|
|
49
|
+
"author": "behowell@microsoft.com",
|
|
50
|
+
"package": "@fluentui/react-aria",
|
|
51
|
+
"commit": "7cc28ed8320b00f42d91c63882f10316db2205c5",
|
|
52
|
+
"comment": "Remove component's shorthandProps array"
|
|
53
|
+
},
|
|
54
|
+
{
|
|
55
|
+
"author": "beachball",
|
|
56
|
+
"package": "@fluentui/react-aria",
|
|
57
|
+
"comment": "Bump @fluentui/keyboard-keys to v9.0.0-rc.1",
|
|
58
|
+
"commit": "e6c855f6d9019d6c73668d15fc9bc3a13291a6c8"
|
|
59
|
+
},
|
|
60
|
+
{
|
|
61
|
+
"author": "beachball",
|
|
62
|
+
"package": "@fluentui/react-aria",
|
|
63
|
+
"comment": "Bump @fluentui/react-utilities to v9.0.0-rc.1",
|
|
64
|
+
"commit": "e6c855f6d9019d6c73668d15fc9bc3a13291a6c8"
|
|
65
|
+
}
|
|
66
|
+
]
|
|
67
|
+
}
|
|
68
|
+
},
|
|
69
|
+
{
|
|
70
|
+
"date": "Thu, 25 Nov 2021 08:34:10 GMT",
|
|
71
|
+
"tag": "@fluentui/react-aria_v9.0.0-beta.4",
|
|
72
|
+
"version": "9.0.0-beta.4",
|
|
73
|
+
"comments": {
|
|
74
|
+
"none": [
|
|
75
|
+
{
|
|
76
|
+
"author": "olfedias@microsoft.com",
|
|
77
|
+
"package": "@fluentui/react-aria",
|
|
78
|
+
"commit": "8a820339f7f4084d8c46e97f06eebbeb18111397",
|
|
79
|
+
"comment": "update tooling config"
|
|
80
|
+
}
|
|
81
|
+
],
|
|
82
|
+
"prerelease": [
|
|
83
|
+
{
|
|
84
|
+
"author": "beachball",
|
|
18
85
|
"package": "@fluentui/react-aria",
|
|
19
|
-
"comment": "
|
|
20
|
-
"commit": "
|
|
86
|
+
"comment": "Bump @fluentui/react-make-styles to v9.0.0-beta.4",
|
|
87
|
+
"commit": "48d236ac53a4950fabc3ddd52f91dac93ca0195b"
|
|
21
88
|
},
|
|
22
89
|
{
|
|
23
90
|
"author": "beachball",
|
|
24
91
|
"package": "@fluentui/react-aria",
|
|
25
|
-
"comment": "Bump @fluentui/
|
|
26
|
-
"commit": "
|
|
92
|
+
"comment": "Bump @fluentui/react-utilities to v9.0.0-beta.4",
|
|
93
|
+
"commit": "48d236ac53a4950fabc3ddd52f91dac93ca0195b"
|
|
94
|
+
},
|
|
95
|
+
{
|
|
96
|
+
"author": "beachball",
|
|
97
|
+
"package": "@fluentui/react-aria",
|
|
98
|
+
"comment": "Bump @fluentui/jest-serializer-make-styles to v9.0.0-beta.4",
|
|
99
|
+
"commit": "48d236ac53a4950fabc3ddd52f91dac93ca0195b"
|
|
100
|
+
},
|
|
101
|
+
{
|
|
102
|
+
"author": "beachball",
|
|
103
|
+
"package": "@fluentui/react-aria",
|
|
104
|
+
"comment": "Bump @fluentui/babel-make-styles to v9.0.0-beta.4",
|
|
105
|
+
"commit": "48d236ac53a4950fabc3ddd52f91dac93ca0195b"
|
|
106
|
+
}
|
|
107
|
+
]
|
|
108
|
+
}
|
|
109
|
+
},
|
|
110
|
+
{
|
|
111
|
+
"date": "Fri, 12 Nov 2021 13:25:13 GMT",
|
|
112
|
+
"tag": "@fluentui/react-aria_v9.0.0-beta.3",
|
|
113
|
+
"version": "9.0.0-beta.3",
|
|
114
|
+
"comments": {
|
|
115
|
+
"prerelease": [
|
|
116
|
+
{
|
|
117
|
+
"author": "Humberto.Morimoto@microsoft.com",
|
|
118
|
+
"package": "@fluentui/react-aria",
|
|
119
|
+
"commit": "a4ea9b6227d2f634f85b40fe4cec10e4c391244b",
|
|
120
|
+
"comment": "Fixing events being fired when button is disabledFocusable"
|
|
121
|
+
},
|
|
122
|
+
{
|
|
123
|
+
"author": "gcox@microsoft.com",
|
|
124
|
+
"package": "@fluentui/react-aria",
|
|
125
|
+
"commit": "c9bd5b5a02ae94a8239ce1b56cac2f0d0dbd3586",
|
|
126
|
+
"comment": "Updated beta and RC components to ES2019"
|
|
127
|
+
},
|
|
128
|
+
{
|
|
129
|
+
"author": "beachball",
|
|
130
|
+
"package": "@fluentui/react-aria",
|
|
131
|
+
"comment": "Bump @fluentui/react-make-styles to v9.0.0-beta.3",
|
|
132
|
+
"commit": "742342e52c65066f779232e4e1302fedf0dd460d"
|
|
133
|
+
},
|
|
134
|
+
{
|
|
135
|
+
"author": "beachball",
|
|
136
|
+
"package": "@fluentui/react-aria",
|
|
137
|
+
"comment": "Bump @fluentui/react-utilities to v9.0.0-beta.3",
|
|
138
|
+
"commit": "742342e52c65066f779232e4e1302fedf0dd460d"
|
|
139
|
+
},
|
|
140
|
+
{
|
|
141
|
+
"author": "beachball",
|
|
142
|
+
"package": "@fluentui/react-aria",
|
|
143
|
+
"comment": "Bump @fluentui/jest-serializer-make-styles to v9.0.0-beta.3",
|
|
144
|
+
"commit": "742342e52c65066f779232e4e1302fedf0dd460d"
|
|
145
|
+
}
|
|
146
|
+
],
|
|
147
|
+
"none": [
|
|
148
|
+
{
|
|
149
|
+
"author": "lingfangao@hotmail.com",
|
|
150
|
+
"package": "@fluentui/react-aria",
|
|
151
|
+
"commit": "00f70581480b536e723fb69edf0ae617beac4807",
|
|
152
|
+
"comment": "Remove beta release tag"
|
|
153
|
+
}
|
|
154
|
+
]
|
|
155
|
+
}
|
|
156
|
+
},
|
|
157
|
+
{
|
|
158
|
+
"date": "Wed, 27 Oct 2021 12:14:13 GMT",
|
|
159
|
+
"tag": "@fluentui/react-aria_v9.0.0-beta.2",
|
|
160
|
+
"version": "9.0.0-beta.2",
|
|
161
|
+
"comments": {
|
|
162
|
+
"prerelease": [
|
|
163
|
+
{
|
|
164
|
+
"author": "peter@draxler.ml",
|
|
165
|
+
"package": "@fluentui/react-aria",
|
|
166
|
+
"commit": "f6db7c8d6b7db0902775e7857b62b745be35b59a",
|
|
167
|
+
"comment": "added styling of documentation"
|
|
27
168
|
},
|
|
28
169
|
{
|
|
29
170
|
"author": "beachball",
|
|
30
171
|
"package": "@fluentui/react-aria",
|
|
31
|
-
"comment": "Bump @fluentui/react-make-styles to v9.0.0-
|
|
32
|
-
"commit": "
|
|
172
|
+
"comment": "Bump @fluentui/react-make-styles to v9.0.0-beta.2",
|
|
173
|
+
"commit": "0f8f1ae7c2d908e51e29dd342d79e041f86fac08"
|
|
33
174
|
},
|
|
34
175
|
{
|
|
35
176
|
"author": "beachball",
|
|
36
177
|
"package": "@fluentui/react-aria",
|
|
37
|
-
"comment": "Bump @fluentui/react-utilities to v9.0.0-
|
|
38
|
-
"commit": "
|
|
178
|
+
"comment": "Bump @fluentui/react-utilities to v9.0.0-beta.2",
|
|
179
|
+
"commit": "0f8f1ae7c2d908e51e29dd342d79e041f86fac08"
|
|
39
180
|
},
|
|
40
181
|
{
|
|
41
182
|
"author": "beachball",
|
|
42
183
|
"package": "@fluentui/react-aria",
|
|
43
|
-
"comment": "Bump @fluentui/jest-serializer-make-styles to v9.0.0-
|
|
44
|
-
"commit": "
|
|
184
|
+
"comment": "Bump @fluentui/jest-serializer-make-styles to v9.0.0-beta.2",
|
|
185
|
+
"commit": "0f8f1ae7c2d908e51e29dd342d79e041f86fac08"
|
|
45
186
|
}
|
|
46
187
|
]
|
|
47
188
|
}
|
package/CHANGELOG.md
CHANGED
|
@@ -1,22 +1,60 @@
|
|
|
1
1
|
# Change Log - @fluentui/react-aria
|
|
2
2
|
|
|
3
|
-
This log was last generated on
|
|
3
|
+
This log was last generated on Thu, 10 Feb 2022 08:45:31 GMT and should not be manually modified.
|
|
4
4
|
|
|
5
5
|
<!-- Start content -->
|
|
6
6
|
|
|
7
|
-
## [9.0.0-
|
|
7
|
+
## [9.0.0-rc.1](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-rc.1)
|
|
8
8
|
|
|
9
|
-
|
|
10
|
-
[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-beta.
|
|
9
|
+
Thu, 10 Feb 2022 08:45:31 GMT
|
|
10
|
+
[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
11
|
|
|
12
12
|
### Changes
|
|
13
13
|
|
|
14
|
-
-
|
|
15
|
-
-
|
|
16
|
-
-
|
|
17
|
-
-
|
|
18
|
-
-
|
|
19
|
-
- Bump @fluentui/
|
|
14
|
+
- remove Griffel packages ([PR #21440](https://github.com/microsoft/fluentui/pull/21440) by olfedias@microsoft.com)
|
|
15
|
+
- Bump Fluent UI packages to 9.0.0-rc ([PR #21623](https://github.com/microsoft/fluentui/pull/21623) by lingfangao@hotmail.com)
|
|
16
|
+
- Updating based on changes to composition types. ([PR #20891](https://github.com/microsoft/fluentui/pull/20891) by Humberto.Morimoto@microsoft.com)
|
|
17
|
+
- Refactor component Slot typings ([PR #21518](https://github.com/microsoft/fluentui/pull/21518) by behowell@microsoft.com)
|
|
18
|
+
- Remove component's shorthandProps array ([PR #21134](https://github.com/microsoft/fluentui/pull/21134) by behowell@microsoft.com)
|
|
19
|
+
- Bump @fluentui/keyboard-keys to v9.0.0-rc.1 ([commit](https://github.com/microsoft/fluentui/commit/e6c855f6d9019d6c73668d15fc9bc3a13291a6c8) by beachball)
|
|
20
|
+
- Bump @fluentui/react-utilities to v9.0.0-rc.1 ([commit](https://github.com/microsoft/fluentui/commit/e6c855f6d9019d6c73668d15fc9bc3a13291a6c8) by beachball)
|
|
21
|
+
|
|
22
|
+
## [9.0.0-beta.4](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-beta.4)
|
|
23
|
+
|
|
24
|
+
Thu, 25 Nov 2021 08:34:10 GMT
|
|
25
|
+
[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-beta.3..@fluentui/react-aria_v9.0.0-beta.4)
|
|
26
|
+
|
|
27
|
+
### Changes
|
|
28
|
+
|
|
29
|
+
- Bump @fluentui/react-make-styles to v9.0.0-beta.4 ([PR #20762](https://github.com/microsoft/fluentui/pull/20762) by beachball)
|
|
30
|
+
- Bump @fluentui/react-utilities to v9.0.0-beta.4 ([PR #20762](https://github.com/microsoft/fluentui/pull/20762) by beachball)
|
|
31
|
+
- Bump @fluentui/jest-serializer-make-styles to v9.0.0-beta.4 ([PR #20762](https://github.com/microsoft/fluentui/pull/20762) by beachball)
|
|
32
|
+
- Bump @fluentui/babel-make-styles to v9.0.0-beta.4 ([PR #20762](https://github.com/microsoft/fluentui/pull/20762) by beachball)
|
|
33
|
+
|
|
34
|
+
## [9.0.0-beta.3](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-beta.3)
|
|
35
|
+
|
|
36
|
+
Fri, 12 Nov 2021 13:25:13 GMT
|
|
37
|
+
[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-beta.2..@fluentui/react-aria_v9.0.0-beta.3)
|
|
38
|
+
|
|
39
|
+
### Changes
|
|
40
|
+
|
|
41
|
+
- Fixing events being fired when button is disabledFocusable ([PR #20342](https://github.com/microsoft/fluentui/pull/20342) by Humberto.Morimoto@microsoft.com)
|
|
42
|
+
- Updated beta and RC components to ES2019 ([PR #20405](https://github.com/microsoft/fluentui/pull/20405) by gcox@microsoft.com)
|
|
43
|
+
- Bump @fluentui/react-make-styles to v9.0.0-beta.3 ([PR #20583](https://github.com/microsoft/fluentui/pull/20583) by beachball)
|
|
44
|
+
- Bump @fluentui/react-utilities to v9.0.0-beta.3 ([PR #20583](https://github.com/microsoft/fluentui/pull/20583) by beachball)
|
|
45
|
+
- Bump @fluentui/jest-serializer-make-styles to v9.0.0-beta.3 ([PR #20583](https://github.com/microsoft/fluentui/pull/20583) by beachball)
|
|
46
|
+
|
|
47
|
+
## [9.0.0-beta.2](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-beta.2)
|
|
48
|
+
|
|
49
|
+
Wed, 27 Oct 2021 12:14:13 GMT
|
|
50
|
+
[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-beta.1..@fluentui/react-aria_v9.0.0-beta.2)
|
|
51
|
+
|
|
52
|
+
### Changes
|
|
53
|
+
|
|
54
|
+
- added styling of documentation ([PR #20193](https://github.com/microsoft/fluentui/pull/20193) by peter@draxler.ml)
|
|
55
|
+
- Bump @fluentui/react-make-styles to v9.0.0-beta.2 ([PR #20353](https://github.com/microsoft/fluentui/pull/20353) by beachball)
|
|
56
|
+
- Bump @fluentui/react-utilities to v9.0.0-beta.2 ([PR #20353](https://github.com/microsoft/fluentui/pull/20353) by beachball)
|
|
57
|
+
- Bump @fluentui/jest-serializer-make-styles to v9.0.0-beta.2 ([PR #20353](https://github.com/microsoft/fluentui/pull/20353) by beachball)
|
|
20
58
|
|
|
21
59
|
## [9.0.0-beta.1](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-beta.1)
|
|
22
60
|
|
package/dist/react-aria.d.ts
CHANGED
|
@@ -1,10 +1,8 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
import {
|
|
3
|
-
import
|
|
4
|
-
import type { ResolveShorthandOptions } from '@fluentui/react-utilities';
|
|
5
|
-
import type { ShorthandProps } 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
|
|
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 ARIAButtonShorthandProps = IntrinsicShorthandProps<'button',
|
|
|
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
|
|
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 ARIAButtonShorthandProps = IntrinsicShorthandProps<'button',
|
|
|
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,20 +6,19 @@ 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
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
var onClickHandler = useEventCallback(function (ev) {
|
|
12
|
+
const shorthandProps = resolveShorthand(shorthand, options);
|
|
13
|
+
const {
|
|
14
|
+
disabled,
|
|
15
|
+
disabledFocusable,
|
|
16
|
+
onClick,
|
|
17
|
+
onKeyDown,
|
|
18
|
+
onKeyUp,
|
|
19
|
+
tabIndex
|
|
20
|
+
} = shorthandProps || {};
|
|
21
|
+
const onClickHandler = useEventCallback(ev => {
|
|
23
22
|
if (disabled || disabledFocusable) {
|
|
24
23
|
ev.preventDefault();
|
|
25
24
|
ev.stopPropagation();
|
|
@@ -27,14 +26,14 @@ export function useARIAButton(shorthand, options) {
|
|
|
27
26
|
onClick === null || onClick === void 0 ? void 0 : onClick(ev);
|
|
28
27
|
}
|
|
29
28
|
});
|
|
30
|
-
|
|
29
|
+
const onKeyDownHandler = useEventCallback(ev => {
|
|
31
30
|
onKeyDown === null || onKeyDown === void 0 ? void 0 : onKeyDown(ev);
|
|
32
31
|
|
|
33
32
|
if (ev.isDefaultPrevented()) {
|
|
34
33
|
return;
|
|
35
34
|
}
|
|
36
35
|
|
|
37
|
-
|
|
36
|
+
const key = ev.key;
|
|
38
37
|
|
|
39
38
|
if ((disabled || disabledFocusable) && (key === Enter || key === Space)) {
|
|
40
39
|
ev.preventDefault();
|
|
@@ -51,14 +50,14 @@ export function useARIAButton(shorthand, options) {
|
|
|
51
50
|
ev.currentTarget.click();
|
|
52
51
|
}
|
|
53
52
|
});
|
|
54
|
-
|
|
53
|
+
const onKeyupHandler = useEventCallback(ev => {
|
|
55
54
|
onKeyUp === null || onKeyUp === void 0 ? void 0 : onKeyUp(ev);
|
|
56
55
|
|
|
57
56
|
if (ev.isDefaultPrevented()) {
|
|
58
57
|
return;
|
|
59
58
|
}
|
|
60
59
|
|
|
61
|
-
|
|
60
|
+
const key = ev.key;
|
|
62
61
|
|
|
63
62
|
if ((disabled || disabledFocusable) && (key === Enter || key === Space)) {
|
|
64
63
|
ev.preventDefault();
|
|
@@ -76,12 +75,18 @@ export function useARIAButton(shorthand, options) {
|
|
|
76
75
|
// If a <button> tag is to be rendered we just need to set disabled and aria-disabled correctly
|
|
77
76
|
if (shorthandProps.as === 'button' || shorthandProps.as === undefined) {
|
|
78
77
|
shorthandProps.disabled = disabled && !disabledFocusable;
|
|
79
|
-
shorthandProps['aria-disabled'] = disabledFocusable;
|
|
80
|
-
|
|
81
|
-
|
|
78
|
+
shorthandProps['aria-disabled'] = disabledFocusable; // Undefine events if disabledFocusable is passed in
|
|
79
|
+
|
|
80
|
+
if (disabledFocusable) {
|
|
81
|
+
shorthandProps.onClick = undefined;
|
|
82
|
+
shorthandProps.onKeyDown = undefined;
|
|
83
|
+
shorthandProps.onKeyUp = undefined;
|
|
84
|
+
}
|
|
85
|
+
} // If an <a> tag is to be rendered we have to remove disabled and type, and set aria-disabled, role and tabIndex.
|
|
82
86
|
else {
|
|
83
87
|
delete shorthandProps.disabled;
|
|
84
88
|
shorthandProps['aria-disabled'] = disabled || disabledFocusable;
|
|
89
|
+
shorthandProps.href = disabled ? undefined : shorthandProps.href;
|
|
85
90
|
shorthandProps.onClick = onClickHandler;
|
|
86
91
|
shorthandProps.onKeyDown = onKeyDownHandler;
|
|
87
92
|
shorthandProps.onKeyUp = onKeyupHandler;
|
|
@@ -94,5 +99,5 @@ export function useARIAButton(shorthand, options) {
|
|
|
94
99
|
}
|
|
95
100
|
|
|
96
101
|
return shorthandProps;
|
|
97
|
-
}
|
|
102
|
+
};
|
|
98
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 { ObjectShorthandProps } 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;
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
export function mergeARIADisabled(shorthand) {
|
|
5
5
|
var _a;
|
|
6
6
|
|
|
7
|
-
|
|
7
|
+
const disabled = (_a = shorthand.disabled) !== null && _a !== void 0 ? _a : shorthand['aria-disabled'];
|
|
8
8
|
|
|
9
9
|
if (typeof disabled === 'string') {
|
|
10
10
|
return disabled === 'false' ? false : true;
|
|
@@ -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
|
|
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 ARIAButtonShorthandProps = IntrinsicShorthandProps<'button',
|
|
|
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>;
|
|
@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.useARIAButton = void 0;
|
|
7
7
|
|
|
8
|
-
|
|
8
|
+
const keyboard_keys_1 = /*#__PURE__*/require("@fluentui/keyboard-keys");
|
|
9
9
|
|
|
10
|
-
|
|
10
|
+
const react_utilities_1 = /*#__PURE__*/require("@fluentui/react-utilities");
|
|
11
11
|
/**
|
|
12
12
|
* Button keyboard handling, role, disabled and tabIndex implementation that ensures ARIA spec
|
|
13
13
|
* for multiple scenarios of shorthand properties. Ensuring 1st rule of ARIA for cases
|
|
@@ -15,20 +15,19 @@ var 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
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
var onClickHandler = react_utilities_1.useEventCallback(function (ev) {
|
|
21
|
+
const shorthandProps = react_utilities_1.resolveShorthand(shorthand, options);
|
|
22
|
+
const {
|
|
23
|
+
disabled,
|
|
24
|
+
disabledFocusable,
|
|
25
|
+
onClick,
|
|
26
|
+
onKeyDown,
|
|
27
|
+
onKeyUp,
|
|
28
|
+
tabIndex
|
|
29
|
+
} = shorthandProps || {};
|
|
30
|
+
const onClickHandler = react_utilities_1.useEventCallback(ev => {
|
|
32
31
|
if (disabled || disabledFocusable) {
|
|
33
32
|
ev.preventDefault();
|
|
34
33
|
ev.stopPropagation();
|
|
@@ -36,14 +35,14 @@ function useARIAButton(shorthand, options) {
|
|
|
36
35
|
onClick === null || onClick === void 0 ? void 0 : onClick(ev);
|
|
37
36
|
}
|
|
38
37
|
});
|
|
39
|
-
|
|
38
|
+
const onKeyDownHandler = react_utilities_1.useEventCallback(ev => {
|
|
40
39
|
onKeyDown === null || onKeyDown === void 0 ? void 0 : onKeyDown(ev);
|
|
41
40
|
|
|
42
41
|
if (ev.isDefaultPrevented()) {
|
|
43
42
|
return;
|
|
44
43
|
}
|
|
45
44
|
|
|
46
|
-
|
|
45
|
+
const key = ev.key;
|
|
47
46
|
|
|
48
47
|
if ((disabled || disabledFocusable) && (key === keyboard_keys_1.Enter || key === keyboard_keys_1.Space)) {
|
|
49
48
|
ev.preventDefault();
|
|
@@ -60,14 +59,14 @@ function useARIAButton(shorthand, options) {
|
|
|
60
59
|
ev.currentTarget.click();
|
|
61
60
|
}
|
|
62
61
|
});
|
|
63
|
-
|
|
62
|
+
const onKeyupHandler = react_utilities_1.useEventCallback(ev => {
|
|
64
63
|
onKeyUp === null || onKeyUp === void 0 ? void 0 : onKeyUp(ev);
|
|
65
64
|
|
|
66
65
|
if (ev.isDefaultPrevented()) {
|
|
67
66
|
return;
|
|
68
67
|
}
|
|
69
68
|
|
|
70
|
-
|
|
69
|
+
const key = ev.key;
|
|
71
70
|
|
|
72
71
|
if ((disabled || disabledFocusable) && (key === keyboard_keys_1.Enter || key === keyboard_keys_1.Space)) {
|
|
73
72
|
ev.preventDefault();
|
|
@@ -85,12 +84,18 @@ function useARIAButton(shorthand, options) {
|
|
|
85
84
|
// If a <button> tag is to be rendered we just need to set disabled and aria-disabled correctly
|
|
86
85
|
if (shorthandProps.as === 'button' || shorthandProps.as === undefined) {
|
|
87
86
|
shorthandProps.disabled = disabled && !disabledFocusable;
|
|
88
|
-
shorthandProps['aria-disabled'] = disabledFocusable;
|
|
89
|
-
|
|
90
|
-
|
|
87
|
+
shorthandProps['aria-disabled'] = disabledFocusable; // Undefine events if disabledFocusable is passed in
|
|
88
|
+
|
|
89
|
+
if (disabledFocusable) {
|
|
90
|
+
shorthandProps.onClick = undefined;
|
|
91
|
+
shorthandProps.onKeyDown = undefined;
|
|
92
|
+
shorthandProps.onKeyUp = undefined;
|
|
93
|
+
}
|
|
94
|
+
} // If an <a> tag is to be rendered we have to remove disabled and type, and set aria-disabled, role and tabIndex.
|
|
91
95
|
else {
|
|
92
96
|
delete shorthandProps.disabled;
|
|
93
97
|
shorthandProps['aria-disabled'] = disabled || disabledFocusable;
|
|
98
|
+
shorthandProps.href = disabled ? undefined : shorthandProps.href;
|
|
94
99
|
shorthandProps.onClick = onClickHandler;
|
|
95
100
|
shorthandProps.onKeyDown = onKeyDownHandler;
|
|
96
101
|
shorthandProps.onKeyUp = onKeyupHandler;
|
|
@@ -103,7 +108,7 @@ function useARIAButton(shorthand, options) {
|
|
|
103
108
|
}
|
|
104
109
|
|
|
105
110
|
return shorthandProps;
|
|
106
|
-
}
|
|
111
|
+
};
|
|
107
112
|
|
|
108
113
|
exports.useARIAButton = useARIAButton;
|
|
109
114
|
//# sourceMappingURL=useARIAButton.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/hooks/useARIAButton.ts"],"names":[],"mappings":";;;;;;;AAAA,
|
|
1
|
+
{"version":3,"sources":["../../src/hooks/useARIAButton.ts"],"names":[],"mappings":"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","sourceRoot":""}
|
package/lib-commonjs/index.js
CHANGED
|
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
|
|
7
|
-
|
|
7
|
+
const tslib_1 = /*#__PURE__*/require("tslib");
|
|
8
8
|
|
|
9
9
|
tslib_1.__exportStar(require("./mergeARIADisabled"), exports);
|
|
10
10
|
//# sourceMappingURL=index.js.map
|
|
@@ -1,10 +1,7 @@
|
|
|
1
|
-
import * as React from 'react';
|
|
2
|
-
import { ObjectShorthandProps } 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;
|
|
@@ -11,7 +11,7 @@ exports.mergeARIADisabled = void 0;
|
|
|
11
11
|
function mergeARIADisabled(shorthand) {
|
|
12
12
|
var _a;
|
|
13
13
|
|
|
14
|
-
|
|
14
|
+
const disabled = (_a = shorthand.disabled) !== null && _a !== void 0 ? _a : shorthand['aria-disabled'];
|
|
15
15
|
|
|
16
16
|
if (typeof disabled === 'string') {
|
|
17
17
|
return disabled === 'false' ? false : true;
|
|
@@ -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": "9.0.0-
|
|
3
|
+
"version": "9.0.0-rc.1",
|
|
4
4
|
"description": "React helper to ensure ARIA",
|
|
5
5
|
"main": "lib-commonjs/index.js",
|
|
6
6
|
"module": "lib/index.js",
|
|
@@ -18,14 +18,14 @@
|
|
|
18
18
|
"just": "just-scripts",
|
|
19
19
|
"lint": "just-scripts lint",
|
|
20
20
|
"start": "yarn storybook",
|
|
21
|
-
"test": "jest",
|
|
21
|
+
"test": "jest --passWithNoTests",
|
|
22
22
|
"docs": "api-extractor run --config=config/api-extractor.local.json --local",
|
|
23
|
-
"build:local": "tsc -p . --module esnext --emitDeclarationOnly && node ../../scripts/typescript/normalize-import --output dist/react-aria/src && yarn docs",
|
|
24
|
-
"storybook": "
|
|
23
|
+
"build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../scripts/typescript/normalize-import --output ./dist/packages/react-aria/src && yarn docs",
|
|
24
|
+
"storybook": "node ../../scripts/storybook/runner",
|
|
25
|
+
"type-check": "tsc -b tsconfig.json"
|
|
25
26
|
},
|
|
26
27
|
"devDependencies": {
|
|
27
28
|
"@fluentui/eslint-plugin": "*",
|
|
28
|
-
"@fluentui/jest-serializer-make-styles": "9.0.0-nightly.46b9ea7036.0",
|
|
29
29
|
"@fluentui/react-conformance": "*",
|
|
30
30
|
"@fluentui/scripts": "^1.0.0",
|
|
31
31
|
"@types/enzyme": "3.10.3",
|
|
@@ -40,9 +40,8 @@
|
|
|
40
40
|
"react-test-renderer": "^16.3.0"
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"@fluentui/keyboard-keys": "9.0.0-
|
|
44
|
-
"@fluentui/react-
|
|
45
|
-
"@fluentui/react-utilities": "9.0.0-nightly.46b9ea7036.0",
|
|
43
|
+
"@fluentui/keyboard-keys": "9.0.0-rc.1",
|
|
44
|
+
"@fluentui/react-utilities": "9.0.0-rc.1",
|
|
46
45
|
"tslib": "^2.1.0"
|
|
47
46
|
},
|
|
48
47
|
"peerDependencies": {
|
|
@@ -52,7 +51,6 @@
|
|
|
52
51
|
"react-dom": ">=16.8.0 <18.0.0"
|
|
53
52
|
},
|
|
54
53
|
"beachball": {
|
|
55
|
-
"tag": "beta",
|
|
56
54
|
"disallowedChangeTypes": [
|
|
57
55
|
"major",
|
|
58
56
|
"minor",
|