@fluentui-react-native/menu 1.12.15 → 1.12.17
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/MenuGroup/MenuGroup.d.ts.map +1 -1
- package/lib/MenuGroup/MenuGroup.js +6 -2
- package/lib/MenuGroup/MenuGroup.js.map +1 -1
- 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-commonjs/MenuGroup/MenuGroup.d.ts.map +1 -1
- package/lib-commonjs/MenuGroup/MenuGroup.js +6 -2
- package/lib-commonjs/MenuGroup/MenuGroup.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/package.json +1 -1
- package/src/MenuGroup/MenuGroup.tsx +5 -2
- package/src/MenuItem/MenuItemTokens.macos.ts +3 -0
- package/src/MenuItemCheckbox/MenuItemCheckboxTokens.macos.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": "Wed, 21 Feb 2024 22:09:57 GMT",
|
|
6
|
+
"version": "1.12.17",
|
|
7
|
+
"tag": "@fluentui-react-native/menu_v1.12.17",
|
|
8
|
+
"comments": {
|
|
9
|
+
"patch": [
|
|
10
|
+
{
|
|
11
|
+
"author": "krsiler@microsoft.com",
|
|
12
|
+
"package": "@fluentui-react-native/menu",
|
|
13
|
+
"commit": "87cd2d51c6699db905f278a6397e92b0f9fd44bb",
|
|
14
|
+
"comment": "exclude dividers from n of m in MenuGroup"
|
|
15
|
+
}
|
|
16
|
+
]
|
|
17
|
+
}
|
|
18
|
+
},
|
|
19
|
+
{
|
|
20
|
+
"date": "Tue, 20 Feb 2024 22:24:34 GMT",
|
|
21
|
+
"version": "1.12.16",
|
|
22
|
+
"tag": "@fluentui-react-native/menu_v1.12.16",
|
|
23
|
+
"comments": {
|
|
24
|
+
"patch": [
|
|
25
|
+
{
|
|
26
|
+
"author": "adgleitm@microsoft.com",
|
|
27
|
+
"package": "@fluentui-react-native/menu",
|
|
28
|
+
"commit": "033c7eeeff2dc807a833548ecab25a6688db9e9c",
|
|
29
|
+
"comment": "Fix some MenuItem font and color tokens"
|
|
30
|
+
}
|
|
31
|
+
]
|
|
32
|
+
}
|
|
33
|
+
},
|
|
34
|
+
{
|
|
35
|
+
"date": "Thu, 15 Feb 2024 23:41:23 GMT",
|
|
6
36
|
"version": "1.12.15",
|
|
7
37
|
"tag": "@fluentui-react-native/menu_v1.12.15",
|
|
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 Wed, 21 Feb 2024 22:09:57 GMT and should not be manually modified.
|
|
4
4
|
|
|
5
5
|
<!-- Start content -->
|
|
6
6
|
|
|
7
|
+
## 1.12.17
|
|
8
|
+
|
|
9
|
+
Wed, 21 Feb 2024 22:09:57 GMT
|
|
10
|
+
|
|
11
|
+
### Patches
|
|
12
|
+
|
|
13
|
+
- exclude dividers from n of m in MenuGroup (krsiler@microsoft.com)
|
|
14
|
+
|
|
15
|
+
## 1.12.16
|
|
16
|
+
|
|
17
|
+
Tue, 20 Feb 2024 22:24:34 GMT
|
|
18
|
+
|
|
19
|
+
### Patches
|
|
20
|
+
|
|
21
|
+
- Fix some MenuItem font and color tokens (adgleitm@microsoft.com)
|
|
22
|
+
|
|
7
23
|
## 1.12.15
|
|
8
24
|
|
|
9
|
-
Thu, 15 Feb 2024 23:
|
|
25
|
+
Thu, 15 Feb 2024 23:41:23 GMT
|
|
10
26
|
|
|
11
27
|
### Patches
|
|
12
28
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuGroup.d.ts","sourceRoot":"","sources":["../../src/MenuGroup/MenuGroup.tsx"],"names":[],"mappings":"AAeA,eAAO,MAAM,SAAS,
|
|
1
|
+
{"version":3,"file":"MenuGroup.d.ts","sourceRoot":"","sources":["../../src/MenuGroup/MenuGroup.tsx"],"names":[],"mappings":"AAeA,eAAO,MAAM,SAAS,uOAmDpB,CAAC"}
|
|
@@ -22,8 +22,12 @@ export var MenuGroup = compose({
|
|
|
22
22
|
var childrenWithSet = React.Children.toArray(children).map(function (child) {
|
|
23
23
|
var _a, _b;
|
|
24
24
|
if (React.isValidElement(child)) {
|
|
25
|
-
var itemCount = React.Children.toArray(children).filter(function (child) {
|
|
26
|
-
|
|
25
|
+
var itemCount = React.Children.toArray(children).filter(function (child) {
|
|
26
|
+
return React.isValidElement(child) &&
|
|
27
|
+
child.type.displayName !== 'MenuGroupHeader' &&
|
|
28
|
+
child.type.displayName !== 'MenuDivider';
|
|
29
|
+
}).length;
|
|
30
|
+
if (child.type.displayName !== 'MenuGroupHeader' && child.type.displayName !== 'MenuDivider') {
|
|
27
31
|
itemPosition++;
|
|
28
32
|
}
|
|
29
33
|
return React.cloneElement(child, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuGroup.js","sourceRoot":"","sources":["../../src/MenuGroup/MenuGroup.tsx"],"names":[],"mappings":";AAAA,0BAA0B;AAC1B,qBAAqB;AACrB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAIlF,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,mEAAmE;AACnE,IAAM,YAAY,GAAG,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAY,CAAC,CAAC;AAE/D,MAAM,CAAC,IAAM,SAAS,GAAG,OAAO,CAAgB;IAC9C,WAAW,EAAE,aAAa;IAC1B,KAAK,EAAE;QACL,IAAI,EAAE,IAAI;QACV,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ;KAC1D;IACD,SAAS,EAAE,UAAC,SAAyB,EAAE,QAAiC;QACtE,IAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;QAClC,OAAO,UAAC,KAAqB,EAAE,QAAyB;YACtD,IAAW,WAAW,UAAK,UAAU,CAAC,SAAS,EAAE,KAAK,CAAC,EAAjD,EAAkB,CAA+B,CAAC;YAExD,IAAI,YAAY,GAAG,CAAC,CAAC;YACrB,IAAM,eAAe,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,UAAC,KAAK;;gBACjE,IAAI,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE;oBAC/B,IAAM,SAAS,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CACvD,UAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"MenuGroup.js","sourceRoot":"","sources":["../../src/MenuGroup/MenuGroup.tsx"],"names":[],"mappings":";AAAA,0BAA0B;AAC1B,qBAAqB;AACrB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAIlF,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,mEAAmE;AACnE,IAAM,YAAY,GAAG,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAY,CAAC,CAAC;AAE/D,MAAM,CAAC,IAAM,SAAS,GAAG,OAAO,CAAgB;IAC9C,WAAW,EAAE,aAAa;IAC1B,KAAK,EAAE;QACL,IAAI,EAAE,IAAI;QACV,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ;KAC1D;IACD,SAAS,EAAE,UAAC,SAAyB,EAAE,QAAiC;QACtE,IAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;QAClC,OAAO,UAAC,KAAqB,EAAE,QAAyB;YACtD,IAAW,WAAW,UAAK,UAAU,CAAC,SAAS,EAAE,KAAK,CAAC,EAAjD,EAAkB,CAA+B,CAAC;YAExD,IAAI,YAAY,GAAG,CAAC,CAAC;YACrB,IAAM,eAAe,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,UAAC,KAAK;;gBACjE,IAAI,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE;oBAC/B,IAAM,SAAS,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CACvD,UAAC,KAAK;wBACJ,OAAA,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC;4BAC1B,KAAa,CAAC,IAAI,CAAC,WAAW,KAAK,iBAAiB;4BACpD,KAAa,CAAC,IAAI,CAAC,WAAW,KAAK,aAAa;oBAFjD,CAEiD,CACpD,CAAC,MAAM,CAAC;oBAET,IAAK,KAAa,CAAC,IAAI,CAAC,WAAW,KAAK,iBAAiB,IAAK,KAAa,CAAC,IAAI,CAAC,WAAW,KAAK,aAAa,EAAE;wBAC9G,YAAY,EAAE,CAAC;qBAChB;oBACD,OAAO,KAAK,CAAC,YAAY,CACvB,KAA+E,EAC/E;wBACE,0BAA0B,EAAE,MAAA,KAAK,CAAC,KAAK,CAAC,0BAA0B,mCAAI,YAAY;wBAClF,oBAAoB,EAAE,MAAA,KAAK,CAAC,KAAK,CAAC,oBAAoB,mCAAI,SAAS,EAAE,OAAO;qBACtE,CACT,CAAC;iBACH;gBACD,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;YAEH,OAAO,CACL,UAAC,KAAK,CAAC,IAAI,eAAK,WAAW;gBACzB,UAAC,KAAK,CAAC,cAAc;gBACnB,mEAAmE;+BAC/D,CAAC,YAAY,IAAI;oBACnB,kBAAkB,EAAE,UAAU;oBAC9B,eAAe,EAAE,KAAK;oBACtB,aAAa,EAAE,kBAAkB;iBAClC,CAAC,GAED,eAAe,CACK,CACZ,CACd,CAAC;QACJ,CAAC,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}
|
|
@@ -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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuGroup.d.ts","sourceRoot":"","sources":["../../src/MenuGroup/MenuGroup.tsx"],"names":[],"mappings":"AAeA,eAAO,MAAM,SAAS,
|
|
1
|
+
{"version":3,"file":"MenuGroup.d.ts","sourceRoot":"","sources":["../../src/MenuGroup/MenuGroup.tsx"],"names":[],"mappings":"AAeA,eAAO,MAAM,SAAS,uOAmDpB,CAAC"}
|
|
@@ -25,8 +25,12 @@ exports.MenuGroup = (0, framework_1.compose)({
|
|
|
25
25
|
var childrenWithSet = react_1.default.Children.toArray(children).map(function (child) {
|
|
26
26
|
var _a, _b;
|
|
27
27
|
if (react_1.default.isValidElement(child)) {
|
|
28
|
-
var itemCount = react_1.default.Children.toArray(children).filter(function (child) {
|
|
29
|
-
|
|
28
|
+
var itemCount = react_1.default.Children.toArray(children).filter(function (child) {
|
|
29
|
+
return react_1.default.isValidElement(child) &&
|
|
30
|
+
child.type.displayName !== 'MenuGroupHeader' &&
|
|
31
|
+
child.type.displayName !== 'MenuDivider';
|
|
32
|
+
}).length;
|
|
33
|
+
if (child.type.displayName !== 'MenuGroupHeader' && child.type.displayName !== 'MenuDivider') {
|
|
30
34
|
itemPosition++;
|
|
31
35
|
}
|
|
32
36
|
return react_1.default.cloneElement(child, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuGroup.js","sourceRoot":"","sources":["../../src/MenuGroup/MenuGroup.tsx"],"names":[],"mappings":";;;;AAAA,0BAA0B;AAC1B,qBAAqB;AACrB,wDAA0B;AAC1B,6CAA8C;AAE9C,gEAA8D;AAC9D,8DAAkF;AAIlF,qDAAkD;AAElD,mEAAmE;AACnE,IAAM,YAAY,GAAG,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,uBAAQ,CAAC,EAAY,CAAC,CAAC;AAElD,QAAA,SAAS,GAAG,IAAA,mBAAO,EAAgB;IAC9C,WAAW,EAAE,+BAAa;IAC1B,KAAK,EAAE;QACL,IAAI,EAAE,mBAAI;QACV,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC,sBAAS,CAAC,CAAC,CAAC,eAAK,CAAC,QAAQ;KAC1D;IACD,SAAS,EAAE,UAAC,SAAyB,EAAE,QAAiC;QACtE,IAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;QAClC,OAAO,UAAC,KAAqB,EAAE,QAAyB;YACtD,IAAW,WAAW,kBAAK,IAAA,sBAAU,EAAC,SAAS,EAAE,KAAK,CAAC,EAAjD,EAAkB,CAA+B,CAAC;YAExD,IAAI,YAAY,GAAG,CAAC,CAAC;YACrB,IAAM,eAAe,GAAG,eAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,UAAC,KAAK;;gBACjE,IAAI,eAAK,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE;oBAC/B,IAAM,SAAS,GAAG,eAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CACvD,UAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"MenuGroup.js","sourceRoot":"","sources":["../../src/MenuGroup/MenuGroup.tsx"],"names":[],"mappings":";;;;AAAA,0BAA0B;AAC1B,qBAAqB;AACrB,wDAA0B;AAC1B,6CAA8C;AAE9C,gEAA8D;AAC9D,8DAAkF;AAIlF,qDAAkD;AAElD,mEAAmE;AACnE,IAAM,YAAY,GAAG,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,uBAAQ,CAAC,EAAY,CAAC,CAAC;AAElD,QAAA,SAAS,GAAG,IAAA,mBAAO,EAAgB;IAC9C,WAAW,EAAE,+BAAa;IAC1B,KAAK,EAAE;QACL,IAAI,EAAE,mBAAI;QACV,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC,sBAAS,CAAC,CAAC,CAAC,eAAK,CAAC,QAAQ;KAC1D;IACD,SAAS,EAAE,UAAC,SAAyB,EAAE,QAAiC;QACtE,IAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;QAClC,OAAO,UAAC,KAAqB,EAAE,QAAyB;YACtD,IAAW,WAAW,kBAAK,IAAA,sBAAU,EAAC,SAAS,EAAE,KAAK,CAAC,EAAjD,EAAkB,CAA+B,CAAC;YAExD,IAAI,YAAY,GAAG,CAAC,CAAC;YACrB,IAAM,eAAe,GAAG,eAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,UAAC,KAAK;;gBACjE,IAAI,eAAK,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE;oBAC/B,IAAM,SAAS,GAAG,eAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CACvD,UAAC,KAAK;wBACJ,OAAA,eAAK,CAAC,cAAc,CAAC,KAAK,CAAC;4BAC1B,KAAa,CAAC,IAAI,CAAC,WAAW,KAAK,iBAAiB;4BACpD,KAAa,CAAC,IAAI,CAAC,WAAW,KAAK,aAAa;oBAFjD,CAEiD,CACpD,CAAC,MAAM,CAAC;oBAET,IAAK,KAAa,CAAC,IAAI,CAAC,WAAW,KAAK,iBAAiB,IAAK,KAAa,CAAC,IAAI,CAAC,WAAW,KAAK,aAAa,EAAE;wBAC9G,YAAY,EAAE,CAAC;qBAChB;oBACD,OAAO,eAAK,CAAC,YAAY,CACvB,KAA+E,EAC/E;wBACE,0BAA0B,EAAE,MAAA,KAAK,CAAC,KAAK,CAAC,0BAA0B,mCAAI,YAAY;wBAClF,oBAAoB,EAAE,MAAA,KAAK,CAAC,KAAK,CAAC,oBAAoB,mCAAI,SAAS,EAAE,OAAO;qBACtE,CACT,CAAC;iBACH;gBACD,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;YAEH,OAAO,CACL,2BAAC,KAAK,CAAC,IAAI,uBAAK,WAAW;gBACzB,2BAAC,KAAK,CAAC,cAAc;gBACnB,mEAAmE;uCAC/D,CAAC,YAAY,IAAI;oBACnB,kBAAkB,EAAE,UAAU;oBAC9B,eAAe,EAAE,KAAK;oBACtB,aAAa,EAAE,kBAAkB;iBAClC,CAAC,GAED,eAAe,CACK,CACZ,CACd,CAAC;QACJ,CAAC,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}
|
|
@@ -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"}
|
package/package.json
CHANGED
|
@@ -28,10 +28,13 @@ export const MenuGroup = compose<MenuGroupType>({
|
|
|
28
28
|
const childrenWithSet = React.Children.toArray(children).map((child) => {
|
|
29
29
|
if (React.isValidElement(child)) {
|
|
30
30
|
const itemCount = React.Children.toArray(children).filter(
|
|
31
|
-
(child) =>
|
|
31
|
+
(child) =>
|
|
32
|
+
React.isValidElement(child) &&
|
|
33
|
+
(child as any).type.displayName !== 'MenuGroupHeader' &&
|
|
34
|
+
(child as any).type.displayName !== 'MenuDivider',
|
|
32
35
|
).length;
|
|
33
36
|
|
|
34
|
-
if ((child as any).type.displayName !== 'MenuGroupHeader') {
|
|
37
|
+
if ((child as any).type.displayName !== 'MenuGroupHeader' && (child as any).type.displayName !== 'MenuDivider') {
|
|
35
38
|
itemPosition++;
|
|
36
39
|
}
|
|
37
40
|
return React.cloneElement(
|
|
@@ -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
|
},
|