feat: remove mergeThemes API

change/@fluentui-react-components-f34f712d-15c2-4cc9-be35-95c55efad70b.json

@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "remove mergeThemes from public API",
+  "packageName": "@fluentui/react-components",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@fluentui-react-provider-d474a580-e643-4191-96db-4d4abf014352.json

@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "replace mergeThemes functionality from react-theme",
+  "packageName": "@fluentui/react-provider",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@fluentui-react-theme-4896497c-3947-4f7c-b2af-97b5cbf1c335.json

@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "remove mergeThemes API",
+  "packageName": "@fluentui/react-theme",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

packages/react-components/etc/react-components.api.md

@@ -188,7 +188,6 @@ import { MenuTriggerContextProvider } from '@fluentui/react-menu';
 import { MenuTriggerProps } from '@fluentui/react-menu';
 import { MenuTriggerState } from '@fluentui/react-menu';
 import { mergeClasses } from '@fluentui/react-make-styles';
-import { mergeThemes } from '@fluentui/react-theme';
 import { OnOpenChangeData } from '@fluentui/react-popover';
 import { OnVisibleChangeData } from '@fluentui/react-tooltip';
 import { OpenPopoverEvents } from '@fluentui/react-popover';
@@ -743,8 +742,6 @@ export { MenuTriggerState }
 
 export { mergeClasses }
 
-export { mergeThemes }
-
 export { OnOpenChangeData }
 
 export { OnVisibleChangeData }

packages/react-components/src/index.ts

@@ -32,7 +32,6 @@ export {
   createHighContrastTheme,
   createLightTheme,
   createTeamsDarkTheme,
-  mergeThemes,
   teamsDarkTheme,
   teamsHighContrastTheme,
   teamsLightTheme,

packages/react-provider/src/components/FluentProvider/useFluentProvider.ts

@@ -1,5 +1,5 @@
 import { useKeyboardNavAttribute } from '@fluentui/react-tabster';
-import { mergeThemes } from '@fluentui/react-theme';
+import type { Theme } from '@fluentui/react-theme';
 import { useFluent, useTheme } from '@fluentui/react-shared-contexts';
 import { getNativeElementProps, useMergedRefs } from '@fluentui/react-utilities';
 import * as React from 'react';
@@ -44,3 +44,16 @@ export const useFluentProvider = (props: FluentProviderProps, ref: React.Ref<HTM
     }),
   };
 };
+
+function mergeThemes(a: Theme | undefined, b: Partial<Theme> | Theme | undefined): Theme {
+  // Merge impacts perf: we should like to avoid it if it's possible
+  if (a && b) {
+    return { ...a, ...b };
+  }
+
+  if (a) {
+    return a;
+  }
+
+  return b as Theme;
+}

packages/react-theme/etc/react-theme.api.md

@@ -363,9 +363,6 @@ export type LineHeightTokens = {
     lineHeightHero1000: string;
 };
 
-// @public (undocumented)
-export function mergeThemes(a: Theme | undefined, b: PartialTheme | Theme | undefined): Theme;
-
 // @public (undocumented)
 export type PartialTheme = Partial<Theme>;
 

packages/react-theme/package.json

@@ -20,7 +20,7 @@
     "lint": "just-scripts lint",
     "start": "yarn storybook",
     "storybook": "start-storybook",
-    "test": "jest",
+    "test": "jest --passWithNoTests",
     "docs": "api-extractor run --config=config/api-extractor.local.json --local",
     "build:local": "tsc -p ./tsconfig.lib.json --module esnext --emitDeclarationOnly && node ../../scripts/typescript/normalize-import --output ./dist/packages/react-theme/src && yarn docs",
     "type-check": "tsc -b tsconfig.json"

packages/react-theme/src/utils/index.ts

@@ -2,5 +2,3 @@ export * from './createLightTheme';
 export * from './createDarkTheme';
 export * from './createTeamsDarkTheme';
 export * from './createHighContrastTheme';
-
-export { mergeThemes } from './mergeThemes';