@fluentui-react-native/tester 0.170.0 → 0.170.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 +16 -1
- package/CHANGELOG.md +10 -2
- package/lib/fluent-tester/src/TestComponents/FocusZone/FocusZoneE2ETest.d.ts.map +1 -1
- package/lib/fluent-tester/src/TestComponents/FocusZone/FocusZoneE2ETest.js +9 -3
- package/lib/fluent-tester/src/TestComponents/FocusZone/FocusZoneE2ETest.js.map +1 -1
- package/lib/fluent-tester/src/TestComponents/FocusZone/styles.d.ts +14 -0
- package/lib/fluent-tester/src/TestComponents/FocusZone/styles.d.ts.map +1 -1
- package/lib/fluent-tester/src/TestComponents/FocusZone/styles.js +4 -13
- package/lib/fluent-tester/src/TestComponents/FocusZone/styles.js.map +1 -1
- package/lib-commonjs/fluent-tester/src/TestComponents/FocusZone/FocusZoneE2ETest.d.ts.map +1 -1
- package/lib-commonjs/fluent-tester/src/TestComponents/FocusZone/FocusZoneE2ETest.js +8 -2
- package/lib-commonjs/fluent-tester/src/TestComponents/FocusZone/FocusZoneE2ETest.js.map +1 -1
- package/lib-commonjs/fluent-tester/src/TestComponents/FocusZone/styles.d.ts +14 -0
- package/lib-commonjs/fluent-tester/src/TestComponents/FocusZone/styles.d.ts.map +1 -1
- package/lib-commonjs/fluent-tester/src/TestComponents/FocusZone/styles.js +3 -12
- package/lib-commonjs/fluent-tester/src/TestComponents/FocusZone/styles.js.map +1 -1
- package/package.json +8 -8
- package/src/TestComponents/FocusZone/FocusZoneE2ETest.tsx +11 -2
- package/src/TestComponents/FocusZone/styles.ts +5 -3
package/CHANGELOG.json
CHANGED
|
@@ -2,7 +2,22 @@
|
|
|
2
2
|
"name": "@fluentui-react-native/tester",
|
|
3
3
|
"entries": [
|
|
4
4
|
{
|
|
5
|
-
"date": "
|
|
5
|
+
"date": "Tue, 23 Jul 2024 16:55:40 GMT",
|
|
6
|
+
"version": "0.170.1",
|
|
7
|
+
"tag": "@fluentui-react-native/tester_v0.170.1",
|
|
8
|
+
"comments": {
|
|
9
|
+
"patch": [
|
|
10
|
+
{
|
|
11
|
+
"author": "nakambo@microsoft.com",
|
|
12
|
+
"package": "@fluentui-react-native/tester",
|
|
13
|
+
"commit": "ddf90fafdfaccd6318bb66f1d114f632bc5eb485",
|
|
14
|
+
"comment": "Minor tweaks for Mac behavior"
|
|
15
|
+
}
|
|
16
|
+
]
|
|
17
|
+
}
|
|
18
|
+
},
|
|
19
|
+
{
|
|
20
|
+
"date": "Mon, 15 Jul 2024 20:20:33 GMT",
|
|
6
21
|
"version": "0.170.0",
|
|
7
22
|
"tag": "@fluentui-react-native/tester_v0.170.0",
|
|
8
23
|
"comments": {
|
package/CHANGELOG.md
CHANGED
|
@@ -1,12 +1,20 @@
|
|
|
1
1
|
# Change Log - @fluentui-react-native/tester
|
|
2
2
|
|
|
3
|
-
This log was last generated on
|
|
3
|
+
This log was last generated on Tue, 23 Jul 2024 16:55:40 GMT and should not be manually modified.
|
|
4
4
|
|
|
5
5
|
<!-- Start content -->
|
|
6
6
|
|
|
7
|
+
## 0.170.1
|
|
8
|
+
|
|
9
|
+
Tue, 23 Jul 2024 16:55:40 GMT
|
|
10
|
+
|
|
11
|
+
### Patches
|
|
12
|
+
|
|
13
|
+
- Minor tweaks for Mac behavior (nakambo@microsoft.com)
|
|
14
|
+
|
|
7
15
|
## 0.170.0
|
|
8
16
|
|
|
9
|
-
Mon, 15 Jul 2024 20:
|
|
17
|
+
Mon, 15 Jul 2024 20:20:33 GMT
|
|
10
18
|
|
|
11
19
|
### Minor changes
|
|
12
20
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FocusZoneE2ETest.d.ts","sourceRoot":"","sources":["../../../../../src/TestComponents/FocusZone/FocusZoneE2ETest.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,
|
|
1
|
+
{"version":3,"file":"FocusZoneE2ETest.d.ts","sourceRoot":"","sources":["../../../../../src/TestComponents/FocusZone/FocusZoneE2ETest.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAY,IAAI,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,sBAAsB,EAAc,MAAM,wBAAwB,CAAC;AAuBrG,eAAO,MAAM,mBAAmB,EAAE,kBAAkB,EAAwD,CAAC;AAC7G,eAAO,MAAM,uBAAuB,EAAE,sBAAsB,EAA6D,CAAC;AAS1H,KAAK,yBAAyB,GAAG,KAAK,CAAC,iBAAiB,CAAC;IACvD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC,CAAC;AACH,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,iBAAiB,CAAC,yBAAyB,CAmBnF,CAAC;AAEF,KAAK,kBAAkB,GAAG;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,iBAAiB,CAAC,kBAAkB,CAyBrE,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,iBAyE/B,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { __assign, __spreadArray } from "tslib";
|
|
2
2
|
import React from 'react';
|
|
3
|
-
import { View } from 'react-native';
|
|
3
|
+
import { Platform, View } from 'react-native';
|
|
4
4
|
import { FocusZone, MenuButton, Text } from '@fluentui/react-native';
|
|
5
5
|
import { ButtonV1 as Button } from '@fluentui-react-native/button';
|
|
6
6
|
import { Switch } from '@fluentui-react-native/switch';
|
|
@@ -10,13 +10,19 @@ import { commonTestStyles } from '../Common/styles';
|
|
|
10
10
|
import { testProps } from '../Common/TestProps';
|
|
11
11
|
export var FocusZoneDirections = ['bidirectional', 'horizontal', 'vertical', 'none'];
|
|
12
12
|
export var FocusZoneTabNavigations = ['None', 'NavigateWrap', 'NavigateStopAtEnds', 'Normal'];
|
|
13
|
+
// Buttons by default focus on click on Win32, but they don't on the Mac, so place focus explicitly for convenience
|
|
14
|
+
function useFocusOnClickForMac() {
|
|
15
|
+
var componentRef = React.useRef();
|
|
16
|
+
var onClick = React.useCallback(function () { var _a; return (_a = componentRef.current) === null || _a === void 0 ? void 0 : _a.focus(); }, [componentRef]);
|
|
17
|
+
return Platform.OS === 'macos' ? { componentRef: componentRef, onClick: onClick } : {};
|
|
18
|
+
}
|
|
13
19
|
export var FocusZoneListWrapper = function (_a) {
|
|
14
20
|
var beforeID = _a.beforeID, afterID = _a.afterID, children = _a.children;
|
|
15
21
|
var buttonProps = { children: 'Click to Focus', style: focusZoneTestStyles.listWrapperButton };
|
|
16
22
|
return (React.createElement(React.Fragment, null,
|
|
17
|
-
React.createElement(Button, __assign({}, buttonProps, testProps(beforeID))),
|
|
23
|
+
React.createElement(Button, __assign({}, buttonProps, useFocusOnClickForMac(), testProps(beforeID))),
|
|
18
24
|
children,
|
|
19
|
-
React.createElement(Button, __assign({}, buttonProps, testProps(afterID)))));
|
|
25
|
+
React.createElement(Button, __assign({}, buttonProps, useFocusOnClickForMac(), testProps(afterID)))));
|
|
20
26
|
};
|
|
21
27
|
export var GridOfButtons = function (props) {
|
|
22
28
|
return (React.createElement(View, { style: focusZoneTestStyles.dashedBorder }, __spreadArray([], Array(props.gridHeight), true).map(function (_value, heightIndex) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FocusZoneE2ETest.js","sourceRoot":"","sources":["../../../../../src/TestComponents/FocusZone/FocusZoneE2ETest.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"FocusZoneE2ETest.js","sourceRoot":"","sources":["../../../../../src/TestComponents/FocusZone/FocusZoneE2ETest.tsx"],"names":[],"mappings":"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"}
|
|
@@ -39,15 +39,29 @@ export declare const focusZoneTestStyles: {
|
|
|
39
39
|
marginBottom: number;
|
|
40
40
|
};
|
|
41
41
|
smallBoxStyle: {
|
|
42
|
+
borderWidth: number;
|
|
43
|
+
backgroundColor?: undefined;
|
|
42
44
|
width: number;
|
|
43
45
|
height: number;
|
|
46
|
+
margin: number;
|
|
47
|
+
} | {
|
|
44
48
|
backgroundColor: string;
|
|
49
|
+
borderWidth?: undefined;
|
|
50
|
+
width: number;
|
|
51
|
+
height: number;
|
|
45
52
|
margin: number;
|
|
46
53
|
};
|
|
47
54
|
wideBoxStyle: {
|
|
55
|
+
borderWidth: number;
|
|
56
|
+
backgroundColor?: undefined;
|
|
48
57
|
width: number;
|
|
49
58
|
height: number;
|
|
59
|
+
margin: number;
|
|
60
|
+
} | {
|
|
50
61
|
backgroundColor: string;
|
|
62
|
+
borderWidth?: undefined;
|
|
63
|
+
width: number;
|
|
64
|
+
height: number;
|
|
51
65
|
margin: number;
|
|
52
66
|
};
|
|
53
67
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../../../../src/TestComponents/FocusZone/styles.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,mBAAmB
|
|
1
|
+
{"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../../../../src/TestComponents/FocusZone/styles.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsD9B,CAAC;AAEH,eAAO,MAAM,UAAU,iRAWrB,CAAC;AAEH,eAAO,MAAM,aAAa;;wVAGxB,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { __assign } from "tslib";
|
|
2
|
+
import { Platform, StyleSheet, View } from 'react-native';
|
|
2
3
|
import { Text } from '@fluentui/react-native';
|
|
3
4
|
import { ButtonV1 as Button } from '@fluentui-react-native/button';
|
|
4
5
|
import { Icon } from '@fluentui-react-native/icon';
|
|
@@ -42,18 +43,8 @@ export var focusZoneTestStyles = StyleSheet.create({
|
|
|
42
43
|
marginHorizontal: 20,
|
|
43
44
|
marginBottom: 100,
|
|
44
45
|
},
|
|
45
|
-
smallBoxStyle: {
|
|
46
|
-
|
|
47
|
-
height: 20,
|
|
48
|
-
backgroundColor: 'lightgrey',
|
|
49
|
-
margin: 5,
|
|
50
|
-
},
|
|
51
|
-
wideBoxStyle: {
|
|
52
|
-
width: 150,
|
|
53
|
-
height: 20,
|
|
54
|
-
backgroundColor: 'lightgrey',
|
|
55
|
-
margin: 5,
|
|
56
|
-
},
|
|
46
|
+
smallBoxStyle: __assign({ width: 20, height: 20, margin: 5 }, Platform.select({ macos: { borderWidth: 1 }, default: { backgroundColor: 'lightgrey' } })),
|
|
47
|
+
wideBoxStyle: __assign({ width: 150, height: 20, margin: 5 }, Platform.select({ macos: { borderWidth: 1 }, default: { backgroundColor: 'lightgrey' } })),
|
|
57
48
|
});
|
|
58
49
|
export var GridButton = Button.compose({
|
|
59
50
|
slots: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"styles.js","sourceRoot":"","sources":["../../../../../src/TestComponents/FocusZone/styles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"styles.js","sourceRoot":"","sources":["../../../../../src/TestComponents/FocusZone/styles.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAE1D,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,QAAQ,IAAI,MAAM,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAEnD,MAAM,CAAC,IAAM,mBAAmB,GAAG,UAAU,CAAC,MAAM,CAAC;IACnD,kBAAkB,EAAE;QAClB,aAAa,EAAE,KAAK;QACpB,YAAY,EAAE,YAAY;QAC1B,UAAU,EAAE,YAAY;QACxB,OAAO,EAAE,EAAE;KACZ;IACD,oBAAoB,EAAE;QACpB,WAAW,EAAE,CAAC;QACd,OAAO,EAAE,CAAC;QACV,MAAM,EAAE,CAAC;KACV;IACD,eAAe,EAAE;QACf,MAAM,EAAE,EAAE;QACV,KAAK,EAAE,GAAG;QACV,MAAM,EAAE,EAAE;KACX;IACD,iBAAiB,EAAE;QACjB,cAAc,EAAE,EAAE;KACnB;IACD,YAAY,EAAE;QACZ,WAAW,EAAE,CAAC;QACd,WAAW,EAAE,QAAQ;KACtB;IACD,UAAU,EAAE;QACV,OAAO,EAAE,MAAM;QACf,aAAa,EAAE,KAAK;QACpB,QAAQ,EAAE,EAAE;KACb;IACD,eAAe,EAAE;QACf,MAAM,EAAE,GAAG;QACX,KAAK,EAAE,GAAG;KACX;IACD,sBAAsB,EAAE;QACtB,eAAe,EAAE,MAAM;KACxB;IACD,gBAAgB,EAAE;QAChB,gBAAgB,EAAE,EAAE;QACpB,YAAY,EAAE,GAAG;KAClB;IACD,aAAa,aACX,KAAK,EAAE,EAAE,EACT,MAAM,EAAE,EAAE,EACV,MAAM,EAAE,CAAC,IAEN,QAAQ,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,eAAe,EAAE,WAAW,EAAE,EAAE,CAAC,CAC7F;IACD,YAAY,aACV,KAAK,EAAE,GAAG,EACV,MAAM,EAAE,EAAE,EACV,MAAM,EAAE,CAAC,IAEN,QAAQ,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,eAAe,EAAE,WAAW,EAAE,EAAE,CAAC,CAC7F;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,IAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC;IACvC,KAAK,EAAE;QACL,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,IAAI;QACV,OAAO,EAAE,IAAI;KACd;IACD,SAAS,EAAE;QACT,OAAO,EAAE;YACP,KAAK,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE;SAC1E;KACF;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,IAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC;IAC1C,MAAM,EAAE,EAAE,OAAO,EAAE,mBAAmB,EAAE;IACxC,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,kBAAkB,EAAE,WAAW,EAAE,EAAE;CACrD,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FocusZoneE2ETest.d.ts","sourceRoot":"","sources":["../../../../../src/TestComponents/FocusZone/FocusZoneE2ETest.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,
|
|
1
|
+
{"version":3,"file":"FocusZoneE2ETest.d.ts","sourceRoot":"","sources":["../../../../../src/TestComponents/FocusZone/FocusZoneE2ETest.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAY,IAAI,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,sBAAsB,EAAc,MAAM,wBAAwB,CAAC;AAuBrG,eAAO,MAAM,mBAAmB,EAAE,kBAAkB,EAAwD,CAAC;AAC7G,eAAO,MAAM,uBAAuB,EAAE,sBAAsB,EAA6D,CAAC;AAS1H,KAAK,yBAAyB,GAAG,KAAK,CAAC,iBAAiB,CAAC;IACvD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC,CAAC;AACH,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,iBAAiB,CAAC,yBAAyB,CAmBnF,CAAC;AAEF,KAAK,kBAAkB,GAAG;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,iBAAiB,CAAC,kBAAkB,CAyBrE,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,iBAyE/B,CAAC"}
|
|
@@ -13,13 +13,19 @@ var styles_2 = require("../Common/styles");
|
|
|
13
13
|
var TestProps_1 = require("../Common/TestProps");
|
|
14
14
|
exports.FocusZoneDirections = ['bidirectional', 'horizontal', 'vertical', 'none'];
|
|
15
15
|
exports.FocusZoneTabNavigations = ['None', 'NavigateWrap', 'NavigateStopAtEnds', 'Normal'];
|
|
16
|
+
// Buttons by default focus on click on Win32, but they don't on the Mac, so place focus explicitly for convenience
|
|
17
|
+
function useFocusOnClickForMac() {
|
|
18
|
+
var componentRef = react_1.default.useRef();
|
|
19
|
+
var onClick = react_1.default.useCallback(function () { var _a; return (_a = componentRef.current) === null || _a === void 0 ? void 0 : _a.focus(); }, [componentRef]);
|
|
20
|
+
return react_native_1.Platform.OS === 'macos' ? { componentRef: componentRef, onClick: onClick } : {};
|
|
21
|
+
}
|
|
16
22
|
var FocusZoneListWrapper = function (_a) {
|
|
17
23
|
var beforeID = _a.beforeID, afterID = _a.afterID, children = _a.children;
|
|
18
24
|
var buttonProps = { children: 'Click to Focus', style: styles_1.focusZoneTestStyles.listWrapperButton };
|
|
19
25
|
return (react_1.default.createElement(react_1.default.Fragment, null,
|
|
20
|
-
react_1.default.createElement(button_1.ButtonV1, tslib_1.__assign({}, buttonProps, (0, TestProps_1.testProps)(beforeID))),
|
|
26
|
+
react_1.default.createElement(button_1.ButtonV1, tslib_1.__assign({}, buttonProps, useFocusOnClickForMac(), (0, TestProps_1.testProps)(beforeID))),
|
|
21
27
|
children,
|
|
22
|
-
react_1.default.createElement(button_1.ButtonV1, tslib_1.__assign({}, buttonProps, (0, TestProps_1.testProps)(afterID)))));
|
|
28
|
+
react_1.default.createElement(button_1.ButtonV1, tslib_1.__assign({}, buttonProps, useFocusOnClickForMac(), (0, TestProps_1.testProps)(afterID)))));
|
|
23
29
|
};
|
|
24
30
|
exports.FocusZoneListWrapper = FocusZoneListWrapper;
|
|
25
31
|
var GridOfButtons = function (props) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FocusZoneE2ETest.js","sourceRoot":"","sources":["../../../../../src/TestComponents/FocusZone/FocusZoneE2ETest.tsx"],"names":[],"mappings":";;;;AAAA,wDAA0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"FocusZoneE2ETest.js","sourceRoot":"","sources":["../../../../../src/TestComponents/FocusZone/FocusZoneE2ETest.tsx"],"names":[],"mappings":"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"}
|
|
@@ -39,15 +39,29 @@ export declare const focusZoneTestStyles: {
|
|
|
39
39
|
marginBottom: number;
|
|
40
40
|
};
|
|
41
41
|
smallBoxStyle: {
|
|
42
|
+
borderWidth: number;
|
|
43
|
+
backgroundColor?: undefined;
|
|
42
44
|
width: number;
|
|
43
45
|
height: number;
|
|
46
|
+
margin: number;
|
|
47
|
+
} | {
|
|
44
48
|
backgroundColor: string;
|
|
49
|
+
borderWidth?: undefined;
|
|
50
|
+
width: number;
|
|
51
|
+
height: number;
|
|
45
52
|
margin: number;
|
|
46
53
|
};
|
|
47
54
|
wideBoxStyle: {
|
|
55
|
+
borderWidth: number;
|
|
56
|
+
backgroundColor?: undefined;
|
|
48
57
|
width: number;
|
|
49
58
|
height: number;
|
|
59
|
+
margin: number;
|
|
60
|
+
} | {
|
|
50
61
|
backgroundColor: string;
|
|
62
|
+
borderWidth?: undefined;
|
|
63
|
+
width: number;
|
|
64
|
+
height: number;
|
|
51
65
|
margin: number;
|
|
52
66
|
};
|
|
53
67
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../../../../src/TestComponents/FocusZone/styles.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,mBAAmB
|
|
1
|
+
{"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../../../../src/TestComponents/FocusZone/styles.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsD9B,CAAC;AAEH,eAAO,MAAM,UAAU,iRAWrB,CAAC;AAEH,eAAO,MAAM,aAAa;;wVAGxB,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SubheaderText = exports.GridButton = exports.focusZoneTestStyles = void 0;
|
|
4
|
+
var tslib_1 = require("tslib");
|
|
4
5
|
var react_native_1 = require("react-native");
|
|
5
6
|
var react_native_2 = require("@fluentui/react-native");
|
|
6
7
|
var button_1 = require("@fluentui-react-native/button");
|
|
@@ -45,18 +46,8 @@ exports.focusZoneTestStyles = react_native_1.StyleSheet.create({
|
|
|
45
46
|
marginHorizontal: 20,
|
|
46
47
|
marginBottom: 100,
|
|
47
48
|
},
|
|
48
|
-
smallBoxStyle: {
|
|
49
|
-
|
|
50
|
-
height: 20,
|
|
51
|
-
backgroundColor: 'lightgrey',
|
|
52
|
-
margin: 5,
|
|
53
|
-
},
|
|
54
|
-
wideBoxStyle: {
|
|
55
|
-
width: 150,
|
|
56
|
-
height: 20,
|
|
57
|
-
backgroundColor: 'lightgrey',
|
|
58
|
-
margin: 5,
|
|
59
|
-
},
|
|
49
|
+
smallBoxStyle: tslib_1.__assign({ width: 20, height: 20, margin: 5 }, react_native_1.Platform.select({ macos: { borderWidth: 1 }, default: { backgroundColor: 'lightgrey' } })),
|
|
50
|
+
wideBoxStyle: tslib_1.__assign({ width: 150, height: 20, margin: 5 }, react_native_1.Platform.select({ macos: { borderWidth: 1 }, default: { backgroundColor: 'lightgrey' } })),
|
|
60
51
|
});
|
|
61
52
|
exports.GridButton = button_1.ButtonV1.compose({
|
|
62
53
|
slots: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"styles.js","sourceRoot":"","sources":["../../../../../src/TestComponents/FocusZone/styles.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"styles.js","sourceRoot":"","sources":["../../../../../src/TestComponents/FocusZone/styles.ts"],"names":[],"mappings":";;;;AAAA,6CAA0D;AAE1D,uDAA8C;AAC9C,wDAAmE;AACnE,oDAAmD;AAEtC,QAAA,mBAAmB,GAAG,yBAAU,CAAC,MAAM,CAAC;IACnD,kBAAkB,EAAE;QAClB,aAAa,EAAE,KAAK;QACpB,YAAY,EAAE,YAAY;QAC1B,UAAU,EAAE,YAAY;QACxB,OAAO,EAAE,EAAE;KACZ;IACD,oBAAoB,EAAE;QACpB,WAAW,EAAE,CAAC;QACd,OAAO,EAAE,CAAC;QACV,MAAM,EAAE,CAAC;KACV;IACD,eAAe,EAAE;QACf,MAAM,EAAE,EAAE;QACV,KAAK,EAAE,GAAG;QACV,MAAM,EAAE,EAAE;KACX;IACD,iBAAiB,EAAE;QACjB,cAAc,EAAE,EAAE;KACnB;IACD,YAAY,EAAE;QACZ,WAAW,EAAE,CAAC;QACd,WAAW,EAAE,QAAQ;KACtB;IACD,UAAU,EAAE;QACV,OAAO,EAAE,MAAM;QACf,aAAa,EAAE,KAAK;QACpB,QAAQ,EAAE,EAAE;KACb;IACD,eAAe,EAAE;QACf,MAAM,EAAE,GAAG;QACX,KAAK,EAAE,GAAG;KACX;IACD,sBAAsB,EAAE;QACtB,eAAe,EAAE,MAAM;KACxB;IACD,gBAAgB,EAAE;QAChB,gBAAgB,EAAE,EAAE;QACpB,YAAY,EAAE,GAAG;KAClB;IACD,aAAa,qBACX,KAAK,EAAE,EAAE,EACT,MAAM,EAAE,EAAE,EACV,MAAM,EAAE,CAAC,IAEN,uBAAQ,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,eAAe,EAAE,WAAW,EAAE,EAAE,CAAC,CAC7F;IACD,YAAY,qBACV,KAAK,EAAE,GAAG,EACV,MAAM,EAAE,EAAE,EACV,MAAM,EAAE,CAAC,IAEN,uBAAQ,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,eAAe,EAAE,WAAW,EAAE,EAAE,CAAC,CAC7F;CACF,CAAC,CAAC;AAEU,QAAA,UAAU,GAAG,iBAAM,CAAC,OAAO,CAAC;IACvC,KAAK,EAAE;QACL,IAAI,EAAE,mBAAI;QACV,IAAI,EAAE,WAAI;QACV,OAAO,EAAE,mBAAI;KACd;IACD,SAAS,EAAE;QACT,OAAO,EAAE;YACP,KAAK,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE;SAC1E;KACF;CACF,CAAC,CAAC;AAEU,QAAA,aAAa,GAAG,mBAAI,CAAC,SAAS,CAAC;IAC1C,MAAM,EAAE,EAAE,OAAO,EAAE,mBAAmB,EAAE;IACxC,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,kBAAkB,EAAE,WAAW,EAAE,EAAE;CACrD,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fluentui-react-native/tester",
|
|
3
|
-
"version": "0.170.
|
|
3
|
+
"version": "0.170.1",
|
|
4
4
|
"description": "A test app to test FluentUI React Native Components during development",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "Microsoft <fluentuinativeowners@microsoft.com>",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"@fluentui-react-native/experimental-avatar": "0.21.2",
|
|
49
49
|
"@fluentui-react-native/experimental-checkbox": "0.17.4",
|
|
50
50
|
"@fluentui-react-native/experimental-expander": "0.8.1",
|
|
51
|
-
"@fluentui-react-native/experimental-menu-button": "0.10.
|
|
51
|
+
"@fluentui-react-native/experimental-menu-button": "0.10.6",
|
|
52
52
|
"@fluentui-react-native/experimental-native-date-picker": "0.11.0",
|
|
53
53
|
"@fluentui-react-native/experimental-shadow": "0.6.0",
|
|
54
54
|
"@fluentui-react-native/experimental-shimmer": "0.13.3",
|
|
@@ -56,16 +56,16 @@
|
|
|
56
56
|
"@fluentui-react-native/icon": "0.21.3",
|
|
57
57
|
"@fluentui-react-native/input": "0.7.3",
|
|
58
58
|
"@fluentui-react-native/interactive-hooks": "0.27.0",
|
|
59
|
-
"@fluentui-react-native/menu": "1.14.
|
|
59
|
+
"@fluentui-react-native/menu": "1.14.8",
|
|
60
60
|
"@fluentui-react-native/merge-props": "0.9.0",
|
|
61
61
|
"@fluentui-react-native/notification": "0.25.4",
|
|
62
|
-
"@fluentui-react-native/overflow": "0.3.
|
|
63
|
-
"@fluentui-react-native/radio-group": "0.21.
|
|
62
|
+
"@fluentui-react-native/overflow": "0.3.8",
|
|
63
|
+
"@fluentui-react-native/radio-group": "0.21.6",
|
|
64
64
|
"@fluentui-react-native/separator": "0.18.0",
|
|
65
65
|
"@fluentui-react-native/spinner": "0.9.4",
|
|
66
66
|
"@fluentui-react-native/stack": "0.10.2",
|
|
67
67
|
"@fluentui-react-native/switch": "0.13.2",
|
|
68
|
-
"@fluentui-react-native/tablist": "0.6.
|
|
68
|
+
"@fluentui-react-native/tablist": "0.6.5",
|
|
69
69
|
"@fluentui-react-native/text": "0.24.1",
|
|
70
70
|
"@fluentui-react-native/theme": "0.11.0",
|
|
71
71
|
"@fluentui-react-native/theme-tokens": "0.27.0",
|
|
@@ -75,7 +75,7 @@
|
|
|
75
75
|
"@fluentui-react-native/tooltip": "0.4.3",
|
|
76
76
|
"@fluentui-react-native/vibrancy-view": "0.2.1",
|
|
77
77
|
"@fluentui-react-native/win32-theme": "0.34.3",
|
|
78
|
-
"@fluentui/react-native": "0.41.
|
|
78
|
+
"@fluentui/react-native": "0.41.9",
|
|
79
79
|
"@fortawesome/fontawesome-svg-core": "^6.2.0",
|
|
80
80
|
"@fortawesome/free-solid-svg-icons": "^6.2.0",
|
|
81
81
|
"@fortawesome/react-native-fontawesome": "^0.3.0",
|
|
@@ -94,7 +94,7 @@
|
|
|
94
94
|
"@babel/core": "^7.8.0",
|
|
95
95
|
"@babel/runtime": "^7.8.0",
|
|
96
96
|
"@fluentui-react-native/eslint-config-rules": "0.1.1",
|
|
97
|
-
"@fluentui-react-native/focus-zone": "0.
|
|
97
|
+
"@fluentui-react-native/focus-zone": "0.18.0",
|
|
98
98
|
"@fluentui-react-native/scripts": "0.1.1",
|
|
99
99
|
"@react-native/babel-preset": "^0.73.0",
|
|
100
100
|
"@react-native/metro-babel-transformer": "^0.73.0",
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { View } from 'react-native';
|
|
2
|
+
import { Platform, View } from 'react-native';
|
|
3
3
|
|
|
4
|
-
import type { FocusZoneDirection, FocusZoneTabNavigation } from '@fluentui/react-native';
|
|
4
|
+
import type { FocusZoneDirection, FocusZoneTabNavigation, IFocusable } from '@fluentui/react-native';
|
|
5
5
|
import { FocusZone, MenuButton, Text } from '@fluentui/react-native';
|
|
6
6
|
import type { ButtonProps } from '@fluentui-react-native/button';
|
|
7
7
|
import { ButtonV1 as Button } from '@fluentui-react-native/button';
|
|
@@ -27,6 +27,13 @@ import { testProps } from '../Common/TestProps';
|
|
|
27
27
|
export const FocusZoneDirections: FocusZoneDirection[] = ['bidirectional', 'horizontal', 'vertical', 'none'];
|
|
28
28
|
export const FocusZoneTabNavigations: FocusZoneTabNavigation[] = ['None', 'NavigateWrap', 'NavigateStopAtEnds', 'Normal'];
|
|
29
29
|
|
|
30
|
+
// Buttons by default focus on click on Win32, but they don't on the Mac, so place focus explicitly for convenience
|
|
31
|
+
function useFocusOnClickForMac(): Partial<ButtonProps> {
|
|
32
|
+
const componentRef = React.useRef<IFocusable>();
|
|
33
|
+
const onClick = React.useCallback(() => componentRef.current?.focus(), [componentRef]);
|
|
34
|
+
return Platform.OS === 'macos' ? { componentRef, onClick } : {};
|
|
35
|
+
}
|
|
36
|
+
|
|
30
37
|
type FocusZoneListWrapperProps = React.PropsWithChildren<{
|
|
31
38
|
beforeID?: string;
|
|
32
39
|
afterID?: string;
|
|
@@ -37,12 +44,14 @@ export const FocusZoneListWrapper: React.FunctionComponent<FocusZoneListWrapperP
|
|
|
37
44
|
<>
|
|
38
45
|
<Button
|
|
39
46
|
{...buttonProps}
|
|
47
|
+
{...useFocusOnClickForMac()}
|
|
40
48
|
/* For Android E2E testing purposes, testProps must be passed in after accessibilityLabel. */
|
|
41
49
|
{...testProps(beforeID)}
|
|
42
50
|
/>
|
|
43
51
|
{children}
|
|
44
52
|
<Button
|
|
45
53
|
{...buttonProps}
|
|
54
|
+
{...useFocusOnClickForMac()}
|
|
46
55
|
/* For Android E2E testing purposes, testProps must be passed in after accessibilityLabel. */
|
|
47
56
|
{...testProps(afterID)}
|
|
48
57
|
/>
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { StyleSheet, View } from 'react-native';
|
|
1
|
+
import { Platform, StyleSheet, View } from 'react-native';
|
|
2
2
|
|
|
3
3
|
import { Text } from '@fluentui/react-native';
|
|
4
4
|
import { ButtonV1 as Button } from '@fluentui-react-native/button';
|
|
@@ -47,14 +47,16 @@ export const focusZoneTestStyles = StyleSheet.create({
|
|
|
47
47
|
smallBoxStyle: {
|
|
48
48
|
width: 20,
|
|
49
49
|
height: 20,
|
|
50
|
-
backgroundColor: 'lightgrey',
|
|
51
50
|
margin: 5,
|
|
51
|
+
// something is wrong with setting the background color on this style on the Mac, and until we fix that, let's not do this
|
|
52
|
+
...Platform.select({ macos: { borderWidth: 1 }, default: { backgroundColor: 'lightgrey' } }),
|
|
52
53
|
},
|
|
53
54
|
wideBoxStyle: {
|
|
54
55
|
width: 150,
|
|
55
56
|
height: 20,
|
|
56
|
-
backgroundColor: 'lightgrey',
|
|
57
57
|
margin: 5,
|
|
58
|
+
// something is wrong with setting the background color on this style on the Mac, and until we fix that, let's not do this
|
|
59
|
+
...Platform.select({ macos: { borderWidth: 1 }, default: { backgroundColor: 'lightgrey' } }),
|
|
58
60
|
},
|
|
59
61
|
});
|
|
60
62
|
|