@fluentui-react-native/focus-zone 0.19.6 → 0.20.0
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 +16 -1
- package/CHANGELOG.md +10 -2
- package/lib/FocusZone.d.ts.map +1 -1
- package/lib/FocusZone.js +8 -5
- package/lib/FocusZone.js.map +1 -1
- package/lib/FocusZone.types.d.ts +1 -1
- package/lib/FocusZone.types.d.ts.map +1 -1
- package/lib-commonjs/FocusZone.d.ts.map +1 -1
- package/lib-commonjs/FocusZone.js +8 -5
- package/lib-commonjs/FocusZone.js.map +1 -1
- package/lib-commonjs/FocusZone.types.d.ts +1 -1
- package/lib-commonjs/FocusZone.types.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/FocusZone.ts +7 -5
- package/src/FocusZone.types.ts +1 -1
package/CHANGELOG.json
CHANGED
|
@@ -2,7 +2,22 @@
|
|
|
2
2
|
"name": "@fluentui-react-native/focus-zone",
|
|
3
3
|
"entries": [
|
|
4
4
|
{
|
|
5
|
-
"date": "
|
|
5
|
+
"date": "Fri, 07 Mar 2025 17:22:16 GMT",
|
|
6
|
+
"version": "0.20.0",
|
|
7
|
+
"tag": "@fluentui-react-native/focus-zone_v0.20.0",
|
|
8
|
+
"comments": {
|
|
9
|
+
"minor": [
|
|
10
|
+
{
|
|
11
|
+
"author": "patboyd@microsoft.com",
|
|
12
|
+
"package": "@fluentui-react-native/focus-zone",
|
|
13
|
+
"commit": "d36c36db62e5de96b30d2ce42b599c1210522099",
|
|
14
|
+
"comment": "Expand defaultTabbableElement to accept a string corresponding a child element's nativeID"
|
|
15
|
+
}
|
|
16
|
+
]
|
|
17
|
+
}
|
|
18
|
+
},
|
|
19
|
+
{
|
|
20
|
+
"date": "Wed, 29 Jan 2025 23:43:55 GMT",
|
|
6
21
|
"version": "0.19.6",
|
|
7
22
|
"tag": "@fluentui-react-native/focus-zone_v0.19.6",
|
|
8
23
|
"comments": {
|
package/CHANGELOG.md
CHANGED
|
@@ -1,12 +1,20 @@
|
|
|
1
1
|
# Change Log - @fluentui-react-native/focus-zone
|
|
2
2
|
|
|
3
|
-
<!-- This log was last generated on
|
|
3
|
+
<!-- This log was last generated on Fri, 07 Mar 2025 17:22:16 GMT and should not be manually modified. -->
|
|
4
4
|
|
|
5
5
|
<!-- Start content -->
|
|
6
6
|
|
|
7
|
+
## 0.20.0
|
|
8
|
+
|
|
9
|
+
Fri, 07 Mar 2025 17:22:16 GMT
|
|
10
|
+
|
|
11
|
+
### Minor changes
|
|
12
|
+
|
|
13
|
+
- Expand defaultTabbableElement to accept a string corresponding a child element's nativeID (patboyd@microsoft.com)
|
|
14
|
+
|
|
7
15
|
## 0.19.6
|
|
8
16
|
|
|
9
|
-
Wed, 29 Jan 2025 23:
|
|
17
|
+
Wed, 29 Jan 2025 23:43:55 GMT
|
|
10
18
|
|
|
11
19
|
### Patches
|
|
12
20
|
|
package/lib/FocusZone.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FocusZone.d.ts","sourceRoot":"","sources":["../src/FocusZone.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAQ/B,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAiB,MAAM,mBAAmB,CAAC;AAK3F,eAAO,MAAM,SAAS,
|
|
1
|
+
{"version":3,"file":"FocusZone.d.ts","sourceRoot":"","sources":["../src/FocusZone.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAQ/B,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAiB,MAAM,mBAAmB,CAAC;AAK3F,eAAO,MAAM,SAAS,uPA+BpB,CAAC"}
|
package/lib/FocusZone.js
CHANGED
|
@@ -36,18 +36,21 @@ export var FocusZone = composable({
|
|
|
36
36
|
usePrepareProps: function (userProps, useStyling) {
|
|
37
37
|
var componentRef = userProps.componentRef, defaultTabbableElement = userProps.defaultTabbableElement, isCircularNavigation = userProps.isCircularNavigation, rest = __rest(userProps, ["componentRef", "defaultTabbableElement", "isCircularNavigation"]);
|
|
38
38
|
var ftzRef = useViewCommandFocus(componentRef);
|
|
39
|
-
var _a = React.useState(undefined),
|
|
39
|
+
var _a = React.useState(undefined), targetFirstFocus = _a[0], setTargetFirstFocus = _a[1];
|
|
40
40
|
React.useLayoutEffect(function () {
|
|
41
|
-
if (
|
|
42
|
-
|
|
41
|
+
if (typeof defaultTabbableElement === 'string') {
|
|
42
|
+
setTargetFirstFocus(defaultTabbableElement);
|
|
43
|
+
}
|
|
44
|
+
else if (defaultTabbableElement === null || defaultTabbableElement === void 0 ? void 0 : defaultTabbableElement.current) {
|
|
45
|
+
setTargetFirstFocus(findNodeHandle(defaultTabbableElement.current));
|
|
43
46
|
}
|
|
44
47
|
else {
|
|
45
|
-
|
|
48
|
+
setTargetFirstFocus(undefined);
|
|
46
49
|
}
|
|
47
50
|
}, [defaultTabbableElement]);
|
|
48
51
|
return {
|
|
49
52
|
slotProps: mergeSettings(useStyling(userProps), {
|
|
50
|
-
root: __assign(__assign({ navigateAtEnd: isCircularNavigation ? 'NavigateWrap' : 'NavigateStopAtEnds' }, rest), { defaultTabbableElement:
|
|
53
|
+
root: __assign(__assign({ navigateAtEnd: isCircularNavigation ? 'NavigateWrap' : 'NavigateStopAtEnds' }, rest), { defaultTabbableElement: targetFirstFocus, ref: ftzRef }),
|
|
51
54
|
}),
|
|
52
55
|
};
|
|
53
56
|
},
|
package/lib/FocusZone.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FocusZone.js","sourceRoot":"","sources":["../src/FocusZone.ts"],"names":[],"mappings":"AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;;;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAE/E,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAGpE,OAAO,YAAY,MAAM,4BAA4B,CAAC;AAEtD,IAAM,qBAAqB,GAAG,UAAC,QAAQ,IAAK,OAAA,QAAQ,KAAK,cAAc,EAA3B,CAA2B,CAAC;AAExE,MAAM,CAAC,IAAM,SAAS,GAAG,UAAU,CAAgB;IACjD,eAAe,EAAE,UAAC,SAAyB,EAAE,UAAsC;QACzE,IAAA,YAAY,GAA4D,SAAS,aAArE,EAAE,sBAAsB,GAAoC,SAAS,uBAA7C,EAAE,oBAAoB,GAAc,SAAS,qBAAvB,EAAK,IAAI,UAAK,SAAS,EAAnF,kEAAuE,CAAF,CAAe;QAE1F,IAAM,MAAM,GAAG,mBAAmB,CAAC,YAAY,CAAC,CAAC;QAE3C,IAAA,
|
|
1
|
+
{"version":3,"file":"FocusZone.js","sourceRoot":"","sources":["../src/FocusZone.ts"],"names":[],"mappings":"AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;;;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAE/E,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAGpE,OAAO,YAAY,MAAM,4BAA4B,CAAC;AAEtD,IAAM,qBAAqB,GAAG,UAAC,QAAQ,IAAK,OAAA,QAAQ,KAAK,cAAc,EAA3B,CAA2B,CAAC;AAExE,MAAM,CAAC,IAAM,SAAS,GAAG,UAAU,CAAgB;IACjD,eAAe,EAAE,UAAC,SAAyB,EAAE,UAAsC;QACzE,IAAA,YAAY,GAA4D,SAAS,aAArE,EAAE,sBAAsB,GAAoC,SAAS,uBAA7C,EAAE,oBAAoB,GAAc,SAAS,qBAAvB,EAAK,IAAI,UAAK,SAAS,EAAnF,kEAAuE,CAAF,CAAe;QAE1F,IAAM,MAAM,GAAG,mBAAmB,CAAC,YAAY,CAAC,CAAC;QAE3C,IAAA,KAA0C,KAAK,CAAC,QAAQ,CAAkB,SAAS,CAAC,EAAnF,gBAAgB,QAAA,EAAE,mBAAmB,QAA8C,CAAC;QAC3F,KAAK,CAAC,eAAe,CAAC;YACpB,IAAI,OAAO,sBAAsB,KAAK,QAAQ,EAAE;gBAC9C,mBAAmB,CAAC,sBAAsB,CAAC,CAAC;aAC7C;iBAAM,IAAI,sBAAsB,aAAtB,sBAAsB,uBAAtB,sBAAsB,CAAE,OAAO,EAAE;gBAC1C,mBAAmB,CAAC,cAAc,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,CAAC;aACrE;iBAAM;gBACL,mBAAmB,CAAC,SAAS,CAAC,CAAC;aAChC;QACH,CAAC,EAAE,CAAC,sBAAsB,CAAC,CAAC,CAAC;QAE7B,OAAO;YACL,SAAS,EAAE,aAAa,CAAqB,UAAU,CAAC,SAAS,CAAC,EAAE;gBAClE,IAAI,sBACF,aAAa,EAAE,oBAAoB,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,oBAAoB,IACxE,IAAI,KACP,sBAAsB,EAAE,gBAAgB,EACxC,GAAG,EAAE,MAAM,GACZ;aACF,CAAC;SACH,CAAC;IACJ,CAAC;IACD,KAAK,EAAE;QACL,IAAI,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,qBAAqB,EAAE;KAChE;CACF,CAAC,CAAC"}
|
package/lib/FocusZone.types.d.ts
CHANGED
|
@@ -13,7 +13,7 @@ export type FocusZoneProps = IViewProps & {
|
|
|
13
13
|
/**
|
|
14
14
|
* Optionally defines the initial tabbable element inside the FocusZone
|
|
15
15
|
*/
|
|
16
|
-
defaultTabbableElement?: React.RefObject<React.Component
|
|
16
|
+
defaultTabbableElement?: React.RefObject<React.Component> | string;
|
|
17
17
|
/**
|
|
18
18
|
** Defines which arrows to react to
|
|
19
19
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FocusZone.types.d.ts","sourceRoot":"","sources":["../src/FocusZone.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,KAAK,MAAM,OAAO,CAAC;AAEpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAEzE,eAAO,MAAM,aAAa,cAAc,CAAC;AAEzC,MAAM,WAAW,cAAc;CAAG;AAElC,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG;IACxC;;OAEG;IACH,YAAY,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAE3C;;OAEG;IACH,sBAAsB,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"FocusZone.types.d.ts","sourceRoot":"","sources":["../src/FocusZone.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,KAAK,MAAM,OAAO,CAAC;AAEpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAEzE,eAAO,MAAM,aAAa,cAAc,CAAC;AAEzC,MAAM,WAAW,cAAc;CAAG;AAElC,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG;IACxC;;OAEG;IACH,YAAY,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAE3C;;OAEG;IACH,sBAAsB,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC;IAEnE;;OAEG;IACH,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IAExC;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAGnB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAE/B;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;;;;;;;;;;;;;;;;;OAkBG;IACH,gBAAgB,CAAC,EAAE,sBAAsB,CAAC;IAE1C;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAE5B;;;;;;;;;;;;;;;OAeG;IACH,4BAA4B,CAAC,EAAE,OAAO,CAAC;CACxC,CAAC;AAEF,MAAM,WAAW,WAAY,SAAQ,IAAI,CAAC,cAAc,EAAE,sBAAsB,CAAC;IAC/E,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,gBAAgB,CAAC,EAAE,sBAAsB,CAAC;CAC3C;AAED,MAAM,MAAM,kBAAkB,GAC1B,eAAe,CAAC,2BAA2B,GAC3C,UAAU,CAAC,oCAAoC,GAC/C,YAAY,CAAC,uCAAuC,GACpD,MAAM,CAAC,CAAC,yCAAyC;AAErD,MAAM,MAAM,aAAa,GACrB,oBAAoB,GACpB,cAAc,GACd,kBAAkB,CAAC;AAEvB,MAAM,MAAM,sBAAsB,GAC9B,MAAM,GACN,cAAc,GACd,oBAAoB,GACpB,QAAQ,CAAC;AAEb,MAAM,WAAW,eAAe;CAAG;AAEnC,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,WAAW,CAAC;CACnB;AAED,MAAM,MAAM,mBAAmB,GAAG,WAAW,CAAC,kBAAkB,EAAE,cAAc,CAAC,CAAC;AAElF,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,cAAc,CAAC;IACtB,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,kBAAkB,CAAC;IAC9B,KAAK,EAAE,cAAc,CAAC;CACvB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FocusZone.d.ts","sourceRoot":"","sources":["../src/FocusZone.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAQ/B,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAiB,MAAM,mBAAmB,CAAC;AAK3F,eAAO,MAAM,SAAS,
|
|
1
|
+
{"version":3,"file":"FocusZone.d.ts","sourceRoot":"","sources":["../src/FocusZone.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAQ/B,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAiB,MAAM,mBAAmB,CAAC;AAK3F,eAAO,MAAM,SAAS,uPA+BpB,CAAC"}
|
|
@@ -65,18 +65,21 @@ exports.FocusZone = (0, foundation_composable_1.composable)({
|
|
|
65
65
|
usePrepareProps: function (userProps, useStyling) {
|
|
66
66
|
var componentRef = userProps.componentRef, defaultTabbableElement = userProps.defaultTabbableElement, isCircularNavigation = userProps.isCircularNavigation, rest = __rest(userProps, ["componentRef", "defaultTabbableElement", "isCircularNavigation"]);
|
|
67
67
|
var ftzRef = (0, interactive_hooks_1.useViewCommandFocus)(componentRef);
|
|
68
|
-
var _a = React.useState(undefined),
|
|
68
|
+
var _a = React.useState(undefined), targetFirstFocus = _a[0], setTargetFirstFocus = _a[1];
|
|
69
69
|
React.useLayoutEffect(function () {
|
|
70
|
-
if (
|
|
71
|
-
|
|
70
|
+
if (typeof defaultTabbableElement === 'string') {
|
|
71
|
+
setTargetFirstFocus(defaultTabbableElement);
|
|
72
|
+
}
|
|
73
|
+
else if (defaultTabbableElement === null || defaultTabbableElement === void 0 ? void 0 : defaultTabbableElement.current) {
|
|
74
|
+
setTargetFirstFocus((0, react_native_1.findNodeHandle)(defaultTabbableElement.current));
|
|
72
75
|
}
|
|
73
76
|
else {
|
|
74
|
-
|
|
77
|
+
setTargetFirstFocus(undefined);
|
|
75
78
|
}
|
|
76
79
|
}, [defaultTabbableElement]);
|
|
77
80
|
return {
|
|
78
81
|
slotProps: (0, foundation_settings_1.mergeSettings)(useStyling(userProps), {
|
|
79
|
-
root: __assign(__assign({ navigateAtEnd: isCircularNavigation ? 'NavigateWrap' : 'NavigateStopAtEnds' }, rest), { defaultTabbableElement:
|
|
82
|
+
root: __assign(__assign({ navigateAtEnd: isCircularNavigation ? 'NavigateWrap' : 'NavigateStopAtEnds' }, rest), { defaultTabbableElement: targetFirstFocus, ref: ftzRef }),
|
|
80
83
|
}),
|
|
81
84
|
};
|
|
82
85
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FocusZone.js","sourceRoot":"","sources":["../src/FocusZone.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,2CAA+B;AAC/B,6CAA8C;AAE9C,8EAA+E;AAE/E,+EAAmE;AACnE,2EAAoE;AAGpE,wFAAsD;AAEtD,IAAM,qBAAqB,GAAG,UAAC,QAAQ,IAAK,OAAA,QAAQ,KAAK,cAAc,EAA3B,CAA2B,CAAC;AAE3D,QAAA,SAAS,GAAG,IAAA,kCAAU,EAAgB;IACjD,eAAe,EAAE,UAAC,SAAyB,EAAE,UAAsC;QACzE,IAAA,YAAY,GAA4D,SAAS,aAArE,EAAE,sBAAsB,GAAoC,SAAS,uBAA7C,EAAE,oBAAoB,GAAc,SAAS,qBAAvB,EAAK,IAAI,UAAK,SAAS,EAAnF,kEAAuE,CAAF,CAAe;QAE1F,IAAM,MAAM,GAAG,IAAA,uCAAmB,EAAC,YAAY,CAAC,CAAC;QAE3C,IAAA,
|
|
1
|
+
{"version":3,"file":"FocusZone.js","sourceRoot":"","sources":["../src/FocusZone.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,2CAA+B;AAC/B,6CAA8C;AAE9C,8EAA+E;AAE/E,+EAAmE;AACnE,2EAAoE;AAGpE,wFAAsD;AAEtD,IAAM,qBAAqB,GAAG,UAAC,QAAQ,IAAK,OAAA,QAAQ,KAAK,cAAc,EAA3B,CAA2B,CAAC;AAE3D,QAAA,SAAS,GAAG,IAAA,kCAAU,EAAgB;IACjD,eAAe,EAAE,UAAC,SAAyB,EAAE,UAAsC;QACzE,IAAA,YAAY,GAA4D,SAAS,aAArE,EAAE,sBAAsB,GAAoC,SAAS,uBAA7C,EAAE,oBAAoB,GAAc,SAAS,qBAAvB,EAAK,IAAI,UAAK,SAAS,EAAnF,kEAAuE,CAAF,CAAe;QAE1F,IAAM,MAAM,GAAG,IAAA,uCAAmB,EAAC,YAAY,CAAC,CAAC;QAE3C,IAAA,KAA0C,KAAK,CAAC,QAAQ,CAAkB,SAAS,CAAC,EAAnF,gBAAgB,QAAA,EAAE,mBAAmB,QAA8C,CAAC;QAC3F,KAAK,CAAC,eAAe,CAAC;YACpB,IAAI,OAAO,sBAAsB,KAAK,QAAQ,EAAE;gBAC9C,mBAAmB,CAAC,sBAAsB,CAAC,CAAC;aAC7C;iBAAM,IAAI,sBAAsB,aAAtB,sBAAsB,uBAAtB,sBAAsB,CAAE,OAAO,EAAE;gBAC1C,mBAAmB,CAAC,IAAA,6BAAc,EAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,CAAC;aACrE;iBAAM;gBACL,mBAAmB,CAAC,SAAS,CAAC,CAAC;aAChC;QACH,CAAC,EAAE,CAAC,sBAAsB,CAAC,CAAC,CAAC;QAE7B,OAAO;YACL,SAAS,EAAE,IAAA,mCAAa,EAAqB,UAAU,CAAC,SAAS,CAAC,EAAE;gBAClE,IAAI,sBACF,aAAa,EAAE,oBAAoB,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,oBAAoB,IACxE,IAAI,KACP,sBAAsB,EAAE,gBAAgB,EACxC,GAAG,EAAE,MAAM,GACZ;aACF,CAAC;SACH,CAAC;IACJ,CAAC;IACD,KAAK,EAAE;QACL,IAAI,EAAE,EAAE,QAAQ,EAAE,kCAAY,EAAE,MAAM,EAAE,qBAAqB,EAAE;KAChE;CACF,CAAC,CAAC"}
|
|
@@ -13,7 +13,7 @@ export type FocusZoneProps = IViewProps & {
|
|
|
13
13
|
/**
|
|
14
14
|
* Optionally defines the initial tabbable element inside the FocusZone
|
|
15
15
|
*/
|
|
16
|
-
defaultTabbableElement?: React.RefObject<React.Component
|
|
16
|
+
defaultTabbableElement?: React.RefObject<React.Component> | string;
|
|
17
17
|
/**
|
|
18
18
|
** Defines which arrows to react to
|
|
19
19
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FocusZone.types.d.ts","sourceRoot":"","sources":["../src/FocusZone.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,KAAK,MAAM,OAAO,CAAC;AAEpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAEzE,eAAO,MAAM,aAAa,cAAc,CAAC;AAEzC,MAAM,WAAW,cAAc;CAAG;AAElC,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG;IACxC;;OAEG;IACH,YAAY,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAE3C;;OAEG;IACH,sBAAsB,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"FocusZone.types.d.ts","sourceRoot":"","sources":["../src/FocusZone.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,KAAK,MAAM,OAAO,CAAC;AAEpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAEzE,eAAO,MAAM,aAAa,cAAc,CAAC;AAEzC,MAAM,WAAW,cAAc;CAAG;AAElC,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG;IACxC;;OAEG;IACH,YAAY,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAE3C;;OAEG;IACH,sBAAsB,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC;IAEnE;;OAEG;IACH,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IAExC;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAGnB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAE/B;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;;;;;;;;;;;;;;;;;OAkBG;IACH,gBAAgB,CAAC,EAAE,sBAAsB,CAAC;IAE1C;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAE5B;;;;;;;;;;;;;;;OAeG;IACH,4BAA4B,CAAC,EAAE,OAAO,CAAC;CACxC,CAAC;AAEF,MAAM,WAAW,WAAY,SAAQ,IAAI,CAAC,cAAc,EAAE,sBAAsB,CAAC;IAC/E,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,gBAAgB,CAAC,EAAE,sBAAsB,CAAC;CAC3C;AAED,MAAM,MAAM,kBAAkB,GAC1B,eAAe,CAAC,2BAA2B,GAC3C,UAAU,CAAC,oCAAoC,GAC/C,YAAY,CAAC,uCAAuC,GACpD,MAAM,CAAC,CAAC,yCAAyC;AAErD,MAAM,MAAM,aAAa,GACrB,oBAAoB,GACpB,cAAc,GACd,kBAAkB,CAAC;AAEvB,MAAM,MAAM,sBAAsB,GAC9B,MAAM,GACN,cAAc,GACd,oBAAoB,GACpB,QAAQ,CAAC;AAEb,MAAM,WAAW,eAAe;CAAG;AAEnC,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,WAAW,CAAC;CACnB;AAED,MAAM,MAAM,mBAAmB,GAAG,WAAW,CAAC,kBAAkB,EAAE,cAAc,CAAC,CAAC;AAElF,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,cAAc,CAAC;IACtB,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,kBAAkB,CAAC;IAC9B,KAAK,EAAE,cAAc,CAAC;CACvB"}
|
package/package.json
CHANGED
package/src/FocusZone.ts
CHANGED
|
@@ -23,12 +23,14 @@ export const FocusZone = composable<FocusZoneType>({
|
|
|
23
23
|
|
|
24
24
|
const ftzRef = useViewCommandFocus(componentRef);
|
|
25
25
|
|
|
26
|
-
const [
|
|
26
|
+
const [targetFirstFocus, setTargetFirstFocus] = React.useState<number | string>(undefined);
|
|
27
27
|
React.useLayoutEffect(() => {
|
|
28
|
-
if (defaultTabbableElement
|
|
29
|
-
|
|
28
|
+
if (typeof defaultTabbableElement === 'string') {
|
|
29
|
+
setTargetFirstFocus(defaultTabbableElement);
|
|
30
|
+
} else if (defaultTabbableElement?.current) {
|
|
31
|
+
setTargetFirstFocus(findNodeHandle(defaultTabbableElement.current));
|
|
30
32
|
} else {
|
|
31
|
-
|
|
33
|
+
setTargetFirstFocus(undefined);
|
|
32
34
|
}
|
|
33
35
|
}, [defaultTabbableElement]);
|
|
34
36
|
|
|
@@ -37,7 +39,7 @@ export const FocusZone = composable<FocusZoneType>({
|
|
|
37
39
|
root: {
|
|
38
40
|
navigateAtEnd: isCircularNavigation ? 'NavigateWrap' : 'NavigateStopAtEnds', // let rest override
|
|
39
41
|
...rest,
|
|
40
|
-
defaultTabbableElement:
|
|
42
|
+
defaultTabbableElement: targetFirstFocus,
|
|
41
43
|
ref: ftzRef,
|
|
42
44
|
},
|
|
43
45
|
}),
|
package/src/FocusZone.types.ts
CHANGED
|
@@ -17,7 +17,7 @@ export type FocusZoneProps = IViewProps & {
|
|
|
17
17
|
/**
|
|
18
18
|
* Optionally defines the initial tabbable element inside the FocusZone
|
|
19
19
|
*/
|
|
20
|
-
defaultTabbableElement?: React.RefObject<React.Component
|
|
20
|
+
defaultTabbableElement?: React.RefObject<React.Component> | string;
|
|
21
21
|
|
|
22
22
|
/**
|
|
23
23
|
** Defines which arrows to react to
|