@fluentui/react-aria 0.0.0-nightly0e0cf06c3420211029.1 → 0.0.0-nightly627ad67f1120211109.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 +24 -12
- package/CHANGELOG.md +11 -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 +5 -5
package/CHANGELOG.json
CHANGED
|
@@ -2,40 +2,52 @@
|
|
|
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": "Tue, 09 Nov 2021 04:20:28 GMT",
|
|
6
|
+
"tag": "@fluentui/react-aria_v0.0.0-nightly627ad67f1120211109.1",
|
|
7
|
+
"version": "0.0.0-nightly627ad67f1120211109.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": "5e2f04f4741a9e3b98463480f9c1926ea2006337",
|
|
14
14
|
"comment": "Release nightly v9"
|
|
15
15
|
},
|
|
16
|
+
{
|
|
17
|
+
"author": "Humberto.Morimoto@microsoft.com",
|
|
18
|
+
"package": "@fluentui/react-aria",
|
|
19
|
+
"commit": "a4ea9b6227d2f634f85b40fe4cec10e4c391244b",
|
|
20
|
+
"comment": "Fixing events being fired when button is disabledFocusable"
|
|
21
|
+
},
|
|
22
|
+
{
|
|
23
|
+
"author": "gcox@microsoft.com",
|
|
24
|
+
"package": "@fluentui/react-aria",
|
|
25
|
+
"commit": "c9bd5b5a02ae94a8239ce1b56cac2f0d0dbd3586",
|
|
26
|
+
"comment": "Updated beta and RC components to ES2019"
|
|
27
|
+
},
|
|
16
28
|
{
|
|
17
29
|
"author": "beachball",
|
|
18
30
|
"package": "@fluentui/react-aria",
|
|
19
|
-
"comment": "Bump @fluentui/keyboard-keys to v0.0.0-
|
|
20
|
-
"commit": "
|
|
31
|
+
"comment": "Bump @fluentui/keyboard-keys to v0.0.0-nightly627ad67f1120211109.1",
|
|
32
|
+
"commit": "5e2f04f4741a9e3b98463480f9c1926ea2006337"
|
|
21
33
|
},
|
|
22
34
|
{
|
|
23
35
|
"author": "beachball",
|
|
24
36
|
"package": "@fluentui/react-aria",
|
|
25
|
-
"comment": "Bump @fluentui/react-make-styles to v0.0.0-
|
|
26
|
-
"commit": "
|
|
37
|
+
"comment": "Bump @fluentui/react-make-styles to v0.0.0-nightly627ad67f1120211109.1",
|
|
38
|
+
"commit": "5e2f04f4741a9e3b98463480f9c1926ea2006337"
|
|
27
39
|
},
|
|
28
40
|
{
|
|
29
41
|
"author": "beachball",
|
|
30
42
|
"package": "@fluentui/react-aria",
|
|
31
|
-
"comment": "Bump @fluentui/react-utilities to v0.0.0-
|
|
32
|
-
"commit": "
|
|
43
|
+
"comment": "Bump @fluentui/react-utilities to v0.0.0-nightly627ad67f1120211109.1",
|
|
44
|
+
"commit": "5e2f04f4741a9e3b98463480f9c1926ea2006337"
|
|
33
45
|
},
|
|
34
46
|
{
|
|
35
47
|
"author": "beachball",
|
|
36
48
|
"package": "@fluentui/react-aria",
|
|
37
|
-
"comment": "Bump @fluentui/jest-serializer-make-styles to v0.0.0-
|
|
38
|
-
"commit": "
|
|
49
|
+
"comment": "Bump @fluentui/jest-serializer-make-styles to v0.0.0-nightly627ad67f1120211109.1",
|
|
50
|
+
"commit": "5e2f04f4741a9e3b98463480f9c1926ea2006337"
|
|
39
51
|
}
|
|
40
52
|
]
|
|
41
53
|
}
|
package/CHANGELOG.md
CHANGED
|
@@ -1,21 +1,23 @@
|
|
|
1
1
|
# Change Log - @fluentui/react-aria
|
|
2
2
|
|
|
3
|
-
This log was last generated on
|
|
3
|
+
This log was last generated on Tue, 09 Nov 2021 04:20:28 GMT and should not be manually modified.
|
|
4
4
|
|
|
5
5
|
<!-- Start content -->
|
|
6
6
|
|
|
7
|
-
## [0.0.0-
|
|
7
|
+
## [0.0.0-nightly627ad67f1120211109.1](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v0.0.0-nightly627ad67f1120211109.1)
|
|
8
8
|
|
|
9
|
-
|
|
10
|
-
[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-beta.2..@fluentui/react-aria_v0.0.0-
|
|
9
|
+
Tue, 09 Nov 2021 04:20:28 GMT
|
|
10
|
+
[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-aria_v9.0.0-beta.2..@fluentui/react-aria_v0.0.0-nightly627ad67f1120211109.1)
|
|
11
11
|
|
|
12
12
|
### Changes
|
|
13
13
|
|
|
14
|
-
- Release nightly v9 ([commit](https://github.com/microsoft/fluentui/commit/
|
|
15
|
-
-
|
|
16
|
-
-
|
|
17
|
-
- Bump @fluentui/
|
|
18
|
-
- Bump @fluentui/
|
|
14
|
+
- Release nightly v9 ([commit](https://github.com/microsoft/fluentui/commit/5e2f04f4741a9e3b98463480f9c1926ea2006337) by email not defined)
|
|
15
|
+
- Fixing events being fired when button is disabledFocusable ([PR #20342](https://github.com/microsoft/fluentui/pull/20342) by Humberto.Morimoto@microsoft.com)
|
|
16
|
+
- Updated beta and RC components to ES2019 ([PR #20405](https://github.com/microsoft/fluentui/pull/20405) by gcox@microsoft.com)
|
|
17
|
+
- Bump @fluentui/keyboard-keys to v0.0.0-nightly627ad67f1120211109.1 ([commit](https://github.com/microsoft/fluentui/commit/5e2f04f4741a9e3b98463480f9c1926ea2006337) by beachball)
|
|
18
|
+
- Bump @fluentui/react-make-styles to v0.0.0-nightly627ad67f1120211109.1 ([commit](https://github.com/microsoft/fluentui/commit/5e2f04f4741a9e3b98463480f9c1926ea2006337) by beachball)
|
|
19
|
+
- Bump @fluentui/react-utilities to v0.0.0-nightly627ad67f1120211109.1 ([commit](https://github.com/microsoft/fluentui/commit/5e2f04f4741a9e3b98463480f9c1926ea2006337) by beachball)
|
|
20
|
+
- Bump @fluentui/jest-serializer-make-styles to v0.0.0-nightly627ad67f1120211109.1 ([commit](https://github.com/microsoft/fluentui/commit/5e2f04f4741a9e3b98463480f9c1926ea2006337) by beachball)
|
|
19
21
|
|
|
20
22
|
## [9.0.0-beta.2](https://github.com/microsoft/fluentui/tree/@fluentui/react-aria_v9.0.0-beta.2)
|
|
21
23
|
|
|
@@ -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":"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,QAAM,cAAc,GAAG,gBAAgB,CAAC,SAAD,EAAY,OAAZ,CAAvC;AAEA,QAAM;AAAE,IAAA,QAAF;AAAY,IAAA,iBAAZ;AAA+B,IAAA,OAA/B;AAAwC,IAAA,SAAxC;AAAmD,IAAA,OAAnD;AAA4D,IAAA;AAA5D,MAA0E,cAAc,IAC5F,EADF;AAGA,QAAM,cAAc,GAAwC,gBAAgB,CAAC,EAAE,IAAG;AAChF,QAAI,QAAQ,IAAI,iBAAhB,EAAmC;AACjC,MAAA,EAAE,CAAC,cAAH;AACA,MAAA,EAAE,CAAC,eAAH;AACD,KAHD,MAGO;AACL,MAAA,OAAO,KAAA,IAAP,IAAA,OAAO,KAAA,KAAA,CAAP,GAAO,KAAA,CAAP,GAAA,OAAO,CAAG,EAAH,CAAP;AACD;AACF,GAP2E,CAA5E;AASA,QAAM,gBAAgB,GAA0C,gBAAgB,CAAC,EAAE,IAAG;AACpF,IAAA,SAAS,KAAA,IAAT,IAAA,SAAS,KAAA,KAAA,CAAT,GAAS,KAAA,CAAT,GAAA,SAAS,CAAG,EAAH,CAAT;;AAEA,QAAI,EAAE,CAAC,kBAAH,EAAJ,EAA6B;AAC3B;AACD;;AAED,UAAM,GAAG,GAAG,EAAE,CAAC,GAAf;;AAEA,QAAI,CAAC,QAAQ,IAAI,iBAAb,MAAoC,GAAG,KAAK,KAAR,IAAiB,GAAG,KAAK,KAA7D,CAAJ,EAAyE;AACvE,MAAA,EAAE,CAAC,cAAH;AACA,MAAA,EAAE,CAAC,eAAH;AACA;AACD;;AAED,QAAI,GAAG,KAAK,KAAZ,EAAmB;AACjB,MAAA,EAAE,CAAC,cAAH;AACA;AACD,KAHD,CAKA;AALA,SAMK,IAAI,GAAG,KAAK,KAAZ,EAAmB;AACtB,MAAA,EAAE,CAAC,cAAH;AACA,MAAA,EAAE,CAAC,aAAH,CAAiB,KAAjB;AACD;AACF,GAzB+E,CAAhF;AA2BA,QAAM,cAAc,GAAwC,gBAAgB,CAAC,EAAE,IAAG;AAChF,IAAA,OAAO,KAAA,IAAP,IAAA,OAAO,KAAA,KAAA,CAAP,GAAO,KAAA,CAAP,GAAA,OAAO,CAAG,EAAH,CAAP;;AAEA,QAAI,EAAE,CAAC,kBAAH,EAAJ,EAA6B;AAC3B;AACD;;AAED,UAAM,GAAG,GAAG,EAAE,CAAC,GAAf;;AAEA,QAAI,CAAC,QAAQ,IAAI,iBAAb,MAAoC,GAAG,KAAK,KAAR,IAAiB,GAAG,KAAK,KAA7D,CAAJ,EAAyE;AACvE,MAAA,EAAE,CAAC,cAAH;AACA,MAAA,EAAE,CAAC,eAAH;AACA;AACD;;AAED,QAAI,GAAG,KAAK,KAAZ,EAAmB;AACjB,MAAA,EAAE,CAAC,cAAH;AACA,MAAA,EAAE,CAAC,aAAH,CAAiB,KAAjB;AACD;AACF,GAnB2E,CAA5E;;AAqBA,MAAI,cAAJ,EAAoB;AAClB;AACA,QAAI,cAAc,CAAC,EAAf,KAAsB,QAAtB,IAAkC,cAAc,CAAC,EAAf,KAAsB,SAA5D,EAAuE;AACrE,MAAA,cAAc,CAAC,QAAf,GAA0B,QAAQ,IAAI,CAAC,iBAAvC;AACA,MAAA,cAAc,CAAC,eAAD,CAAd,GAAkC,iBAAlC,CAFqE,CAIrE;;AACA,UAAI,iBAAJ,EAAuB;AACrB,QAAA,cAAc,CAAC,OAAf,GAAyB,SAAzB;AACA,QAAA,cAAc,CAAC,SAAf,GAA2B,SAA3B;AACA,QAAA,cAAc,CAAC,OAAf,GAAyB,SAAzB;AACD;AACF,KAVD,CAYA;AAZA,SAaK;AACH,aAAO,cAAc,CAAC,QAAtB;AACA,MAAA,cAAc,CAAC,eAAD,CAAd,GAAkC,QAAQ,IAAI,iBAA9C;AACC,MAAA,cAA+C,CAAC,IAAhD,GAAuD,QAAQ,GAC5D,SAD4D,GAE3D,cAA+C,CAAC,IAFpD;AAGD,MAAA,cAAc,CAAC,OAAf,GAAyB,cAAzB;AACA,MAAA,cAAc,CAAC,SAAf,GAA2B,gBAA3B;AACA,MAAA,cAAc,CAAC,OAAf,GAAyB,cAAzB;AACA,MAAA,cAAc,CAAC,IAAf,GAAmB,CAAA,EAAA,GAAG,cAAc,CAAC,IAAlB,MAAsB,IAAtB,IAAsB,EAAA,KAAA,KAAA,CAAtB,GAAsB,EAAtB,GAA0B,QAA7C;AACA,MAAA,cAAc,CAAC,QAAf,GAA0B,QAAQ,IAAI,CAAC,iBAAb,GAAiC,SAAjC,GAA6C,QAAQ,KAAA,IAAR,IAAA,QAAQ,KAAA,KAAA,CAAR,GAAA,QAAA,GAAY,CAAnF;AACD,KA1BiB,CA4BlB;;;AACA,WAAO,cAAc,CAAC,iBAAtB;AACD;;AAED,SAAO,cAAP;AACD","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-nightly627ad67f1120211109.1",
|
|
4
4
|
"description": "React helper to ensure ARIA",
|
|
5
5
|
"main": "lib-commonjs/index.js",
|
|
6
6
|
"module": "lib/index.js",
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
27
|
"@fluentui/eslint-plugin": "*",
|
|
28
|
-
"@fluentui/jest-serializer-make-styles": "0.0.0-
|
|
28
|
+
"@fluentui/jest-serializer-make-styles": "0.0.0-nightly627ad67f1120211109.1",
|
|
29
29
|
"@fluentui/react-conformance": "*",
|
|
30
30
|
"@fluentui/scripts": "^1.0.0",
|
|
31
31
|
"@types/enzyme": "3.10.3",
|
|
@@ -40,9 +40,9 @@
|
|
|
40
40
|
"react-test-renderer": "^16.3.0"
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"@fluentui/keyboard-keys": "0.0.0-
|
|
44
|
-
"@fluentui/react-make-styles": "0.0.0-
|
|
45
|
-
"@fluentui/react-utilities": "0.0.0-
|
|
43
|
+
"@fluentui/keyboard-keys": "0.0.0-nightly627ad67f1120211109.1",
|
|
44
|
+
"@fluentui/react-make-styles": "0.0.0-nightly627ad67f1120211109.1",
|
|
45
|
+
"@fluentui/react-utilities": "0.0.0-nightly627ad67f1120211109.1",
|
|
46
46
|
"tslib": "^2.1.0"
|
|
47
47
|
},
|
|
48
48
|
"peerDependencies": {
|