Slots/JSX rework part 1: Create a common @fluentui-react-native/framework-base package

apps/fluent-tester/package.json

@@ -63,11 +63,11 @@
     "@fluentui-react-native/experimental-shadow": "workspace:*",
     "@fluentui-react-native/experimental-shimmer": "workspace:*",
     "@fluentui-react-native/framework": "workspace:*",
+    "@fluentui-react-native/framework-base": "workspace:*",
     "@fluentui-react-native/icon": "workspace:*",
     "@fluentui-react-native/input": "workspace:*",
     "@fluentui-react-native/interactive-hooks": "workspace:*",
     "@fluentui-react-native/menu": "workspace:*",
-    "@fluentui-react-native/merge-props": "workspace:*",
     "@fluentui-react-native/notification": "workspace:*",
     "@fluentui-react-native/overflow": "workspace:*",
     "@fluentui-react-native/radio-group": "workspace:*",

apps/fluent-tester/src/TestComponents/Shadow/ShadowWithDifferentPropsTestSection.tsx

@@ -5,7 +5,7 @@ import { Text } from '@fluentui/react-native';
 import { Shadow } from '@fluentui-react-native/experimental-shadow';
 import type { Theme } from '@fluentui-react-native/framework';
 import { useFluentTheme } from '@fluentui-react-native/framework';
-import { mergeStyles } from '@fluentui-react-native/merge-props';
+import { mergeStyles } from '@fluentui-react-native/framework-base';
 import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet';
 
 import { shadowTestPageStyles } from './ShadowTestPageStyles';

