Merge branch 'main' into user/rofang/versioning

apps/fluent-tester/CHANGELOG.json

@@ -1,6 +1,57 @@
 {
   "name": "@fluentui-react-native/tester",
   "entries": [
+    {
+      "date": "Wed, 21 Feb 2024 22:10:45 GMT",
+      "version": "0.167.9",
+      "tag": "@fluentui-react-native/tester_v0.167.9",
+      "comments": {
+        "patch": [
+          {
+            "author": "krsiler@microsoft.com",
+            "package": "@fluentui-react-native/tester",
+            "commit": "87cd2d51c6699db905f278a6397e92b0f9fd44bb",
+            "comment": "exclude dividers from n of m in MenuGroup"
+          },
+          {
+            "author": "beachball",
+            "package": "@fluentui-react-native/tester",
+            "comment": "Bump @fluentui-react-native/menu to v1.12.17",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 20 Feb 2024 22:24:35 GMT",
+      "version": "0.167.8",
+      "tag": "@fluentui-react-native/tester_v0.167.8",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@fluentui-react-native/tester",
+            "comment": "Bump @fluentui-react-native/menu to v1.12.16",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 15 Feb 2024 23:41:23 GMT",
+      "version": "0.167.7",
+      "tag": "@fluentui-react-native/tester_v0.167.7",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@fluentui-react-native/tester",
+            "comment": "Bump @fluentui-react-native/menu to v1.12.15",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Sat, 03 Feb 2024 02:29:49 GMT",
       "version": "0.167.6",

apps/fluent-tester/CHANGELOG.md

@@ -1,9 +1,34 @@
 # Change Log - @fluentui-react-native/tester
 
-This log was last generated on Sat, 03 Feb 2024 02:29:49 GMT and should not be manually modified.
+This log was last generated on Wed, 21 Feb 2024 22:10:45 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.167.9
+
+Wed, 21 Feb 2024 22:10:45 GMT
+
+### Patches
+
+- exclude dividers from n of m in MenuGroup (krsiler@microsoft.com)
+- Bump @fluentui-react-native/menu to v1.12.17
+
+## 0.167.8
+
+Tue, 20 Feb 2024 22:24:35 GMT
+
+### Patches
+
+- Bump @fluentui-react-native/menu to v1.12.16
+
+## 0.167.7
+
+Thu, 15 Feb 2024 23:41:23 GMT
+
+### Patches
+
+- Bump @fluentui-react-native/menu to v1.12.15
+
 ## 0.167.6
 
 Sat, 03 Feb 2024 02:29:49 GMT

apps/fluent-tester/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluentui-react-native/tester",
-  "version": "0.167.6",
+  "version": "0.167.9",
   "description": "A test app to test FluentUI React Native Components during development",
   "license": "MIT",
   "author": "Microsoft <fluentuinativeowners@microsoft.com>",
@@ -61,7 +61,7 @@
     "@fluentui-react-native/icon": "0.20.8",
     "@fluentui-react-native/input": "^0.5.8",
     "@fluentui-react-native/interactive-hooks": "^0.25.7",
-    "@fluentui-react-native/menu": "^1.12.14",
+    "@fluentui-react-native/menu": "^1.12.17",
     "@fluentui-react-native/merge-props": "^0.8.0",
     "@fluentui-react-native/notification": "0.24.10",
     "@fluentui-react-native/radio-group": "^0.20.9",

apps/fluent-tester/src/TestComponents/Menu/MenuTest.tsx

@@ -384,6 +384,8 @@ const MenuWithGroups: React.FunctionComponent = () => {
               <MenuGroupHeader>Section 2</MenuGroupHeader>
               <MenuItem>A plain MenuItem</MenuItem>
               <MenuItem>A plain MenuItem</MenuItem>
+              <MenuDivider />
+              <MenuItem>A plain MenuItem</MenuItem>
             </MenuGroup>
           </MenuList>
         </MenuPopover>

apps/win32/CHANGELOG.json

@@ -1,6 +1,51 @@
 {
   "name": "@fluentui-react-native/tester-win32",
   "entries": [
+    {
+      "date": "Wed, 21 Feb 2024 22:10:45 GMT",
+      "version": "0.37.40",
+      "tag": "@fluentui-react-native/tester-win32_v0.37.40",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@fluentui-react-native/tester-win32",
+            "comment": "Bump @fluentui-react-native/tester to v0.167.9",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 20 Feb 2024 22:24:35 GMT",
+      "version": "0.37.39",
+      "tag": "@fluentui-react-native/tester-win32_v0.37.39",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@fluentui-react-native/tester-win32",
+            "comment": "Bump @fluentui-react-native/tester to v0.167.8",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 15 Feb 2024 23:41:23 GMT",
+      "version": "0.37.38",
+      "tag": "@fluentui-react-native/tester-win32_v0.37.38",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@fluentui-react-native/tester-win32",
+            "comment": "Bump @fluentui-react-native/tester to v0.167.7",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Sat, 03 Feb 2024 02:29:49 GMT",
       "version": "0.37.37",

apps/win32/CHANGELOG.md

@@ -1,9 +1,33 @@
 # Change Log - @fluentui-react-native/tester-win32
 
-This log was last generated on Sat, 03 Feb 2024 02:29:49 GMT and should not be manually modified.
+This log was last generated on Wed, 21 Feb 2024 22:10:45 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.37.40
+
+Wed, 21 Feb 2024 22:10:45 GMT
+
+### Patches
+
+- Bump @fluentui-react-native/tester to v0.167.9
+
+## 0.37.39
+
+Tue, 20 Feb 2024 22:24:35 GMT
+
+### Patches
+
+- Bump @fluentui-react-native/tester to v0.167.8
+
+## 0.37.38
+
+Thu, 15 Feb 2024 23:41:23 GMT
+
+### Patches
+
+- Bump @fluentui-react-native/tester to v0.167.7
+
 ## 0.37.37
 
 Sat, 03 Feb 2024 02:29:49 GMT

apps/win32/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluentui-react-native/tester-win32",
-  "version": "0.37.37",
+  "version": "0.37.40",
   "main": "src/index.tsx",
   "module": "src/index.tsx",
   "typings": "lib/index.d.ts",
@@ -30,7 +30,7 @@
     "directory": "apps/win32"
   },
   "dependencies": {
-    "@fluentui-react-native/tester": "^0.167.6",
+    "@fluentui-react-native/tester": "^0.167.9",
     "react": "18.2.0",
     "react-native": "^0.72.0",
     "react-native-svg": "^13.14.0",

packages/components/Menu/CHANGELOG.json

@@ -1,6 +1,51 @@
 {
   "name": "@fluentui-react-native/menu",
   "entries": [
+    {
+      "date": "Wed, 21 Feb 2024 22:10:45 GMT",
+      "version": "1.12.17",
+      "tag": "@fluentui-react-native/menu_v1.12.17",
+      "comments": {
+        "patch": [
+          {
+            "author": "krsiler@microsoft.com",
+            "package": "@fluentui-react-native/menu",
+            "commit": "87cd2d51c6699db905f278a6397e92b0f9fd44bb",
+            "comment": "exclude dividers from n of m in MenuGroup"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 20 Feb 2024 22:24:34 GMT",
+      "version": "1.12.16",
+      "tag": "@fluentui-react-native/menu_v1.12.16",
+      "comments": {
+        "patch": [
+          {
+            "author": "adgleitm@microsoft.com",
+            "package": "@fluentui-react-native/menu",
+            "commit": "033c7eeeff2dc807a833548ecab25a6688db9e9c",
+            "comment": "Fix some MenuItem font and color tokens"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 15 Feb 2024 23:41:23 GMT",
+      "version": "1.12.15",
+      "tag": "@fluentui-react-native/menu_v1.12.15",
+      "comments": {
+        "patch": [
+          {
+            "author": "adgleitm@microsoft.com",
+            "package": "@fluentui-react-native/menu",
+            "commit": "757a58039a139ee16c1ba47fafda300fe7883133",
+            "comment": "Add safety checks for `MenuList` max height/width specifications"
+          }
+        ]
+      }
+    },
     {
       "date": "Sat, 03 Feb 2024 02:29:49 GMT",
       "version": "1.12.14",

packages/components/Menu/CHANGELOG.md

@@ -1,9 +1,33 @@
 # Change Log - @fluentui-react-native/menu
 
-This log was last generated on Sat, 03 Feb 2024 02:29:49 GMT and should not be manually modified.
+This log was last generated on Wed, 21 Feb 2024 22:10:45 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 1.12.17
+
+Wed, 21 Feb 2024 22:10:45 GMT
+
+### Patches
+
+- exclude dividers from n of m in MenuGroup (krsiler@microsoft.com)
+
+## 1.12.16
+
+Tue, 20 Feb 2024 22:24:34 GMT
+
+### Patches
+
+- Fix some MenuItem font and color tokens (adgleitm@microsoft.com)
+
+## 1.12.15
+
+Thu, 15 Feb 2024 23:41:23 GMT
+
+### Patches
+
+- Add safety checks for `MenuList` max height/width specifications (adgleitm@microsoft.com)
+
 ## 1.12.14
 
 Sat, 03 Feb 2024 02:29:49 GMT

packages/components/Menu/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluentui-react-native/menu",
-  "version": "1.12.14",
+  "version": "1.12.17",
   "description": "A cross-platform Menu component using the Fluent Design System",
   "main": "src/index.ts",
   "module": "src/index.ts",

packages/components/Menu/src/MenuGroup/MenuGroup.tsx

@@ -28,10 +28,13 @@ export const MenuGroup = compose<MenuGroupType>({
       const childrenWithSet = React.Children.toArray(children).map((child) => {
         if (React.isValidElement(child)) {
           const itemCount = React.Children.toArray(children).filter(
-            (child) => React.isValidElement(child) && (child as any).type.displayName !== 'MenuGroupHeader',
+            (child) =>
+              React.isValidElement(child) &&
+              (child as any).type.displayName !== 'MenuGroupHeader' &&
+              (child as any).type.displayName !== 'MenuDivider',
           ).length;
 
-          if ((child as any).type.displayName !== 'MenuGroupHeader') {
+          if ((child as any).type.displayName !== 'MenuGroupHeader' && (child as any).type.displayName !== 'MenuDivider') {
             itemPosition++;
           }
           return React.cloneElement(

packages/components/Menu/src/MenuItem/MenuItemTokens.macos.ts

@@ -24,15 +24,18 @@ export const defaultMenuItemTokens: TokenSettings<MenuItemTokens, Theme> = (t: T
     backgroundColor: t.colors.menuItemBackgroundHovered,
     color: t.colors.menuItemTextHovered,
     iconColor: t.colors.menuItemTextHovered,
+    submenuIndicatorColor: t.colors.menuItemTextHovered,
   },
   pressed: {
     backgroundColor: t.colors.menuItemBackgroundPressed,
     color: t.colors.menuItemTextHovered,
     iconColor: t.colors.menuItemTextHovered,
+    submenuIndicatorColor: t.colors.menuItemTextHovered,
   },
   disabled: {
     backgroundColor: t.colors.menuBackground,
     color: t.colors.disabledText,
     iconColor: t.colors.disabledText,
+    submenuIndicatorColor: t.colors.disabledText,
   },
 });

packages/components/Menu/src/MenuItemCheckbox/MenuItemCheckboxTokens.macos.ts

@@ -12,7 +12,7 @@ export const defaultMenuItemCheckboxTokens: TokenSettings<MenuItemCheckboxTokens
   checkmarkVisibility: 0,
   color: t.colors.neutralForeground2,
   fontFamily: t.typography.families.primary,
-  fontSize: globalTokens.font.size300,
+  fontSize: 13, // aligning with NSMenu font size
   fontWeight: globalTokens.font.weight.regular as FontWeightValue,
   gap: globalTokens.size40,
   iconColor: t.colors.neutralForeground2,
@@ -24,7 +24,7 @@ export const defaultMenuItemCheckboxTokens: TokenSettings<MenuItemCheckboxTokens
     color: t.colors.neutralForegroundOnBrand,
     iconColor: t.colors.neutralForegroundOnBrand,
     checked: {
-      checkmarkColor: t.colors.neutralForeground2Hover,
+      checkmarkColor: t.colors.neutralForegroundOnBrand,
       checkmarkVisibility: 1,
     },
   },

packages/components/Menu/src/MenuList/useMenuList.ts

@@ -188,8 +188,8 @@ export const useMenuList = (_props: MenuListProps): MenuListState => {
     removeRadioItem,
     trackMenuItem,
     untrackMenuItem,
-    hasMaxHeight: context.hasMaxHeight,
+    hasMaxHeight: context.hasMaxHeight ?? false,
-    hasMaxWidth: context.hasMaxWidth,
+    hasMaxWidth: context.hasMaxWidth ?? false,
     focusZoneRef: focusZoneRef,
   };
 };

packages/dependency-profiles/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluentui-react-native/dependency-profiles",
-  "version": "0.7.7",
+  "version": "0.7.10",
   "description": "@rnx-kit/align-deps profiles covering packages published from FluentUI-React-Native",
   "license": "MIT",
   "files": [

packages/dependency-profiles/src/index.js

@@ -8,11 +8,11 @@ module.exports = {
     },
     "@fluentui-react-native/tester": {
       "name": "@fluentui-react-native/tester",
-      "version": "0.167.6"
+      "version": "0.167.9"
     },
     "@fluentui-react-native/tester-win32": {
       "name": "@fluentui-react-native/tester-win32",
-      "version": "0.37.37"
+      "version": "0.37.40"
     },
     "@fluentui-react-native/avatar": {
       "name": "@fluentui-react-native/avatar",
@@ -68,7 +68,7 @@ module.exports = {
     },
     "@fluentui-react-native/menu": {
       "name": "@fluentui-react-native/menu",
-      "version": "1.12.14"
+      "version": "1.12.17"
     },
     "@fluentui-react-native/menu-button": {
       "name": "@fluentui-react-native/menu-button",

tester_deps/yarn.lock

@@ -3934,9 +3934,9 @@ __metadata:
   linkType: hard
 
 "ip@npm:^2.0.0":
-  version: 2.0.0
+  version: 2.0.1
-  resolution: "ip@npm:2.0.0"
+  resolution: "ip@npm:2.0.1"
-  checksum: cfcfac6b873b701996d71ec82a7dd27ba92450afdb421e356f44044ed688df04567344c36cbacea7d01b1c39a4c732dc012570ebe9bebfb06f27314bca625349
+  checksum: d765c9fd212b8a99023a4cde6a558a054c298d640fec1020567494d257afd78ca77e37126b1a3ef0e053646ced79a816bf50621d38d5e768cdde0431fa3b0d35
   languageName: node
   linkType: hard
 

yarn.lock

@@ -3319,7 +3319,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@fluentui-react-native/menu@*, @fluentui-react-native/menu@^1.12.14, @fluentui-react-native/menu@workspace:packages/components/Menu":
+"@fluentui-react-native/menu@*, @fluentui-react-native/menu@^1.12.17, @fluentui-react-native/menu@workspace:packages/components/Menu":
   version: 0.0.0-use.local
   resolution: "@fluentui-react-native/menu@workspace:packages/components/Menu"
   dependencies:
@@ -3741,7 +3741,7 @@ __metadata:
   dependencies:
     "@fluentui-react-native/eslint-config-rules": ^0.1.1
     "@fluentui-react-native/scripts": ^0.1.1
-    "@fluentui-react-native/tester": ^0.167.6
+    "@fluentui-react-native/tester": ^0.167.9
     "@office-iss/react-native-win32": ^0.72.0
     "@office-iss/rex-win32": 0.72.25-devmain.16.0.17327.15000
     "@react-native/metro-config": ^0.72.0
@@ -3762,7 +3762,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@fluentui-react-native/tester@*, @fluentui-react-native/tester@^0.167.6, @fluentui-react-native/tester@workspace:apps/fluent-tester":
+"@fluentui-react-native/tester@*, @fluentui-react-native/tester@^0.167.9, @fluentui-react-native/tester@workspace:apps/fluent-tester":
   version: 0.0.0-use.local
   resolution: "@fluentui-react-native/tester@workspace:apps/fluent-tester"
   dependencies:
@@ -3794,7 +3794,7 @@ __metadata:
     "@fluentui-react-native/icon": 0.20.8
     "@fluentui-react-native/input": ^0.5.8
     "@fluentui-react-native/interactive-hooks": ^0.25.7
-    "@fluentui-react-native/menu": ^1.12.14
+    "@fluentui-react-native/menu": ^1.12.17
     "@fluentui-react-native/merge-props": ^0.8.0
     "@fluentui-react-native/notification": 0.24.10
     "@fluentui-react-native/radio-group": ^0.20.9
@@ -13556,9 +13556,9 @@ __metadata:
   linkType: hard
 
 "ip@npm:^1.1.5":
-  version: 1.1.8
+  version: 1.1.9
-  resolution: "ip@npm:1.1.8"
+  resolution: "ip@npm:1.1.9"
-  checksum: a2ade53eb339fb0cbe9e69a44caab10d6e3784662285eb5d2677117ee4facc33a64679051c35e0dfdb1a3983a51ce2f5d2cb36446d52e10d01881789b76e28fb
+  checksum: b6d91fd45a856e3bd6d4f601ea0619d90f3517638f6918ebd079f959a8a6308568d8db5ef4fdf037e0d9cfdcf264f46833dfeea81ca31309cf0a7eb4b1307b84
   languageName: node
   linkType: hard