@fluentui-react-native/menu 1.12.14 → 1.12.16
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 +31 -1
- package/CHANGELOG.md +18 -2
- package/lib/MenuItem/MenuItemTokens.macos.d.ts.map +1 -1
- package/lib/MenuItem/MenuItemTokens.macos.js +3 -0
- package/lib/MenuItem/MenuItemTokens.macos.js.map +1 -1
- package/lib/MenuItemCheckbox/MenuItemCheckboxTokens.macos.js +2 -2
- package/lib/MenuItemCheckbox/MenuItemCheckboxTokens.macos.js.map +1 -1
- package/lib/MenuList/useMenuList.js +5 -4
- package/lib/MenuList/useMenuList.js.map +1 -1
- package/lib-commonjs/MenuItem/MenuItemTokens.macos.d.ts.map +1 -1
- package/lib-commonjs/MenuItem/MenuItemTokens.macos.js +3 -0
- package/lib-commonjs/MenuItem/MenuItemTokens.macos.js.map +1 -1
- package/lib-commonjs/MenuItemCheckbox/MenuItemCheckboxTokens.macos.js +2 -2
- package/lib-commonjs/MenuItemCheckbox/MenuItemCheckboxTokens.macos.js.map +1 -1
- package/lib-commonjs/MenuList/useMenuList.js +5 -4
- package/lib-commonjs/MenuList/useMenuList.js.map +1 -1
- package/package.json +1 -1
- package/src/MenuItem/MenuItemTokens.macos.ts +3 -0
- package/src/MenuItemCheckbox/MenuItemCheckboxTokens.macos.ts +2 -2
- package/src/MenuList/useMenuList.ts +2 -2
package/CHANGELOG.json
CHANGED
|
@@ -2,7 +2,37 @@
|
|
|
2
2
|
"name": "@fluentui-react-native/menu",
|
|
3
3
|
"entries": [
|
|
4
4
|
{
|
|
5
|
-
"date": "
|
|
5
|
+
"date": "Tue, 20 Feb 2024 22:23:53 GMT",
|
|
6
|
+
"version": "1.12.16",
|
|
7
|
+
"tag": "@fluentui-react-native/menu_v1.12.16",
|
|
8
|
+
"comments": {
|
|
9
|
+
"patch": [
|
|
10
|
+
{
|
|
11
|
+
"author": "adgleitm@microsoft.com",
|
|
12
|
+
"package": "@fluentui-react-native/menu",
|
|
13
|
+
"commit": "033c7eeeff2dc807a833548ecab25a6688db9e9c",
|
|
14
|
+
"comment": "Fix some MenuItem font and color tokens"
|
|
15
|
+
}
|
|
16
|
+
]
|
|
17
|
+
}
|
|
18
|
+
},
|
|
19
|
+
{
|
|
20
|
+
"date": "Thu, 15 Feb 2024 23:41:23 GMT",
|
|
21
|
+
"version": "1.12.15",
|
|
22
|
+
"tag": "@fluentui-react-native/menu_v1.12.15",
|
|
23
|
+
"comments": {
|
|
24
|
+
"patch": [
|
|
25
|
+
{
|
|
26
|
+
"author": "adgleitm@microsoft.com",
|
|
27
|
+
"package": "@fluentui-react-native/menu",
|
|
28
|
+
"commit": "757a58039a139ee16c1ba47fafda300fe7883133",
|
|
29
|
+
"comment": "Add safety checks for `MenuList` max height/width specifications"
|
|
30
|
+
}
|
|
31
|
+
]
|
|
32
|
+
}
|
|
33
|
+
},
|
|
34
|
+
{
|
|
35
|
+
"date": "Sat, 03 Feb 2024 02:29:49 GMT",
|
|
6
36
|
"version": "1.12.14",
|
|
7
37
|
"tag": "@fluentui-react-native/menu_v1.12.14",
|
|
8
38
|
"comments": {
|
package/CHANGELOG.md
CHANGED
|
@@ -1,12 +1,28 @@
|
|
|
1
1
|
# Change Log - @fluentui-react-native/menu
|
|
2
2
|
|
|
3
|
-
This log was last generated on
|
|
3
|
+
This log was last generated on Tue, 20 Feb 2024 22:23:53 GMT and should not be manually modified.
|
|
4
4
|
|
|
5
5
|
<!-- Start content -->
|
|
6
6
|
|
|
7
|
+
## 1.12.16
|
|
8
|
+
|
|
9
|
+
Tue, 20 Feb 2024 22:23:53 GMT
|
|
10
|
+
|
|
11
|
+
### Patches
|
|
12
|
+
|
|
13
|
+
- Fix some MenuItem font and color tokens (adgleitm@microsoft.com)
|
|
14
|
+
|
|
15
|
+
## 1.12.15
|
|
16
|
+
|
|
17
|
+
Thu, 15 Feb 2024 23:41:23 GMT
|
|
18
|
+
|
|
19
|
+
### Patches
|
|
20
|
+
|
|
21
|
+
- Add safety checks for `MenuList` max height/width specifications (adgleitm@microsoft.com)
|
|
22
|
+
|
|
7
23
|
## 1.12.14
|
|
8
24
|
|
|
9
|
-
Sat, 03 Feb 2024 02:29:
|
|
25
|
+
Sat, 03 Feb 2024 02:29:49 GMT
|
|
10
26
|
|
|
11
27
|
### Patches
|
|
12
28
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuItemTokens.macos.d.ts","sourceRoot":"","sources":["../../src/MenuItem/MenuItemTokens.macos.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAmB,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAE/E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAExE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,eAAO,MAAM,qBAAqB,EAAE,aAAa,CAAC,cAAc,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"MenuItemTokens.macos.d.ts","sourceRoot":"","sources":["../../src/MenuItem/MenuItemTokens.macos.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAmB,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAE/E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAExE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,eAAO,MAAM,qBAAqB,EAAE,aAAa,CAAC,cAAc,EAAE,KAAK,CAkCrE,CAAC"}
|
|
@@ -19,16 +19,19 @@ export var defaultMenuItemTokens = function (t) { return ({
|
|
|
19
19
|
backgroundColor: t.colors.menuItemBackgroundHovered,
|
|
20
20
|
color: t.colors.menuItemTextHovered,
|
|
21
21
|
iconColor: t.colors.menuItemTextHovered,
|
|
22
|
+
submenuIndicatorColor: t.colors.menuItemTextHovered,
|
|
22
23
|
},
|
|
23
24
|
pressed: {
|
|
24
25
|
backgroundColor: t.colors.menuItemBackgroundPressed,
|
|
25
26
|
color: t.colors.menuItemTextHovered,
|
|
26
27
|
iconColor: t.colors.menuItemTextHovered,
|
|
28
|
+
submenuIndicatorColor: t.colors.menuItemTextHovered,
|
|
27
29
|
},
|
|
28
30
|
disabled: {
|
|
29
31
|
backgroundColor: t.colors.menuBackground,
|
|
30
32
|
color: t.colors.disabledText,
|
|
31
33
|
iconColor: t.colors.disabledText,
|
|
34
|
+
submenuIndicatorColor: t.colors.disabledText,
|
|
32
35
|
},
|
|
33
36
|
}); };
|
|
34
37
|
//# sourceMappingURL=MenuItemTokens.macos.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuItemTokens.macos.js","sourceRoot":"","sources":["../../src/MenuItem/MenuItemTokens.macos.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAKnE,MAAM,CAAC,IAAM,qBAAqB,GAAyC,UAAC,CAAQ,IAAqB,OAAA,CAAC;IACxG,eAAe,EAAE,CAAC,CAAC,MAAM,CAAC,qBAAqB;IAC/C,YAAY,EAAE,CAAC;IACf,aAAa,EAAE,EAAE;IACjB,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,kBAAkB;IAClC,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO;IACzC,QAAQ,EAAE,EAAE;IACZ,UAAU,EAAE,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,OAA0B;IAC/D,GAAG,EAAE,YAAY,CAAC,MAAM;IACxB,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,kBAAkB;IACtC,QAAQ,EAAE,EAAE;IACZ,iBAAiB,EAAE,CAAC;IACpB,eAAe,EAAE,CAAC;IAClB,qBAAqB,EAAE,CAAC,CAAC,MAAM,CAAC,kBAAkB;IAClD,uBAAuB,EAAE,YAAY,CAAC,QAAQ;IAC9C,oBAAoB,EAAE,EAAE;IACxB,OAAO,EAAE;QACP,eAAe,EAAE,CAAC,CAAC,MAAM,CAAC,yBAAyB;QACnD,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,mBAAmB;QACnC,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,mBAAmB;
|
|
1
|
+
{"version":3,"file":"MenuItemTokens.macos.js","sourceRoot":"","sources":["../../src/MenuItem/MenuItemTokens.macos.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAKnE,MAAM,CAAC,IAAM,qBAAqB,GAAyC,UAAC,CAAQ,IAAqB,OAAA,CAAC;IACxG,eAAe,EAAE,CAAC,CAAC,MAAM,CAAC,qBAAqB;IAC/C,YAAY,EAAE,CAAC;IACf,aAAa,EAAE,EAAE;IACjB,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,kBAAkB;IAClC,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO;IACzC,QAAQ,EAAE,EAAE;IACZ,UAAU,EAAE,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,OAA0B;IAC/D,GAAG,EAAE,YAAY,CAAC,MAAM;IACxB,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,kBAAkB;IACtC,QAAQ,EAAE,EAAE;IACZ,iBAAiB,EAAE,CAAC;IACpB,eAAe,EAAE,CAAC;IAClB,qBAAqB,EAAE,CAAC,CAAC,MAAM,CAAC,kBAAkB;IAClD,uBAAuB,EAAE,YAAY,CAAC,QAAQ;IAC9C,oBAAoB,EAAE,EAAE;IACxB,OAAO,EAAE;QACP,eAAe,EAAE,CAAC,CAAC,MAAM,CAAC,yBAAyB;QACnD,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,mBAAmB;QACnC,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,mBAAmB;QACvC,qBAAqB,EAAE,CAAC,CAAC,MAAM,CAAC,mBAAmB;KACpD;IACD,OAAO,EAAE;QACP,eAAe,EAAE,CAAC,CAAC,MAAM,CAAC,yBAAyB;QACnD,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,mBAAmB;QACnC,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,mBAAmB;QACvC,qBAAqB,EAAE,CAAC,CAAC,MAAM,CAAC,mBAAmB;KACpD;IACD,QAAQ,EAAE;QACR,eAAe,EAAE,CAAC,CAAC,MAAM,CAAC,cAAc;QACxC,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,YAAY;QAC5B,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,YAAY;QAChC,qBAAqB,EAAE,CAAC,CAAC,MAAM,CAAC,YAAY;KAC7C;CACF,CAAC,EAlCuG,CAkCvG,CAAC"}
|
|
@@ -7,7 +7,7 @@ export var defaultMenuItemCheckboxTokens = function (t) { return ({
|
|
|
7
7
|
checkmarkVisibility: 0,
|
|
8
8
|
color: t.colors.neutralForeground2,
|
|
9
9
|
fontFamily: t.typography.families.primary,
|
|
10
|
-
fontSize:
|
|
10
|
+
fontSize: 13,
|
|
11
11
|
fontWeight: globalTokens.font.weight.regular,
|
|
12
12
|
gap: globalTokens.size40,
|
|
13
13
|
iconColor: t.colors.neutralForeground2,
|
|
@@ -19,7 +19,7 @@ export var defaultMenuItemCheckboxTokens = function (t) { return ({
|
|
|
19
19
|
color: t.colors.neutralForegroundOnBrand,
|
|
20
20
|
iconColor: t.colors.neutralForegroundOnBrand,
|
|
21
21
|
checked: {
|
|
22
|
-
checkmarkColor: t.colors.
|
|
22
|
+
checkmarkColor: t.colors.neutralForegroundOnBrand,
|
|
23
23
|
checkmarkVisibility: 1,
|
|
24
24
|
},
|
|
25
25
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuItemCheckboxTokens.macos.js","sourceRoot":"","sources":["../../src/MenuItemCheckbox/MenuItemCheckboxTokens.macos.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAKnE,MAAM,CAAC,IAAM,6BAA6B,GAAiD,UAAC,CAAQ,IAA6B,OAAA,CAAC;IAChI,eAAe,EAAE,CAAC,CAAC,MAAM,CAAC,qBAAqB;IAC/C,YAAY,EAAE,CAAC;IACf,gBAAgB,EAAE,YAAY,CAAC,MAAM;IACrC,aAAa,EAAE,EAAE;IACjB,mBAAmB,EAAE,CAAC;IACtB,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,kBAAkB;IAClC,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO;IACzC,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"MenuItemCheckboxTokens.macos.js","sourceRoot":"","sources":["../../src/MenuItemCheckbox/MenuItemCheckboxTokens.macos.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAKnE,MAAM,CAAC,IAAM,6BAA6B,GAAiD,UAAC,CAAQ,IAA6B,OAAA,CAAC;IAChI,eAAe,EAAE,CAAC,CAAC,MAAM,CAAC,qBAAqB;IAC/C,YAAY,EAAE,CAAC;IACf,gBAAgB,EAAE,YAAY,CAAC,MAAM;IACrC,aAAa,EAAE,EAAE;IACjB,mBAAmB,EAAE,CAAC;IACtB,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,kBAAkB;IAClC,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO;IACzC,QAAQ,EAAE,EAAE;IACZ,UAAU,EAAE,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,OAA0B;IAC/D,GAAG,EAAE,YAAY,CAAC,MAAM;IACxB,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,kBAAkB;IACtC,QAAQ,EAAE,EAAE;IACZ,iBAAiB,EAAE,CAAC;IACpB,eAAe,EAAE,CAAC;IAClB,OAAO,EAAE;QACP,eAAe,EAAE,CAAC,CAAC,MAAM,CAAC,eAAe;QACzC,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,wBAAwB;QACxC,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,wBAAwB;QAC5C,OAAO,EAAE;YACP,cAAc,EAAE,CAAC,CAAC,MAAM,CAAC,wBAAwB;YACjD,mBAAmB,EAAE,CAAC;SACvB;KACF;IACD,OAAO,EAAE;QACP,eAAe,EAAE,CAAC,CAAC,MAAM,CAAC,sBAAsB;QAChD,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,+BAA+B;QAC/C,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,+BAA+B;QACnD,OAAO,EAAE;YACP,cAAc,EAAE,CAAC,CAAC,MAAM,CAAC,+BAA+B;YACxD,mBAAmB,EAAE,CAAC;SACvB;KACF;IACD,QAAQ,EAAE;QACR,eAAe,EAAE,CAAC,CAAC,MAAM,CAAC,qBAAqB;QAC/C,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,wBAAwB;QACxC,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,wBAAwB;QAC5C,OAAO,EAAE;YACP,cAAc,EAAE,CAAC,CAAC,MAAM,CAAC,wBAAwB;YACjD,mBAAmB,EAAE,CAAC;SACvB;KACF;IACD,OAAO,EAAE;QACP,cAAc,EAAE,CAAC,CAAC,MAAM,CAAC,kBAAkB;QAC3C,mBAAmB,EAAE,CAAC;KACvB;CACF,CAAC,EA9C+H,CA8C/H,CAAC"}
|
|
@@ -18,6 +18,7 @@ var platformsWithoutFocusOnDisabled = ['ios', 'macos'];
|
|
|
18
18
|
var handledKeys = ['Home', 'End'];
|
|
19
19
|
var handleFocusOnMouseLevae = Platform.OS === 'macos';
|
|
20
20
|
export var useMenuList = function (_props) {
|
|
21
|
+
var _a, _b;
|
|
21
22
|
var context = useMenuContext();
|
|
22
23
|
// MenuList v2 needs to be able to be standalone, but this is not in scope for v1
|
|
23
24
|
// Assuming that checked information will come from parent Menu
|
|
@@ -34,7 +35,7 @@ export var useMenuList = function (_props) {
|
|
|
34
35
|
}
|
|
35
36
|
return state;
|
|
36
37
|
}, [checkedOriginal]);
|
|
37
|
-
var
|
|
38
|
+
var _c = React.useState(function () {
|
|
38
39
|
if (checkedMap) {
|
|
39
40
|
return checkedMap;
|
|
40
41
|
}
|
|
@@ -45,7 +46,7 @@ export var useMenuList = function (_props) {
|
|
|
45
46
|
state[key] = true;
|
|
46
47
|
}
|
|
47
48
|
return state;
|
|
48
|
-
}), checkedInternal =
|
|
49
|
+
}), checkedInternal = _c[0], setCheckedInternal = _c[1];
|
|
49
50
|
var isCheckedControlled = typeof checkedOriginal !== 'undefined';
|
|
50
51
|
var checked = isCheckedControlled ? checkedMap : checkedInternal;
|
|
51
52
|
var onCheckedChange = React.useCallback(function (e, name, isChecked) {
|
|
@@ -150,8 +151,8 @@ export var useMenuList = function (_props) {
|
|
|
150
151
|
removeRadioItem: removeRadioItem,
|
|
151
152
|
trackMenuItem: trackMenuItem,
|
|
152
153
|
untrackMenuItem: untrackMenuItem,
|
|
153
|
-
hasMaxHeight: context.hasMaxHeight,
|
|
154
|
-
hasMaxWidth: context.hasMaxWidth,
|
|
154
|
+
hasMaxHeight: (_a = context.hasMaxHeight) !== null && _a !== void 0 ? _a : false,
|
|
155
|
+
hasMaxWidth: (_b = context.hasMaxWidth) !== null && _b !== void 0 ? _b : false,
|
|
155
156
|
focusZoneRef: focusZoneRef,
|
|
156
157
|
};
|
|
157
158
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMenuList.js","sourceRoot":"","sources":["../../src/MenuList/useMenuList.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAMxC,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAEhE,2FAA2F;AAC3F,4CAA4C;AAC5C,qGAAqG;AACrG,2HAA2H;AAC3H,IAAM,UAAU,GAAG,EAAE,CAAC;AACtB,IAAM,YAAY,GAAG,UAAC,IAAY;IAChC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACxB,CAAC,CAAC;AACF,IAAM,eAAe,GAAG,UAAC,IAAY;IACnC,UAAU,CAAC,MAAM,CAAC,UAAC,IAAI,IAAK,OAAA,IAAI,KAAK,IAAI,EAAb,CAAa,CAAC,CAAC;AAC7C,CAAC,CAAC;AAEF,IAAM,+BAA+B,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AACzD,IAAM,WAAW,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACpC,IAAM,uBAAuB,GAAG,QAAQ,CAAC,EAAE,KAAK,OAAO,CAAC;AAExD,MAAM,CAAC,IAAM,WAAW,GAAG,UAAC,MAAqB
|
|
1
|
+
{"version":3,"file":"useMenuList.js","sourceRoot":"","sources":["../../src/MenuList/useMenuList.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuItemTokens.macos.d.ts","sourceRoot":"","sources":["../../src/MenuItem/MenuItemTokens.macos.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAmB,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAE/E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAExE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,eAAO,MAAM,qBAAqB,EAAE,aAAa,CAAC,cAAc,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"MenuItemTokens.macos.d.ts","sourceRoot":"","sources":["../../src/MenuItem/MenuItemTokens.macos.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAmB,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAE/E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAExE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,eAAO,MAAM,qBAAqB,EAAE,aAAa,CAAC,cAAc,EAAE,KAAK,CAkCrE,CAAC"}
|
|
@@ -22,16 +22,19 @@ var defaultMenuItemTokens = function (t) { return ({
|
|
|
22
22
|
backgroundColor: t.colors.menuItemBackgroundHovered,
|
|
23
23
|
color: t.colors.menuItemTextHovered,
|
|
24
24
|
iconColor: t.colors.menuItemTextHovered,
|
|
25
|
+
submenuIndicatorColor: t.colors.menuItemTextHovered,
|
|
25
26
|
},
|
|
26
27
|
pressed: {
|
|
27
28
|
backgroundColor: t.colors.menuItemBackgroundPressed,
|
|
28
29
|
color: t.colors.menuItemTextHovered,
|
|
29
30
|
iconColor: t.colors.menuItemTextHovered,
|
|
31
|
+
submenuIndicatorColor: t.colors.menuItemTextHovered,
|
|
30
32
|
},
|
|
31
33
|
disabled: {
|
|
32
34
|
backgroundColor: t.colors.menuBackground,
|
|
33
35
|
color: t.colors.disabledText,
|
|
34
36
|
iconColor: t.colors.disabledText,
|
|
37
|
+
submenuIndicatorColor: t.colors.disabledText,
|
|
35
38
|
},
|
|
36
39
|
}); };
|
|
37
40
|
exports.defaultMenuItemTokens = defaultMenuItemTokens;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuItemTokens.macos.js","sourceRoot":"","sources":["../../src/MenuItem/MenuItemTokens.macos.ts"],"names":[],"mappings":";;;AACA,oEAAmE;AAK5D,IAAM,qBAAqB,GAAyC,UAAC,CAAQ,IAAqB,OAAA,CAAC;IACxG,eAAe,EAAE,CAAC,CAAC,MAAM,CAAC,qBAAqB;IAC/C,YAAY,EAAE,CAAC;IACf,aAAa,EAAE,EAAE;IACjB,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,kBAAkB;IAClC,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO;IACzC,QAAQ,EAAE,EAAE;IACZ,UAAU,EAAE,2BAAY,CAAC,IAAI,CAAC,MAAM,CAAC,OAA0B;IAC/D,GAAG,EAAE,2BAAY,CAAC,MAAM;IACxB,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,kBAAkB;IACtC,QAAQ,EAAE,EAAE;IACZ,iBAAiB,EAAE,CAAC;IACpB,eAAe,EAAE,CAAC;IAClB,qBAAqB,EAAE,CAAC,CAAC,MAAM,CAAC,kBAAkB;IAClD,uBAAuB,EAAE,2BAAY,CAAC,QAAQ;IAC9C,oBAAoB,EAAE,EAAE;IACxB,OAAO,EAAE;QACP,eAAe,EAAE,CAAC,CAAC,MAAM,CAAC,yBAAyB;QACnD,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,mBAAmB;QACnC,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,mBAAmB;
|
|
1
|
+
{"version":3,"file":"MenuItemTokens.macos.js","sourceRoot":"","sources":["../../src/MenuItem/MenuItemTokens.macos.ts"],"names":[],"mappings":";;;AACA,oEAAmE;AAK5D,IAAM,qBAAqB,GAAyC,UAAC,CAAQ,IAAqB,OAAA,CAAC;IACxG,eAAe,EAAE,CAAC,CAAC,MAAM,CAAC,qBAAqB;IAC/C,YAAY,EAAE,CAAC;IACf,aAAa,EAAE,EAAE;IACjB,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,kBAAkB;IAClC,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO;IACzC,QAAQ,EAAE,EAAE;IACZ,UAAU,EAAE,2BAAY,CAAC,IAAI,CAAC,MAAM,CAAC,OAA0B;IAC/D,GAAG,EAAE,2BAAY,CAAC,MAAM;IACxB,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,kBAAkB;IACtC,QAAQ,EAAE,EAAE;IACZ,iBAAiB,EAAE,CAAC;IACpB,eAAe,EAAE,CAAC;IAClB,qBAAqB,EAAE,CAAC,CAAC,MAAM,CAAC,kBAAkB;IAClD,uBAAuB,EAAE,2BAAY,CAAC,QAAQ;IAC9C,oBAAoB,EAAE,EAAE;IACxB,OAAO,EAAE;QACP,eAAe,EAAE,CAAC,CAAC,MAAM,CAAC,yBAAyB;QACnD,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,mBAAmB;QACnC,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,mBAAmB;QACvC,qBAAqB,EAAE,CAAC,CAAC,MAAM,CAAC,mBAAmB;KACpD;IACD,OAAO,EAAE;QACP,eAAe,EAAE,CAAC,CAAC,MAAM,CAAC,yBAAyB;QACnD,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,mBAAmB;QACnC,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,mBAAmB;QACvC,qBAAqB,EAAE,CAAC,CAAC,MAAM,CAAC,mBAAmB;KACpD;IACD,QAAQ,EAAE;QACR,eAAe,EAAE,CAAC,CAAC,MAAM,CAAC,cAAc;QACxC,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,YAAY;QAC5B,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,YAAY;QAChC,qBAAqB,EAAE,CAAC,CAAC,MAAM,CAAC,YAAY;KAC7C;CACF,CAAC,EAlCuG,CAkCvG,CAAC;AAlCU,QAAA,qBAAqB,yBAkC/B"}
|
|
@@ -10,7 +10,7 @@ var defaultMenuItemCheckboxTokens = function (t) { return ({
|
|
|
10
10
|
checkmarkVisibility: 0,
|
|
11
11
|
color: t.colors.neutralForeground2,
|
|
12
12
|
fontFamily: t.typography.families.primary,
|
|
13
|
-
fontSize:
|
|
13
|
+
fontSize: 13,
|
|
14
14
|
fontWeight: theme_tokens_1.globalTokens.font.weight.regular,
|
|
15
15
|
gap: theme_tokens_1.globalTokens.size40,
|
|
16
16
|
iconColor: t.colors.neutralForeground2,
|
|
@@ -22,7 +22,7 @@ var defaultMenuItemCheckboxTokens = function (t) { return ({
|
|
|
22
22
|
color: t.colors.neutralForegroundOnBrand,
|
|
23
23
|
iconColor: t.colors.neutralForegroundOnBrand,
|
|
24
24
|
checked: {
|
|
25
|
-
checkmarkColor: t.colors.
|
|
25
|
+
checkmarkColor: t.colors.neutralForegroundOnBrand,
|
|
26
26
|
checkmarkVisibility: 1,
|
|
27
27
|
},
|
|
28
28
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuItemCheckboxTokens.macos.js","sourceRoot":"","sources":["../../src/MenuItemCheckbox/MenuItemCheckboxTokens.macos.ts"],"names":[],"mappings":";;;AACA,oEAAmE;AAK5D,IAAM,6BAA6B,GAAiD,UAAC,CAAQ,IAA6B,OAAA,CAAC;IAChI,eAAe,EAAE,CAAC,CAAC,MAAM,CAAC,qBAAqB;IAC/C,YAAY,EAAE,CAAC;IACf,gBAAgB,EAAE,2BAAY,CAAC,MAAM;IACrC,aAAa,EAAE,EAAE;IACjB,mBAAmB,EAAE,CAAC;IACtB,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,kBAAkB;IAClC,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO;IACzC,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"MenuItemCheckboxTokens.macos.js","sourceRoot":"","sources":["../../src/MenuItemCheckbox/MenuItemCheckboxTokens.macos.ts"],"names":[],"mappings":";;;AACA,oEAAmE;AAK5D,IAAM,6BAA6B,GAAiD,UAAC,CAAQ,IAA6B,OAAA,CAAC;IAChI,eAAe,EAAE,CAAC,CAAC,MAAM,CAAC,qBAAqB;IAC/C,YAAY,EAAE,CAAC;IACf,gBAAgB,EAAE,2BAAY,CAAC,MAAM;IACrC,aAAa,EAAE,EAAE;IACjB,mBAAmB,EAAE,CAAC;IACtB,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,kBAAkB;IAClC,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO;IACzC,QAAQ,EAAE,EAAE;IACZ,UAAU,EAAE,2BAAY,CAAC,IAAI,CAAC,MAAM,CAAC,OAA0B;IAC/D,GAAG,EAAE,2BAAY,CAAC,MAAM;IACxB,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,kBAAkB;IACtC,QAAQ,EAAE,EAAE;IACZ,iBAAiB,EAAE,CAAC;IACpB,eAAe,EAAE,CAAC;IAClB,OAAO,EAAE;QACP,eAAe,EAAE,CAAC,CAAC,MAAM,CAAC,eAAe;QACzC,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,wBAAwB;QACxC,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,wBAAwB;QAC5C,OAAO,EAAE;YACP,cAAc,EAAE,CAAC,CAAC,MAAM,CAAC,wBAAwB;YACjD,mBAAmB,EAAE,CAAC;SACvB;KACF;IACD,OAAO,EAAE;QACP,eAAe,EAAE,CAAC,CAAC,MAAM,CAAC,sBAAsB;QAChD,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,+BAA+B;QAC/C,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,+BAA+B;QACnD,OAAO,EAAE;YACP,cAAc,EAAE,CAAC,CAAC,MAAM,CAAC,+BAA+B;YACxD,mBAAmB,EAAE,CAAC;SACvB;KACF;IACD,QAAQ,EAAE;QACR,eAAe,EAAE,CAAC,CAAC,MAAM,CAAC,qBAAqB;QAC/C,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,wBAAwB;QACxC,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,wBAAwB;QAC5C,OAAO,EAAE;YACP,cAAc,EAAE,CAAC,CAAC,MAAM,CAAC,wBAAwB;YACjD,mBAAmB,EAAE,CAAC;SACvB;KACF;IACD,OAAO,EAAE;QACP,cAAc,EAAE,CAAC,CAAC,MAAM,CAAC,kBAAkB;QAC3C,mBAAmB,EAAE,CAAC;KACvB;CACF,CAAC,EA9C+H,CA8C/H,CAAC;AA9CU,QAAA,6BAA6B,iCA8CvC"}
|
|
@@ -21,6 +21,7 @@ var platformsWithoutFocusOnDisabled = ['ios', 'macos'];
|
|
|
21
21
|
var handledKeys = ['Home', 'End'];
|
|
22
22
|
var handleFocusOnMouseLevae = react_native_1.Platform.OS === 'macos';
|
|
23
23
|
var useMenuList = function (_props) {
|
|
24
|
+
var _a, _b;
|
|
24
25
|
var context = (0, menuContext_1.useMenuContext)();
|
|
25
26
|
// MenuList v2 needs to be able to be standalone, but this is not in scope for v1
|
|
26
27
|
// Assuming that checked information will come from parent Menu
|
|
@@ -37,7 +38,7 @@ var useMenuList = function (_props) {
|
|
|
37
38
|
}
|
|
38
39
|
return state;
|
|
39
40
|
}, [checkedOriginal]);
|
|
40
|
-
var
|
|
41
|
+
var _c = react_1.default.useState(function () {
|
|
41
42
|
if (checkedMap) {
|
|
42
43
|
return checkedMap;
|
|
43
44
|
}
|
|
@@ -48,7 +49,7 @@ var useMenuList = function (_props) {
|
|
|
48
49
|
state[key] = true;
|
|
49
50
|
}
|
|
50
51
|
return state;
|
|
51
|
-
}), checkedInternal =
|
|
52
|
+
}), checkedInternal = _c[0], setCheckedInternal = _c[1];
|
|
52
53
|
var isCheckedControlled = typeof checkedOriginal !== 'undefined';
|
|
53
54
|
var checked = isCheckedControlled ? checkedMap : checkedInternal;
|
|
54
55
|
var onCheckedChange = react_1.default.useCallback(function (e, name, isChecked) {
|
|
@@ -153,8 +154,8 @@ var useMenuList = function (_props) {
|
|
|
153
154
|
removeRadioItem: removeRadioItem,
|
|
154
155
|
trackMenuItem: trackMenuItem,
|
|
155
156
|
untrackMenuItem: untrackMenuItem,
|
|
156
|
-
hasMaxHeight: context.hasMaxHeight,
|
|
157
|
-
hasMaxWidth: context.hasMaxWidth,
|
|
157
|
+
hasMaxHeight: (_a = context.hasMaxHeight) !== null && _a !== void 0 ? _a : false,
|
|
158
|
+
hasMaxWidth: (_b = context.hasMaxWidth) !== null && _b !== void 0 ? _b : false,
|
|
158
159
|
focusZoneRef: focusZoneRef,
|
|
159
160
|
};
|
|
160
161
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMenuList.js","sourceRoot":"","sources":["../../src/MenuList/useMenuList.ts"],"names":[],"mappings":";;;;AAAA,wDAA0B;AAC1B,6CAAwC;AAMxC,sDAAwD;AACxD,8DAAgE;AAEhE,2FAA2F;AAC3F,4CAA4C;AAC5C,qGAAqG;AACrG,2HAA2H;AAC3H,IAAM,UAAU,GAAG,EAAE,CAAC;AACtB,IAAM,YAAY,GAAG,UAAC,IAAY;IAChC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACxB,CAAC,CAAC;AACF,IAAM,eAAe,GAAG,UAAC,IAAY;IACnC,UAAU,CAAC,MAAM,CAAC,UAAC,IAAI,IAAK,OAAA,IAAI,KAAK,IAAI,EAAb,CAAa,CAAC,CAAC;AAC7C,CAAC,CAAC;AAEF,IAAM,+BAA+B,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AACzD,IAAM,WAAW,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACpC,IAAM,uBAAuB,GAAG,uBAAQ,CAAC,EAAE,KAAK,OAAO,CAAC;AAEjD,IAAM,WAAW,GAAG,UAAC,MAAqB
|
|
1
|
+
{"version":3,"file":"useMenuList.js","sourceRoot":"","sources":["../../src/MenuList/useMenuList.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -24,15 +24,18 @@ export const defaultMenuItemTokens: TokenSettings<MenuItemTokens, Theme> = (t: T
|
|
|
24
24
|
backgroundColor: t.colors.menuItemBackgroundHovered,
|
|
25
25
|
color: t.colors.menuItemTextHovered,
|
|
26
26
|
iconColor: t.colors.menuItemTextHovered,
|
|
27
|
+
submenuIndicatorColor: t.colors.menuItemTextHovered,
|
|
27
28
|
},
|
|
28
29
|
pressed: {
|
|
29
30
|
backgroundColor: t.colors.menuItemBackgroundPressed,
|
|
30
31
|
color: t.colors.menuItemTextHovered,
|
|
31
32
|
iconColor: t.colors.menuItemTextHovered,
|
|
33
|
+
submenuIndicatorColor: t.colors.menuItemTextHovered,
|
|
32
34
|
},
|
|
33
35
|
disabled: {
|
|
34
36
|
backgroundColor: t.colors.menuBackground,
|
|
35
37
|
color: t.colors.disabledText,
|
|
36
38
|
iconColor: t.colors.disabledText,
|
|
39
|
+
submenuIndicatorColor: t.colors.disabledText,
|
|
37
40
|
},
|
|
38
41
|
});
|
|
@@ -12,7 +12,7 @@ export const defaultMenuItemCheckboxTokens: TokenSettings<MenuItemCheckboxTokens
|
|
|
12
12
|
checkmarkVisibility: 0,
|
|
13
13
|
color: t.colors.neutralForeground2,
|
|
14
14
|
fontFamily: t.typography.families.primary,
|
|
15
|
-
fontSize:
|
|
15
|
+
fontSize: 13, // aligning with NSMenu font size
|
|
16
16
|
fontWeight: globalTokens.font.weight.regular as FontWeightValue,
|
|
17
17
|
gap: globalTokens.size40,
|
|
18
18
|
iconColor: t.colors.neutralForeground2,
|
|
@@ -24,7 +24,7 @@ export const defaultMenuItemCheckboxTokens: TokenSettings<MenuItemCheckboxTokens
|
|
|
24
24
|
color: t.colors.neutralForegroundOnBrand,
|
|
25
25
|
iconColor: t.colors.neutralForegroundOnBrand,
|
|
26
26
|
checked: {
|
|
27
|
-
checkmarkColor: t.colors.
|
|
27
|
+
checkmarkColor: t.colors.neutralForegroundOnBrand,
|
|
28
28
|
checkmarkVisibility: 1,
|
|
29
29
|
},
|
|
30
30
|
},
|
|
@@ -188,8 +188,8 @@ export const useMenuList = (_props: MenuListProps): MenuListState => {
|
|
|
188
188
|
removeRadioItem,
|
|
189
189
|
trackMenuItem,
|
|
190
190
|
untrackMenuItem,
|
|
191
|
-
hasMaxHeight: context.hasMaxHeight,
|
|
192
|
-
hasMaxWidth: context.hasMaxWidth,
|
|
191
|
+
hasMaxHeight: context.hasMaxHeight ?? false,
|
|
192
|
+
hasMaxWidth: context.hasMaxWidth ?? false,
|
|
193
193
|
focusZoneRef: focusZoneRef,
|
|
194
194
|
};
|
|
195
195
|
};
|