change/@fluentui-react-native-android-theme-79d0cb08-a474-4364-a692-c4f20fcd9d78.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "create common framework-base package to share common utiltities more broadly",
+  "packageName": "@fluentui-react-native/android-theme",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@fluentui-react-native-apple-theme-5511160e-b4f1-47ab-a3de-260e39e9f321.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "create common framework-base package to share common utiltities more broadly",
+  "packageName": "@fluentui-react-native/apple-theme",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@fluentui-react-native-composition-6be8cbe2-598b-4b1a-9e95-73054a3be8b2.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "create common framework-base package to share common utiltities more broadly",
+  "packageName": "@fluentui-react-native/composition",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@fluentui-react-native-default-theme-1de2032c-1956-4b8f-a799-666c811a5a46.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "create common framework-base package to share common utiltities more broadly",
+  "packageName": "@fluentui-react-native/default-theme",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@fluentui-react-native-framework-51d22d0f-7e10-4dbc-9f86-0443590314d0.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "create common framework-base package to share common utiltities more broadly",
+  "packageName": "@fluentui-react-native/framework",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@fluentui-react-native-framework-base-4e51dad2-1178-40d6-ae86-16ef7a5c611a.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "create common framework-base package to share common utiltities more broadly",
+  "packageName": "@fluentui-react-native/framework-base",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@fluentui-react-native-immutable-merge-ad2e7d97-0a27-4981-bc47-d5ede2f225eb.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "create common framework-base package to share common utiltities more broadly",
+  "packageName": "@fluentui-react-native/immutable-merge",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@fluentui-react-native-interactive-hooks-b423ce5a-733a-4384-87f6-e8c36af6311c.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "create common framework-base package to share common utiltities more broadly",
+  "packageName": "@fluentui-react-native/interactive-hooks",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@fluentui-react-native-memo-cache-0ad8f5fd-561f-4884-a39e-e5d101412b87.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "create common framework-base package to share common utiltities more broadly",
+  "packageName": "@fluentui-react-native/memo-cache",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@fluentui-react-native-merge-props-e7fe022e-553d-42d1-b297-a9711113cb0e.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "create common framework-base package to share common utiltities more broadly",
+  "packageName": "@fluentui-react-native/merge-props",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@fluentui-react-native-tester-04e4af23-8af5-4b57-84c6-ba6c47306b06.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "create common framework-base package to share common utiltities more broadly",
+  "packageName": "@fluentui-react-native/tester",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@fluentui-react-native-theme-fa2ef829-f473-4c33-815f-10c40d4529bd.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "create common framework-base package to share common utiltities more broadly",
+  "packageName": "@fluentui-react-native/theme",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@fluentui-react-native-themed-stylesheet-115d7870-4da9-4581-a7a8-f1be56ec74c3.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "create common framework-base package to share common utiltities more broadly",
+  "packageName": "@fluentui-react-native/themed-stylesheet",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@fluentui-react-native-use-slot-80d9dcb1-2eb6-44df-bff1-49ced15d322e.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "create common framework-base package to share common utiltities more broadly",
+  "packageName": "@fluentui-react-native/use-slot",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@fluentui-react-native-use-slots-9d59772e-f08d-48e4-a85c-8b459dac7709.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "create common framework-base package to share common utiltities more broadly",
+  "packageName": "@fluentui-react-native/use-slots",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@fluentui-react-native-use-styling-8d11f42d-9acf-4fbb-8388-3cda5d247a20.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "create common framework-base package to share common utiltities more broadly",
+  "packageName": "@fluentui-react-native/use-styling",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@fluentui-react-native-use-tokens-f99b9ff3-a0e0-45a5-b52b-1bf2c967e159.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "create common framework-base package to share common utiltities more broadly",
+  "packageName": "@fluentui-react-native/use-tokens",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@fluentui-react-native-win32-theme-d7f74ff4-a3c5-4918-9c89-34cb0f6bc1f8.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "create common framework-base package to share common utiltities more broadly",
+  "packageName": "@fluentui-react-native/win32-theme",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@uifabricshared-foundation-composable-e6c04383-d731-4a6f-8bae-ea7a7d1cc52c.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "create common framework-base package to share common utiltities more broadly",
+  "packageName": "@uifabricshared/foundation-composable",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@uifabricshared-foundation-compose-54c0bdd5-e062-41e8-94e0-c79cff67c904.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "create common framework-base package to share common utiltities more broadly",
+  "packageName": "@uifabricshared/foundation-compose",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@uifabricshared-foundation-settings-5f948513-b644-4dc0-86e8-3435b7668484.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "create common framework-base package to share common utiltities more broadly",
+  "packageName": "@uifabricshared/foundation-settings",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@uifabricshared-foundation-tokens-2261e975-0110-4a0c-b81c-f6510092501c.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "create common framework-base package to share common utiltities more broadly",
+  "packageName": "@uifabricshared/foundation-tokens",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@uifabricshared-theme-registry-48207dc8-1a8e-4286-bbd9-40b64ffa41e4.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "create common framework-base package to share common utiltities more broadly",
+  "packageName": "@uifabricshared/theme-registry",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@uifabricshared-themed-settings-bd629bb3-561e-4373-9bf5-d8361ab7e19f.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "create common framework-base package to share common utiltities more broadly",
+  "packageName": "@uifabricshared/themed-settings",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

change/@uifabricshared-theming-ramp-f3aef3d5-037b-44ba-b66f-a631b462fd9e.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "create common framework-base package to share common utiltities more broadly",
+  "packageName": "@uifabricshared/theming-ramp",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

packages/deprecated/foundation-composable/package.json

