@fluentui/react-aria 0.0.0-nightly0e0cf06c3420211029.1 → 0.0.0-nightly131c59c96120211203.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 +106 -12
- package/CHANGELOG.md +35 -9
- package/lib/hooks/useARIAButton.js +23 -18
- package/lib/hooks/useARIAButton.js.map +1 -1
- 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.js +25 -20
- 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.js +1 -1
- package/lib-commonjs/utils/mergeARIADisabled.js.map +1 -1
- package/package.json +10 -9
package/CHANGELOG.json
CHANGED
|
@@ -2,40 +2,134 @@
|
|
|
2
2
|
"name": "@fluentui/react-aria",
|
|
3
3
|
"entries": [
|
|
4
4
|
{
|
|
5
|
-
"date": "Fri,
|
|
6
|
-
"tag": "@fluentui/react-aria_v0.0.0-
|
|
7
|
-
"version": "0.0.0-
|
|
5
|
+
"date": "Fri, 03 Dec 2021 04:13:19 GMT",
|
|
6
|
+
"tag": "@fluentui/react-aria_v0.0.0-nightly131c59c96120211203.1",
|
|
7
|
+
"version": "0.0.0-nightly131c59c96120211203.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": "6fe1f0a081835b662f3c880d6405724d3abc4c0b",
|
|
14
14
|
"comment": "Release nightly v9"
|
|
15
15
|
},
|
|
16
16
|
{
|
|
17
17
|
"author": "beachball",
|
|
18
18
|
"package": "@fluentui/react-aria",
|
|
19
|
-
"comment": "Bump @fluentui/keyboard-keys to v0.0.0-
|
|
20
|
-
"commit": "
|
|
19
|
+
"comment": "Bump @fluentui/keyboard-keys to v0.0.0-nightly131c59c96120211203.1",
|
|
20
|
+
"commit": "6fe1f0a081835b662f3c880d6405724d3abc4c0b"
|
|
21
21
|
},
|
|
22
22
|
{
|
|
23
23
|
"author": "beachball",
|
|
24
24
|
"package": "@fluentui/react-aria",
|
|
25
|
-
"comment": "Bump @fluentui/react-make-styles to v0.0.0-
|
|
26
|
-
"commit": "
|
|
25
|
+
"comment": "Bump @fluentui/react-make-styles to v0.0.0-nightly131c59c96120211203.1",
|
|
26
|
+
"commit": "6fe1f0a081835b662f3c880d6405724d3abc4c0b"
|
|
27
27
|
},
|
|
28
28
|
{
|
|
29
29
|
"author": "beachball",
|
|
30
30
|
"package": "@fluentui/react-aria",
|
|
31
|
-
"comment": "Bump @fluentui/react-utilities to v0.0.0-
|
|
32
|
-
"commit": "
|
|
31
|
+
"comment": "Bump @fluentui/react-utilities to v0.0.0-nightly131c59c96120211203.1",
|
|
32
|
+
"commit": "6fe1f0a081835b662f3c880d6405724d3abc4c0b"
|
|
33
33
|
},
|
|
34
34
|
{
|
|
35
35
|
"author": "beachball",
|
|
36
36
|
"package": "@fluentui/react-aria",
|
|
37
|
-
"comment": "Bump @fluentui/jest-serializer-make-styles to v0.0.0-
|
|
38
|
-
"commit": "
|
|
37
|
+
"comment": "Bump @fluentui/jest-serializer-make-styles to v0.0.0-nightly131c59c96120211203.1",
|
|
38
|
+
"commit": "6fe1f0a081835b662f3c880d6405724d3abc4c0b"
|
|
39
|
+
},
|
|
40
|
+
{
|
|
41
|
+
"author": "beachball",
|
|
42
|
+
"package": "@fluentui/react-aria",
|
|
43
|
+
"comment": "Bump @fluentui/babel-make-styles to v0.0.0-nightly131c59c96120211203.1",
|
|
44
|
+
"commit": "6fe1f0a081835b662f3c880d6405724d3abc4c0b"
|
|
45
|
+
}
|
|
46
|
+
]
|
|
47
|
+
}
|
|
48
|
+
},
|
|
49
|
+
{
|
|
50
|
+
"date": "Thu, 25 Nov 2021 08:34:10 GMT",
|
|
51
|
+
"tag": "@fluentui/react-aria_v9.0.0-beta.4",
|
|
52
|
+
"version": "9.0.0-beta.4",
|
|
53
|
+
"comments": {
|
|
54
|
+
"none": [
|
|
55
|
+
{
|
|
56
|
+
"author": "olfedias@microsoft.com",
|
|
57
|
+
"package": "@fluentui/react-aria",
|
|
58
|
+
"commit": "8a820339f7f4084d8c46e97f06eebbeb18111397",
|
|
59
|
+
"comment": "update tooling config"
|
|
60
|
+
}
|
|
61
|
+
],
|
|
62
|
+
"prerelease": [
|
|
63
|
+
{
|
|
64
|
+
"author": "beachball",
|
|
65
|
+
"package": "@fluentui/react-aria",
|
|
66
|
+
"comment": "Bump @fluentui/react-make-styles to v9.0.0-beta.4",
|
|
67
|
+
"commit": "48d236ac53a4950fabc3ddd52f91dac93ca0195b"
|
|
68
|
+
},
|
|
69
|
+
{
|
|
70
|
+
"author": "beachball",
|
|
71
|
+
"package": "@fluentui/react-aria",
|
|
72
|
+
"comment": "Bump @fluentui/react-utilities to v9.0.0-beta.4",
|
|
73
|
+
"commit": "48d236ac53a4950fabc3ddd52f91dac93ca0195b"
|
|
74
|
+
},
|
|
75
|
+
{
|
|
76
|
+
"author": "beachball",
|
|
77
|
+
"package": "@fluentui/react-aria",
|
|
78
|
+
"comment": "Bump @fluentui/jest-serializer-make-styles to v9.0.0-beta.4",
|
|
79
|
+
"commit": "48d236ac53a4950fabc3ddd52f91dac93ca0195b"
|
|
80
|
+
},
|
|
81
|
+
{
|
|
82
|
+
"author": "beachball",
|
|
83
|
+
"package": "@fluentui/react-aria",
|
|
84
|
+
"comment": "Bump @fluentui/babel-make-styles to v9.0.0-beta.4",
|
|
85
|
+
"commit": "48d236ac53a4950fabc3ddd52f91dac93ca0195b"
|
|
86
|
+
}
|
|
87
|
+
]
|
|
88
|
+
}
|
|
89
|
+
},
|
|
90
|
+
{
|
|
91
|
+
"date": "Fri, 12 Nov 2021 13:25:13 GMT",
|
|
92
|
+
"tag": "@fluentui/react-aria_v9.0.0-beta.3",
|
|
93
|
+
"version": "9.0.0-beta.3",
|
|
94
|
+
"comments": {
|
|
95
|
+
"prerelease": [
|
|
96
|
+
{
|
|
97
|
+
"author": "Humberto.Morimoto@microsoft.com",
|
|
98
|
+
"package": "@fluentui/react-aria",
|
|
99
|
+
"commit": "a4ea9b6227d2f634f85b40fe4cec10e4c391244b",
|
|
100
|
+
"comment": "Fixing events being fired when button is disabledFocusable"
|
|
101
|
+
},
|
|
102
|
+
{
|
|
103
|
+
"author": "gcox@microsoft.com",
|
|
104
|
+
"package": "@fluentui/react-aria",
|
|
105
|
+
"commit": "c9bd5b5a02ae94a8239ce1b56cac2f0d0dbd3586",
|
|
106
|
+
"comment": "Updated beta and RC components to ES2019"
|
|
107
|
+
},
|
|
108
|
+
{
|
|
109
|
+
"author": "beachball",
|
|
110
|
+
"package": "@fluentui/react-aria",
|
|
111
|
+
"comment": "Bump @fluentui/react-make-styles to v9.0.0-beta.3",
|
|
112
|
+
"commit": "742342e52c65066f779232e4e1302fedf0dd460d"
|
|
113
|
+
},
|
|
114
|
+
{
|
|
115
|
+
"author": "beachball",
|
|
116
|
+
"package": "@fluentui/react-aria",
|
|
117
|
+
"comment": "Bump @fluentui/react-utilities to v9.0.0-beta.3",
|
|
118
|
+
"commit": "742342e52c65066f779232e4e1302fedf0dd460d"
|
|
119
|
+
},
|
|
120
|
+
{
|
|
121
|
+
"author": "beachball",
|
|
122
|
+
"package": "@fluentui/react-aria",
|
|
123
|
+
"comment": "Bump @fluentui/jest-serializer-make-styles to v9.0.0-beta.3",
|
|
124
|
+
"commit": "742342e52c65066f779232e4e1302fedf0dd460d"
|
|
125
|
+
}
|
|
126
|
+
],
|
|
127
|
+
"none": [
|
|
128
|
+
{
|
|
129
|
+
"author": "lingfangao@hotmail.com",
|
|
130
|
+
"package": "@fluentui/react-aria",
|
|
131
|
+
"commit": "00f70581480b536e723fb69edf0ae617beac4807",
|
|
132
|
+
"comment": "Remove beta release tag"
|
|
39
133
|
}
|
|
40
134
|
]
|
|
41
135
|
}
|
package/CHANGELOG.md
CHANGED
|
@@ -1,21 +1,47 @@
|
|
|
1
1
|
# Change Log - @fluentui/react-aria
|
|
2
2
|
|
|
3
|
-
This log was last generated on Fri,
|
|
3
|
+
This log was last generated on Fri, 03 Dec 2021 04:13:19 GMT and should not be manually modified.
|
|
4
4
|
|
|
5
5
|
<!-- Start content -->
|
|
6
6
|
|
|
7
|
-
## [0.0.0-
|
|
7
|
+
## [0.0.0-nightly131c59c96120211203.1](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v0.0.0-nightly131c59c96120211203.1)
|
|
8
8
|
|
|
9
|
-
Fri,
|
|
10
|
-
[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-beta.
|
|
9
|
+
Fri, 03 Dec 2021 04:13:19 GMT
|
|
10
|
+
[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-beta.4..@fluentui/react-aria_v0.0.0-nightly131c59c96120211203.1)
|
|
11
11
|
|
|
12
12
|
### Changes
|
|
13
13
|
|
|
14
|
-
- Release nightly v9 ([commit](https://github.com/microsoft/fluentui/commit/
|
|
15
|
-
- Bump @fluentui/keyboard-keys to v0.0.0-
|
|
16
|
-
- Bump @fluentui/react-make-styles to v0.0.0-
|
|
17
|
-
- Bump @fluentui/react-utilities to v0.0.0-
|
|
18
|
-
- Bump @fluentui/jest-serializer-make-styles to v0.0.0-
|
|
14
|
+
- Release nightly v9 ([commit](https://github.com/microsoft/fluentui/commit/6fe1f0a081835b662f3c880d6405724d3abc4c0b) by email not defined)
|
|
15
|
+
- Bump @fluentui/keyboard-keys to v0.0.0-nightly131c59c96120211203.1 ([commit](https://github.com/microsoft/fluentui/commit/6fe1f0a081835b662f3c880d6405724d3abc4c0b) by beachball)
|
|
16
|
+
- Bump @fluentui/react-make-styles to v0.0.0-nightly131c59c96120211203.1 ([commit](https://github.com/microsoft/fluentui/commit/6fe1f0a081835b662f3c880d6405724d3abc4c0b) by beachball)
|
|
17
|
+
- Bump @fluentui/react-utilities to v0.0.0-nightly131c59c96120211203.1 ([commit](https://github.com/microsoft/fluentui/commit/6fe1f0a081835b662f3c880d6405724d3abc4c0b) by beachball)
|
|
18
|
+
- Bump @fluentui/jest-serializer-make-styles to v0.0.0-nightly131c59c96120211203.1 ([commit](https://github.com/microsoft/fluentui/commit/6fe1f0a081835b662f3c880d6405724d3abc4c0b) by beachball)
|
|
19
|
+
- Bump @fluentui/babel-make-styles to v0.0.0-nightly131c59c96120211203.1 ([commit](https://github.com/microsoft/fluentui/commit/6fe1f0a081835b662f3c880d6405724d3abc4c0b) by beachball)
|
|
20
|
+
|
|
21
|
+
## [9.0.0-beta.4](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-beta.4)
|
|
22
|
+
|
|
23
|
+
Thu, 25 Nov 2021 08:34:10 GMT
|
|
24
|
+
[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-beta.3..@fluentui/react-aria_v9.0.0-beta.4)
|
|
25
|
+
|
|
26
|
+
### Changes
|
|
27
|
+
|
|
28
|
+
- Bump @fluentui/react-make-styles to v9.0.0-beta.4 ([PR #20762](https://github.com/microsoft/fluentui/pull/20762) by beachball)
|
|
29
|
+
- Bump @fluentui/react-utilities to v9.0.0-beta.4 ([PR #20762](https://github.com/microsoft/fluentui/pull/20762) by beachball)
|
|
30
|
+
- Bump @fluentui/jest-serializer-make-styles to v9.0.0-beta.4 ([PR #20762](https://github.com/microsoft/fluentui/pull/20762) by beachball)
|
|
31
|
+
- Bump @fluentui/babel-make-styles to v9.0.0-beta.4 ([PR #20762](https://github.com/microsoft/fluentui/pull/20762) by beachball)
|
|
32
|
+
|
|
33
|
+
## [9.0.0-beta.3](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-beta.3)
|
|
34
|
+
|
|
35
|
+
Fri, 12 Nov 2021 13:25:13 GMT
|
|
36
|
+
[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-beta.2..@fluentui/react-aria_v9.0.0-beta.3)
|
|
37
|
+
|
|
38
|
+
### Changes
|
|
39
|
+
|
|
40
|
+
- Fixing events being fired when button is disabledFocusable ([PR #20342](https://github.com/microsoft/fluentui/pull/20342) by Humberto.Morimoto@microsoft.com)
|
|
41
|
+
- Updated beta and RC components to ES2019 ([PR #20405](https://github.com/microsoft/fluentui/pull/20405) by gcox@microsoft.com)
|
|
42
|
+
- Bump @fluentui/react-make-styles to v9.0.0-beta.3 ([PR #20583](https://github.com/microsoft/fluentui/pull/20583) by beachball)
|
|
43
|
+
- Bump @fluentui/react-utilities to v9.0.0-beta.3 ([PR #20583](https://github.com/microsoft/fluentui/pull/20583) by beachball)
|
|
44
|
+
- Bump @fluentui/jest-serializer-make-styles to v9.0.0-beta.3 ([PR #20583](https://github.com/microsoft/fluentui/pull/20583) by beachball)
|
|
19
45
|
|
|
20
46
|
## [9.0.0-beta.2](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-beta.2)
|
|
21
47
|
|
|
@@ -9,17 +9,16 @@ import { resolveShorthand, useEventCallback } from '@fluentui/react-utilities';
|
|
|
9
9
|
export function 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;
|
|
@@ -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,OAAM,SAAU,aAAV,CACJ,SADI,EAEJ,OAFI,EAEiE;;;AAErE,
|
|
1
|
+
{"version":3,"sources":["../../src/hooks/useARIAButton.ts"],"names":[],"mappings":"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","sourceRoot":""}
|
|
@@ -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":"AAGA;;AAEG;AACH,OAAM,SAAU,iBAAV,CACJ,SADI,EAKF;;;AAEF,
|
|
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":""}
|
|
@@ -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
|
|
@@ -18,17 +18,16 @@ var react_utilities_1 = /*#__PURE__*/require("@fluentui/react-utilities");
|
|
|
18
18
|
function 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;
|
|
@@ -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
|
|
@@ -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":";;;;;;AAGA;;AAEG;;AACH,SAAgB,iBAAhB,CACE,SADF,EAKI;;;AAEF,
|
|
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
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fluentui/react-aria",
|
|
3
|
-
"version": "0.0.0-
|
|
3
|
+
"version": "0.0.0-nightly131c59c96120211203.1",
|
|
4
4
|
"description": "React helper to ensure ARIA",
|
|
5
5
|
"main": "lib-commonjs/index.js",
|
|
6
6
|
"module": "lib/index.js",
|
|
@@ -20,12 +20,13 @@
|
|
|
20
20
|
"start": "yarn storybook",
|
|
21
21
|
"test": "jest",
|
|
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": "start-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": "start-storybook",
|
|
25
|
+
"type-check": "tsc -b tsconfig.json"
|
|
25
26
|
},
|
|
26
27
|
"devDependencies": {
|
|
27
28
|
"@fluentui/eslint-plugin": "*",
|
|
28
|
-
"@fluentui/jest-serializer-make-styles": "0.0.0-
|
|
29
|
+
"@fluentui/jest-serializer-make-styles": "0.0.0-nightly131c59c96120211203.1",
|
|
29
30
|
"@fluentui/react-conformance": "*",
|
|
30
31
|
"@fluentui/scripts": "^1.0.0",
|
|
31
32
|
"@types/enzyme": "3.10.3",
|
|
@@ -37,12 +38,13 @@
|
|
|
37
38
|
"enzyme-adapter-react-16": "^1.15.0",
|
|
38
39
|
"react": "16.8.6",
|
|
39
40
|
"react-dom": "16.8.6",
|
|
40
|
-
"react-test-renderer": "^16.3.0"
|
|
41
|
+
"react-test-renderer": "^16.3.0",
|
|
42
|
+
"@fluentui/babel-make-styles": "0.0.0-nightly131c59c96120211203.1"
|
|
41
43
|
},
|
|
42
44
|
"dependencies": {
|
|
43
|
-
"@fluentui/keyboard-keys": "0.0.0-
|
|
44
|
-
"@fluentui/react-make-styles": "0.0.0-
|
|
45
|
-
"@fluentui/react-utilities": "0.0.0-
|
|
45
|
+
"@fluentui/keyboard-keys": "0.0.0-nightly131c59c96120211203.1",
|
|
46
|
+
"@fluentui/react-make-styles": "0.0.0-nightly131c59c96120211203.1",
|
|
47
|
+
"@fluentui/react-utilities": "0.0.0-nightly131c59c96120211203.1",
|
|
46
48
|
"tslib": "^2.1.0"
|
|
47
49
|
},
|
|
48
50
|
"peerDependencies": {
|
|
@@ -52,7 +54,6 @@
|
|
|
52
54
|
"react-dom": ">=16.8.0 <18.0.0"
|
|
53
55
|
},
|
|
54
56
|
"beachball": {
|
|
55
|
-
"tag": "beta",
|
|
56
57
|
"disallowedChangeTypes": [
|
|
57
58
|
"major",
|
|
58
59
|
"minor",
|