@@ -35,7 +35,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@fluentui-react-native/merge-props": "workspace:*",
+    "@fluentui-react-native/framework-base": "workspace:*",
     "@uifabricshared/foundation-settings": "workspace:*"
   },
   "devDependencies": {

packages/deprecated/foundation-composable/src/Composable.slots.ts

@@ -3,7 +3,7 @@
 import * as React from 'react';
 import { IRenderData, ISlotWithFilter, IComposable, IWithComposable, ISlots, IPropFilter, INativeSlotType } from './Composable.types';
 import { mergeSettings, ISlotProps } from '@uifabricshared/foundation-settings';
-import { mergeProps } from '@fluentui-react-native/merge-props';
+import { mergeProps } from '@fluentui-react-native/framework-base';
 
 export type ISlotFn<TProps> = React.FunctionComponent<TProps> & {
   _canCompose?: boolean;

packages/deprecated/foundation-compose/package.json

@@ -36,8 +36,7 @@
   "license": "MIT",
   "dependencies": {
     "@fluentui-react-native/default-theme": "workspace:*",
-    "@fluentui-react-native/immutable-merge": "workspace:*",
-    "@fluentui-react-native/memo-cache": "workspace:*",
+    "@fluentui-react-native/framework-base": "workspace:*",
     "@fluentui-react-native/theme-types": "workspace:*",
     "@uifabricshared/foundation-composable": "workspace:*",
     "@uifabricshared/foundation-settings": "workspace:*",

packages/deprecated/foundation-compose/src/compose.tsx

@@ -10,7 +10,7 @@ import {
   IExtractState,
 } from '@uifabricshared/foundation-composable';
 import { initializeStyling, getOptionsFromObj } from './useStyling';
-import { immutableMerge } from '@fluentui-react-native/immutable-merge';
+import { immutableMerge } from '@fluentui-react-native/framework-base';
 import { ISlotProps } from '@uifabricshared/foundation-settings';
 
 /**

packages/deprecated/foundation-compose/src/useStyling.ts

@@ -8,7 +8,7 @@ import { useTheme } from '@fluentui-react-native/theme-types';
 import { defaultFluentTheme } from '@fluentui-react-native/default-theme';
 import { IWithComposable, AsObject, IComposableDefinition, INativeSlotType } from '@uifabricshared/foundation-composable';
 import { IComposeOptions, IStylingSettings, IDefineUseComposeStyling } from './compose.types';
-import { getMemoCache, GetMemoValue } from '@fluentui-react-native/memo-cache';
+import { getMemoCache, GetMemoValue } from '@fluentui-react-native/framework-base';
 
 /* tslint:disable-next-line no-any */
 export function getOptionsFromObj<TComponent>(obj: any): TComponent | undefined {

packages/deprecated/foundation-settings/package.json

@@ -35,8 +35,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@fluentui-react-native/immutable-merge": "workspace:*",
-    "@fluentui-react-native/merge-props": "workspace:*"
+    "@fluentui-react-native/framework-base": "workspace:*"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

packages/deprecated/foundation-settings/src/Settings.merge.test.ts

@@ -1,6 +1,6 @@
 import type { ColorValue } from 'react-native';
 
-import type { StyleProp } from '@fluentui-react-native/merge-props';
+import type { StyleProp } from '@fluentui-react-native/framework-base';
 
 import { mergeSettings } from './Settings';
 import type { IComponentSettings } from './Settings.types';

packages/deprecated/foundation-settings/src/Settings.ts

@@ -1,8 +1,8 @@
 /* eslint-disable */
 
-import { MergeOptions, immutableMergeCore } from '@fluentui-react-native/immutable-merge';
+import { MergeOptions, immutableMergeCore } from '@fluentui-react-native/framework-base';
 import { IComponentSettingsCollection, IComponentSettings, ISlotProps, IOverrideLookup } from './Settings.types';
-import { mergeProps } from '@fluentui-react-native/merge-props';
+import { mergeProps } from '@fluentui-react-native/framework-base';
 
 /**
  * an individual settings block is a set of slotProps, with an additional collection of tokens.
@@ -73,7 +73,6 @@ export function resolveSettingsOverrides(target: IComponentSettings, overrideLoo
  * @param target - settings block to strip the settings specific information from
  */
 export function slotPropsFromSettings(target: IComponentSettings): ISlotProps {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const { _overrides, _precedence, ...slotProps } = target;
   return slotProps as ISlotProps;
 }

packages/deprecated/foundation-tokens/package.json

@@ -35,13 +35,12 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@fluentui-react-native/merge-props": "workspace:*",
+    "@fluentui-react-native/framework-base": "workspace:*",
     "@fluentui-react-native/tokens": "workspace:*",
     "@uifabricshared/foundation-settings": "workspace:*"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",
-    "@fluentui-react-native/memo-cache": "workspace:*",
     "@fluentui-react-native/scripts": "workspace:*",
     "@react-native/babel-preset": "^0.74.0",
     "@react-native/metro-config": "^0.74.0",

packages/deprecated/foundation-tokens/src/MockComponent.ts

@@ -1,5 +1,4 @@
-import type { GetMemoValue } from '@fluentui-react-native/memo-cache';
-import type { StyleProp } from '@fluentui-react-native/merge-props';
+import type { GetMemoValue, StyleProp } from '@fluentui-react-native/framework-base';
 import type { ISlotProps, IComponentSettings } from '@uifabricshared/foundation-settings';
 import { mergeSettings } from '@uifabricshared/foundation-settings';
 

packages/deprecated/foundation-tokens/src/Token.function.ts

@@ -1,5 +1,5 @@
-import type { GetMemoValue } from '@fluentui-react-native/memo-cache';
-import { mergeProps } from '@fluentui-react-native/merge-props';
+import type { GetMemoValue } from '@fluentui-react-native/framework-base';
+import { mergeProps } from '@fluentui-react-native/framework-base';
 import type { ISlotProps } from '@uifabricshared/foundation-settings';
 
 import type { ITokenPropInfo, ICachedPropHandlers } from './Token.internal';

packages/deprecated/foundation-tokens/src/Token.internal.ts

@@ -1,4 +1,4 @@
-import type { GetMemoValue } from '@fluentui-react-native/memo-cache';
+import type { GetMemoValue } from '@fluentui-react-native/framework-base';
 
 export interface ITokenPropInfo<TTokens> {
   /** token props, aggregated from settings and user props */

packages/deprecated/foundation-tokens/src/Token.test.ts

@@ -1,4 +1,4 @@
-import { getMemoCache } from '@fluentui-react-native/memo-cache';
+import { getMemoCache } from '@fluentui-react-native/framework-base';
 
 import type { IButtonSettings } from './MockButton';
 import { MockButton } from './MockButton';

packages/deprecated/foundation-tokens/src/Token.ts

@@ -1,4 +1,4 @@
-import type { GetMemoValue } from '@fluentui-react-native/memo-cache';
+import type { GetMemoValue } from '@fluentui-react-native/framework-base';
 import type { ISlotProps, IComponentSettings } from '@uifabricshared/foundation-settings';
 
 import type { ITokenPropInfo } from './Token.internal';

packages/deprecated/theme-registry/package.json

@@ -37,7 +37,7 @@
   "devDependencies": {
     "@babel/core": "^7.20.0",
     "@fluentui-react-native/eslint-config-rules": "workspace:*",
-    "@fluentui-react-native/immutable-merge": "workspace:*",
+    "@fluentui-react-native/framework-base": "workspace:*",
     "@fluentui-react-native/scripts": "workspace:*",
     "@react-native/babel-preset": "^0.74.0",
     "@react-native/metro-config": "^0.74.0",

packages/deprecated/theme-registry/src/Registry.test.ts

@@ -1,6 +1,6 @@
 import type { ColorValue } from 'react-native';
 
-import { immutableMerge } from '@fluentui-react-native/immutable-merge';
+import { immutableMerge } from '@fluentui-react-native/framework-base';
 
 import { createThemeRegistry } from './Registry';
 import type { IThemeRegistry } from './Registry.types';

packages/deprecated/themed-settings/package.json

@@ -35,12 +35,12 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
+    "@fluentui-react-native/framework-base": "workspace:*",
     "@uifabricshared/foundation-settings": "workspace:*"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",
     "@fluentui-react-native/eslint-config-rules": "workspace:*",
-    "@fluentui-react-native/memo-cache": "workspace:*",
     "@fluentui-react-native/scripts": "workspace:*",
     "@react-native/babel-preset": "^0.74.0",
     "@react-native/metro-config": "^0.74.0",

packages/deprecated/themed-settings/src/CustomSettings.test.ts

@@ -1,6 +1,6 @@
 import type { ColorValue } from 'react-native';
 
-import { getMemoCache } from '@fluentui-react-native/memo-cache';
+import { getMemoCache } from '@fluentui-react-native/framework-base';
 import type { IComponentSettings } from '@uifabricshared/foundation-settings';
 import { mergeSettings } from '@uifabricshared/foundation-settings';
 

packages/deprecated/themed-settings/src/CustomSettings.ts

@@ -1,4 +1,4 @@
-import type { GetMemoValue } from '@fluentui-react-native/memo-cache';
+import type { GetMemoValue } from '@fluentui-react-native/framework-base';
 import type { IComponentSettings, IOverrideLookup } from '@uifabricshared/foundation-settings';
 import { mergeSettings, getActiveOverrides, resolveSettingsOverrides } from '@uifabricshared/foundation-settings';