From 953022eb38e458534b55ca5021d4b61fec7c78f7 Mon Sep 17 00:00:00 2001 From: Jason Morse Date: Wed, 26 Aug 2026 16:43:08 -0700 Subject: [PATCH 1/8] fix bad references in lockfile --- yarn.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/yarn.lock b/yarn.lock index 275b66753a..136dfcc408 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8341,7 +8341,7 @@ __metadata: "@react-native-windows/cli@npm:0.81.8": version: 0.81.8 - resolution: "@react-native-windows/cli@npm:0.81.8::__archiveUrl=https%3A%2F%2Fms-feed-25.pkgs.visualstudio.com%2F1es-public%2F_packaging%2Fnpm-public%2Fnpm%2Fregistry%2F%40react-native-windows%2Fcli%2F-%2Fcli-0.81.8.tgz" + resolution: "@react-native-windows/cli@npm:0.81.8" dependencies: "@react-native-windows/codegen": "npm:0.81.7" "@react-native-windows/find-dotnet-tools": "npm:0.0.0-canary.3" @@ -8373,7 +8373,7 @@ __metadata: "@react-native-windows/cli@patch:@react-native-windows/cli@npm%3A0.81.8#~/.yarn/patches/@react-native-windows-cli-npm-0.81.8-9ffb7042e8.patch": version: 0.81.8 - resolution: "@react-native-windows/cli@patch:@react-native-windows/cli@npm%3A0.81.8%3A%3A__archiveUrl=https%253A%252F%252Fms-feed-25.pkgs.visualstudio.com%252F1es-public%252F_packaging%252Fnpm-public%252Fnpm%252Fregistry%252F%2540react-native-windows%252Fcli%252F-%252Fcli-0.81.8.tgz#~/.yarn/patches/@react-native-windows-cli-npm-0.81.8-9ffb7042e8.patch::version=0.81.8&hash=c0543d" + resolution: "@react-native-windows/cli@patch:@react-native-windows/cli@npm%3A0.81.8#~/.yarn/patches/@react-native-windows-cli-npm-0.81.8-9ffb7042e8.patch::version=0.81.8&hash=c0543d" dependencies: "@react-native-windows/codegen": "npm:0.81.7" "@react-native-windows/find-dotnet-tools": "npm:0.0.0-canary.3" @@ -8405,7 +8405,7 @@ __metadata: "@react-native-windows/codegen@npm:0.81.7": version: 0.81.7 - resolution: "@react-native-windows/codegen@npm:0.81.7::__archiveUrl=https%3A%2F%2Fms-feed-12.pkgs.visualstudio.com%2F1es-public%2F_packaging%2Fnpm-public%2Fnpm%2Fregistry%2F%40react-native-windows%2Fcodegen%2F-%2Fcodegen-0.81.7.tgz" + resolution: "@react-native-windows/codegen@npm:0.81.7" dependencies: "@react-native-windows/fs": "npm:0.81.2" chalk: "npm:^4.1.0" @@ -8432,7 +8432,7 @@ __metadata: "@react-native-windows/find-dotnet-tools@npm:0.0.0-canary.3": version: 0.0.0-canary.3 - resolution: "@react-native-windows/find-dotnet-tools@npm:0.0.0-canary.3::__archiveUrl=https%3A%2F%2Fms-feed-12.pkgs.visualstudio.com%2F1es-public%2F_packaging%2Fnpm-public%2Fnpm%2Fregistry%2F%40react-native-windows%2Ffind-dotnet-tools%2F-%2Ffind-dotnet-tools-0.0.0-canary.3.tgz" + resolution: "@react-native-windows/find-dotnet-tools@npm:0.0.0-canary.3" dependencies: "@react-native-windows/fs": "npm:^0.81.2" checksum: 10c0/640cd7a5fc3e6c98c13956ff63e02bc729a70ef5caad88a724374551a51728eed723411badc313cef0b81c496e96ba448ea2dd9911b0240793119401d7353b7f @@ -8441,7 +8441,7 @@ __metadata: "@react-native-windows/find-repo-root@npm:0.81.2": version: 0.81.2 - resolution: "@react-native-windows/find-repo-root@npm:0.81.2::__archiveUrl=https%3A%2F%2Fms-feed-17.pkgs.visualstudio.com%2F1es-public%2F_packaging%2Fnpm-public%2Fnpm%2Fregistry%2F%40react-native-windows%2Ffind-repo-root%2F-%2Ffind-repo-root-0.81.2.tgz" + resolution: "@react-native-windows/find-repo-root@npm:0.81.2" dependencies: "@react-native-windows/fs": "npm:0.81.2" find-up: "npm:^4.1.0" @@ -8460,7 +8460,7 @@ __metadata: "@react-native-windows/fs@npm:0.81.2, @react-native-windows/fs@npm:^0.81.2": version: 0.81.2 - resolution: "@react-native-windows/fs@npm:0.81.2::__archiveUrl=https%3A%2F%2Fms-feed-25.pkgs.visualstudio.com%2F1es-public%2F_packaging%2Fnpm-public%2Fnpm%2Fregistry%2F%40react-native-windows%2Ffs%2F-%2Ffs-0.81.2.tgz" + resolution: "@react-native-windows/fs@npm:0.81.2" dependencies: graceful-fs: "npm:^4.2.8" checksum: 10c0/4377f6f34a94a0a5b81c42325501ea0907fb175c40e8a92b7c1d2220a19a6bd8fdbf515553d7a5d46fda73bec8e6c1c25c97a773bfbff93f7dc548fdc691b3c6 @@ -8479,7 +8479,7 @@ __metadata: "@react-native-windows/package-utils@npm:0.81.2": version: 0.81.2 - resolution: "@react-native-windows/package-utils@npm:0.81.2::__archiveUrl=https%3A%2F%2Fms-feed-17.pkgs.visualstudio.com%2F1es-public%2F_packaging%2Fnpm-public%2Fnpm%2Fregistry%2F%40react-native-windows%2Fpackage-utils%2F-%2Fpackage-utils-0.81.2.tgz" + resolution: "@react-native-windows/package-utils@npm:0.81.2" dependencies: "@react-native-windows/find-repo-root": "npm:0.81.2" "@react-native-windows/fs": "npm:0.81.2" @@ -8491,7 +8491,7 @@ __metadata: "@react-native-windows/telemetry@npm:0.81.4": version: 0.81.4 - resolution: "@react-native-windows/telemetry@npm:0.81.4::__archiveUrl=https%3A%2F%2Fms-feed-17.pkgs.visualstudio.com%2F1es-public%2F_packaging%2Fnpm-public%2Fnpm%2Fregistry%2F%40react-native-windows%2Ftelemetry%2F-%2Ftelemetry-0.81.4.tgz" + resolution: "@react-native-windows/telemetry@npm:0.81.4" dependencies: "@microsoft/1ds-core-js": "npm:^4.3.0" "@microsoft/1ds-post-js": "npm:^4.3.0" @@ -11590,7 +11590,7 @@ __metadata: "@xmldom/xmldom@npm:^0.8.13": version: 0.8.14 - resolution: "@xmldom/xmldom@npm:0.8.14::__archiveUrl=https%3A%2F%2Fms-feed-25.pkgs.visualstudio.com%2F1es-public%2F_packaging%2Fnpm-public%2Fnpm%2Fregistry%2F%40xmldom%2Fxmldom%2F-%2Fxmldom-0.8.14.tgz" + resolution: "@xmldom/xmldom@npm:0.8.14" checksum: 10c0/dde6f8ca418ff7436ff61063e7bb8c3773ed9d01f420bf1251a6c13a5d3b088ead7c9c66ca56343615a1f304fe4907db0a9b8ff55fc9319e215fa5ca198555c9 languageName: node linkType: hard @@ -22682,7 +22682,7 @@ __metadata: "react-native-windows@npm:^0.81.0": version: 0.81.34 - resolution: "react-native-windows@npm:0.81.34::__archiveUrl=https%3A%2F%2Fms-feed-25.pkgs.visualstudio.com%2F1es-public%2F_packaging%2Fnpm-public%2Fnpm%2Fregistry%2Freact-native-windows%2F-%2Freact-native-windows-0.81.34.tgz" + resolution: "react-native-windows@npm:0.81.34" dependencies: "@babel/runtime": "npm:^7.0.0" "@jest/create-cache-key-function": "npm:^29.7.0" From 5687852ea4ba0d4063aad1eef1d6d8a7d427510e Mon Sep 17 00:00:00 2001 From: Jason Morse Date: Wed, 26 Aug 2026 17:01:30 -0700 Subject: [PATCH 2/8] consolidate theming utils --- .changeset/tidy-themes-consolidate.md | 9 ++++ packages/agentic/design/SYMBOL_INVENTORY.md | 19 +++++++++ packages/agentic/design/package.json | 30 ++++++++++--- .../design/src/styling/stylesheet/index.ts | 2 + .../stylesheet}/themedStyleSheet.test.ts | 0 .../styling/stylesheet}/themedStyleSheet.ts | 0 .../src/styling/tokens}/border-tokens.ts | 2 +- .../src/styling/tokens}/color-tokens.ts | 2 +- .../design/src/styling/tokens/index.ts | 14 +++++++ .../src/styling/tokens}/layout-tokens.ts | 2 +- .../src/styling/tokens}/shadow-tokens.ts | 2 +- .../design/src/styling/tokens}/text-tokens.ts | 2 +- .../src/styling/tokens}/token.function.ts | 0 .../design/src/styling/tokens}/token.types.ts | 0 .../src/styling/tokens}/tokenBuilder.ts | 2 +- .../__snapshots__/theming-utils.test.ts.snap | 0 .../theming}/__tests__/theming-utils.test.ts | 0 packages/agentic/design/src/theming/index.ts | 2 + .../src/theming}/mapPipelineToShadow.ts | 2 +- .../theming}/mapPipelineToTheme.android.ts | 3 +- .../src/theming}/mapPipelineToTheme.ios.ts | 5 ++- .../design/src/theming}/mapPipelineToTheme.ts | 3 +- .../src/tokens/legacy}/getTokens.android.ts | 2 +- .../src/tokens/legacy}/getTokens.ios.ts | 2 +- .../design/src/tokens/legacy}/getTokens.ts | 2 +- .../legacy}/highContrast/tokens-alias.ts | 0 .../highContrast/tokens-alias.win32.ts | 0 .../agentic/design/src/tokens/legacy/index.ts | 2 + .../tokens/legacy}/tokens-global.android.ts | 0 .../src/tokens/legacy}/tokens-global.ios.ts | 0 .../src/tokens/legacy}/tokens-global.ts | 0 .../src/tokens/legacy}/tokens-global.win32.ts | 0 packages/agentic/design/tsconfig.json | 3 ++ .../framework/themed-stylesheet/README.md | 6 +++ .../framework/themed-stylesheet/package.json | 2 +- .../framework/themed-stylesheet/src/index.ts | 7 +++- .../framework/themed-stylesheet/tsconfig.json | 2 +- packages/theming/theme-tokens/README.md | 6 ++- packages/theming/theme-tokens/package.json | 7 +--- packages/theming/theme-tokens/src/index.ts | 6 ++- packages/theming/theming-utils/README.md | 7 ++++ packages/theming/theming-utils/package.json | 5 +-- packages/theming/theming-utils/src/index.ts | 14 +++++-- packages/theming/theming-utils/tsconfig.json | 3 -- packages/utils/tokens/README.md | 6 ++- packages/utils/tokens/package.json | 1 - packages/utils/tokens/src/index.ts | 42 ++++++++++++------- packages/utils/tokens/tsconfig.json | 3 -- yarn.lock | 13 ++---- 49 files changed, 171 insertions(+), 71 deletions(-) create mode 100644 .changeset/tidy-themes-consolidate.md create mode 100644 packages/agentic/design/SYMBOL_INVENTORY.md create mode 100644 packages/agentic/design/src/styling/stylesheet/index.ts rename packages/{framework/themed-stylesheet/src => agentic/design/src/styling/stylesheet}/themedStyleSheet.test.ts (100%) rename packages/{framework/themed-stylesheet/src => agentic/design/src/styling/stylesheet}/themedStyleSheet.ts (100%) rename packages/{utils/tokens/src => agentic/design/src/styling/tokens}/border-tokens.ts (91%) rename packages/{utils/tokens/src => agentic/design/src/styling/tokens}/color-tokens.ts (89%) create mode 100644 packages/agentic/design/src/styling/tokens/index.ts rename packages/{utils/tokens/src => agentic/design/src/styling/tokens}/layout-tokens.ts (94%) rename packages/{utils/tokens/src => agentic/design/src/styling/tokens}/shadow-tokens.ts (92%) rename packages/{utils/tokens/src => agentic/design/src/styling/tokens}/text-tokens.ts (97%) rename packages/{utils/tokens/src => agentic/design/src/styling/tokens}/token.function.ts (100%) rename packages/{utils/tokens/src => agentic/design/src/styling/tokens}/token.types.ts (100%) rename packages/{utils/tokens/src => agentic/design/src/styling/tokens}/tokenBuilder.ts (91%) rename packages/{theming/theming-utils/src => agentic/design/src/theming}/__tests__/__snapshots__/theming-utils.test.ts.snap (100%) rename packages/{theming/theming-utils/src => agentic/design/src/theming}/__tests__/theming-utils.test.ts (100%) rename packages/{theming/theming-utils/src => agentic/design/src/theming}/mapPipelineToShadow.ts (95%) rename packages/{theming/theming-utils/src => agentic/design/src/theming}/mapPipelineToTheme.android.ts (98%) rename packages/{theming/theming-utils/src => agentic/design/src/theming}/mapPipelineToTheme.ios.ts (97%) rename packages/{theming/theming-utils/src => agentic/design/src/theming}/mapPipelineToTheme.ts (98%) rename packages/{theming/theme-tokens/src => agentic/design/src/tokens/legacy}/getTokens.android.ts (93%) rename packages/{theming/theme-tokens/src => agentic/design/src/tokens/legacy}/getTokens.ios.ts (95%) rename packages/{theming/theme-tokens/src => agentic/design/src/tokens/legacy}/getTokens.ts (93%) rename packages/{theming/theme-tokens/src => agentic/design/src/tokens/legacy}/highContrast/tokens-alias.ts (100%) rename packages/{theming/theme-tokens/src => agentic/design/src/tokens/legacy}/highContrast/tokens-alias.win32.ts (100%) create mode 100644 packages/agentic/design/src/tokens/legacy/index.ts rename packages/{theming/theme-tokens/src => agentic/design/src/tokens/legacy}/tokens-global.android.ts (100%) rename packages/{theming/theme-tokens/src => agentic/design/src/tokens/legacy}/tokens-global.ios.ts (100%) rename packages/{theming/theme-tokens/src => agentic/design/src/tokens/legacy}/tokens-global.ts (100%) rename packages/{theming/theme-tokens/src => agentic/design/src/tokens/legacy}/tokens-global.win32.ts (100%) create mode 100644 packages/theming/theming-utils/README.md diff --git a/.changeset/tidy-themes-consolidate.md b/.changeset/tidy-themes-consolidate.md new file mode 100644 index 0000000000..ca178b47e5 --- /dev/null +++ b/.changeset/tidy-themes-consolidate.md @@ -0,0 +1,9 @@ +--- +"@fluentui-react-native/design": patch +"@fluentui-react-native/theme-tokens": patch +"@fluentui-react-native/themed-stylesheet": patch +"@fluentui-react-native/theming-utils": patch +"@fluentui-react-native/tokens": patch +--- + +Consolidate legacy theming and styling implementations into design submodules and deprecate their former packages as compatibility shims. diff --git a/packages/agentic/design/SYMBOL_INVENTORY.md b/packages/agentic/design/SYMBOL_INVENTORY.md new file mode 100644 index 0000000000..b31bac0f02 --- /dev/null +++ b/packages/agentic/design/SYMBOL_INVENTORY.md @@ -0,0 +1,19 @@ +# Theming and styling symbol inventory + +`@fluentui-react-native/design` is the definition site for the symbols below. +The legacy packages listed here are compatibility entry points and contain only +explicit named re-exports. + +| Legacy package | Exported symbols | Owning design entry point | Definition | +| ------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -------------------------------------------------- | ------------------------------------------------------------------------------------------------------------ | +| `@fluentui-react-native/theme` | `ThemeProvider`, `ThemeProviderProps`, `ThemeReference`, `OnThemeChange`, `ThemeRecipe`, `ThemeTransform` | `@fluentui-react-native/design/theming` | `src/theming/ThemeProvider.tsx`, `src/theming/themeReference.ts` | +| `@fluentui-react-native/theme-types` | `AliasColorTokens`, `AppearanceOptions`, `BaseShadowAliasTokens`, `Color`, `FabricWebPalette`, `FontDynamicTypeRamp`, `FontFamilies`, `FontFamily`, `FontFamilyValue`, `FontSize`, `FontSizeValuePoints`, `FontSizes`, `FontWeight`, `FontWeightValue`, `FontWeights`, `OfficePalette`, `Palette`, `PaletteBackgroundColors`, `PaletteTextColors`, `PartialPalette`, `PartialShadowDefinition`, `PartialTheme`, `PartialTypography`, `ShadowToken`, `ShadowValue`, `Spacing`, `TextStyling`, `Theme`, `ThemeColorDefinition`, `ThemeContext`, `ThemeOptions`, `ThemeShadowDefinition`, `Typography`, `Variant`, `VariantValue`, `Variants`, `useTheme` | `@fluentui-react-native/design/theming` | `src/theming/context.ts`, `src/theming/types/` | +| `@fluentui-react-native/theming-utils` | `getCurrentAppearance`, `isHighContrast`, `mapFontPipelineToTheme`, `mapPipelineToShadow`, `mapPipelineToTheme`, `setIsHighContrast` | `@fluentui-react-native/design/theming` | `src/theming/platformUtils.*.ts`, `src/theming/mapPipelineToShadow.ts`, `src/theming/mapPipelineToTheme*.ts` | +| `@fluentui-react-native/theme-tokens` | `getAliasTokens`, `getShadowTokens`, `globalTokens` | `@fluentui-react-native/design/tokens/legacy` | `src/tokens/legacy/` | +| `@fluentui-react-native/tokens` | `backgroundColorTokens`, `borderStyles`, `borderTokens`, `colorTokens`, `fontStyles`, `foregroundColorTokens`, `getPaletteFromTheme`, `layoutStyles`, `layoutTokens`, `shadowStyles`, `shadowTokens`, `styleFunction`, `textTokens`, `tokenBuilder`, `FontDecorationTokens`, `FontStyleTokens`, `FontTokens`, `FontVariantTokens`, `IBackgroundColorTokens`, `IBorderTokens`, `IColorTokens`, `IForegroundColorTokens`, `IShadowTokens`, `LayoutTokens`, `LookupThemePart`, `OperationSet`, `StyleFactoryFunction`, `StyleFactoryFunctionRaw`, `StyleFactoryOperation`, `TokenBuilder` | `@fluentui-react-native/design/styling/tokens` | `src/styling/tokens/` | +| `@fluentui-react-native/themed-stylesheet` | `NamedStyles`, `themedStyleSheet` | `@fluentui-react-native/design/styling/stylesheet` | `src/styling/stylesheet/themedStyleSheet.ts` | + +The three optional entry points (`tokens/legacy`, `styling/tokens`, and +`styling/stylesheet`) are intentionally absent from the design root barrel. +This keeps legacy token data and styling infrastructure out of consumers that +only use the current design APIs. diff --git a/packages/agentic/design/package.json b/packages/agentic/design/package.json index ef810c9f1f..2f57a332f9 100644 --- a/packages/agentic/design/package.json +++ b/packages/agentic/design/package.json @@ -26,6 +26,12 @@ "import": "./lib/tokens/global.generated.js", "default": "./src/tokens/global.generated.ts" }, + "./tokens/legacy": { + "types": "./lib/tokens/legacy/index.d.ts", + "react-native": "./src/tokens/legacy/index.ts", + "import": "./lib/tokens/legacy/index.js", + "default": "./src/tokens/legacy/index.ts" + }, "./theming": { "types": "./lib/theming/index.d.ts", "react-native": "./src/theming/index.ts", @@ -44,6 +50,18 @@ "import": "./lib/styling/index.js", "default": "./src/styling/index.ts" }, + "./styling/stylesheet": { + "types": "./lib/styling/stylesheet/index.d.ts", + "react-native": "./src/styling/stylesheet/index.ts", + "import": "./lib/styling/stylesheet/index.js", + "default": "./src/styling/stylesheet/index.ts" + }, + "./styling/tokens": { + "types": "./lib/styling/tokens/index.d.ts", + "react-native": "./src/styling/tokens/index.ts", + "import": "./lib/styling/tokens/index.js", + "default": "./src/styling/tokens/index.ts" + }, "./package.json": "./package.json" }, "scripts": { @@ -56,15 +74,17 @@ "update-snapshots": "fluentui-scripts jest -u" }, "dependencies": { - "@fluentui-react-native/framework-base": "workspace:*" - }, - "devDependencies": { - "@babel/core": "catalog:", + "@fluentui-react-native/adapters": "workspace:*", "@fluentui-react-native/design-tokens-android": "catalog:", "@fluentui-react-native/design-tokens-ios": "catalog:", - "@fluentui-react-native/design-tokens-macos": "catalog:", "@fluentui-react-native/design-tokens-win32": "catalog:", "@fluentui-react-native/design-tokens-windows": "catalog:", + "@fluentui-react-native/framework-base": "workspace:*", + "assert-never": "^1.2.1" + }, + "devDependencies": { + "@babel/core": "catalog:", + "@fluentui-react-native/design-tokens-macos": "catalog:", "@fluentui-react-native/scripts": "workspace:*", "@office-iss/react-native-win32": "^0.81.0", "@react-native-community/cli": "^20.0.0", diff --git a/packages/agentic/design/src/styling/stylesheet/index.ts b/packages/agentic/design/src/styling/stylesheet/index.ts new file mode 100644 index 0000000000..d2c85bd61a --- /dev/null +++ b/packages/agentic/design/src/styling/stylesheet/index.ts @@ -0,0 +1,2 @@ +export { themedStyleSheet } from './themedStyleSheet'; +export type { NamedStyles } from './themedStyleSheet'; diff --git a/packages/framework/themed-stylesheet/src/themedStyleSheet.test.ts b/packages/agentic/design/src/styling/stylesheet/themedStyleSheet.test.ts similarity index 100% rename from packages/framework/themed-stylesheet/src/themedStyleSheet.test.ts rename to packages/agentic/design/src/styling/stylesheet/themedStyleSheet.test.ts diff --git a/packages/framework/themed-stylesheet/src/themedStyleSheet.ts b/packages/agentic/design/src/styling/stylesheet/themedStyleSheet.ts similarity index 100% rename from packages/framework/themed-stylesheet/src/themedStyleSheet.ts rename to packages/agentic/design/src/styling/stylesheet/themedStyleSheet.ts diff --git a/packages/utils/tokens/src/border-tokens.ts b/packages/agentic/design/src/styling/tokens/border-tokens.ts similarity index 91% rename from packages/utils/tokens/src/border-tokens.ts rename to packages/agentic/design/src/styling/tokens/border-tokens.ts index 25cc67a548..cd25b4084b 100644 --- a/packages/utils/tokens/src/border-tokens.ts +++ b/packages/agentic/design/src/styling/tokens/border-tokens.ts @@ -1,6 +1,6 @@ import type { ViewStyle, ColorValue, AnimatableNumericValue } from 'react-native'; -import type { Theme } from '@fluentui-react-native/design/theming'; +import type { Theme } from '../../theming'; import { getPaletteFromTheme } from './color-tokens'; import type { OperationSet } from './token.types'; diff --git a/packages/utils/tokens/src/color-tokens.ts b/packages/agentic/design/src/styling/tokens/color-tokens.ts similarity index 89% rename from packages/utils/tokens/src/color-tokens.ts rename to packages/agentic/design/src/styling/tokens/color-tokens.ts index 4a1523b38b..2905961adc 100644 --- a/packages/utils/tokens/src/color-tokens.ts +++ b/packages/agentic/design/src/styling/tokens/color-tokens.ts @@ -1,6 +1,6 @@ import type { ColorValue } from 'react-native'; -import type { Theme, ThemeColorDefinition } from '@fluentui-react-native/design/theming'; +import type { Theme, ThemeColorDefinition } from '../../theming'; import type { OperationSet } from './token.types'; diff --git a/packages/agentic/design/src/styling/tokens/index.ts b/packages/agentic/design/src/styling/tokens/index.ts new file mode 100644 index 0000000000..2d6895ac36 --- /dev/null +++ b/packages/agentic/design/src/styling/tokens/index.ts @@ -0,0 +1,14 @@ +export { borderStyles, borderTokens } from './border-tokens'; +export type { IBorderTokens } from './border-tokens'; +export { backgroundColorTokens, colorTokens, foregroundColorTokens, getPaletteFromTheme } from './color-tokens'; +export type { IBackgroundColorTokens, IColorTokens, IForegroundColorTokens } from './color-tokens'; +export { fontStyles, textTokens } from './text-tokens'; +export type { FontDecorationTokens, FontStyleTokens, FontTokens, FontVariantTokens } from './text-tokens'; +export { layoutStyles, layoutTokens } from './layout-tokens'; +export type { LayoutTokens } from './layout-tokens'; +export { shadowStyles, shadowTokens } from './shadow-tokens'; +export type { IShadowTokens } from './shadow-tokens'; +export { tokenBuilder } from './tokenBuilder'; +export type { TokenBuilder } from './tokenBuilder'; +export type { LookupThemePart, OperationSet, StyleFactoryOperation, StyleFactoryFunction, StyleFactoryFunctionRaw } from './token.types'; +export { styleFunction } from './token.function'; diff --git a/packages/utils/tokens/src/layout-tokens.ts b/packages/agentic/design/src/styling/tokens/layout-tokens.ts similarity index 94% rename from packages/utils/tokens/src/layout-tokens.ts rename to packages/agentic/design/src/styling/tokens/layout-tokens.ts index aae02e4c1f..675818d475 100644 --- a/packages/utils/tokens/src/layout-tokens.ts +++ b/packages/agentic/design/src/styling/tokens/layout-tokens.ts @@ -1,6 +1,6 @@ import type { ViewStyle } from 'react-native'; -import type { Theme } from '@fluentui-react-native/design/theming'; +import type { Theme } from '../../theming'; import type { OperationSet } from './token.types'; import { tokenBuilder } from './tokenBuilder'; diff --git a/packages/utils/tokens/src/shadow-tokens.ts b/packages/agentic/design/src/styling/tokens/shadow-tokens.ts similarity index 92% rename from packages/utils/tokens/src/shadow-tokens.ts rename to packages/agentic/design/src/styling/tokens/shadow-tokens.ts index ce10149eab..3aa84aaefb 100644 --- a/packages/utils/tokens/src/shadow-tokens.ts +++ b/packages/agentic/design/src/styling/tokens/shadow-tokens.ts @@ -1,6 +1,6 @@ import type { AnimatableNumericValue, ColorValue, ViewStyle } from 'react-native'; -import type { Theme } from '@fluentui-react-native/design/theming'; +import type { Theme } from '../../theming'; import type { OperationSet } from './token.types'; import { tokenBuilder } from './tokenBuilder'; diff --git a/packages/utils/tokens/src/text-tokens.ts b/packages/agentic/design/src/styling/tokens/text-tokens.ts similarity index 97% rename from packages/utils/tokens/src/text-tokens.ts rename to packages/agentic/design/src/styling/tokens/text-tokens.ts index 62e371df57..2715856f39 100644 --- a/packages/utils/tokens/src/text-tokens.ts +++ b/packages/agentic/design/src/styling/tokens/text-tokens.ts @@ -1,7 +1,7 @@ import type { TextProps, TextStyle } from 'react-native'; import type { ITextProps, ITextStyle } from '@fluentui-react-native/adapters'; -import type { Theme, Typography } from '@fluentui-react-native/design/theming'; +import type { Theme, Typography } from '../../theming'; import { styleFunction } from './token.function'; import type { TokenBuilder } from './tokenBuilder'; diff --git a/packages/utils/tokens/src/token.function.ts b/packages/agentic/design/src/styling/tokens/token.function.ts similarity index 100% rename from packages/utils/tokens/src/token.function.ts rename to packages/agentic/design/src/styling/tokens/token.function.ts diff --git a/packages/utils/tokens/src/token.types.ts b/packages/agentic/design/src/styling/tokens/token.types.ts similarity index 100% rename from packages/utils/tokens/src/token.types.ts rename to packages/agentic/design/src/styling/tokens/token.types.ts diff --git a/packages/utils/tokens/src/tokenBuilder.ts b/packages/agentic/design/src/styling/tokens/tokenBuilder.ts similarity index 91% rename from packages/utils/tokens/src/tokenBuilder.ts rename to packages/agentic/design/src/styling/tokens/tokenBuilder.ts index acd918563f..6f0f304255 100644 --- a/packages/utils/tokens/src/tokenBuilder.ts +++ b/packages/agentic/design/src/styling/tokens/tokenBuilder.ts @@ -1,6 +1,6 @@ import type { ViewStyle, TextStyle, ImageStyle } from 'react-native'; -import type { Theme } from '@fluentui-react-native/design/theming'; +import type { Theme } from '../../theming'; export type TokenBuilder = { from: (tokens: TTokens, theme: Theme) => TStyle; diff --git a/packages/theming/theming-utils/src/__tests__/__snapshots__/theming-utils.test.ts.snap b/packages/agentic/design/src/theming/__tests__/__snapshots__/theming-utils.test.ts.snap similarity index 100% rename from packages/theming/theming-utils/src/__tests__/__snapshots__/theming-utils.test.ts.snap rename to packages/agentic/design/src/theming/__tests__/__snapshots__/theming-utils.test.ts.snap diff --git a/packages/theming/theming-utils/src/__tests__/theming-utils.test.ts b/packages/agentic/design/src/theming/__tests__/theming-utils.test.ts similarity index 100% rename from packages/theming/theming-utils/src/__tests__/theming-utils.test.ts rename to packages/agentic/design/src/theming/__tests__/theming-utils.test.ts diff --git a/packages/agentic/design/src/theming/index.ts b/packages/agentic/design/src/theming/index.ts index 2cebc8dc4a..a4f66b56b0 100644 --- a/packages/agentic/design/src/theming/index.ts +++ b/packages/agentic/design/src/theming/index.ts @@ -35,3 +35,5 @@ export type { ThemeProviderProps } from './ThemeProvider'; export { ThemeReference } from './themeReference'; export type { OnThemeChange, ThemeRecipe, ThemeTransform } from './themeReference'; export { getCurrentAppearance, isHighContrast, setIsHighContrast } from './platformUtils'; +export { mapFontPipelineToTheme, mapPipelineToTheme } from './mapPipelineToTheme'; +export { mapPipelineToShadow } from './mapPipelineToShadow'; diff --git a/packages/theming/theming-utils/src/mapPipelineToShadow.ts b/packages/agentic/design/src/theming/mapPipelineToShadow.ts similarity index 95% rename from packages/theming/theming-utils/src/mapPipelineToShadow.ts rename to packages/agentic/design/src/theming/mapPipelineToShadow.ts index 4f0d5fd5a4..fcde469cfa 100644 --- a/packages/theming/theming-utils/src/mapPipelineToShadow.ts +++ b/packages/agentic/design/src/theming/mapPipelineToShadow.ts @@ -1,4 +1,4 @@ -import type { ThemeShadowDefinition } from '@fluentui-react-native/design/theming'; +import type { ThemeShadowDefinition } from './types/Shadow.types'; /** * Given design token pipeline output for shadow tokens, creates an object that can be used in Theme object. diff --git a/packages/theming/theming-utils/src/mapPipelineToTheme.android.ts b/packages/agentic/design/src/theming/mapPipelineToTheme.android.ts similarity index 98% rename from packages/theming/theming-utils/src/mapPipelineToTheme.android.ts rename to packages/agentic/design/src/theming/mapPipelineToTheme.android.ts index f4b9acb40f..1fc2744f00 100644 --- a/packages/theming/theming-utils/src/mapPipelineToTheme.android.ts +++ b/packages/agentic/design/src/theming/mapPipelineToTheme.android.ts @@ -1,4 +1,5 @@ -import type { AliasColorTokens, Variants, VariantValue } from '@fluentui-react-native/design/theming'; +import type { AliasColorTokens } from './types/Color.types'; +import type { Variants, VariantValue } from './types/Typography.types'; // API that maps tokens coming from the android token pipeline to Theme color values. export function mapPipelineToTheme(pipelineOutput: any): AliasColorTokens { diff --git a/packages/theming/theming-utils/src/mapPipelineToTheme.ios.ts b/packages/agentic/design/src/theming/mapPipelineToTheme.ios.ts similarity index 97% rename from packages/theming/theming-utils/src/mapPipelineToTheme.ios.ts rename to packages/agentic/design/src/theming/mapPipelineToTheme.ios.ts index 06fe1e68a3..960624f783 100644 --- a/packages/theming/theming-utils/src/mapPipelineToTheme.ios.ts +++ b/packages/agentic/design/src/theming/mapPipelineToTheme.ios.ts @@ -1,5 +1,6 @@ -import type { AliasColorTokens, FontDynamicTypeRamp, Variants, VariantValue } from '@fluentui-react-native/design/theming'; -import type { FontStyleTokens } from '@fluentui-react-native/tokens'; +import type { FontStyleTokens } from '../styling/tokens'; +import type { AliasColorTokens } from './types/Color.types'; +import type { FontDynamicTypeRamp, Variants, VariantValue } from './types/Typography.types'; // API that maps tokens coming from the iOS token pipeline to Theme color values. export function mapPipelineToTheme(pipelineOutput: any): AliasColorTokens { diff --git a/packages/theming/theming-utils/src/mapPipelineToTheme.ts b/packages/agentic/design/src/theming/mapPipelineToTheme.ts similarity index 98% rename from packages/theming/theming-utils/src/mapPipelineToTheme.ts rename to packages/agentic/design/src/theming/mapPipelineToTheme.ts index 037050e134..2d948624d6 100644 --- a/packages/theming/theming-utils/src/mapPipelineToTheme.ts +++ b/packages/agentic/design/src/theming/mapPipelineToTheme.ts @@ -1,4 +1,5 @@ -import type { AliasColorTokens, Variants } from '@fluentui-react-native/design/theming'; +import type { AliasColorTokens } from './types/Color.types'; +import type { Variants } from './types/Typography.types'; export function mapPipelineToTheme(pipelineOutput: any): AliasColorTokens { return { diff --git a/packages/theming/theme-tokens/src/getTokens.android.ts b/packages/agentic/design/src/tokens/legacy/getTokens.android.ts similarity index 93% rename from packages/theming/theme-tokens/src/getTokens.android.ts rename to packages/agentic/design/src/tokens/legacy/getTokens.android.ts index a1a7548606..cc8275e33b 100644 --- a/packages/theming/theme-tokens/src/getTokens.android.ts +++ b/packages/agentic/design/src/tokens/legacy/getTokens.android.ts @@ -2,7 +2,7 @@ import darkAliasTokens from '@fluentui-react-native/design-tokens-android/dark/t import darkShadowTokens from '@fluentui-react-native/design-tokens-android/dark/tokens-shadow.json'; import lightAliasTokens from '@fluentui-react-native/design-tokens-android/light/tokens-aliases.json'; import lightShadowTokens from '@fluentui-react-native/design-tokens-android/light/tokens-shadow.json'; -import type { AppearanceOptions } from '@fluentui-react-native/design/theming'; +import type { AppearanceOptions } from '../../theming'; export function getAliasTokens(mode: AppearanceOptions) { if (mode === 'light') { diff --git a/packages/theming/theme-tokens/src/getTokens.ios.ts b/packages/agentic/design/src/tokens/legacy/getTokens.ios.ts similarity index 95% rename from packages/theming/theme-tokens/src/getTokens.ios.ts rename to packages/agentic/design/src/tokens/legacy/getTokens.ios.ts index d254201df2..1103fd1a05 100644 --- a/packages/theming/theme-tokens/src/getTokens.ios.ts +++ b/packages/agentic/design/src/tokens/legacy/getTokens.ios.ts @@ -3,7 +3,7 @@ import iOSDarkShadowTokens from '@fluentui-react-native/design-tokens-ios/dark/t import iOSDarkElevatedAliasTokens from '@fluentui-react-native/design-tokens-ios/elevateddark/tokens-aliases.json'; import iOSLightAliasTokens from '@fluentui-react-native/design-tokens-ios/light/tokens-aliases.json'; import iOSLightShadowTokens from '@fluentui-react-native/design-tokens-ios/light/tokens-shadow.json'; -import type { AppearanceOptions } from '@fluentui-react-native/design/theming'; +import type { AppearanceOptions } from '../../theming'; import { assertNever } from 'assert-never'; export function getAliasTokens(mode: AppearanceOptions) { diff --git a/packages/theming/theme-tokens/src/getTokens.ts b/packages/agentic/design/src/tokens/legacy/getTokens.ts similarity index 93% rename from packages/theming/theme-tokens/src/getTokens.ts rename to packages/agentic/design/src/tokens/legacy/getTokens.ts index f490f2782f..86cf9063ed 100644 --- a/packages/theming/theme-tokens/src/getTokens.ts +++ b/packages/agentic/design/src/tokens/legacy/getTokens.ts @@ -3,7 +3,7 @@ import darkAliasTokens from '@fluentui-react-native/design-tokens-windows/dark/t import darkShadowTokens from '@fluentui-react-native/design-tokens-windows/dark/tokens-shadow.json'; import lightAliasTokens from '@fluentui-react-native/design-tokens-windows/light/tokens-aliases.json'; import lightShadowTokens from '@fluentui-react-native/design-tokens-windows/light/tokens-shadow.json'; -import type { AppearanceOptions } from '@fluentui-react-native/design/theming'; +import type { AppearanceOptions } from '../../theming'; import { assertNever } from 'assert-never'; import { hcAliasTokens } from './highContrast/tokens-alias'; diff --git a/packages/theming/theme-tokens/src/highContrast/tokens-alias.ts b/packages/agentic/design/src/tokens/legacy/highContrast/tokens-alias.ts similarity index 100% rename from packages/theming/theme-tokens/src/highContrast/tokens-alias.ts rename to packages/agentic/design/src/tokens/legacy/highContrast/tokens-alias.ts diff --git a/packages/theming/theme-tokens/src/highContrast/tokens-alias.win32.ts b/packages/agentic/design/src/tokens/legacy/highContrast/tokens-alias.win32.ts similarity index 100% rename from packages/theming/theme-tokens/src/highContrast/tokens-alias.win32.ts rename to packages/agentic/design/src/tokens/legacy/highContrast/tokens-alias.win32.ts diff --git a/packages/agentic/design/src/tokens/legacy/index.ts b/packages/agentic/design/src/tokens/legacy/index.ts new file mode 100644 index 0000000000..2832ce3c03 --- /dev/null +++ b/packages/agentic/design/src/tokens/legacy/index.ts @@ -0,0 +1,2 @@ +export { default as globalTokens } from './tokens-global'; +export { getAliasTokens, getShadowTokens } from './getTokens'; diff --git a/packages/theming/theme-tokens/src/tokens-global.android.ts b/packages/agentic/design/src/tokens/legacy/tokens-global.android.ts similarity index 100% rename from packages/theming/theme-tokens/src/tokens-global.android.ts rename to packages/agentic/design/src/tokens/legacy/tokens-global.android.ts diff --git a/packages/theming/theme-tokens/src/tokens-global.ios.ts b/packages/agentic/design/src/tokens/legacy/tokens-global.ios.ts similarity index 100% rename from packages/theming/theme-tokens/src/tokens-global.ios.ts rename to packages/agentic/design/src/tokens/legacy/tokens-global.ios.ts diff --git a/packages/theming/theme-tokens/src/tokens-global.ts b/packages/agentic/design/src/tokens/legacy/tokens-global.ts similarity index 100% rename from packages/theming/theme-tokens/src/tokens-global.ts rename to packages/agentic/design/src/tokens/legacy/tokens-global.ts diff --git a/packages/theming/theme-tokens/src/tokens-global.win32.ts b/packages/agentic/design/src/tokens/legacy/tokens-global.win32.ts similarity index 100% rename from packages/theming/theme-tokens/src/tokens-global.win32.ts rename to packages/agentic/design/src/tokens/legacy/tokens-global.win32.ts diff --git a/packages/agentic/design/tsconfig.json b/packages/agentic/design/tsconfig.json index db54025b4d..a6ffa4b7c7 100644 --- a/packages/agentic/design/tsconfig.json +++ b/packages/agentic/design/tsconfig.json @@ -10,6 +10,9 @@ "include": ["src", "src/**/*.json"], "exclude": ["**/*.stories.ts", "**/*.stories.tsx"], "references": [ + { + "path": "../../utils/adapters/tsconfig.json" + }, { "path": "../../framework-base/tsconfig.json" }, diff --git a/packages/framework/themed-stylesheet/README.md b/packages/framework/themed-stylesheet/README.md index 2278b1241b..0fc167d3dd 100644 --- a/packages/framework/themed-stylesheet/README.md +++ b/packages/framework/themed-stylesheet/README.md @@ -1,5 +1,11 @@ # Themed StyleSheet +> **Deprecated:** Import `themedStyleSheet` and `NamedStyles` from +> `@fluentui-react-native/design/styling/stylesheet` instead. + +This package is a compatibility shim and will not receive new APIs. It preserves +the existing entry point while consumers migrate to the design package. + A convenience wrapper to create style sheets which depend upon values in a theme, and use them in a manner where they are built and cached once per theme. This doesn't have a huge amount of code, it is mainly about standardizing the usage patterns. diff --git a/packages/framework/themed-stylesheet/package.json b/packages/framework/themed-stylesheet/package.json index 5eb3758639..0386e2c62e 100644 --- a/packages/framework/themed-stylesheet/package.json +++ b/packages/framework/themed-stylesheet/package.json @@ -33,7 +33,7 @@ "update-snapshots": "fluentui-scripts jest -u" }, "dependencies": { - "@fluentui-react-native/framework-base": "workspace:*" + "@fluentui-react-native/design": "workspace:*" }, "devDependencies": { "@babel/core": "catalog:", diff --git a/packages/framework/themed-stylesheet/src/index.ts b/packages/framework/themed-stylesheet/src/index.ts index d2c85bd61a..db5e540d7e 100644 --- a/packages/framework/themed-stylesheet/src/index.ts +++ b/packages/framework/themed-stylesheet/src/index.ts @@ -1,2 +1,5 @@ -export { themedStyleSheet } from './themedStyleSheet'; -export type { NamedStyles } from './themedStyleSheet'; +// This package is a compatibility shim. The legacy themed StyleSheet helper now +// lives in the `@fluentui-react-native/design/styling/stylesheet` submodule. +// These explicit re-exports preserve the existing package entry point. +export { themedStyleSheet } from '@fluentui-react-native/design/styling/stylesheet'; +export type { NamedStyles } from '@fluentui-react-native/design/styling/stylesheet'; diff --git a/packages/framework/themed-stylesheet/tsconfig.json b/packages/framework/themed-stylesheet/tsconfig.json index 256f00585b..b33d13464a 100644 --- a/packages/framework/themed-stylesheet/tsconfig.json +++ b/packages/framework/themed-stylesheet/tsconfig.json @@ -9,7 +9,7 @@ "include": ["src"], "references": [ { - "path": "../../framework-base/tsconfig.json" + "path": "../../agentic/design/tsconfig.json" }, { "path": "../../../scripts/tsconfig.json" diff --git a/packages/theming/theme-tokens/README.md b/packages/theming/theme-tokens/README.md index 414ec6137f..a84ebbb491 100644 --- a/packages/theming/theme-tokens/README.md +++ b/packages/theming/theme-tokens/README.md @@ -1,3 +1,7 @@ # Theme-tokens -Defines values for tokens used to fill out themes, such as color, typography, and spacing values. +> **Deprecated:** Import `globalTokens`, `getAliasTokens`, and `getShadowTokens` +> from `@fluentui-react-native/design/tokens/legacy` instead. + +This package is a compatibility shim and will not receive new APIs. It preserves +the existing entry point while consumers migrate to the design package. diff --git a/packages/theming/theme-tokens/package.json b/packages/theming/theme-tokens/package.json index 45a94138bb..7659843b24 100644 --- a/packages/theming/theme-tokens/package.json +++ b/packages/theming/theme-tokens/package.json @@ -33,12 +33,7 @@ "update-snapshots": "fluentui-scripts jest -u" }, "dependencies": { - "@fluentui-react-native/design": "workspace:*", - "@fluentui-react-native/design-tokens-android": "catalog:", - "@fluentui-react-native/design-tokens-ios": "catalog:", - "@fluentui-react-native/design-tokens-win32": "catalog:", - "@fluentui-react-native/design-tokens-windows": "catalog:", - "assert-never": "^1.2.1" + "@fluentui-react-native/design": "workspace:*" }, "devDependencies": { "@babel/core": "catalog:", diff --git a/packages/theming/theme-tokens/src/index.ts b/packages/theming/theme-tokens/src/index.ts index 2832ce3c03..7547d35e1d 100644 --- a/packages/theming/theme-tokens/src/index.ts +++ b/packages/theming/theme-tokens/src/index.ts @@ -1,2 +1,4 @@ -export { default as globalTokens } from './tokens-global'; -export { getAliasTokens, getShadowTokens } from './getTokens'; +// This package is a compatibility shim. Legacy Fluent token values now live in +// the `@fluentui-react-native/design/tokens/legacy` submodule. These explicit +// re-exports preserve the existing `@fluentui-react-native/theme-tokens` entry point. +export { getAliasTokens, getShadowTokens, globalTokens } from '@fluentui-react-native/design/tokens/legacy'; diff --git a/packages/theming/theming-utils/README.md b/packages/theming/theming-utils/README.md new file mode 100644 index 0000000000..82c4b8e8a7 --- /dev/null +++ b/packages/theming/theming-utils/README.md @@ -0,0 +1,7 @@ +# Theming Utils + +> **Deprecated:** Import appearance and token-pipeline helpers from +> `@fluentui-react-native/design/theming` instead. + +This package is a compatibility shim and will not receive new APIs. It preserves +the existing entry point while consumers migrate to the design package. diff --git a/packages/theming/theming-utils/package.json b/packages/theming/theming-utils/package.json index f088dfa583..2750fa2bbf 100644 --- a/packages/theming/theming-utils/package.json +++ b/packages/theming/theming-utils/package.json @@ -30,13 +30,10 @@ "update-snapshots": "fluentui-scripts jest -u" }, "dependencies": { - "@fluentui-react-native/design": "workspace:*", - "@fluentui-react-native/tokens": "workspace:*" + "@fluentui-react-native/design": "workspace:*" }, "devDependencies": { "@babel/core": "catalog:", - "@fluentui-react-native/design-tokens-win32": "catalog:", - "@fluentui-react-native/design-tokens-windows": "catalog:", "@fluentui-react-native/scripts": "workspace:*", "@react-native-community/cli": "^20.0.0", "@react-native-community/cli-platform-android": "^20.0.0", diff --git a/packages/theming/theming-utils/src/index.ts b/packages/theming/theming-utils/src/index.ts index 95419129d8..077e7f4220 100644 --- a/packages/theming/theming-utils/src/index.ts +++ b/packages/theming/theming-utils/src/index.ts @@ -1,3 +1,11 @@ -export { getCurrentAppearance, isHighContrast, setIsHighContrast } from '@fluentui-react-native/design/theming'; -export { mapPipelineToTheme, mapFontPipelineToTheme } from './mapPipelineToTheme'; -export { mapPipelineToShadow } from './mapPipelineToShadow'; +// This package is a compatibility shim. Theme appearance and token-pipeline +// utilities now live in the `@fluentui-react-native/design/theming` submodule. +// These explicit re-exports preserve the existing package entry point. +export { + getCurrentAppearance, + isHighContrast, + mapFontPipelineToTheme, + mapPipelineToShadow, + mapPipelineToTheme, + setIsHighContrast, +} from '@fluentui-react-native/design/theming'; diff --git a/packages/theming/theming-utils/tsconfig.json b/packages/theming/theming-utils/tsconfig.json index 1427434b9b..b33d13464a 100644 --- a/packages/theming/theming-utils/tsconfig.json +++ b/packages/theming/theming-utils/tsconfig.json @@ -13,9 +13,6 @@ }, { "path": "../../../scripts/tsconfig.json" - }, - { - "path": "../../utils/tokens/tsconfig.json" } ] } diff --git a/packages/utils/tokens/README.md b/packages/utils/tokens/README.md index 76b89a8ac4..80446b6d2a 100644 --- a/packages/utils/tokens/README.md +++ b/packages/utils/tokens/README.md @@ -1,3 +1,7 @@ # Tokens -This package contains functions that help resolve common tokens against a given theme to the final component settings. +> **Deprecated:** Import these token-to-style helpers from +> `@fluentui-react-native/design/styling/tokens` instead. + +This package is a compatibility shim and will not receive new APIs. It preserves +the existing entry point while consumers migrate to the design package. diff --git a/packages/utils/tokens/package.json b/packages/utils/tokens/package.json index 66d659ea9e..f5f4084154 100644 --- a/packages/utils/tokens/package.json +++ b/packages/utils/tokens/package.json @@ -30,7 +30,6 @@ "update-snapshots": "fluentui-scripts jest -u" }, "dependencies": { - "@fluentui-react-native/adapters": "workspace:*", "@fluentui-react-native/design": "workspace:*" }, "devDependencies": { diff --git a/packages/utils/tokens/src/index.ts b/packages/utils/tokens/src/index.ts index 2d6895ac36..7525a49a86 100644 --- a/packages/utils/tokens/src/index.ts +++ b/packages/utils/tokens/src/index.ts @@ -1,14 +1,28 @@ -export { borderStyles, borderTokens } from './border-tokens'; -export type { IBorderTokens } from './border-tokens'; -export { backgroundColorTokens, colorTokens, foregroundColorTokens, getPaletteFromTheme } from './color-tokens'; -export type { IBackgroundColorTokens, IColorTokens, IForegroundColorTokens } from './color-tokens'; -export { fontStyles, textTokens } from './text-tokens'; -export type { FontDecorationTokens, FontStyleTokens, FontTokens, FontVariantTokens } from './text-tokens'; -export { layoutStyles, layoutTokens } from './layout-tokens'; -export type { LayoutTokens } from './layout-tokens'; -export { shadowStyles, shadowTokens } from './shadow-tokens'; -export type { IShadowTokens } from './shadow-tokens'; -export { tokenBuilder } from './tokenBuilder'; -export type { TokenBuilder } from './tokenBuilder'; -export type { LookupThemePart, OperationSet, StyleFactoryOperation, StyleFactoryFunction, StyleFactoryFunctionRaw } from './token.types'; -export { styleFunction } from './token.function'; +// This package is a compatibility shim. Legacy token-to-style helpers now live +// in the `@fluentui-react-native/design/styling/tokens` submodule. These explicit +// re-exports preserve the existing `@fluentui-react-native/tokens` entry point. +export { borderStyles, borderTokens } from '@fluentui-react-native/design/styling/tokens'; +export type { IBorderTokens } from '@fluentui-react-native/design/styling/tokens'; +export { + backgroundColorTokens, + colorTokens, + foregroundColorTokens, + getPaletteFromTheme, +} from '@fluentui-react-native/design/styling/tokens'; +export type { IBackgroundColorTokens, IColorTokens, IForegroundColorTokens } from '@fluentui-react-native/design/styling/tokens'; +export { fontStyles, textTokens } from '@fluentui-react-native/design/styling/tokens'; +export type { FontDecorationTokens, FontStyleTokens, FontTokens, FontVariantTokens } from '@fluentui-react-native/design/styling/tokens'; +export { layoutStyles, layoutTokens } from '@fluentui-react-native/design/styling/tokens'; +export type { LayoutTokens } from '@fluentui-react-native/design/styling/tokens'; +export { shadowStyles, shadowTokens } from '@fluentui-react-native/design/styling/tokens'; +export type { IShadowTokens } from '@fluentui-react-native/design/styling/tokens'; +export { tokenBuilder } from '@fluentui-react-native/design/styling/tokens'; +export type { TokenBuilder } from '@fluentui-react-native/design/styling/tokens'; +export type { + LookupThemePart, + OperationSet, + StyleFactoryFunction, + StyleFactoryFunctionRaw, + StyleFactoryOperation, +} from '@fluentui-react-native/design/styling/tokens'; +export { styleFunction } from '@fluentui-react-native/design/styling/tokens'; diff --git a/packages/utils/tokens/tsconfig.json b/packages/utils/tokens/tsconfig.json index 44f3f84b0c..b33d13464a 100644 --- a/packages/utils/tokens/tsconfig.json +++ b/packages/utils/tokens/tsconfig.json @@ -8,9 +8,6 @@ }, "include": ["src"], "references": [ - { - "path": "../adapters/tsconfig.json" - }, { "path": "../../agentic/design/tsconfig.json" }, diff --git a/yarn.lock b/yarn.lock index 136dfcc408..eb3574df85 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3287,6 +3287,7 @@ __metadata: resolution: "@fluentui-react-native/design@workspace:packages/agentic/design" dependencies: "@babel/core": "catalog:" + "@fluentui-react-native/adapters": "workspace:*" "@fluentui-react-native/design-tokens-android": "catalog:" "@fluentui-react-native/design-tokens-ios": "catalog:" "@fluentui-react-native/design-tokens-macos": "catalog:" @@ -3302,6 +3303,7 @@ __metadata: "@rnx-kit/tools-filesystem": "npm:^0.2.0" "@types/react": "npm:~19.1.4" "@types/react-test-renderer": "npm:^19.1.0" + assert-never: "npm:^1.2.1" react: "npm:19.1.4" react-native: "npm:^0.81.6" react-native-macos: "npm:^0.81.0" @@ -5313,17 +5315,12 @@ __metadata: dependencies: "@babel/core": "catalog:" "@fluentui-react-native/design": "workspace:*" - "@fluentui-react-native/design-tokens-android": "catalog:" - "@fluentui-react-native/design-tokens-ios": "catalog:" - "@fluentui-react-native/design-tokens-win32": "catalog:" - "@fluentui-react-native/design-tokens-windows": "catalog:" "@fluentui-react-native/scripts": "workspace:*" "@react-native-community/cli": "npm:^20.0.0" "@react-native-community/cli-platform-android": "npm:^20.0.0" "@react-native-community/cli-platform-ios": "npm:^20.0.0" "@react-native/metro-config": "npm:^0.81.0" "@types/react": "npm:~19.1.4" - assert-never: "npm:^1.2.1" react: "npm:19.1.4" react-native: "npm:^0.81.6" peerDependencies: @@ -5408,7 +5405,7 @@ __metadata: resolution: "@fluentui-react-native/themed-stylesheet@workspace:packages/framework/themed-stylesheet" dependencies: "@babel/core": "catalog:" - "@fluentui-react-native/framework-base": "workspace:*" + "@fluentui-react-native/design": "workspace:*" "@fluentui-react-native/scripts": "workspace:*" "@react-native-community/cli": "npm:^20.0.0" "@react-native-community/cli-platform-android": "npm:^20.0.0" @@ -5434,10 +5431,7 @@ __metadata: dependencies: "@babel/core": "catalog:" "@fluentui-react-native/design": "workspace:*" - "@fluentui-react-native/design-tokens-win32": "catalog:" - "@fluentui-react-native/design-tokens-windows": "catalog:" "@fluentui-react-native/scripts": "workspace:*" - "@fluentui-react-native/tokens": "workspace:*" "@react-native-community/cli": "npm:^20.0.0" "@react-native-community/cli-platform-android": "npm:^20.0.0" "@react-native-community/cli-platform-ios": "npm:^20.0.0" @@ -5472,7 +5466,6 @@ __metadata: resolution: "@fluentui-react-native/tokens@workspace:packages/utils/tokens" dependencies: "@babel/core": "catalog:" - "@fluentui-react-native/adapters": "workspace:*" "@fluentui-react-native/design": "workspace:*" "@fluentui-react-native/scripts": "workspace:*" "@react-native-community/cli": "npm:^20.0.0" From a232df757b35e131a1e8a8b538cd06450ab4279b Mon Sep 17 00:00:00 2001 From: Jason Morse Date: Wed, 26 Aug 2026 17:23:07 -0700 Subject: [PATCH 3/8] move dead packages to shim directory --- .changeset/tidy-themes-consolidate.md | 4 ++- README.md | 2 +- apps/tester-core/tsconfig.json | 6 ++-- docs/pages/Theming/ThemedStylesheet.md | 2 +- packages/components/Avatar/tsconfig.json | 2 +- packages/components/Badge/tsconfig.json | 2 +- packages/components/Button/tsconfig.json | 2 +- packages/components/Checkbox/tsconfig.json | 2 +- packages/components/Chip/tsconfig.json | 2 +- .../components/ContextualMenu/tsconfig.json | 2 +- packages/components/Divider/tsconfig.json | 2 +- packages/components/Input/tsconfig.json | 2 +- packages/components/Link/tsconfig.json | 2 +- packages/components/Menu/tsconfig.json | 2 +- packages/components/MenuButton/tsconfig.json | 2 +- .../components/Notification/tsconfig.json | 2 +- packages/components/Persona/tsconfig.json | 2 +- packages/components/PersonaCoin/tsconfig.json | 2 +- packages/components/RadioGroup/tsconfig.json | 2 +- packages/components/Stack/tsconfig.json | 2 +- packages/components/Switch/tsconfig.json | 2 +- packages/components/TabList/tsconfig.json | 2 +- packages/components/Text/tsconfig.json | 2 +- .../foundation-tokens/tsconfig.json | 2 +- .../deprecated/theming-react-native/README.md | 2 +- .../experimental/MenuButton/tsconfig.json | 2 +- packages/experimental/Shimmer/tsconfig.json | 2 +- packages/framework/framework/tsconfig.json | 2 +- .../theme-tokens}/.npmignore | 0 .../theme-tokens/CHANGELOG.json | 0 .../theme-tokens/CHANGELOG.md | 0 .../{theming => shim}/theme-tokens/README.md | 0 .../theme-tokens/package.json | 2 +- .../theme-tokens/src/index.ts | 0 .../theme-tokens/tsconfig.json | 0 .../theme-types}/.npmignore | 0 .../theme-types/CHANGELOG.json | 0 .../theme-types/CHANGELOG.md | 0 .../{theming => shim}/theme-types/README.md | 0 .../theme-types/package.json | 2 +- .../theme-types/src/index.ts | 0 .../theme => shim/theme-types}/tsconfig.json | 0 packages/{framework => shim}/theme/.npmignore | 0 .../{framework => shim}/theme/CHANGELOG.json | 0 .../{framework => shim}/theme/CHANGELOG.md | 0 packages/{framework => shim}/theme/README.md | 0 .../{framework => shim}/theme/jest.config.cjs | 0 .../{framework => shim}/theme/package.json | 2 +- .../{framework => shim}/theme/src/index.ts | 0 .../theme}/tsconfig.json | 0 .../themed-stylesheet}/.npmignore | 0 .../themed-stylesheet/CHANGELOG.json | 0 .../themed-stylesheet/CHANGELOG.md | 0 .../themed-stylesheet/README.md | 0 .../themed-stylesheet/jest.config.cjs | 0 .../themed-stylesheet/package.json | 2 +- .../themed-stylesheet/src/index.ts | 0 .../themed-stylesheet}/tsconfig.json | 0 .../theming-utils/CHANGELOG.json | 0 .../theming-utils/CHANGELOG.md | 0 .../{theming => shim}/theming-utils/README.md | 0 .../theming-utils/jest.config.cjs | 0 .../theming-utils/oxlint.config.ts | 0 .../theming-utils/package.json | 2 +- .../theming-utils/src/index.ts | 0 .../theming-utils/tsconfig.json | 0 .../{utils => shim}/tokens/CHANGELOG.json | 0 packages/{utils => shim}/tokens/CHANGELOG.md | 0 packages/{utils => shim}/tokens/README.md | 0 packages/{utils => shim}/tokens/package.json | 2 +- packages/{utils => shim}/tokens/src/index.ts | 0 packages/{utils => shim}/tokens/tsconfig.json | 0 packages/theming/README.md | 4 +-- packages/theming/android-theme/tsconfig.json | 4 +-- packages/theming/apple-theme/tsconfig.json | 4 +-- packages/theming/default-theme/tsconfig.json | 4 +-- packages/theming/win32-theme/tsconfig.json | 4 +-- tsconfig.json | 30 +++++++++---------- yarn.lock | 24 +++++++-------- 79 files changed, 75 insertions(+), 73 deletions(-) rename packages/{framework/themed-stylesheet => shim/theme-tokens}/.npmignore (100%) rename packages/{theming => shim}/theme-tokens/CHANGELOG.json (100%) rename packages/{theming => shim}/theme-tokens/CHANGELOG.md (100%) rename packages/{theming => shim}/theme-tokens/README.md (100%) rename packages/{theming => shim}/theme-tokens/package.json (97%) rename packages/{theming => shim}/theme-tokens/src/index.ts (100%) rename packages/{theming => shim}/theme-tokens/tsconfig.json (100%) rename packages/{theming/theme-tokens => shim/theme-types}/.npmignore (100%) rename packages/{theming => shim}/theme-types/CHANGELOG.json (100%) rename packages/{theming => shim}/theme-types/CHANGELOG.md (100%) rename packages/{theming => shim}/theme-types/README.md (100%) rename packages/{theming => shim}/theme-types/package.json (97%) rename packages/{theming => shim}/theme-types/src/index.ts (100%) rename packages/{framework/theme => shim/theme-types}/tsconfig.json (100%) rename packages/{framework => shim}/theme/.npmignore (100%) rename packages/{framework => shim}/theme/CHANGELOG.json (100%) rename packages/{framework => shim}/theme/CHANGELOG.md (100%) rename packages/{framework => shim}/theme/README.md (100%) rename packages/{framework => shim}/theme/jest.config.cjs (100%) rename packages/{framework => shim}/theme/package.json (98%) rename packages/{framework => shim}/theme/src/index.ts (100%) rename packages/{framework/themed-stylesheet => shim/theme}/tsconfig.json (100%) rename packages/{theming/theme-types => shim/themed-stylesheet}/.npmignore (100%) rename packages/{framework => shim}/themed-stylesheet/CHANGELOG.json (100%) rename packages/{framework => shim}/themed-stylesheet/CHANGELOG.md (100%) rename packages/{framework => shim}/themed-stylesheet/README.md (100%) rename packages/{framework => shim}/themed-stylesheet/jest.config.cjs (100%) rename packages/{framework => shim}/themed-stylesheet/package.json (97%) rename packages/{framework => shim}/themed-stylesheet/src/index.ts (100%) rename packages/{theming/theme-types => shim/themed-stylesheet}/tsconfig.json (100%) rename packages/{theming => shim}/theming-utils/CHANGELOG.json (100%) rename packages/{theming => shim}/theming-utils/CHANGELOG.md (100%) rename packages/{theming => shim}/theming-utils/README.md (100%) rename packages/{theming => shim}/theming-utils/jest.config.cjs (100%) rename packages/{theming => shim}/theming-utils/oxlint.config.ts (100%) rename packages/{theming => shim}/theming-utils/package.json (97%) rename packages/{theming => shim}/theming-utils/src/index.ts (100%) rename packages/{theming => shim}/theming-utils/tsconfig.json (100%) rename packages/{utils => shim}/tokens/CHANGELOG.json (100%) rename packages/{utils => shim}/tokens/CHANGELOG.md (100%) rename packages/{utils => shim}/tokens/README.md (100%) rename packages/{utils => shim}/tokens/package.json (98%) rename packages/{utils => shim}/tokens/src/index.ts (100%) rename packages/{utils => shim}/tokens/tsconfig.json (100%) diff --git a/.changeset/tidy-themes-consolidate.md b/.changeset/tidy-themes-consolidate.md index ca178b47e5..bdcf3d150f 100644 --- a/.changeset/tidy-themes-consolidate.md +++ b/.changeset/tidy-themes-consolidate.md @@ -1,9 +1,11 @@ --- "@fluentui-react-native/design": patch "@fluentui-react-native/theme-tokens": patch +"@fluentui-react-native/theme-types": patch +"@fluentui-react-native/theme": patch "@fluentui-react-native/themed-stylesheet": patch "@fluentui-react-native/theming-utils": patch "@fluentui-react-native/tokens": patch --- -Consolidate legacy theming and styling implementations into design submodules and deprecate their former packages as compatibility shims. +Consolidate legacy theming and styling implementations into design submodules, deprecate their former packages as compatibility shims, and group those shims under `packages/shim`. diff --git a/README.md b/README.md index df5b3da34f..c4b107ef65 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ Documentation for Theming can be found in our docs file, or for more in depth do - [Theming Overview](./docs/pages/Theming/Basics.md) - [StyleSheets](./docs/pages/Theming/ThemedStylesheet.md) - [Customizing Theme Settings](./docs/pages/Theming/CustomTheme.md) -- [Theme Reference](./packages/framework/theme/README.md) +- [Theme Reference](./packages/shim/theme/README.md) - [Tokens](./packages/framework/use-tokens/README.md) - [Slots](./packages/framework/use-slots/README.md) - [Customize and Compose](./packages/framework/composition/README.md) diff --git a/apps/tester-core/tsconfig.json b/apps/tester-core/tsconfig.json index c3e102afbb..b4cf47c8c9 100644 --- a/apps/tester-core/tsconfig.json +++ b/apps/tester-core/tsconfig.json @@ -137,13 +137,13 @@ "path": "../../packages/components/Text/tsconfig.json" }, { - "path": "../../packages/theming/theme-tokens/tsconfig.json" + "path": "../../packages/shim/theme-tokens/tsconfig.json" }, { - "path": "../../packages/framework/theme/tsconfig.json" + "path": "../../packages/shim/theme/tsconfig.json" }, { - "path": "../../packages/framework/themed-stylesheet/tsconfig.json" + "path": "../../packages/shim/themed-stylesheet/tsconfig.json" }, { "path": "../../packages/experimental/Tooltip/tsconfig.json" diff --git a/docs/pages/Theming/ThemedStylesheet.md b/docs/pages/Theming/ThemedStylesheet.md index f182a88e21..b34d8f1a19 100644 --- a/docs/pages/Theming/ThemedStylesheet.md +++ b/docs/pages/Theming/ThemedStylesheet.md @@ -43,4 +43,4 @@ export const Component = () => { ## Additional Reading -For more detailed information, check out [our README](../../../packages/framework/themed-stylesheet/README.md). +For more detailed information, check out [our README](../../../packages/shim/themed-stylesheet/README.md). diff --git a/packages/components/Avatar/tsconfig.json b/packages/components/Avatar/tsconfig.json index 71d1e2da90..fa09be6ec5 100644 --- a/packages/components/Avatar/tsconfig.json +++ b/packages/components/Avatar/tsconfig.json @@ -30,7 +30,7 @@ "path": "../../../scripts/tsconfig.json" }, { - "path": "../../utils/tokens/tsconfig.json" + "path": "../../shim/tokens/tsconfig.json" }, { "path": "../../framework/use-styling/tsconfig.json" diff --git a/packages/components/Badge/tsconfig.json b/packages/components/Badge/tsconfig.json index 6c1ec30ebf..c93ee34243 100644 --- a/packages/components/Badge/tsconfig.json +++ b/packages/components/Badge/tsconfig.json @@ -36,7 +36,7 @@ "path": "../Text/tsconfig.json" }, { - "path": "../../utils/tokens/tsconfig.json" + "path": "../../shim/tokens/tsconfig.json" }, { "path": "../../framework/use-styling/tsconfig.json" diff --git a/packages/components/Button/tsconfig.json b/packages/components/Button/tsconfig.json index 55963bc92f..31b11f147c 100644 --- a/packages/components/Button/tsconfig.json +++ b/packages/components/Button/tsconfig.json @@ -48,7 +48,7 @@ "path": "../Text/tsconfig.json" }, { - "path": "../../utils/tokens/tsconfig.json" + "path": "../../shim/tokens/tsconfig.json" }, { "path": "../../framework/use-styling/tsconfig.json" diff --git a/packages/components/Checkbox/tsconfig.json b/packages/components/Checkbox/tsconfig.json index 85ce33df9b..99e01e9e66 100644 --- a/packages/components/Checkbox/tsconfig.json +++ b/packages/components/Checkbox/tsconfig.json @@ -39,7 +39,7 @@ "path": "../Text/tsconfig.json" }, { - "path": "../../utils/tokens/tsconfig.json" + "path": "../../shim/tokens/tsconfig.json" }, { "path": "../../framework/use-styling/tsconfig.json" diff --git a/packages/components/Chip/tsconfig.json b/packages/components/Chip/tsconfig.json index b33611a468..02d565a8c6 100644 --- a/packages/components/Chip/tsconfig.json +++ b/packages/components/Chip/tsconfig.json @@ -36,7 +36,7 @@ "path": "../Text/tsconfig.json" }, { - "path": "../../utils/tokens/tsconfig.json" + "path": "../../shim/tokens/tsconfig.json" }, { "path": "../../framework/use-styling/tsconfig.json" diff --git a/packages/components/ContextualMenu/tsconfig.json b/packages/components/ContextualMenu/tsconfig.json index c6173db3b1..4375d0bb4d 100644 --- a/packages/components/ContextualMenu/tsconfig.json +++ b/packages/components/ContextualMenu/tsconfig.json @@ -36,7 +36,7 @@ "path": "../Text/tsconfig.json" }, { - "path": "../../utils/tokens/tsconfig.json" + "path": "../../shim/tokens/tsconfig.json" }, { "path": "../../deprecated/foundation-composable/tsconfig.json" diff --git a/packages/components/Divider/tsconfig.json b/packages/components/Divider/tsconfig.json index 8d76e556f4..6d7bd160c4 100644 --- a/packages/components/Divider/tsconfig.json +++ b/packages/components/Divider/tsconfig.json @@ -30,7 +30,7 @@ "path": "../Text/tsconfig.json" }, { - "path": "../../utils/tokens/tsconfig.json" + "path": "../../shim/tokens/tsconfig.json" } ] } diff --git a/packages/components/Input/tsconfig.json b/packages/components/Input/tsconfig.json index 1376d11091..c049a38fca 100644 --- a/packages/components/Input/tsconfig.json +++ b/packages/components/Input/tsconfig.json @@ -36,7 +36,7 @@ "path": "../Text/tsconfig.json" }, { - "path": "../../utils/tokens/tsconfig.json" + "path": "../../shim/tokens/tsconfig.json" }, { "path": "../../framework/use-styling/tsconfig.json" diff --git a/packages/components/Link/tsconfig.json b/packages/components/Link/tsconfig.json index aeefb9bbee..08ca66844c 100644 --- a/packages/components/Link/tsconfig.json +++ b/packages/components/Link/tsconfig.json @@ -30,7 +30,7 @@ "path": "../Text/tsconfig.json" }, { - "path": "../../utils/tokens/tsconfig.json" + "path": "../../shim/tokens/tsconfig.json" }, { "path": "../../framework/use-styling/tsconfig.json" diff --git a/packages/components/Menu/tsconfig.json b/packages/components/Menu/tsconfig.json index 32a4a06d6c..979d1cabb7 100644 --- a/packages/components/Menu/tsconfig.json +++ b/packages/components/Menu/tsconfig.json @@ -45,7 +45,7 @@ "path": "../Text/tsconfig.json" }, { - "path": "../../utils/tokens/tsconfig.json" + "path": "../../shim/tokens/tsconfig.json" }, { "path": "../../framework/use-styling/tsconfig.json" diff --git a/packages/components/MenuButton/tsconfig.json b/packages/components/MenuButton/tsconfig.json index 7726b449a0..e55d4239f4 100644 --- a/packages/components/MenuButton/tsconfig.json +++ b/packages/components/MenuButton/tsconfig.json @@ -24,7 +24,7 @@ "path": "../../../scripts/tsconfig.json" }, { - "path": "../../utils/tokens/tsconfig.json" + "path": "../../shim/tokens/tsconfig.json" }, { "path": "../../deprecated/foundation-composable/tsconfig.json" diff --git a/packages/components/Notification/tsconfig.json b/packages/components/Notification/tsconfig.json index 09cf60a96e..cb6a219da2 100644 --- a/packages/components/Notification/tsconfig.json +++ b/packages/components/Notification/tsconfig.json @@ -48,7 +48,7 @@ "path": "../Text/tsconfig.json" }, { - "path": "../../utils/tokens/tsconfig.json" + "path": "../../shim/tokens/tsconfig.json" }, { "path": "../../framework/use-styling/tsconfig.json" diff --git a/packages/components/Persona/tsconfig.json b/packages/components/Persona/tsconfig.json index 132cc6b683..eb7badafdf 100644 --- a/packages/components/Persona/tsconfig.json +++ b/packages/components/Persona/tsconfig.json @@ -24,7 +24,7 @@ "path": "../../../scripts/tsconfig.json" }, { - "path": "../../utils/tokens/tsconfig.json" + "path": "../../shim/tokens/tsconfig.json" }, { "path": "../../deprecated/foundation-composable/tsconfig.json" diff --git a/packages/components/PersonaCoin/tsconfig.json b/packages/components/PersonaCoin/tsconfig.json index 2d460e8bdb..82c3e9af0c 100644 --- a/packages/components/PersonaCoin/tsconfig.json +++ b/packages/components/PersonaCoin/tsconfig.json @@ -24,7 +24,7 @@ "path": "../../../scripts/tsconfig.json" }, { - "path": "../../utils/tokens/tsconfig.json" + "path": "../../shim/tokens/tsconfig.json" }, { "path": "../../deprecated/foundation-composable/tsconfig.json" diff --git a/packages/components/RadioGroup/tsconfig.json b/packages/components/RadioGroup/tsconfig.json index 87381be67e..e8c7aaab3b 100644 --- a/packages/components/RadioGroup/tsconfig.json +++ b/packages/components/RadioGroup/tsconfig.json @@ -39,7 +39,7 @@ "path": "../Text/tsconfig.json" }, { - "path": "../../utils/tokens/tsconfig.json" + "path": "../../shim/tokens/tsconfig.json" }, { "path": "../../framework/use-styling/tsconfig.json" diff --git a/packages/components/Stack/tsconfig.json b/packages/components/Stack/tsconfig.json index 25fc2ef620..1da974d35b 100644 --- a/packages/components/Stack/tsconfig.json +++ b/packages/components/Stack/tsconfig.json @@ -24,7 +24,7 @@ "path": "../Text/tsconfig.json" }, { - "path": "../../utils/tokens/tsconfig.json" + "path": "../../shim/tokens/tsconfig.json" }, { "path": "../../deprecated/foundation-composable/tsconfig.json" diff --git a/packages/components/Switch/tsconfig.json b/packages/components/Switch/tsconfig.json index 9588c41aa1..8ac7f5704e 100644 --- a/packages/components/Switch/tsconfig.json +++ b/packages/components/Switch/tsconfig.json @@ -30,7 +30,7 @@ "path": "../Text/tsconfig.json" }, { - "path": "../../utils/tokens/tsconfig.json" + "path": "../../shim/tokens/tsconfig.json" }, { "path": "../../framework/use-styling/tsconfig.json" diff --git a/packages/components/TabList/tsconfig.json b/packages/components/TabList/tsconfig.json index b0ee201123..315dd5b548 100644 --- a/packages/components/TabList/tsconfig.json +++ b/packages/components/TabList/tsconfig.json @@ -39,7 +39,7 @@ "path": "../Text/tsconfig.json" }, { - "path": "../../utils/tokens/tsconfig.json" + "path": "../../shim/tokens/tsconfig.json" }, { "path": "../../framework/use-styling/tsconfig.json" diff --git a/packages/components/Text/tsconfig.json b/packages/components/Text/tsconfig.json index 162cb3927b..93b4c34527 100644 --- a/packages/components/Text/tsconfig.json +++ b/packages/components/Text/tsconfig.json @@ -30,7 +30,7 @@ "path": "../../utils/test-tools/tsconfig.json" }, { - "path": "../../utils/tokens/tsconfig.json" + "path": "../../shim/tokens/tsconfig.json" }, { "path": "../../deprecated/foundation-compose/tsconfig.json" diff --git a/packages/deprecated/foundation-tokens/tsconfig.json b/packages/deprecated/foundation-tokens/tsconfig.json index 8311dc5197..64a365c31e 100644 --- a/packages/deprecated/foundation-tokens/tsconfig.json +++ b/packages/deprecated/foundation-tokens/tsconfig.json @@ -16,7 +16,7 @@ "path": "../../../scripts/tsconfig.json" }, { - "path": "../../utils/tokens/tsconfig.json" + "path": "../../shim/tokens/tsconfig.json" }, { "path": "../foundation-settings/tsconfig.json" diff --git a/packages/deprecated/theming-react-native/README.md b/packages/deprecated/theming-react-native/README.md index cabaa1002a..76f6c66a1b 100644 --- a/packages/deprecated/theming-react-native/README.md +++ b/packages/deprecated/theming-react-native/README.md @@ -112,7 +112,7 @@ You can read more about the [ThemeRegistry here](../theme-registry/README.md). ### Create a Themed Stylesheet -The `themed-stylesheet` package allows you to author View/Text/Image Style objects similar to `StyleSheet.create(...);`. You can learn more at the [themed-stylesheet's README](../../framework/themed-stylesheet/README.md) +The `themed-stylesheet` package allows you to author View/Text/Image Style objects similar to `StyleSheet.create(...);`. You can learn more at the [themed-stylesheet's README](../../shim/themed-stylesheet/README.md) ```tsx // styles.ts diff --git a/packages/experimental/MenuButton/tsconfig.json b/packages/experimental/MenuButton/tsconfig.json index 481f89ad5c..117d86a4e1 100644 --- a/packages/experimental/MenuButton/tsconfig.json +++ b/packages/experimental/MenuButton/tsconfig.json @@ -24,7 +24,7 @@ "path": "../../../scripts/tsconfig.json" }, { - "path": "../../utils/tokens/tsconfig.json" + "path": "../../shim/tokens/tsconfig.json" } ] } diff --git a/packages/experimental/Shimmer/tsconfig.json b/packages/experimental/Shimmer/tsconfig.json index 8bcaadef22..a61a98cc1b 100644 --- a/packages/experimental/Shimmer/tsconfig.json +++ b/packages/experimental/Shimmer/tsconfig.json @@ -21,7 +21,7 @@ "path": "../../../scripts/tsconfig.json" }, { - "path": "../../utils/tokens/tsconfig.json" + "path": "../../shim/tokens/tsconfig.json" }, { "path": "../../framework/use-styling/tsconfig.json" diff --git a/packages/framework/framework/tsconfig.json b/packages/framework/framework/tsconfig.json index 527f012904..c9dbfdf63b 100644 --- a/packages/framework/framework/tsconfig.json +++ b/packages/framework/framework/tsconfig.json @@ -28,7 +28,7 @@ "path": "../../../scripts/tsconfig.json" }, { - "path": "../../utils/tokens/tsconfig.json" + "path": "../../shim/tokens/tsconfig.json" }, { "path": "../use-slots/tsconfig.json" diff --git a/packages/framework/themed-stylesheet/.npmignore b/packages/shim/theme-tokens/.npmignore similarity index 100% rename from packages/framework/themed-stylesheet/.npmignore rename to packages/shim/theme-tokens/.npmignore diff --git a/packages/theming/theme-tokens/CHANGELOG.json b/packages/shim/theme-tokens/CHANGELOG.json similarity index 100% rename from packages/theming/theme-tokens/CHANGELOG.json rename to packages/shim/theme-tokens/CHANGELOG.json diff --git a/packages/theming/theme-tokens/CHANGELOG.md b/packages/shim/theme-tokens/CHANGELOG.md similarity index 100% rename from packages/theming/theme-tokens/CHANGELOG.md rename to packages/shim/theme-tokens/CHANGELOG.md diff --git a/packages/theming/theme-tokens/README.md b/packages/shim/theme-tokens/README.md similarity index 100% rename from packages/theming/theme-tokens/README.md rename to packages/shim/theme-tokens/README.md diff --git a/packages/theming/theme-tokens/package.json b/packages/shim/theme-tokens/package.json similarity index 97% rename from packages/theming/theme-tokens/package.json rename to packages/shim/theme-tokens/package.json index 7659843b24..d99558bc2b 100644 --- a/packages/theming/theme-tokens/package.json +++ b/packages/shim/theme-tokens/package.json @@ -8,7 +8,7 @@ "repository": { "type": "git", "url": "https://github.com/microsoft/fluentui-react-native.git", - "directory": "packages/theming/theme-tokens" + "directory": "packages/shim/theme-tokens" }, "type": "module", "main": "lib/index.js", diff --git a/packages/theming/theme-tokens/src/index.ts b/packages/shim/theme-tokens/src/index.ts similarity index 100% rename from packages/theming/theme-tokens/src/index.ts rename to packages/shim/theme-tokens/src/index.ts diff --git a/packages/theming/theme-tokens/tsconfig.json b/packages/shim/theme-tokens/tsconfig.json similarity index 100% rename from packages/theming/theme-tokens/tsconfig.json rename to packages/shim/theme-tokens/tsconfig.json diff --git a/packages/theming/theme-tokens/.npmignore b/packages/shim/theme-types/.npmignore similarity index 100% rename from packages/theming/theme-tokens/.npmignore rename to packages/shim/theme-types/.npmignore diff --git a/packages/theming/theme-types/CHANGELOG.json b/packages/shim/theme-types/CHANGELOG.json similarity index 100% rename from packages/theming/theme-types/CHANGELOG.json rename to packages/shim/theme-types/CHANGELOG.json diff --git a/packages/theming/theme-types/CHANGELOG.md b/packages/shim/theme-types/CHANGELOG.md similarity index 100% rename from packages/theming/theme-types/CHANGELOG.md rename to packages/shim/theme-types/CHANGELOG.md diff --git a/packages/theming/theme-types/README.md b/packages/shim/theme-types/README.md similarity index 100% rename from packages/theming/theme-types/README.md rename to packages/shim/theme-types/README.md diff --git a/packages/theming/theme-types/package.json b/packages/shim/theme-types/package.json similarity index 97% rename from packages/theming/theme-types/package.json rename to packages/shim/theme-types/package.json index 35e30123a6..9029d1a078 100644 --- a/packages/theming/theme-types/package.json +++ b/packages/shim/theme-types/package.json @@ -8,7 +8,7 @@ "repository": { "type": "git", "url": "https://github.com/microsoft/fluentui-react-native.git", - "directory": "packages/theming/theme-types" + "directory": "packages/shim/theme-types" }, "type": "module", "main": "lib/index.js", diff --git a/packages/theming/theme-types/src/index.ts b/packages/shim/theme-types/src/index.ts similarity index 100% rename from packages/theming/theme-types/src/index.ts rename to packages/shim/theme-types/src/index.ts diff --git a/packages/framework/theme/tsconfig.json b/packages/shim/theme-types/tsconfig.json similarity index 100% rename from packages/framework/theme/tsconfig.json rename to packages/shim/theme-types/tsconfig.json diff --git a/packages/framework/theme/.npmignore b/packages/shim/theme/.npmignore similarity index 100% rename from packages/framework/theme/.npmignore rename to packages/shim/theme/.npmignore diff --git a/packages/framework/theme/CHANGELOG.json b/packages/shim/theme/CHANGELOG.json similarity index 100% rename from packages/framework/theme/CHANGELOG.json rename to packages/shim/theme/CHANGELOG.json diff --git a/packages/framework/theme/CHANGELOG.md b/packages/shim/theme/CHANGELOG.md similarity index 100% rename from packages/framework/theme/CHANGELOG.md rename to packages/shim/theme/CHANGELOG.md diff --git a/packages/framework/theme/README.md b/packages/shim/theme/README.md similarity index 100% rename from packages/framework/theme/README.md rename to packages/shim/theme/README.md diff --git a/packages/framework/theme/jest.config.cjs b/packages/shim/theme/jest.config.cjs similarity index 100% rename from packages/framework/theme/jest.config.cjs rename to packages/shim/theme/jest.config.cjs diff --git a/packages/framework/theme/package.json b/packages/shim/theme/package.json similarity index 98% rename from packages/framework/theme/package.json rename to packages/shim/theme/package.json index 08f036c1ed..21f270919e 100644 --- a/packages/framework/theme/package.json +++ b/packages/shim/theme/package.json @@ -8,7 +8,7 @@ "repository": { "type": "git", "url": "https://github.com/microsoft/fluentui-react-native", - "directory": "packages/framework/theme" + "directory": "packages/shim/theme" }, "type": "module", "main": "./lib/index.js", diff --git a/packages/framework/theme/src/index.ts b/packages/shim/theme/src/index.ts similarity index 100% rename from packages/framework/theme/src/index.ts rename to packages/shim/theme/src/index.ts diff --git a/packages/framework/themed-stylesheet/tsconfig.json b/packages/shim/theme/tsconfig.json similarity index 100% rename from packages/framework/themed-stylesheet/tsconfig.json rename to packages/shim/theme/tsconfig.json diff --git a/packages/theming/theme-types/.npmignore b/packages/shim/themed-stylesheet/.npmignore similarity index 100% rename from packages/theming/theme-types/.npmignore rename to packages/shim/themed-stylesheet/.npmignore diff --git a/packages/framework/themed-stylesheet/CHANGELOG.json b/packages/shim/themed-stylesheet/CHANGELOG.json similarity index 100% rename from packages/framework/themed-stylesheet/CHANGELOG.json rename to packages/shim/themed-stylesheet/CHANGELOG.json diff --git a/packages/framework/themed-stylesheet/CHANGELOG.md b/packages/shim/themed-stylesheet/CHANGELOG.md similarity index 100% rename from packages/framework/themed-stylesheet/CHANGELOG.md rename to packages/shim/themed-stylesheet/CHANGELOG.md diff --git a/packages/framework/themed-stylesheet/README.md b/packages/shim/themed-stylesheet/README.md similarity index 100% rename from packages/framework/themed-stylesheet/README.md rename to packages/shim/themed-stylesheet/README.md diff --git a/packages/framework/themed-stylesheet/jest.config.cjs b/packages/shim/themed-stylesheet/jest.config.cjs similarity index 100% rename from packages/framework/themed-stylesheet/jest.config.cjs rename to packages/shim/themed-stylesheet/jest.config.cjs diff --git a/packages/framework/themed-stylesheet/package.json b/packages/shim/themed-stylesheet/package.json similarity index 97% rename from packages/framework/themed-stylesheet/package.json rename to packages/shim/themed-stylesheet/package.json index 0386e2c62e..2acf18f9c0 100644 --- a/packages/framework/themed-stylesheet/package.json +++ b/packages/shim/themed-stylesheet/package.json @@ -8,7 +8,7 @@ "repository": { "type": "git", "url": "https://github.com/microsoft/fluentui-react-native", - "directory": "packages/framework/themed-stylesheet" + "directory": "packages/shim/themed-stylesheet" }, "type": "module", "main": "./lib/index.js", diff --git a/packages/framework/themed-stylesheet/src/index.ts b/packages/shim/themed-stylesheet/src/index.ts similarity index 100% rename from packages/framework/themed-stylesheet/src/index.ts rename to packages/shim/themed-stylesheet/src/index.ts diff --git a/packages/theming/theme-types/tsconfig.json b/packages/shim/themed-stylesheet/tsconfig.json similarity index 100% rename from packages/theming/theme-types/tsconfig.json rename to packages/shim/themed-stylesheet/tsconfig.json diff --git a/packages/theming/theming-utils/CHANGELOG.json b/packages/shim/theming-utils/CHANGELOG.json similarity index 100% rename from packages/theming/theming-utils/CHANGELOG.json rename to packages/shim/theming-utils/CHANGELOG.json diff --git a/packages/theming/theming-utils/CHANGELOG.md b/packages/shim/theming-utils/CHANGELOG.md similarity index 100% rename from packages/theming/theming-utils/CHANGELOG.md rename to packages/shim/theming-utils/CHANGELOG.md diff --git a/packages/theming/theming-utils/README.md b/packages/shim/theming-utils/README.md similarity index 100% rename from packages/theming/theming-utils/README.md rename to packages/shim/theming-utils/README.md diff --git a/packages/theming/theming-utils/jest.config.cjs b/packages/shim/theming-utils/jest.config.cjs similarity index 100% rename from packages/theming/theming-utils/jest.config.cjs rename to packages/shim/theming-utils/jest.config.cjs diff --git a/packages/theming/theming-utils/oxlint.config.ts b/packages/shim/theming-utils/oxlint.config.ts similarity index 100% rename from packages/theming/theming-utils/oxlint.config.ts rename to packages/shim/theming-utils/oxlint.config.ts diff --git a/packages/theming/theming-utils/package.json b/packages/shim/theming-utils/package.json similarity index 97% rename from packages/theming/theming-utils/package.json rename to packages/shim/theming-utils/package.json index 2750fa2bbf..ead51a09e6 100644 --- a/packages/theming/theming-utils/package.json +++ b/packages/shim/theming-utils/package.json @@ -7,7 +7,7 @@ "repository": { "type": "git", "url": "https://github.com/microsoft/fluentui-react-native.git", - "directory": "packages/theming/theming-utils" + "directory": "packages/shim/theming-utils" }, "type": "module", "main": "lib/index.js", diff --git a/packages/theming/theming-utils/src/index.ts b/packages/shim/theming-utils/src/index.ts similarity index 100% rename from packages/theming/theming-utils/src/index.ts rename to packages/shim/theming-utils/src/index.ts diff --git a/packages/theming/theming-utils/tsconfig.json b/packages/shim/theming-utils/tsconfig.json similarity index 100% rename from packages/theming/theming-utils/tsconfig.json rename to packages/shim/theming-utils/tsconfig.json diff --git a/packages/utils/tokens/CHANGELOG.json b/packages/shim/tokens/CHANGELOG.json similarity index 100% rename from packages/utils/tokens/CHANGELOG.json rename to packages/shim/tokens/CHANGELOG.json diff --git a/packages/utils/tokens/CHANGELOG.md b/packages/shim/tokens/CHANGELOG.md similarity index 100% rename from packages/utils/tokens/CHANGELOG.md rename to packages/shim/tokens/CHANGELOG.md diff --git a/packages/utils/tokens/README.md b/packages/shim/tokens/README.md similarity index 100% rename from packages/utils/tokens/README.md rename to packages/shim/tokens/README.md diff --git a/packages/utils/tokens/package.json b/packages/shim/tokens/package.json similarity index 98% rename from packages/utils/tokens/package.json rename to packages/shim/tokens/package.json index f5f4084154..2cd29a1d73 100644 --- a/packages/utils/tokens/package.json +++ b/packages/shim/tokens/package.json @@ -7,7 +7,7 @@ "repository": { "type": "git", "url": "https://github.com/microsoft/fluentui-react-native.git", - "directory": "packages/utils/tokens" + "directory": "packages/shim/tokens" }, "type": "module", "main": "lib/index.js", diff --git a/packages/utils/tokens/src/index.ts b/packages/shim/tokens/src/index.ts similarity index 100% rename from packages/utils/tokens/src/index.ts rename to packages/shim/tokens/src/index.ts diff --git a/packages/utils/tokens/tsconfig.json b/packages/shim/tokens/tsconfig.json similarity index 100% rename from packages/utils/tokens/tsconfig.json rename to packages/shim/tokens/tsconfig.json diff --git a/packages/theming/README.md b/packages/theming/README.md index 9b73d4c1e0..617ef4fbde 100644 --- a/packages/theming/README.md +++ b/packages/theming/README.md @@ -12,5 +12,5 @@ ## Theme types and utilities -[Theme-types](./theme-types/README.md) -[Theme-tokens](./theme-tokens/README.md) +- [Theme-types](../shim/theme-types/README.md) +- [Theme-tokens](../shim/theme-tokens/README.md) diff --git a/packages/theming/android-theme/tsconfig.json b/packages/theming/android-theme/tsconfig.json index 9c91869f23..65780a28c7 100644 --- a/packages/theming/android-theme/tsconfig.json +++ b/packages/theming/android-theme/tsconfig.json @@ -19,10 +19,10 @@ "path": "../../../scripts/tsconfig.json" }, { - "path": "../theme-tokens/tsconfig.json" + "path": "../../shim/theme-tokens/tsconfig.json" }, { - "path": "../theming-utils/tsconfig.json" + "path": "../../shim/theming-utils/tsconfig.json" } ] } diff --git a/packages/theming/apple-theme/tsconfig.json b/packages/theming/apple-theme/tsconfig.json index 2e4eb1640d..bcb0266426 100644 --- a/packages/theming/apple-theme/tsconfig.json +++ b/packages/theming/apple-theme/tsconfig.json @@ -25,10 +25,10 @@ "path": "../../../scripts/tsconfig.json" }, { - "path": "../theme-tokens/tsconfig.json" + "path": "../../shim/theme-tokens/tsconfig.json" }, { - "path": "../theming-utils/tsconfig.json" + "path": "../../shim/theming-utils/tsconfig.json" } ] } diff --git a/packages/theming/default-theme/tsconfig.json b/packages/theming/default-theme/tsconfig.json index ea6d1f1ab5..476741ff14 100644 --- a/packages/theming/default-theme/tsconfig.json +++ b/packages/theming/default-theme/tsconfig.json @@ -18,10 +18,10 @@ "path": "../../../scripts/tsconfig.json" }, { - "path": "../theme-tokens/tsconfig.json" + "path": "../../shim/theme-tokens/tsconfig.json" }, { - "path": "../theming-utils/tsconfig.json" + "path": "../../shim/theming-utils/tsconfig.json" } ] } diff --git a/packages/theming/win32-theme/tsconfig.json b/packages/theming/win32-theme/tsconfig.json index 9458a86aa9..ac58a5008a 100644 --- a/packages/theming/win32-theme/tsconfig.json +++ b/packages/theming/win32-theme/tsconfig.json @@ -22,10 +22,10 @@ "path": "../../../scripts/tsconfig.json" }, { - "path": "../theme-tokens/tsconfig.json" + "path": "../../shim/theme-tokens/tsconfig.json" }, { - "path": "../theming-utils/tsconfig.json" + "path": "../../shim/theming-utils/tsconfig.json" } ] } diff --git a/tsconfig.json b/tsconfig.json index a67a92e8ca..a9e9136c2f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -181,12 +181,6 @@ { "path": "packages/framework/framework/tsconfig.json" }, - { - "path": "packages/framework/theme/tsconfig.json" - }, - { - "path": "packages/framework/themed-stylesheet/tsconfig.json" - }, { "path": "packages/framework/use-slots/tsconfig.json" }, @@ -203,22 +197,31 @@ "path": "packages/native/Callout/tsconfig.json" }, { - "path": "packages/theming/android-theme/tsconfig.json" + "path": "packages/shim/theme-tokens/tsconfig.json" }, { - "path": "packages/theming/apple-theme/tsconfig.json" + "path": "packages/shim/theme-types/tsconfig.json" }, { - "path": "packages/theming/default-theme/tsconfig.json" + "path": "packages/shim/theme/tsconfig.json" + }, + { + "path": "packages/shim/themed-stylesheet/tsconfig.json" }, { - "path": "packages/theming/theme-tokens/tsconfig.json" + "path": "packages/shim/theming-utils/tsconfig.json" }, { - "path": "packages/theming/theme-types/tsconfig.json" + "path": "packages/shim/tokens/tsconfig.json" }, { - "path": "packages/theming/theming-utils/tsconfig.json" + "path": "packages/theming/android-theme/tsconfig.json" + }, + { + "path": "packages/theming/apple-theme/tsconfig.json" + }, + { + "path": "packages/theming/default-theme/tsconfig.json" }, { "path": "packages/theming/win32-theme/tsconfig.json" @@ -235,9 +238,6 @@ { "path": "packages/utils/test-tools/tsconfig.json" }, - { - "path": "packages/utils/tokens/tsconfig.json" - }, { "path": "scripts/tsconfig.json" } diff --git a/yarn.lock b/yarn.lock index eb3574df85..3c5ed4296c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5309,9 +5309,9 @@ __metadata: languageName: unknown linkType: soft -"@fluentui-react-native/theme-tokens@workspace:*, @fluentui-react-native/theme-tokens@workspace:packages/theming/theme-tokens": +"@fluentui-react-native/theme-tokens@workspace:*, @fluentui-react-native/theme-tokens@workspace:packages/shim/theme-tokens": version: 0.0.0-use.local - resolution: "@fluentui-react-native/theme-tokens@workspace:packages/theming/theme-tokens" + resolution: "@fluentui-react-native/theme-tokens@workspace:packages/shim/theme-tokens" dependencies: "@babel/core": "catalog:" "@fluentui-react-native/design": "workspace:*" @@ -5339,9 +5339,9 @@ __metadata: languageName: unknown linkType: soft -"@fluentui-react-native/theme-types@workspace:packages/theming/theme-types": +"@fluentui-react-native/theme-types@workspace:packages/shim/theme-types": version: 0.0.0-use.local - resolution: "@fluentui-react-native/theme-types@workspace:packages/theming/theme-types" + resolution: "@fluentui-react-native/theme-types@workspace:packages/shim/theme-types" dependencies: "@babel/core": "catalog:" "@fluentui-react-native/design": "workspace:*" @@ -5369,9 +5369,9 @@ __metadata: languageName: unknown linkType: soft -"@fluentui-react-native/theme@workspace:*, @fluentui-react-native/theme@workspace:packages/framework/theme": +"@fluentui-react-native/theme@workspace:*, @fluentui-react-native/theme@workspace:packages/shim/theme": version: 0.0.0-use.local - resolution: "@fluentui-react-native/theme@workspace:packages/framework/theme" + resolution: "@fluentui-react-native/theme@workspace:packages/shim/theme" dependencies: "@babel/core": "catalog:" "@fluentui-react-native/design": "workspace:*" @@ -5400,9 +5400,9 @@ __metadata: languageName: unknown linkType: soft -"@fluentui-react-native/themed-stylesheet@workspace:*, @fluentui-react-native/themed-stylesheet@workspace:packages/framework/themed-stylesheet": +"@fluentui-react-native/themed-stylesheet@workspace:*, @fluentui-react-native/themed-stylesheet@workspace:packages/shim/themed-stylesheet": version: 0.0.0-use.local - resolution: "@fluentui-react-native/themed-stylesheet@workspace:packages/framework/themed-stylesheet" + resolution: "@fluentui-react-native/themed-stylesheet@workspace:packages/shim/themed-stylesheet" dependencies: "@babel/core": "catalog:" "@fluentui-react-native/design": "workspace:*" @@ -5425,9 +5425,9 @@ __metadata: languageName: unknown linkType: soft -"@fluentui-react-native/theming-utils@workspace:*, @fluentui-react-native/theming-utils@workspace:packages/theming/theming-utils": +"@fluentui-react-native/theming-utils@workspace:*, @fluentui-react-native/theming-utils@workspace:packages/shim/theming-utils": version: 0.0.0-use.local - resolution: "@fluentui-react-native/theming-utils@workspace:packages/theming/theming-utils" + resolution: "@fluentui-react-native/theming-utils@workspace:packages/shim/theming-utils" dependencies: "@babel/core": "catalog:" "@fluentui-react-native/design": "workspace:*" @@ -5461,9 +5461,9 @@ __metadata: languageName: unknown linkType: soft -"@fluentui-react-native/tokens@workspace:*, @fluentui-react-native/tokens@workspace:packages/utils/tokens": +"@fluentui-react-native/tokens@workspace:*, @fluentui-react-native/tokens@workspace:packages/shim/tokens": version: 0.0.0-use.local - resolution: "@fluentui-react-native/tokens@workspace:packages/utils/tokens" + resolution: "@fluentui-react-native/tokens@workspace:packages/shim/tokens" dependencies: "@babel/core": "catalog:" "@fluentui-react-native/design": "workspace:*" From 785f4a2673ccb4c4e0efe3cc5f80b4eb75f81a06 Mon Sep 17 00:00:00 2001 From: Jason Morse Date: Wed, 26 Aug 2026 17:24:03 -0700 Subject: [PATCH 4/8] add changeset --- .changeset/rich-pumas-try.md | 39 ++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .changeset/rich-pumas-try.md diff --git a/.changeset/rich-pumas-try.md b/.changeset/rich-pumas-try.md new file mode 100644 index 0000000000..4408af2d5f --- /dev/null +++ b/.changeset/rich-pumas-try.md @@ -0,0 +1,39 @@ +--- +"@uifabricshared/theming-react-native": patch +"@uifabricshared/foundation-tokens": patch +"@fluentui-react-native/contextual-menu": patch +"@fluentui-react-native/notification": patch +"@fluentui-react-native/experimental-menu-button": patch +"@fluentui-react-native/persona-coin": patch +"@fluentui-react-native/themed-stylesheet": patch +"@fluentui-react-native/menu-button": patch +"@fluentui-react-native/radio-group": patch +"@fluentui-react-native/android-theme": patch +"@fluentui-react-native/default-theme": patch +"@fluentui-react-native/experimental-shimmer": patch +"@fluentui-react-native/checkbox": patch +"@fluentui-react-native/framework": patch +"@fluentui-react-native/apple-theme": patch +"@fluentui-react-native/win32-theme": patch +"@fluentui-react-native/divider": patch +"@fluentui-react-native/persona": patch +"@fluentui-react-native/tablist": patch +"@fluentui-react-native/theming-utils": patch +"@fluentui-react-native/avatar": patch +"@fluentui-react-native/button": patch +"@fluentui-react-native/switch": patch +"@fluentui-react-native/theme-tokens": patch +"@fluentui-react-native/badge": patch +"@fluentui-react-native/input": patch +"@fluentui-react-native/stack": patch +"@fluentui-react-native/theme-types": patch +"@fluentui-react-native/chip": patch +"@fluentui-react-native/link": patch +"@fluentui-react-native/menu": patch +"@fluentui-react-native/text": patch +"@fluentui-react-native/design": patch +"@fluentui-react-native/tokens": patch +"@fluentui-react-native/theme": patch +--- + +Consolidate theming utilities in the design package and move compatibility packages to the shim directory From 7329ad9b1e8586558dae1e3a703da5a8aec36315 Mon Sep 17 00:00:00 2001 From: Jason Morse Date: Wed, 26 Aug 2026 17:25:52 -0700 Subject: [PATCH 5/8] fix formatting --- packages/agentic/design/package.json | 4 ++++ packages/deprecated/theming-ramp/package.json | 4 ++++ packages/shim/theme-tokens/package.json | 4 ++++ packages/shim/theme-types/package.json | 4 ++++ packages/shim/theme/package.json | 4 ++++ packages/shim/themed-stylesheet/package.json | 14 +++++++++++++- packages/utils/test-tools/package.json | 4 ++++ 7 files changed, 37 insertions(+), 1 deletion(-) diff --git a/packages/agentic/design/package.json b/packages/agentic/design/package.json index 2f57a332f9..d543fc6aa7 100644 --- a/packages/agentic/design/package.json +++ b/packages/agentic/design/package.json @@ -101,6 +101,7 @@ "react-test-renderer": "19.1.4" }, "peerDependencies": { + "@office-iss/react-native-win32": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0", "@types/react": "~18.2.0 || ~19.0.0 || ~19.1.4", "react": "18.2.0 || 19.0.0 || 19.1.4", "react-native": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.6", @@ -116,6 +117,9 @@ }, "react-native-windows": { "optional": true + }, + "@office-iss/react-native-win32": { + "optional": true } }, "furn": { diff --git a/packages/deprecated/theming-ramp/package.json b/packages/deprecated/theming-ramp/package.json index 8032fdb4de..bfaa31ac9d 100644 --- a/packages/deprecated/theming-ramp/package.json +++ b/packages/deprecated/theming-ramp/package.json @@ -47,6 +47,7 @@ "react-native": "^0.81.6" }, "peerDependencies": { + "@office-iss/react-native-win32": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0", "@types/react": "~18.2.0 || ~19.0.0 || ~19.1.4", "react": "18.2.0 || 19.0.0 || 19.1.4", "react-native": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0", @@ -62,6 +63,9 @@ }, "react-native-windows": { "optional": true + }, + "@office-iss/react-native-win32": { + "optional": true } }, "furn": { diff --git a/packages/shim/theme-tokens/package.json b/packages/shim/theme-tokens/package.json index d99558bc2b..e06106af2b 100644 --- a/packages/shim/theme-tokens/package.json +++ b/packages/shim/theme-tokens/package.json @@ -47,6 +47,7 @@ "react-native": "^0.81.6" }, "peerDependencies": { + "@office-iss/react-native-win32": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0", "@types/react": "~18.2.0 || ~19.0.0 || ~19.1.4", "react": "18.2.0 || 19.0.0 || 19.1.4", "react-native": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.6", @@ -62,6 +63,9 @@ }, "react-native-windows": { "optional": true + }, + "@office-iss/react-native-win32": { + "optional": true } }, "rnx-kit": { diff --git a/packages/shim/theme-types/package.json b/packages/shim/theme-types/package.json index 9029d1a078..380daf5e06 100644 --- a/packages/shim/theme-types/package.json +++ b/packages/shim/theme-types/package.json @@ -47,6 +47,7 @@ "react-native": "^0.81.6" }, "peerDependencies": { + "@office-iss/react-native-win32": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0", "@types/react": "~18.2.0 || ~19.0.0 || ~19.1.4", "react": "18.2.0 || 19.0.0 || 19.1.4", "react-native": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.6", @@ -62,6 +63,9 @@ }, "react-native-windows": { "optional": true + }, + "@office-iss/react-native-win32": { + "optional": true } }, "rnx-kit": { diff --git a/packages/shim/theme/package.json b/packages/shim/theme/package.json index 21f270919e..190f108954 100644 --- a/packages/shim/theme/package.json +++ b/packages/shim/theme/package.json @@ -48,6 +48,7 @@ "react-native": "^0.81.6" }, "peerDependencies": { + "@office-iss/react-native-win32": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0", "@types/react": "~18.2.0 || ~19.0.0 || ~19.1.4", "react": "18.2.0 || 19.0.0 || 19.1.4", "react-native": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.6", @@ -63,6 +64,9 @@ }, "react-native-windows": { "optional": true + }, + "@office-iss/react-native-win32": { + "optional": true } }, "furn": { diff --git a/packages/shim/themed-stylesheet/package.json b/packages/shim/themed-stylesheet/package.json index 2acf18f9c0..ac40fee0ed 100644 --- a/packages/shim/themed-stylesheet/package.json +++ b/packages/shim/themed-stylesheet/package.json @@ -48,13 +48,25 @@ "react-native": "^0.81.6" }, "peerDependencies": { + "@office-iss/react-native-win32": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0", "@types/react": "~18.2.0 || ~19.0.0 || ~19.1.4", "react": "18.2.0 || 19.0.0 || 19.1.4", - "react-native": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.6" + "react-native": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.6", + "react-native-macos": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0", + "react-native-windows": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0" }, "peerDependenciesMeta": { "@types/react": { "optional": true + }, + "react-native-macos": { + "optional": true + }, + "react-native-windows": { + "optional": true + }, + "@office-iss/react-native-win32": { + "optional": true } }, "furn": { diff --git a/packages/utils/test-tools/package.json b/packages/utils/test-tools/package.json index d127dcd073..104cd0f3df 100644 --- a/packages/utils/test-tools/package.json +++ b/packages/utils/test-tools/package.json @@ -44,6 +44,7 @@ "react-test-renderer": "19.1.4" }, "peerDependencies": { + "@office-iss/react-native-win32": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0", "@types/react": "~18.2.0 || ~19.0.0 || ~19.1.4", "react": "18.2.0 || 19.0.0 || 19.1.4", "react-native": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.6", @@ -59,6 +60,9 @@ }, "react-native-windows": { "optional": true + }, + "@office-iss/react-native-win32": { + "optional": true } }, "furn": { From f864ed22d67f765f2fbb0f4675ea9b06d3f7bbdd Mon Sep 17 00:00:00 2001 From: Jason Morse Date: Wed, 26 Aug 2026 17:52:54 -0700 Subject: [PATCH 6/8] remove old references --- .../ComponentTemplate/package.json | 4 +- .../src/ComponentName.styling.ts | 2 +- .../src/ComponentName.types.ts | 2 +- .../ComponentTemplate/tsconfig.json | 7 +- apps/tester-core/package.json | 3 - apps/tester-core/src/FluentTester.tsx | 2 +- .../CheckboxLegacy/CheckboxLegacyTest.tsx | 2 +- .../CheckboxV1/TokenCheckboxTest.tsx | 2 +- .../ColorTokens/ColorTokenTest.tsx | 4 +- .../FocusTrapZone/FocusTrapZoneTest.tsx | 2 +- .../TestComponents/Persona/CustomizeUsage.tsx | 2 +- .../PersonaCoin/CustomizeUsage.tsx | 2 +- .../Shadow/ShadowDepthTestSection.tsx | 2 +- .../Shadow/ShadowTestPageStyles.tsx | 2 +- .../ShadowWithDifferentPropsTestSection.tsx | 2 +- .../StrokeWidth/StrokeWidthTest.tsx | 2 +- .../Theme/ThemeTest.android.tsx | 2 +- .../src/TestComponents/Theme/ThemeTest.tsx | 2 +- .../src/theme/ThemePickers.android.tsx | 2 +- .../src/theme/ThemePickers.ios.tsx | 2 +- apps/tester-core/tsconfig.json | 9 --- packages/agentic/design/package.json | 6 +- packages/components/Avatar/package.json | 1 - .../components/Avatar/src/Avatar.styling.ts | 2 +- .../components/Avatar/src/Avatar.types.ts | 7 +- packages/components/Avatar/tsconfig.json | 3 - packages/components/Badge/package.json | 1 - .../components/Badge/src/Badge.styling.ts | 2 +- packages/components/Badge/src/Badge.types.ts | 2 +- .../src/CounterBadge/CounterBadge.styling.ts | 2 +- .../PresenceBadge/PresenceBadge.styling.ts | 2 +- packages/components/Badge/tsconfig.json | 3 - packages/components/Button/package.json | 1 - .../components/Button/src/Button.styling.ts | 4 +- .../components/Button/src/Button.types.ts | 2 +- .../CompoundButton/CompoundButton.styling.ts | 2 +- .../CompoundButton/CompoundButton.types.ts | 2 +- .../components/Button/src/FAB/FAB.styling.ts | 2 +- .../src/ToggleButton/ToggleButton.styling.ts | 2 +- .../Button/src/deprecated/Button.android.tsx | 8 +- .../Button/src/deprecated/Button.tsx | 8 +- .../Button/src/deprecated/Button.types.ts | 7 +- packages/components/Button/tsconfig.json | 3 - packages/components/Checkbox/package.json | 1 - .../Checkbox/src/Checkbox.styling.ts | 2 +- .../components/Checkbox/src/Checkbox.types.ts | 2 +- .../Checkbox/src/deprecated/Checkbox.tsx | 4 +- .../Checkbox/src/deprecated/Checkbox.types.ts | 7 +- packages/components/Checkbox/tsconfig.json | 3 - packages/components/Chip/package.json | 3 +- packages/components/Chip/src/Chip.styling.ts | 2 +- packages/components/Chip/src/Chip.types.ts | 2 +- packages/components/Chip/tsconfig.json | 3 - .../components/ContextualMenu/package.json | 2 +- .../ContextualMenu/src/ContextualMenu.tsx | 2 +- .../ContextualMenu/src/ContextualMenuItem.tsx | 8 +- .../src/ContextualMenuItem.types.ts | 7 +- .../components/ContextualMenu/src/Submenu.tsx | 2 +- .../ContextualMenu/src/SubmenuItem.tsx | 8 +- .../components/ContextualMenu/tsconfig.json | 6 +- packages/components/Divider/package.json | 3 +- .../components/Divider/src/Divider.styling.ts | 2 +- .../components/Divider/src/Divider.types.ts | 2 +- packages/components/Divider/tsconfig.json | 3 - packages/components/Input/package.json | 1 - .../components/Input/src/Input.styling.ts | 2 +- packages/components/Input/src/Input.types.ts | 2 +- packages/components/Input/tsconfig.json | 3 - packages/components/Link/package.json | 2 +- packages/components/Link/src/Link.styling.ts | 2 +- packages/components/Link/src/legacy/Link.tsx | 2 +- .../components/Link/src/legacy/Link.types.ts | 2 +- packages/components/Link/tsconfig.json | 6 +- packages/components/Menu/package.json | 1 - .../Menu/src/MenuDivider/MenuDivider.types.ts | 2 +- .../Menu/src/MenuGroup/MenuGroup.types.ts | 2 +- .../MenuGroupHeader/MenuGroupHeader.types.ts | 2 +- .../Menu/src/MenuItem/MenuItem.styling.ts | 2 +- .../Menu/src/MenuItem/MenuItem.types.ts | 2 +- .../MenuItemCheckbox.styling.ts | 2 +- .../MenuItemRadio.styling.android.ts | 2 +- .../MenuItemRadio/MenuItemRadio.styling.ts | 2 +- .../Menu/src/MenuList/MenuList.styling.ts | 2 +- .../Menu/src/MenuList/MenuList.types.ts | 2 +- packages/components/Menu/tsconfig.json | 3 - packages/components/MenuButton/package.json | 2 +- .../MenuButton/src/MenuButton.macos.tsx | 2 +- .../components/MenuButton/src/MenuButton.tsx | 2 +- .../MenuButton/src/MenuButton.types.ts | 7 +- packages/components/MenuButton/tsconfig.json | 6 +- packages/components/Notification/package.json | 1 - .../Notification/src/Notification.styling.ts | 2 +- .../Notification/src/Notification.types.ts | 2 +- .../components/Notification/tsconfig.json | 3 - packages/components/Persona/package.json | 2 +- .../components/Persona/src/Persona.helpers.ts | 2 +- .../Persona/src/Persona.tokens.texts.ts | 2 +- packages/components/Persona/src/Persona.tsx | 2 +- .../components/Persona/src/Persona.types.ts | 2 +- packages/components/Persona/tsconfig.json | 6 +- packages/components/PersonaCoin/package.json | 1 - .../PersonaCoin/src/PersonaCoin.tsx | 2 +- .../PersonaCoin/src/PersonaCoin.types.ts | 2 +- packages/components/PersonaCoin/tsconfig.json | 3 - packages/components/RadioGroup/package.json | 1 - .../RadioGroup/src/Radio/Radio.styling.ts | 2 +- .../RadioGroup/src/Radio/Radio.types.ts | 2 +- .../src/RadioGroup/RadioGroup.styling.ts | 2 +- .../src/RadioGroup/RadioGroup.types.ts | 2 +- .../RadioGroup/src/legacy/RadioButton.tsx | 8 +- .../src/legacy/RadioButton.types.ts | 7 +- .../src/legacy/RadioButton.win32.tsx | 8 +- .../RadioGroup/src/legacy/RadioGroup.tsx | 2 +- .../RadioGroup/src/legacy/RadioGroup.types.ts | 2 +- packages/components/RadioGroup/tsconfig.json | 3 - packages/components/Stack/package.json | 2 +- packages/components/Stack/src/Stack.tsx | 2 +- packages/components/Stack/src/Stack.types.ts | 2 +- packages/components/Stack/tsconfig.json | 6 +- packages/components/Switch/package.json | 1 - .../components/Switch/src/Switch.styling.ts | 2 +- .../components/Switch/src/Switch.types.ts | 2 +- packages/components/Switch/tsconfig.json | 3 - packages/components/TabList/package.json | 1 - .../components/TabList/src/Tab/Tab.types.ts | 2 +- .../TabList/src/TabList/TabList.types.ts | 2 +- packages/components/TabList/tsconfig.json | 3 - packages/components/Text/package.json | 1 - .../components/Text/src/deprecated/Text.tsx | 2 +- .../Text/src/deprecated/Text.types.ts | 2 +- packages/components/Text/tsconfig.json | 3 - .../deprecated/foundation-tokens/package.json | 2 +- .../foundation-tokens/src/Token.types.ts | 2 +- .../deprecated/foundation-tokens/src/index.ts | 2 +- .../foundation-tokens/tsconfig.json | 4 +- .../deprecated/theme-registry/src/Registry.ts | 2 +- packages/deprecated/theming-ramp/package.json | 6 +- .../deprecated/theming-react-native/README.md | 4 +- .../src/ThemeProvider.tsx | 2 +- packages/experimental/MenuButton/package.json | 4 +- .../MenuButton/src/MenuButton.types.ts | 7 +- .../experimental/MenuButton/tsconfig.json | 2 +- packages/experimental/Shimmer/package.json | 1 - .../Shimmer/src/Shimmer.types.shared.ts | 2 +- packages/experimental/Shimmer/tsconfig.json | 3 - packages/framework/framework/package.json | 1 - packages/framework/framework/src/index.ts | 4 +- packages/framework/framework/tsconfig.json | 3 - packages/shim/theme-tokens/package.json | 6 +- packages/shim/theme-types/package.json | 6 +- packages/shim/theme/package.json | 6 +- packages/shim/themed-stylesheet/package.json | 6 +- packages/theming/android-theme/package.json | 4 +- .../android-theme/src/createAliasTokens.ts | 4 +- .../src/createFontAliasTokens.ts | 4 +- packages/theming/android-theme/tsconfig.json | 6 -- packages/theming/apple-theme/package.json | 2 - .../src/createFontAliasTokens.ios.ts | 2 +- .../apple-theme/src/createMacOSAliasTokens.ts | 2 +- .../apple-theme/src/createiOSAliasTokens.ts | 4 +- packages/theming/apple-theme/tsconfig.json | 6 -- packages/theming/default-theme/package.json | 2 - .../default-theme/src/createAliasTokens.ts | 4 +- .../theming/default-theme/src/defaultTheme.ts | 2 +- .../src/stockWebPalette.macos.ts | 2 +- .../default-theme/src/stockWebPalette.ts | 2 +- .../src/stockWebPalette.win32.ts | 2 +- packages/theming/default-theme/tsconfig.json | 6 -- packages/theming/win32-theme/package.json | 4 +- .../src/createBrandedThemeWithAlias.ts | 2 +- .../win32-theme/src/createFontAliasTokens.ts | 2 +- .../src/createOfficeAliasTokens.ts | 2 +- packages/theming/win32-theme/tsconfig.json | 6 -- packages/utils/test-tools/package.json | 6 +- yarn.lock | 78 +++++++++---------- 175 files changed, 288 insertions(+), 318 deletions(-) diff --git a/apps/component-generator/component-templates/ComponentTemplate/package.json b/apps/component-generator/component-templates/ComponentTemplate/package.json index 2f69c0e6e1..7b1e735b2b 100644 --- a/apps/component-generator/component-templates/ComponentTemplate/package.json +++ b/apps/component-generator/component-templates/ComponentTemplate/package.json @@ -24,7 +24,9 @@ "format": "fluentui-scripts format", "prettier-fix": "fluentui-scripts prettier --fix true" }, - "dependencies": {}, + "dependencies": { + "@fluentui-react-native/design": "workspace:*" + }, "devDependencies": { "@fluentui-react-native/framework-base": "workspace:*", "@fluentui-react-native/scripts": "workspace:*", diff --git a/apps/component-generator/component-templates/ComponentTemplate/src/ComponentName.styling.ts b/apps/component-generator/component-templates/ComponentTemplate/src/ComponentName.styling.ts index 3a6482f345..4a13a7edb7 100644 --- a/apps/component-generator/component-templates/ComponentTemplate/src/ComponentName.styling.ts +++ b/apps/component-generator/component-templates/ComponentTemplate/src/ComponentName.styling.ts @@ -1,6 +1,6 @@ import { componentName, ComponentNameTokens, ComponentNameSlotProps, ComponentNameProps } from './ComponentName.types'; import { Theme, UseStylingOptions, buildProps } from '@fluentui-react-native/framework'; -import { borderStyles, layoutStyles } from '@fluentui-react-native/tokens'; +import { borderStyles, layoutStyles } from '@fluentui-react-native/design/styling/tokens'; import { defaultComponentNameTokens } from './ComponentNameTokens'; export const componentNameStates: (keyof ComponentNameTokens)[] = ['small', 'medium', 'large']; diff --git a/apps/component-generator/component-templates/ComponentTemplate/src/ComponentName.types.ts b/apps/component-generator/component-templates/ComponentTemplate/src/ComponentName.types.ts index 538de39e11..29add8bb50 100644 --- a/apps/component-generator/component-templates/ComponentTemplate/src/ComponentName.types.ts +++ b/apps/component-generator/component-templates/ComponentTemplate/src/ComponentName.types.ts @@ -1,6 +1,6 @@ import { ViewProps } from 'react-native'; import { TextProps } from '@fluentui-react-native/text'; -import { IBorderTokens, IColorTokens, LayoutTokens } from '@fluentui-react-native/tokens'; +import { IBorderTokens, IColorTokens, LayoutTokens } from '@fluentui-react-native/design/styling/tokens'; export const componentName = 'ComponentName'; /** diff --git a/apps/component-generator/component-templates/ComponentTemplate/tsconfig.json b/apps/component-generator/component-templates/ComponentTemplate/tsconfig.json index 07b157e5c6..37b12748fd 100644 --- a/apps/component-generator/component-templates/ComponentTemplate/tsconfig.json +++ b/apps/component-generator/component-templates/ComponentTemplate/tsconfig.json @@ -4,5 +4,10 @@ "rootDir": "src", "outDir": "lib" }, - "include": ["src"] + "include": ["src"], + "references": [ + { + "path": "../../agentic/design/tsconfig.json" + } + ] } diff --git a/apps/tester-core/package.json b/apps/tester-core/package.json index 7d680428e9..c686718ee0 100644 --- a/apps/tester-core/package.json +++ b/apps/tester-core/package.json @@ -70,9 +70,6 @@ "@fluentui-react-native/switch": "workspace:*", "@fluentui-react-native/tablist": "workspace:*", "@fluentui-react-native/text": "workspace:*", - "@fluentui-react-native/theme": "workspace:*", - "@fluentui-react-native/theme-tokens": "workspace:*", - "@fluentui-react-native/themed-stylesheet": "workspace:*", "@fluentui-react-native/tooltip": "workspace:*", "@fluentui-react-native/vibrancy-view": "workspace:*", "@fluentui-react-native/win32-theme": "workspace:*", diff --git a/apps/tester-core/src/FluentTester.tsx b/apps/tester-core/src/FluentTester.tsx index fb6ebf995a..bde4e50c0c 100644 --- a/apps/tester-core/src/FluentTester.tsx +++ b/apps/tester-core/src/FluentTester.tsx @@ -7,7 +7,7 @@ import { BASE_TESTPAGE, TESTPAGE_BUTTONS_SCROLLVIEWER, TESTPAGE_CONTENT_SCROLLVI import { ROOT_VIEW } from '@fluentui-react-native/e2e-testing'; import type { Theme } from '@fluentui-react-native/framework'; import { useTheme } from '@fluentui-react-native/design/theming'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; +import { themedStyleSheet } from '@fluentui-react-native/design/styling/stylesheet'; import { fluentTesterStyles, mobileStyles } from './TestComponents/Common/styles'; import { testProps } from './TestComponents/Common/TestProps'; diff --git a/apps/tester-core/src/TestComponents/CheckboxLegacy/CheckboxLegacyTest.tsx b/apps/tester-core/src/TestComponents/CheckboxLegacy/CheckboxLegacyTest.tsx index 863f536183..5e7ee56cd0 100644 --- a/apps/tester-core/src/TestComponents/CheckboxLegacy/CheckboxLegacyTest.tsx +++ b/apps/tester-core/src/TestComponents/CheckboxLegacy/CheckboxLegacyTest.tsx @@ -5,7 +5,7 @@ import { Checkbox } from '@fluentui/react-native'; import { CHECKBOX_TESTPAGE } from '@fluentui-react-native/e2e-testing'; import type { Theme } from '@fluentui-react-native/design/theming'; import { useTheme } from '@fluentui-react-native/design/theming'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; +import { themedStyleSheet } from '@fluentui-react-native/design/styling/stylesheet'; import { CheckboxLegacyE2ETest } from './CheckboxLegacyE2ETest'; import { commonTestStyles as commonStyles } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/CheckboxV1/TokenCheckboxTest.tsx b/apps/tester-core/src/TestComponents/CheckboxV1/TokenCheckboxTest.tsx index 68b5c2df06..b10bbc0847 100644 --- a/apps/tester-core/src/TestComponents/CheckboxV1/TokenCheckboxTest.tsx +++ b/apps/tester-core/src/TestComponents/CheckboxV1/TokenCheckboxTest.tsx @@ -5,7 +5,7 @@ import { Checkbox } from '@fluentui-react-native/experimental-checkbox'; import type { InteractionEvent } from '@fluentui-react-native/interactive-hooks'; import type { Theme } from '@fluentui-react-native/design/theming'; import { useTheme } from '@fluentui-react-native/design/theming'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; +import { themedStyleSheet } from '@fluentui-react-native/design/styling/stylesheet'; import { commonTestStyles as commonStyles } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/ColorTokens/ColorTokenTest.tsx b/apps/tester-core/src/TestComponents/ColorTokens/ColorTokenTest.tsx index 77a8cfcf30..76695950f4 100644 --- a/apps/tester-core/src/TestComponents/ColorTokens/ColorTokenTest.tsx +++ b/apps/tester-core/src/TestComponents/ColorTokens/ColorTokenTest.tsx @@ -6,10 +6,10 @@ import { Text, ToggleButton } from '@fluentui/react-native'; import { createAliasTokens } from '@fluentui-react-native/default-theme'; import { COLORTOKENS_TEST_COMPONENT, COLORTOKEN_TESTPAGE } from '@fluentui-react-native/e2e-testing'; import type { SvgIconProps } from '@fluentui-react-native/icon'; -import { globalTokens } from '@fluentui-react-native/theme-tokens'; +import { globalTokens } from '@fluentui-react-native/design/tokens/legacy'; import type { Theme } from '@fluentui-react-native/design/theming'; import { useTheme } from '@fluentui-react-native/design/theming'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; +import { themedStyleSheet } from '@fluentui-react-native/design/styling/stylesheet'; import { getCurrentAppearance } from '@fluentui-react-native/design/theming'; import { createOfficeAliasTokens } from '@fluentui-react-native/win32-theme'; import type { SvgProps } from 'react-native-svg'; diff --git a/apps/tester-core/src/TestComponents/FocusTrapZone/FocusTrapZoneTest.tsx b/apps/tester-core/src/TestComponents/FocusTrapZone/FocusTrapZoneTest.tsx index 1cc66b00b7..60b2c738a2 100644 --- a/apps/tester-core/src/TestComponents/FocusTrapZone/FocusTrapZoneTest.tsx +++ b/apps/tester-core/src/TestComponents/FocusTrapZone/FocusTrapZoneTest.tsx @@ -9,7 +9,7 @@ import type { KeyPressEvent } from '@fluentui-react-native/interactive-hooks'; import { useFocusState } from '@fluentui-react-native/interactive-hooks'; import { Stack } from '@fluentui-react-native/stack'; import { useTheme } from '@fluentui-react-native/design/theming'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; +import { themedStyleSheet } from '@fluentui-react-native/design/styling/stylesheet'; import { stackStyle } from '../Common/styles'; import type { TestSection, PlatformStatus } from '../Test'; diff --git a/apps/tester-core/src/TestComponents/Persona/CustomizeUsage.tsx b/apps/tester-core/src/TestComponents/Persona/CustomizeUsage.tsx index ca3a07cc3b..a2ce8cd038 100644 --- a/apps/tester-core/src/TestComponents/Persona/CustomizeUsage.tsx +++ b/apps/tester-core/src/TestComponents/Persona/CustomizeUsage.tsx @@ -4,7 +4,7 @@ import { View, Text, Switch, TextInput } from 'react-native'; import { Persona } from '@fluentui/react-native'; import type { Theme } from '@fluentui-react-native/design/theming'; import { useTheme } from '@fluentui-react-native/design/theming'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; +import { themedStyleSheet } from '@fluentui-react-native/design/styling/stylesheet'; import { michaelImageUrl } from './styles'; import { Slider } from '../Common/Slider'; diff --git a/apps/tester-core/src/TestComponents/PersonaCoin/CustomizeUsage.tsx b/apps/tester-core/src/TestComponents/PersonaCoin/CustomizeUsage.tsx index a04451523b..bfc0f7293f 100644 --- a/apps/tester-core/src/TestComponents/PersonaCoin/CustomizeUsage.tsx +++ b/apps/tester-core/src/TestComponents/PersonaCoin/CustomizeUsage.tsx @@ -5,7 +5,7 @@ import type { IconAlignment } from '@fluentui/react-native'; import { PersonaCoin } from '@fluentui/react-native'; import type { Theme } from '@fluentui-react-native/design/theming'; import { useTheme } from '@fluentui-react-native/design/theming'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; +import { themedStyleSheet } from '@fluentui-react-native/design/styling/stylesheet'; import { steveBallmerPhotoUrl } from './styles'; import { AlignmentPicker } from '../Common/AlignmentPicker'; diff --git a/apps/tester-core/src/TestComponents/Shadow/ShadowDepthTestSection.tsx b/apps/tester-core/src/TestComponents/Shadow/ShadowDepthTestSection.tsx index f1f0d2c5f4..e48f103db7 100644 --- a/apps/tester-core/src/TestComponents/Shadow/ShadowDepthTestSection.tsx +++ b/apps/tester-core/src/TestComponents/Shadow/ShadowDepthTestSection.tsx @@ -7,7 +7,7 @@ import { useFluentTheme } from '@fluentui-react-native/framework'; import { mergeStyles } from '@fluentui-react-native/framework-base'; import type { ShadowToken, Theme } from '@fluentui-react-native/design/theming'; import { useTheme } from '@fluentui-react-native/design/theming'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; +import { themedStyleSheet } from '@fluentui-react-native/design/styling/stylesheet'; import { shadowTestPageStyles } from './ShadowTestPageStyles'; diff --git a/apps/tester-core/src/TestComponents/Shadow/ShadowTestPageStyles.tsx b/apps/tester-core/src/TestComponents/Shadow/ShadowTestPageStyles.tsx index 8b129937d9..c1a0fba3b2 100644 --- a/apps/tester-core/src/TestComponents/Shadow/ShadowTestPageStyles.tsx +++ b/apps/tester-core/src/TestComponents/Shadow/ShadowTestPageStyles.tsx @@ -1,7 +1,7 @@ import { Platform } from 'react-native'; import type { Theme } from '@fluentui-react-native/design/theming'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; +import { themedStyleSheet } from '@fluentui-react-native/design/styling/stylesheet'; /** * The default dark mode iOS background color from the theme is black ('#000000'), which shadows are not visible against. diff --git a/apps/tester-core/src/TestComponents/Shadow/ShadowWithDifferentPropsTestSection.tsx b/apps/tester-core/src/TestComponents/Shadow/ShadowWithDifferentPropsTestSection.tsx index abbe58fa25..332225e969 100644 --- a/apps/tester-core/src/TestComponents/Shadow/ShadowWithDifferentPropsTestSection.tsx +++ b/apps/tester-core/src/TestComponents/Shadow/ShadowWithDifferentPropsTestSection.tsx @@ -6,7 +6,7 @@ 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/framework-base'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; +import { themedStyleSheet } from '@fluentui-react-native/design/styling/stylesheet'; import { shadowTestPageStyles } from './ShadowTestPageStyles'; diff --git a/apps/tester-core/src/TestComponents/StrokeWidth/StrokeWidthTest.tsx b/apps/tester-core/src/TestComponents/StrokeWidth/StrokeWidthTest.tsx index 3f6494855b..415c1f970c 100644 --- a/apps/tester-core/src/TestComponents/StrokeWidth/StrokeWidthTest.tsx +++ b/apps/tester-core/src/TestComponents/StrokeWidth/StrokeWidthTest.tsx @@ -18,7 +18,7 @@ import { STROKEWIDTH_TESTPAGE } from '@fluentui-react-native/e2e-testing'; import type { Theme } from '@fluentui-react-native/framework'; import { useFluentTheme } from '@fluentui-react-native/framework'; import { Stack } from '@fluentui-react-native/stack'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; +import { themedStyleSheet } from '@fluentui-react-native/design/styling/stylesheet'; import { getCurrentAppearance } from '@fluentui-react-native/design/theming'; import { stackStyle } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/Theme/ThemeTest.android.tsx b/apps/tester-core/src/TestComponents/Theme/ThemeTest.android.tsx index 329ad7c622..f224016379 100644 --- a/apps/tester-core/src/TestComponents/Theme/ThemeTest.android.tsx +++ b/apps/tester-core/src/TestComponents/Theme/ThemeTest.android.tsx @@ -7,7 +7,7 @@ import { Text } from '@fluentui/react-native'; import { THEME_TESTPAGE } from '@fluentui-react-native/e2e-testing'; import { useFluentTheme } from '@fluentui-react-native/framework'; import type { Theme } from '@fluentui-react-native/design/theming'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; +import { themedStyleSheet } from '@fluentui-react-native/design/styling/stylesheet'; import { commonTestStyles } from '../Common/styles'; import type { TestSection, PlatformStatus } from '../Test'; diff --git a/apps/tester-core/src/TestComponents/Theme/ThemeTest.tsx b/apps/tester-core/src/TestComponents/Theme/ThemeTest.tsx index bb28bcc553..145487e95c 100644 --- a/apps/tester-core/src/TestComponents/Theme/ThemeTest.tsx +++ b/apps/tester-core/src/TestComponents/Theme/ThemeTest.tsx @@ -6,7 +6,7 @@ import { Button, PrimaryButton, Text, StealthButton } from '@fluentui/react-nati import { THEME_TESTPAGE } from '@fluentui-react-native/e2e-testing'; import type { Theme } from '@fluentui-react-native/design/theming'; import { useTheme } from '@fluentui-react-native/design/theming'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; +import { themedStyleSheet } from '@fluentui-react-native/design/styling/stylesheet'; import { commonTestStyles } from '../Common/styles'; import type { TestSection, PlatformStatus } from '../Test'; diff --git a/apps/tester-core/src/theme/ThemePickers.android.tsx b/apps/tester-core/src/theme/ThemePickers.android.tsx index 56cc0f6ff7..a74f8b3e11 100644 --- a/apps/tester-core/src/theme/ThemePickers.android.tsx +++ b/apps/tester-core/src/theme/ThemePickers.android.tsx @@ -4,7 +4,7 @@ import { View } from 'react-native'; import type { Theme } from '@fluentui-react-native/framework'; import { useTheme } from '@fluentui-react-native/framework'; import { TextV1 as Text } from '@fluentui-react-native/text'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; +import { themedStyleSheet } from '@fluentui-react-native/design/styling/stylesheet'; import type { PickerProps } from '@react-native-picker/picker'; import { Picker } from '@react-native-picker/picker'; diff --git a/apps/tester-core/src/theme/ThemePickers.ios.tsx b/apps/tester-core/src/theme/ThemePickers.ios.tsx index 25811fde50..0195ea62a1 100644 --- a/apps/tester-core/src/theme/ThemePickers.ios.tsx +++ b/apps/tester-core/src/theme/ThemePickers.ios.tsx @@ -4,7 +4,7 @@ import { View } from 'react-native'; import { ButtonV1 as Button } from '@fluentui-react-native/button'; import type { Theme } from '@fluentui-react-native/framework'; import { useTheme } from '@fluentui-react-native/framework'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; +import { themedStyleSheet } from '@fluentui-react-native/design/styling/stylesheet'; import { MenuView } from '@react-native-menu/menu'; import type { MenuAction } from '@react-native-menu/menu'; diff --git a/apps/tester-core/tsconfig.json b/apps/tester-core/tsconfig.json index b4cf47c8c9..7757310289 100644 --- a/apps/tester-core/tsconfig.json +++ b/apps/tester-core/tsconfig.json @@ -136,15 +136,6 @@ { "path": "../../packages/components/Text/tsconfig.json" }, - { - "path": "../../packages/shim/theme-tokens/tsconfig.json" - }, - { - "path": "../../packages/shim/theme/tsconfig.json" - }, - { - "path": "../../packages/shim/themed-stylesheet/tsconfig.json" - }, { "path": "../../packages/experimental/Tooltip/tsconfig.json" }, diff --git a/packages/agentic/design/package.json b/packages/agentic/design/package.json index d543fc6aa7..3e2a803959 100644 --- a/packages/agentic/design/package.json +++ b/packages/agentic/design/package.json @@ -109,6 +109,9 @@ "react-native-windows": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0" }, "peerDependenciesMeta": { + "@office-iss/react-native-win32": { + "optional": true + }, "@types/react": { "optional": true }, @@ -117,9 +120,6 @@ }, "react-native-windows": { "optional": true - }, - "@office-iss/react-native-win32": { - "optional": true } }, "furn": { diff --git a/packages/components/Avatar/package.json b/packages/components/Avatar/package.json index 53f935a2ea..e909a09de7 100644 --- a/packages/components/Avatar/package.json +++ b/packages/components/Avatar/package.json @@ -37,7 +37,6 @@ "@fluentui-react-native/framework": "workspace:*", "@fluentui-react-native/framework-base": "workspace:*", "@fluentui-react-native/icon": "workspace:*", - "@fluentui-react-native/tokens": "workspace:*", "@fluentui-react-native/use-styling": "workspace:*", "unicode-segmenter": "^0.14.4" }, diff --git a/packages/components/Avatar/src/Avatar.styling.ts b/packages/components/Avatar/src/Avatar.styling.ts index cea5b1197f..4f736f2fb1 100644 --- a/packages/components/Avatar/src/Avatar.styling.ts +++ b/packages/components/Avatar/src/Avatar.styling.ts @@ -2,7 +2,7 @@ import { Platform } from 'react-native'; import type { Theme, UseStylingOptions } from '@fluentui-react-native/framework'; import { buildProps } from '@fluentui-react-native/framework'; -import { borderStyles, fontStyles } from '@fluentui-react-native/tokens'; +import { borderStyles, fontStyles } from '@fluentui-react-native/design/styling/tokens'; import type { AvatarTokens, diff --git a/packages/components/Avatar/src/Avatar.types.ts b/packages/components/Avatar/src/Avatar.types.ts index fee53086ac..c7758098b0 100644 --- a/packages/components/Avatar/src/Avatar.types.ts +++ b/packages/components/Avatar/src/Avatar.types.ts @@ -3,7 +3,12 @@ import type { ImageProps, ViewProps, TextProps, ColorValue } from 'react-native' import type { IViewProps } from '@fluentui-react-native/adapters'; import type { PresenceBadgeProps, BadgeSize, PresenceBadgeStatus } from '@fluentui-react-native/badge'; import type { IconProps, IconSourcesType } from '@fluentui-react-native/icon'; -import type { IBackgroundColorTokens, IForegroundColorTokens, IBorderTokens, FontTokens } from '@fluentui-react-native/tokens'; +import type { + IBackgroundColorTokens, + IForegroundColorTokens, + IBorderTokens, + FontTokens, +} from '@fluentui-react-native/design/styling/tokens'; import type { SvgProps } from 'react-native-svg'; export const AvatarName = 'Avatar'; diff --git a/packages/components/Avatar/tsconfig.json b/packages/components/Avatar/tsconfig.json index fa09be6ec5..1c464e9399 100644 --- a/packages/components/Avatar/tsconfig.json +++ b/packages/components/Avatar/tsconfig.json @@ -29,9 +29,6 @@ { "path": "../../../scripts/tsconfig.json" }, - { - "path": "../../shim/tokens/tsconfig.json" - }, { "path": "../../framework/use-styling/tsconfig.json" } diff --git a/packages/components/Badge/package.json b/packages/components/Badge/package.json index 2675ae7384..bb62748392 100644 --- a/packages/components/Badge/package.json +++ b/packages/components/Badge/package.json @@ -34,7 +34,6 @@ "@fluentui-react-native/framework-base": "workspace:*", "@fluentui-react-native/icon": "workspace:*", "@fluentui-react-native/text": "workspace:*", - "@fluentui-react-native/tokens": "workspace:*", "@fluentui-react-native/use-styling": "workspace:*" }, "devDependencies": { diff --git a/packages/components/Badge/src/Badge.styling.ts b/packages/components/Badge/src/Badge.styling.ts index 02bccaa6da..e167f8c697 100644 --- a/packages/components/Badge/src/Badge.styling.ts +++ b/packages/components/Badge/src/Badge.styling.ts @@ -1,6 +1,6 @@ import type { UseStylingOptions, Theme } from '@fluentui-react-native/framework'; import { buildProps } from '@fluentui-react-native/framework'; -import { borderStyles, layoutStyles, fontStyles } from '@fluentui-react-native/tokens'; +import { borderStyles, layoutStyles, fontStyles } from '@fluentui-react-native/design/styling/tokens'; import { badgeName, BadgeColors, BadgeSizes, BadgeShapes, BadgeAppearances } from './Badge.types'; import type { BadgeCoreTokens, BadgeTokens, BadgeSlotProps, BadgeProps, BadgeConfigurableProps, BadgeNamedColor } from './Badge.types'; diff --git a/packages/components/Badge/src/Badge.types.ts b/packages/components/Badge/src/Badge.types.ts index 0c312e738e..9a4fa1703e 100644 --- a/packages/components/Badge/src/Badge.types.ts +++ b/packages/components/Badge/src/Badge.types.ts @@ -5,7 +5,7 @@ import type { ShadowProps } from '@fluentui-react-native/experimental-shadow'; import type { IconProps, IconSourcesType } from '@fluentui-react-native/icon'; import type { TextProps } from '@fluentui-react-native/text'; import type { ShadowToken } from '@fluentui-react-native/design/theming'; -import type { FontTokens, IBorderTokens, IColorTokens, IShadowTokens, LayoutTokens } from '@fluentui-react-native/tokens'; +import type { FontTokens, IBorderTokens, IColorTokens, IShadowTokens, LayoutTokens } from '@fluentui-react-native/design/styling/tokens'; export const badgeName = 'Badge'; export const BadgeSizes = ['tiny', 'extraSmall', 'small', 'medium', 'large', 'extraLarge'] as const; diff --git a/packages/components/Badge/src/CounterBadge/CounterBadge.styling.ts b/packages/components/Badge/src/CounterBadge/CounterBadge.styling.ts index 336ab295b6..c8d184f6c7 100644 --- a/packages/components/Badge/src/CounterBadge/CounterBadge.styling.ts +++ b/packages/components/Badge/src/CounterBadge/CounterBadge.styling.ts @@ -1,6 +1,6 @@ import type { UseStylingOptions, Theme } from '@fluentui-react-native/framework'; import { buildProps } from '@fluentui-react-native/framework'; -import { borderStyles } from '@fluentui-react-native/tokens'; +import { borderStyles } from '@fluentui-react-native/design/styling/tokens'; import { counterBadgeName } from './CounterBadge.types'; import type { CounterBadgeTokens, CounterBadgeProps, CounterBadgeSlotProps } from './CounterBadge.types'; diff --git a/packages/components/Badge/src/PresenceBadge/PresenceBadge.styling.ts b/packages/components/Badge/src/PresenceBadge/PresenceBadge.styling.ts index a6e8abd4a7..4ba09223c8 100644 --- a/packages/components/Badge/src/PresenceBadge/PresenceBadge.styling.ts +++ b/packages/components/Badge/src/PresenceBadge/PresenceBadge.styling.ts @@ -1,6 +1,6 @@ import type { UseStylingOptions, Theme } from '@fluentui-react-native/framework'; import { buildProps } from '@fluentui-react-native/framework'; -import { borderStyles } from '@fluentui-react-native/tokens'; +import { borderStyles } from '@fluentui-react-native/design/styling/tokens'; import { presenceBadgeName, PresenceBadgeStatuses } from './PresenceBadge.types'; import type { PresenceBadgeTokens, PresenceBadgeSlotProps, PresenceBadgeProps } from './PresenceBadge.types'; diff --git a/packages/components/Badge/tsconfig.json b/packages/components/Badge/tsconfig.json index c93ee34243..cba0081cb8 100644 --- a/packages/components/Badge/tsconfig.json +++ b/packages/components/Badge/tsconfig.json @@ -35,9 +35,6 @@ { "path": "../Text/tsconfig.json" }, - { - "path": "../../shim/tokens/tsconfig.json" - }, { "path": "../../framework/use-styling/tsconfig.json" } diff --git a/packages/components/Button/package.json b/packages/components/Button/package.json index 2eedf39a59..b4cd35945f 100644 --- a/packages/components/Button/package.json +++ b/packages/components/Button/package.json @@ -42,7 +42,6 @@ "@fluentui-react-native/pressable": "workspace:*", "@fluentui-react-native/styling-utils": "workspace:*", "@fluentui-react-native/text": "workspace:*", - "@fluentui-react-native/tokens": "workspace:*", "@fluentui-react-native/use-styling": "workspace:*", "@uifabricshared/foundation-composable": "workspace:*", "@uifabricshared/foundation-compose": "workspace:*", diff --git a/packages/components/Button/src/Button.styling.ts b/packages/components/Button/src/Button.styling.ts index c9724251ad..35264bbf51 100644 --- a/packages/components/Button/src/Button.styling.ts +++ b/packages/components/Button/src/Button.styling.ts @@ -4,8 +4,8 @@ import { Platform } from 'react-native'; import type { Theme, UseStylingOptions } from '@fluentui-react-native/framework'; import { buildProps } from '@fluentui-react-native/framework'; import { getTextMarginAdjustment } from '@fluentui-react-native/styling-utils'; -import { borderStyles, layoutStyles, fontStyles } from '@fluentui-react-native/tokens'; -import type { FontTokens } from '@fluentui-react-native/tokens'; +import { borderStyles, layoutStyles, fontStyles } from '@fluentui-react-native/design/styling/tokens'; +import type { FontTokens } from '@fluentui-react-native/design/styling/tokens'; import { buttonName } from './Button.types'; import type { ButtonTokens, ButtonSlotProps, ButtonProps, ButtonSize, ButtonAppearance } from './Button.types'; diff --git a/packages/components/Button/src/Button.types.ts b/packages/components/Button/src/Button.types.ts index 3fc5245a5c..f2fea4390b 100644 --- a/packages/components/Button/src/Button.types.ts +++ b/packages/components/Button/src/Button.types.ts @@ -5,7 +5,7 @@ import type { IconProps, IconSourcesType } from '@fluentui-react-native/icon'; import type { IFocusable, InteractionEvent, PressablePropsExtended, PressableState } from '@fluentui-react-native/interactive-hooks'; import type { TextProps } from '@fluentui-react-native/text'; import type { ShadowToken } from '@fluentui-react-native/design/theming'; -import type { FontTokens, IBorderTokens, IColorTokens, IShadowTokens, LayoutTokens } from '@fluentui-react-native/tokens'; +import type { FontTokens, IBorderTokens, IColorTokens, IShadowTokens, LayoutTokens } from '@fluentui-react-native/design/styling/tokens'; export const buttonName = 'Button'; export type ButtonSize = 'small' | 'medium' | 'large'; diff --git a/packages/components/Button/src/CompoundButton/CompoundButton.styling.ts b/packages/components/Button/src/CompoundButton/CompoundButton.styling.ts index 1b72d0d3e0..a243d8e3f2 100644 --- a/packages/components/Button/src/CompoundButton/CompoundButton.styling.ts +++ b/packages/components/Button/src/CompoundButton/CompoundButton.styling.ts @@ -1,6 +1,6 @@ import type { Theme, UseStylingOptions } from '@fluentui-react-native/framework'; import { buildProps } from '@fluentui-react-native/framework'; -import { borderStyles, fontStyles, layoutStyles } from '@fluentui-react-native/tokens'; +import { borderStyles, fontStyles, layoutStyles } from '@fluentui-react-native/design/styling/tokens'; import { compoundButtonName } from './CompoundButton.types'; import type { CompoundButtonTokens, CompoundButtonSlotProps, CompoundButtonProps } from './CompoundButton.types'; diff --git a/packages/components/Button/src/CompoundButton/CompoundButton.types.ts b/packages/components/Button/src/CompoundButton/CompoundButton.types.ts index 874c22ab68..ad09cd02c9 100644 --- a/packages/components/Button/src/CompoundButton/CompoundButton.types.ts +++ b/packages/components/Button/src/CompoundButton/CompoundButton.types.ts @@ -1,7 +1,7 @@ import type { ViewProps, ColorValue } from 'react-native'; import type { TextProps } from '@fluentui-react-native/text'; -import type { FontTokens } from '@fluentui-react-native/tokens'; +import type { FontTokens } from '@fluentui-react-native/design/styling/tokens'; import type { ButtonSlotProps, ButtonTokens, ButtonProps } from '../Button.types'; diff --git a/packages/components/Button/src/FAB/FAB.styling.ts b/packages/components/Button/src/FAB/FAB.styling.ts index 35b4209907..b3e585203c 100644 --- a/packages/components/Button/src/FAB/FAB.styling.ts +++ b/packages/components/Button/src/FAB/FAB.styling.ts @@ -3,7 +3,7 @@ import { Platform } from 'react-native'; import type { Theme, UseStylingOptions } from '@fluentui-react-native/framework'; import { buildProps } from '@fluentui-react-native/framework'; import { getTextMarginAdjustment } from '@fluentui-react-native/styling-utils'; -import { borderStyles, layoutStyles, fontStyles, shadowStyles } from '@fluentui-react-native/tokens'; +import { borderStyles, layoutStyles, fontStyles, shadowStyles } from '@fluentui-react-native/design/styling/tokens'; import { fabName } from './FAB.types'; import type { FABProps, FABSlotProps, FABTokens } from './FAB.types'; diff --git a/packages/components/Button/src/ToggleButton/ToggleButton.styling.ts b/packages/components/Button/src/ToggleButton/ToggleButton.styling.ts index fa6ef29c89..a3e3246103 100644 --- a/packages/components/Button/src/ToggleButton/ToggleButton.styling.ts +++ b/packages/components/Button/src/ToggleButton/ToggleButton.styling.ts @@ -1,6 +1,6 @@ import type { Theme, UseStylingOptions } from '@fluentui-react-native/framework'; import { buildProps } from '@fluentui-react-native/framework'; -import { borderStyles, layoutStyles, fontStyles } from '@fluentui-react-native/tokens'; +import { borderStyles, layoutStyles, fontStyles } from '@fluentui-react-native/design/styling/tokens'; import { toggleButtonName } from './ToggleButton.types'; import type { ToggleButtonTokens, ToggleButtonSlotProps, ToggleButtonProps } from './ToggleButton.types'; diff --git a/packages/components/Button/src/deprecated/Button.android.tsx b/packages/components/Button/src/deprecated/Button.android.tsx index e755dfb0d4..f4d8be27dd 100644 --- a/packages/components/Button/src/deprecated/Button.android.tsx +++ b/packages/components/Button/src/deprecated/Button.android.tsx @@ -6,7 +6,13 @@ import { filterViewProps } from '@fluentui-react-native/adapters'; import { Icon, createIconProps } from '@fluentui-react-native/icon'; import { useAsPressable, useViewCommandFocus } from '@fluentui-react-native/interactive-hooks'; import { Text } from '@fluentui-react-native/text'; -import { backgroundColorTokens, borderTokens, textTokens, foregroundColorTokens, getPaletteFromTheme } from '@fluentui-react-native/tokens'; +import { + backgroundColorTokens, + borderTokens, + textTokens, + foregroundColorTokens, + getPaletteFromTheme, +} from '@fluentui-react-native/design/styling/tokens'; import type { ISlots } from '@uifabricshared/foundation-composable'; import type { IUseComposeStyling } from '@uifabricshared/foundation-compose'; import { compose } from '@uifabricshared/foundation-compose'; diff --git a/packages/components/Button/src/deprecated/Button.tsx b/packages/components/Button/src/deprecated/Button.tsx index 36960622ee..d93dd17e62 100644 --- a/packages/components/Button/src/deprecated/Button.tsx +++ b/packages/components/Button/src/deprecated/Button.tsx @@ -6,7 +6,13 @@ import { filterViewProps } from '@fluentui-react-native/adapters'; import { Icon, createIconProps } from '@fluentui-react-native/icon'; import { useAsPressable, useKeyProps, useViewCommandFocus, useOnPressWithFocus } from '@fluentui-react-native/interactive-hooks'; import { Text } from '@fluentui-react-native/text'; -import { backgroundColorTokens, borderTokens, textTokens, foregroundColorTokens, getPaletteFromTheme } from '@fluentui-react-native/tokens'; +import { + backgroundColorTokens, + borderTokens, + textTokens, + foregroundColorTokens, + getPaletteFromTheme, +} from '@fluentui-react-native/design/styling/tokens'; import type { ISlots } from '@uifabricshared/foundation-composable'; import type { IUseComposeStyling } from '@uifabricshared/foundation-compose'; import { compose } from '@uifabricshared/foundation-compose'; diff --git a/packages/components/Button/src/deprecated/Button.types.ts b/packages/components/Button/src/deprecated/Button.types.ts index c8b5d6fb2f..647266e913 100644 --- a/packages/components/Button/src/deprecated/Button.types.ts +++ b/packages/components/Button/src/deprecated/Button.types.ts @@ -5,7 +5,12 @@ import type { IconProps, IconSourcesType } from '@fluentui-react-native/icon'; import type { IFocusable, IPressableState } from '@fluentui-react-native/interactive-hooks'; import type { IPressableProps } from '@fluentui-react-native/pressable'; import type { ITextProps } from '@fluentui-react-native/text'; -import type { FontTokens, IForegroundColorTokens, IBackgroundColorTokens, IBorderTokens } from '@fluentui-react-native/tokens'; +import type { + FontTokens, + IForegroundColorTokens, + IBackgroundColorTokens, + IBorderTokens, +} from '@fluentui-react-native/design/styling/tokens'; import type { IRenderData } from '@uifabricshared/foundation-composable'; /** diff --git a/packages/components/Button/tsconfig.json b/packages/components/Button/tsconfig.json index 31b11f147c..86599484e6 100644 --- a/packages/components/Button/tsconfig.json +++ b/packages/components/Button/tsconfig.json @@ -47,9 +47,6 @@ { "path": "../Text/tsconfig.json" }, - { - "path": "../../shim/tokens/tsconfig.json" - }, { "path": "../../framework/use-styling/tsconfig.json" }, diff --git a/packages/components/Checkbox/package.json b/packages/components/Checkbox/package.json index 1690666184..d5c0a23077 100644 --- a/packages/components/Checkbox/package.json +++ b/packages/components/Checkbox/package.json @@ -39,7 +39,6 @@ "@fluentui-react-native/pressable": "workspace:*", "@fluentui-react-native/styling-utils": "workspace:*", "@fluentui-react-native/text": "workspace:*", - "@fluentui-react-native/tokens": "workspace:*", "@fluentui-react-native/use-styling": "workspace:*", "@uifabricshared/foundation-composable": "workspace:*", "@uifabricshared/foundation-compose": "workspace:*", diff --git a/packages/components/Checkbox/src/Checkbox.styling.ts b/packages/components/Checkbox/src/Checkbox.styling.ts index 28a859fbca..819ea5a2de 100644 --- a/packages/components/Checkbox/src/Checkbox.styling.ts +++ b/packages/components/Checkbox/src/Checkbox.styling.ts @@ -3,7 +3,7 @@ import { Platform } from 'react-native'; import type { Theme, UseStylingOptions } from '@fluentui-react-native/framework'; import { buildProps } from '@fluentui-react-native/framework'; import { getTextMarginAdjustment } from '@fluentui-react-native/styling-utils'; -import { borderStyles, fontStyles } from '@fluentui-react-native/tokens'; +import { borderStyles, fontStyles } from '@fluentui-react-native/design/styling/tokens'; import { checkboxName } from './Checkbox.types'; import type { CheckboxTokens, CheckboxSlotProps, CheckboxProps, CheckboxSize } from './Checkbox.types'; diff --git a/packages/components/Checkbox/src/Checkbox.types.ts b/packages/components/Checkbox/src/Checkbox.types.ts index 9fd8f0f80c..be8e4b68d3 100644 --- a/packages/components/Checkbox/src/Checkbox.types.ts +++ b/packages/components/Checkbox/src/Checkbox.types.ts @@ -9,7 +9,7 @@ import type { IForegroundColorTokens, IBackgroundColorTokens, LayoutTokens, -} from '@fluentui-react-native/tokens'; +} from '@fluentui-react-native/design/styling/tokens'; import type { SvgProps } from 'react-native-svg'; export const checkboxName = 'Checkbox'; diff --git a/packages/components/Checkbox/src/deprecated/Checkbox.tsx b/packages/components/Checkbox/src/deprecated/Checkbox.tsx index d01b280eee..30393469ce 100644 --- a/packages/components/Checkbox/src/deprecated/Checkbox.tsx +++ b/packages/components/Checkbox/src/deprecated/Checkbox.tsx @@ -12,8 +12,8 @@ import { } from '@fluentui-react-native/interactive-hooks'; import type { IPressableProps } from '@fluentui-react-native/pressable'; import { Text } from '@fluentui-react-native/text'; -import { foregroundColorTokens, textTokens, borderTokens, getPaletteFromTheme } from '@fluentui-react-native/tokens'; -import { backgroundColorTokens } from '@fluentui-react-native/tokens'; +import { foregroundColorTokens, textTokens, borderTokens, getPaletteFromTheme } from '@fluentui-react-native/design/styling/tokens'; +import { backgroundColorTokens } from '@fluentui-react-native/design/styling/tokens'; import type { ISlots } from '@uifabricshared/foundation-composable'; import type { IUseComposeStyling } from '@uifabricshared/foundation-compose'; import { compose } from '@uifabricshared/foundation-compose'; diff --git a/packages/components/Checkbox/src/deprecated/Checkbox.types.ts b/packages/components/Checkbox/src/deprecated/Checkbox.types.ts index 21fa62ca50..80629e7ddc 100644 --- a/packages/components/Checkbox/src/deprecated/Checkbox.types.ts +++ b/packages/components/Checkbox/src/deprecated/Checkbox.types.ts @@ -5,7 +5,12 @@ import type { IViewProps } from '@fluentui-react-native/adapters'; import type { IPressableState, IFocusable } from '@fluentui-react-native/interactive-hooks'; // import { IPressableProps } from '@fluentui-react-native/pressable'; import type { ITextProps } from '@fluentui-react-native/text'; -import type { FontTokens, IForegroundColorTokens, IBackgroundColorTokens, IBorderTokens } from '@fluentui-react-native/tokens'; +import type { + FontTokens, + IForegroundColorTokens, + IBackgroundColorTokens, + IBorderTokens, +} from '@fluentui-react-native/design/styling/tokens'; import type { IRenderData } from '@uifabricshared/foundation-composable'; /** diff --git a/packages/components/Checkbox/tsconfig.json b/packages/components/Checkbox/tsconfig.json index 99e01e9e66..d2c633e958 100644 --- a/packages/components/Checkbox/tsconfig.json +++ b/packages/components/Checkbox/tsconfig.json @@ -38,9 +38,6 @@ { "path": "../Text/tsconfig.json" }, - { - "path": "../../shim/tokens/tsconfig.json" - }, { "path": "../../framework/use-styling/tsconfig.json" }, diff --git a/packages/components/Chip/package.json b/packages/components/Chip/package.json index fd1f58ecfe..45140d1c84 100644 --- a/packages/components/Chip/package.json +++ b/packages/components/Chip/package.json @@ -32,8 +32,7 @@ "@fluentui-react-native/framework-base": "workspace:*", "@fluentui-react-native/icon": "workspace:*", "@fluentui-react-native/interactive-hooks": "workspace:*", - "@fluentui-react-native/text": "workspace:*", - "@fluentui-react-native/tokens": "workspace:*" + "@fluentui-react-native/text": "workspace:*" }, "devDependencies": { "@babel/core": "catalog:", diff --git a/packages/components/Chip/src/Chip.styling.ts b/packages/components/Chip/src/Chip.styling.ts index a8341244bf..af77b4414f 100644 --- a/packages/components/Chip/src/Chip.styling.ts +++ b/packages/components/Chip/src/Chip.styling.ts @@ -1,6 +1,6 @@ import type { UseStylingOptions, Theme } from '@fluentui-react-native/framework'; import { buildProps } from '@fluentui-react-native/framework'; -import { borderStyles, layoutStyles, fontStyles } from '@fluentui-react-native/tokens'; +import { borderStyles, layoutStyles, fontStyles } from '@fluentui-react-native/design/styling/tokens'; import { chipName, ChipColors, ChipSizes } from './Chip.types'; import type { ChipTokens, ChipSlotProps, ChipProps, ChipConfigurableProps } from './Chip.types'; diff --git a/packages/components/Chip/src/Chip.types.ts b/packages/components/Chip/src/Chip.types.ts index 1d009c5a9e..b42114a8bc 100644 --- a/packages/components/Chip/src/Chip.types.ts +++ b/packages/components/Chip/src/Chip.types.ts @@ -4,7 +4,7 @@ import type { IViewProps } from '@fluentui-react-native/adapters'; import type { IconProps, IconSourcesType } from '@fluentui-react-native/icon'; import type { InteractionEvent, PressablePropsExtended, PressableState } from '@fluentui-react-native/interactive-hooks'; import type { TextProps } from '@fluentui-react-native/text'; -import type { FontTokens, IBorderTokens, IColorTokens, LayoutTokens } from '@fluentui-react-native/tokens'; +import type { FontTokens, IBorderTokens, IColorTokens, LayoutTokens } from '@fluentui-react-native/design/styling/tokens'; export const chipName = 'Chip'; export const ChipSizes = ['small', 'medium'] as const; diff --git a/packages/components/Chip/tsconfig.json b/packages/components/Chip/tsconfig.json index 02d565a8c6..0af4d09bc2 100644 --- a/packages/components/Chip/tsconfig.json +++ b/packages/components/Chip/tsconfig.json @@ -35,9 +35,6 @@ { "path": "../Text/tsconfig.json" }, - { - "path": "../../shim/tokens/tsconfig.json" - }, { "path": "../../framework/use-styling/tsconfig.json" } diff --git a/packages/components/ContextualMenu/package.json b/packages/components/ContextualMenu/package.json index 5dc0bdcfa2..218f884aff 100644 --- a/packages/components/ContextualMenu/package.json +++ b/packages/components/ContextualMenu/package.json @@ -33,12 +33,12 @@ "dependencies": { "@fluentui-react-native/adapters": "workspace:*", "@fluentui-react-native/callout": "workspace:*", + "@fluentui-react-native/design": "workspace:*", "@fluentui-react-native/focus-zone": "workspace:*", "@fluentui-react-native/framework-base": "workspace:*", "@fluentui-react-native/icon": "workspace:*", "@fluentui-react-native/interactive-hooks": "workspace:*", "@fluentui-react-native/text": "workspace:*", - "@fluentui-react-native/tokens": "workspace:*", "@uifabricshared/foundation-composable": "workspace:*", "@uifabricshared/foundation-compose": "workspace:*", "@uifabricshared/foundation-settings": "workspace:*" diff --git a/packages/components/ContextualMenu/src/ContextualMenu.tsx b/packages/components/ContextualMenu/src/ContextualMenu.tsx index bf5c3373d5..1968e02126 100644 --- a/packages/components/ContextualMenu/src/ContextualMenu.tsx +++ b/packages/components/ContextualMenu/src/ContextualMenu.tsx @@ -6,7 +6,7 @@ import { Callout } from '@fluentui-react-native/callout'; import { FocusZone } from '@fluentui-react-native/focus-zone'; import type { IFocusable } from '@fluentui-react-native/interactive-hooks'; import { useSelectedKey } from '@fluentui-react-native/interactive-hooks'; -import { backgroundColorTokens, borderTokens } from '@fluentui-react-native/tokens'; +import { backgroundColorTokens, borderTokens } from '@fluentui-react-native/design/styling/tokens'; import type { ISlots } from '@uifabricshared/foundation-composable'; import type { IUseComposeStyling } from '@uifabricshared/foundation-compose'; import { compose } from '@uifabricshared/foundation-compose'; diff --git a/packages/components/ContextualMenu/src/ContextualMenuItem.tsx b/packages/components/ContextualMenu/src/ContextualMenuItem.tsx index b2d9001372..77ec337b03 100644 --- a/packages/components/ContextualMenu/src/ContextualMenuItem.tsx +++ b/packages/components/ContextualMenu/src/ContextualMenuItem.tsx @@ -5,7 +5,13 @@ import { View } from 'react-native'; import { Icon, createIconProps } from '@fluentui-react-native/icon'; import { useAsPressable, useKeyProps, useViewCommandFocus } from '@fluentui-react-native/interactive-hooks'; import { Text } from '@fluentui-react-native/text'; -import { backgroundColorTokens, borderTokens, textTokens, foregroundColorTokens, getPaletteFromTheme } from '@fluentui-react-native/tokens'; +import { + backgroundColorTokens, + borderTokens, + textTokens, + foregroundColorTokens, + getPaletteFromTheme, +} from '@fluentui-react-native/design/styling/tokens'; import type { ISlots } from '@uifabricshared/foundation-composable'; import type { IUseComposeStyling } from '@uifabricshared/foundation-compose'; import { compose } from '@uifabricshared/foundation-compose'; diff --git a/packages/components/ContextualMenu/src/ContextualMenuItem.types.ts b/packages/components/ContextualMenu/src/ContextualMenuItem.types.ts index e62c9f72e1..733c760f13 100644 --- a/packages/components/ContextualMenu/src/ContextualMenuItem.types.ts +++ b/packages/components/ContextualMenu/src/ContextualMenuItem.types.ts @@ -4,7 +4,12 @@ import type { IViewProps } from '@fluentui-react-native/adapters'; import type { IconProps } from '@fluentui-react-native/icon'; import type { IFocusable, IPressableState, PressablePropsExtended } from '@fluentui-react-native/interactive-hooks'; import type { ITextProps } from '@fluentui-react-native/text'; -import type { FontTokens, IForegroundColorTokens, IBackgroundColorTokens, IBorderTokens } from '@fluentui-react-native/tokens'; +import type { + FontTokens, + IForegroundColorTokens, + IBackgroundColorTokens, + IBorderTokens, +} from '@fluentui-react-native/design/styling/tokens'; import type { IRenderData } from '@uifabricshared/foundation-composable'; export const contextualMenuItemName = 'ContextualMenuItem'; diff --git a/packages/components/ContextualMenu/src/Submenu.tsx b/packages/components/ContextualMenu/src/Submenu.tsx index f48c3fda31..5e45666073 100644 --- a/packages/components/ContextualMenu/src/Submenu.tsx +++ b/packages/components/ContextualMenu/src/Submenu.tsx @@ -6,7 +6,7 @@ import { Callout } from '@fluentui-react-native/callout'; import { FocusZone } from '@fluentui-react-native/focus-zone'; import type { IFocusable } from '@fluentui-react-native/interactive-hooks'; import { useKeyDownProps, useSelectedKey } from '@fluentui-react-native/interactive-hooks'; -import { backgroundColorTokens, borderTokens } from '@fluentui-react-native/tokens'; +import { backgroundColorTokens, borderTokens } from '@fluentui-react-native/design/styling/tokens'; import type { ISlots } from '@uifabricshared/foundation-composable'; import type { IUseComposeStyling } from '@uifabricshared/foundation-compose'; import { compose } from '@uifabricshared/foundation-compose'; diff --git a/packages/components/ContextualMenu/src/SubmenuItem.tsx b/packages/components/ContextualMenu/src/SubmenuItem.tsx index fba9b80500..27791d794e 100644 --- a/packages/components/ContextualMenu/src/SubmenuItem.tsx +++ b/packages/components/ContextualMenu/src/SubmenuItem.tsx @@ -6,7 +6,13 @@ import type { SvgIconProps } from '@fluentui-react-native/icon'; import { Icon, createIconProps } from '@fluentui-react-native/icon'; import { useKeyDownProps, useViewCommandFocus, useAsPressable } from '@fluentui-react-native/interactive-hooks'; import { Text } from '@fluentui-react-native/text'; -import { backgroundColorTokens, borderTokens, textTokens, foregroundColorTokens, getPaletteFromTheme } from '@fluentui-react-native/tokens'; +import { + backgroundColorTokens, + borderTokens, + textTokens, + foregroundColorTokens, + getPaletteFromTheme, +} from '@fluentui-react-native/design/styling/tokens'; import type { ISlots } from '@uifabricshared/foundation-composable'; import type { IUseComposeStyling } from '@uifabricshared/foundation-compose'; import { compose } from '@uifabricshared/foundation-compose'; diff --git a/packages/components/ContextualMenu/tsconfig.json b/packages/components/ContextualMenu/tsconfig.json index 4375d0bb4d..6c64cdfc02 100644 --- a/packages/components/ContextualMenu/tsconfig.json +++ b/packages/components/ContextualMenu/tsconfig.json @@ -35,9 +35,6 @@ { "path": "../Text/tsconfig.json" }, - { - "path": "../../shim/tokens/tsconfig.json" - }, { "path": "../../deprecated/foundation-composable/tsconfig.json" }, @@ -46,6 +43,9 @@ }, { "path": "../../deprecated/foundation-settings/tsconfig.json" + }, + { + "path": "../../agentic/design/tsconfig.json" } ] } diff --git a/packages/components/Divider/package.json b/packages/components/Divider/package.json index 19c5ee492f..8855a32ca9 100644 --- a/packages/components/Divider/package.json +++ b/packages/components/Divider/package.json @@ -34,8 +34,7 @@ "@fluentui-react-native/framework": "workspace:*", "@fluentui-react-native/framework-base": "workspace:*", "@fluentui-react-native/icon": "workspace:*", - "@fluentui-react-native/text": "workspace:*", - "@fluentui-react-native/tokens": "workspace:*" + "@fluentui-react-native/text": "workspace:*" }, "devDependencies": { "@babel/core": "catalog:", diff --git a/packages/components/Divider/src/Divider.styling.ts b/packages/components/Divider/src/Divider.styling.ts index 692b751081..68ea02b315 100644 --- a/packages/components/Divider/src/Divider.styling.ts +++ b/packages/components/Divider/src/Divider.styling.ts @@ -7,7 +7,7 @@ import type { Theme } from '@fluentui-react-native/framework'; import type { IconPropsV1 as IconProps } from '@fluentui-react-native/icon'; import type { TextProps } from '@fluentui-react-native/text'; import { size200 } from '@fluentui-react-native/design/tokens/global'; -import { fontStyles } from '@fluentui-react-native/tokens'; +import { fontStyles } from '@fluentui-react-native/design/styling/tokens'; import type { DividerTokens, DividerProps, DividerAppearance } from './Divider.types'; diff --git a/packages/components/Divider/src/Divider.types.ts b/packages/components/Divider/src/Divider.types.ts index b367f022d3..4f592dfbe8 100644 --- a/packages/components/Divider/src/Divider.types.ts +++ b/packages/components/Divider/src/Divider.types.ts @@ -2,7 +2,7 @@ import type { ViewProps, ColorValue, DimensionValue } from 'react-native'; import type { IconPropsV1 as IconProps } from '@fluentui-react-native/icon'; import type { TextProps } from '@fluentui-react-native/text'; -import type { LayoutTokens, FontTokens } from '@fluentui-react-native/tokens'; +import type { LayoutTokens, FontTokens } from '@fluentui-react-native/design/styling/tokens'; export const dividerName = 'Divider'; diff --git a/packages/components/Divider/tsconfig.json b/packages/components/Divider/tsconfig.json index 6d7bd160c4..47eeb87d91 100644 --- a/packages/components/Divider/tsconfig.json +++ b/packages/components/Divider/tsconfig.json @@ -28,9 +28,6 @@ }, { "path": "../Text/tsconfig.json" - }, - { - "path": "../../shim/tokens/tsconfig.json" } ] } diff --git a/packages/components/Input/package.json b/packages/components/Input/package.json index 33d5981348..c2aaec1b74 100644 --- a/packages/components/Input/package.json +++ b/packages/components/Input/package.json @@ -37,7 +37,6 @@ "@fluentui-react-native/interactive-hooks": "workspace:*", "@fluentui-react-native/styling-utils": "workspace:*", "@fluentui-react-native/text": "workspace:*", - "@fluentui-react-native/tokens": "workspace:*", "@fluentui-react-native/use-styling": "workspace:*" }, "devDependencies": { diff --git a/packages/components/Input/src/Input.styling.ts b/packages/components/Input/src/Input.styling.ts index e9f60d2f8d..fa7e6c723c 100644 --- a/packages/components/Input/src/Input.styling.ts +++ b/packages/components/Input/src/Input.styling.ts @@ -1,7 +1,7 @@ import type { Theme, UseStylingOptions } from '@fluentui-react-native/framework'; import { buildProps } from '@fluentui-react-native/framework'; import { getTextMarginAdjustment } from '@fluentui-react-native/styling-utils'; -import { borderStyles, fontStyles, layoutStyles } from '@fluentui-react-native/tokens'; +import { borderStyles, fontStyles, layoutStyles } from '@fluentui-react-native/design/styling/tokens'; import { input } from './Input.types'; import type { InputTokens, InputSlotProps, InputProps } from './Input.types'; diff --git a/packages/components/Input/src/Input.types.ts b/packages/components/Input/src/Input.types.ts index 7350250494..56742f4b8b 100644 --- a/packages/components/Input/src/Input.types.ts +++ b/packages/components/Input/src/Input.types.ts @@ -4,7 +4,7 @@ import type { IconProps, IconSourcesType } from '@fluentui-react-native/icon'; import type { InteractionEvent, PressableFocusProps } from '@fluentui-react-native/interactive-hooks'; import type { FocusState, PressablePropsExtended } from '@fluentui-react-native/interactive-hooks'; import type { TextProps } from '@fluentui-react-native/text'; -import type { FontTokens, IBorderTokens, IColorTokens, LayoutTokens } from '@fluentui-react-native/tokens'; +import type { FontTokens, IBorderTokens, IColorTokens, LayoutTokens } from '@fluentui-react-native/design/styling/tokens'; export const input = 'Input'; diff --git a/packages/components/Input/tsconfig.json b/packages/components/Input/tsconfig.json index c049a38fca..c936c807e1 100644 --- a/packages/components/Input/tsconfig.json +++ b/packages/components/Input/tsconfig.json @@ -35,9 +35,6 @@ { "path": "../Text/tsconfig.json" }, - { - "path": "../../shim/tokens/tsconfig.json" - }, { "path": "../../framework/use-styling/tsconfig.json" } diff --git a/packages/components/Link/package.json b/packages/components/Link/package.json index b2499b0b3e..1ccaff18e0 100644 --- a/packages/components/Link/package.json +++ b/packages/components/Link/package.json @@ -31,11 +31,11 @@ }, "dependencies": { "@fluentui-react-native/adapters": "workspace:*", + "@fluentui-react-native/design": "workspace:*", "@fluentui-react-native/framework": "workspace:*", "@fluentui-react-native/framework-base": "workspace:*", "@fluentui-react-native/interactive-hooks": "workspace:*", "@fluentui-react-native/text": "workspace:*", - "@fluentui-react-native/tokens": "workspace:*", "@fluentui-react-native/use-styling": "workspace:*", "@uifabricshared/foundation-composable": "workspace:*", "@uifabricshared/foundation-compose": "workspace:*", diff --git a/packages/components/Link/src/Link.styling.ts b/packages/components/Link/src/Link.styling.ts index 02f4dc162a..027b6cc59b 100644 --- a/packages/components/Link/src/Link.styling.ts +++ b/packages/components/Link/src/Link.styling.ts @@ -1,6 +1,6 @@ import type { Theme, UseStylingOptions } from '@fluentui-react-native/framework'; import { buildProps } from '@fluentui-react-native/framework'; -import { borderStyles, fontStyles } from '@fluentui-react-native/tokens'; +import { borderStyles, fontStyles } from '@fluentui-react-native/design/styling/tokens'; import { linkName } from './Link.types'; import type { LinkState, LinkTokens, LinkSlotProps, LinkProps } from './Link.types'; diff --git a/packages/components/Link/src/legacy/Link.tsx b/packages/components/Link/src/legacy/Link.tsx index 0ca49364fd..a6854e80af 100644 --- a/packages/components/Link/src/legacy/Link.tsx +++ b/packages/components/Link/src/legacy/Link.tsx @@ -5,7 +5,7 @@ import { Linking, View } from 'react-native'; import type { ITextProps } from '@fluentui-react-native/adapters'; import { useAsPressable, useKeyProps, useOnPressWithFocus, useViewCommandFocus } from '@fluentui-react-native/interactive-hooks'; import { Text } from '@fluentui-react-native/text'; -import { foregroundColorTokens, textTokens, borderTokens } from '@fluentui-react-native/tokens'; +import { foregroundColorTokens, textTokens, borderTokens } from '@fluentui-react-native/design/styling/tokens'; import type { ISlots } from '@uifabricshared/foundation-composable'; import type { IUseComposeStyling } from '@uifabricshared/foundation-compose'; import { compose } from '@uifabricshared/foundation-compose'; diff --git a/packages/components/Link/src/legacy/Link.types.ts b/packages/components/Link/src/legacy/Link.types.ts index e63bfb0008..0141754600 100644 --- a/packages/components/Link/src/legacy/Link.types.ts +++ b/packages/components/Link/src/legacy/Link.types.ts @@ -3,7 +3,7 @@ import type * as React from 'react'; import type { IViewProps } from '@fluentui-react-native/adapters'; import type { IFocusable, IPressableState, IWithPressableOptions } from '@fluentui-react-native/interactive-hooks'; import type { ITextProps } from '@fluentui-react-native/text'; -import type { IForegroundColorTokens, FontTokens, IBorderTokens } from '@fluentui-react-native/tokens'; +import type { IForegroundColorTokens, FontTokens, IBorderTokens } from '@fluentui-react-native/design/styling/tokens'; import type { IRenderData } from '@uifabricshared/foundation-composable'; // eslint-disable-next-line @typescript-eslint/no-empty-object-type diff --git a/packages/components/Link/tsconfig.json b/packages/components/Link/tsconfig.json index 08ca66844c..0abd0d33c6 100644 --- a/packages/components/Link/tsconfig.json +++ b/packages/components/Link/tsconfig.json @@ -29,9 +29,6 @@ { "path": "../Text/tsconfig.json" }, - { - "path": "../../shim/tokens/tsconfig.json" - }, { "path": "../../framework/use-styling/tsconfig.json" }, @@ -43,6 +40,9 @@ }, { "path": "../../deprecated/foundation-settings/tsconfig.json" + }, + { + "path": "../../agentic/design/tsconfig.json" } ] } diff --git a/packages/components/Menu/package.json b/packages/components/Menu/package.json index 62bf42afb7..b3c033641f 100644 --- a/packages/components/Menu/package.json +++ b/packages/components/Menu/package.json @@ -40,7 +40,6 @@ "@fluentui-react-native/icon": "workspace:*", "@fluentui-react-native/interactive-hooks": "workspace:*", "@fluentui-react-native/text": "workspace:*", - "@fluentui-react-native/tokens": "workspace:*", "@fluentui-react-native/use-styling": "workspace:*" }, "devDependencies": { diff --git a/packages/components/Menu/src/MenuDivider/MenuDivider.types.ts b/packages/components/Menu/src/MenuDivider/MenuDivider.types.ts index a3d0351b96..e44479a249 100644 --- a/packages/components/Menu/src/MenuDivider/MenuDivider.types.ts +++ b/packages/components/Menu/src/MenuDivider/MenuDivider.types.ts @@ -2,7 +2,7 @@ import type * as React from 'react'; import type { ViewStyle } from 'react-native'; import type { IViewProps } from '@fluentui-react-native/adapters'; -import type { IBackgroundColorTokens } from '@fluentui-react-native/tokens'; +import type { IBackgroundColorTokens } from '@fluentui-react-native/design/styling/tokens'; export const menuDividerName = 'MenuDivider'; diff --git a/packages/components/Menu/src/MenuGroup/MenuGroup.types.ts b/packages/components/Menu/src/MenuGroup/MenuGroup.types.ts index 33248137e3..86a8dfc4fc 100644 --- a/packages/components/Menu/src/MenuGroup/MenuGroup.types.ts +++ b/packages/components/Menu/src/MenuGroup/MenuGroup.types.ts @@ -2,7 +2,7 @@ import type { ViewProps } from 'react-native'; import type { IViewProps } from '@fluentui-react-native/adapters'; import type { FocusZoneProps } from '@fluentui-react-native/focus-zone'; -import type { LayoutTokens } from '@fluentui-react-native/tokens'; +import type { LayoutTokens } from '@fluentui-react-native/design/styling/tokens'; export const menuGroupName = 'MenuGroup'; diff --git a/packages/components/Menu/src/MenuGroupHeader/MenuGroupHeader.types.ts b/packages/components/Menu/src/MenuGroupHeader/MenuGroupHeader.types.ts index c5ea58be48..2888aff1fd 100644 --- a/packages/components/Menu/src/MenuGroupHeader/MenuGroupHeader.types.ts +++ b/packages/components/Menu/src/MenuGroupHeader/MenuGroupHeader.types.ts @@ -1,5 +1,5 @@ import type { TextProps } from '@fluentui-react-native/text'; -import type { FontTokens, IColorTokens, LayoutTokens } from '@fluentui-react-native/tokens'; +import type { FontTokens, IColorTokens, LayoutTokens } from '@fluentui-react-native/design/styling/tokens'; export const menuGroupHeaderName = 'MenuGroupHeader'; diff --git a/packages/components/Menu/src/MenuItem/MenuItem.styling.ts b/packages/components/Menu/src/MenuItem/MenuItem.styling.ts index 50a4a303e0..dc1f25ed56 100644 --- a/packages/components/Menu/src/MenuItem/MenuItem.styling.ts +++ b/packages/components/Menu/src/MenuItem/MenuItem.styling.ts @@ -2,7 +2,7 @@ import { Platform } from 'react-native'; import type { Theme, UseStylingOptions } from '@fluentui-react-native/framework'; import { buildProps } from '@fluentui-react-native/framework'; -import { borderStyles, fontStyles, layoutStyles } from '@fluentui-react-native/tokens'; +import { borderStyles, fontStyles, layoutStyles } from '@fluentui-react-native/design/styling/tokens'; import type { MenuItemProps, MenuItemTokens, MenuItemSlotProps } from './MenuItem.types'; import { menuItemName } from './MenuItem.types'; diff --git a/packages/components/Menu/src/MenuItem/MenuItem.types.ts b/packages/components/Menu/src/MenuItem/MenuItem.types.ts index d808a3ee95..26afbdcae1 100644 --- a/packages/components/Menu/src/MenuItem/MenuItem.types.ts +++ b/packages/components/Menu/src/MenuItem/MenuItem.types.ts @@ -5,7 +5,7 @@ import type { IViewProps } from '@fluentui-react-native/adapters'; import type { IconPropsV1 as IconProps } from '@fluentui-react-native/icon'; import type { IFocusable, InteractionEvent, PressablePropsExtended, PressableState } from '@fluentui-react-native/interactive-hooks'; import type { TextProps } from '@fluentui-react-native/text'; -import type { FontTokens, IBorderTokens, IColorTokens, LayoutTokens } from '@fluentui-react-native/tokens'; +import type { FontTokens, IBorderTokens, IColorTokens, LayoutTokens } from '@fluentui-react-native/design/styling/tokens'; import type { XmlProps } from 'react-native-svg'; export const menuItemName = 'MenuItem'; diff --git a/packages/components/Menu/src/MenuItemCheckbox/MenuItemCheckbox.styling.ts b/packages/components/Menu/src/MenuItemCheckbox/MenuItemCheckbox.styling.ts index c4203814e0..ad8c09f953 100644 --- a/packages/components/Menu/src/MenuItemCheckbox/MenuItemCheckbox.styling.ts +++ b/packages/components/Menu/src/MenuItemCheckbox/MenuItemCheckbox.styling.ts @@ -2,7 +2,7 @@ import { Platform } from 'react-native'; import type { Theme, UseStylingOptions } from '@fluentui-react-native/framework'; import { buildProps } from '@fluentui-react-native/framework'; -import { borderStyles, fontStyles, layoutStyles } from '@fluentui-react-native/tokens'; +import { borderStyles, fontStyles, layoutStyles } from '@fluentui-react-native/design/styling/tokens'; import type { MenuItemCheckboxProps, MenuItemCheckboxTokens, MenuItemCheckboxSlotProps } from './MenuItemCheckbox.types'; import { menuItemCheckboxName } from './MenuItemCheckbox.types'; diff --git a/packages/components/Menu/src/MenuItemRadio/MenuItemRadio.styling.android.ts b/packages/components/Menu/src/MenuItemRadio/MenuItemRadio.styling.android.ts index 3d315f3ff6..2100a1c7b1 100644 --- a/packages/components/Menu/src/MenuItemRadio/MenuItemRadio.styling.android.ts +++ b/packages/components/Menu/src/MenuItemRadio/MenuItemRadio.styling.android.ts @@ -2,7 +2,7 @@ import { Platform } from 'react-native'; import type { Theme, UseStylingOptions } from '@fluentui-react-native/framework'; import { buildProps } from '@fluentui-react-native/framework'; -import { borderStyles, fontStyles, layoutStyles } from '@fluentui-react-native/tokens'; +import { borderStyles, fontStyles, layoutStyles } from '@fluentui-react-native/design/styling/tokens'; import type { MenuItemRadioProps, MenuItemRadioSlotProps } from './MenuItemRadio.types'; import { menuItemRadioName } from './MenuItemRadio.types'; diff --git a/packages/components/Menu/src/MenuItemRadio/MenuItemRadio.styling.ts b/packages/components/Menu/src/MenuItemRadio/MenuItemRadio.styling.ts index 5992068f77..cf6bea7380 100644 --- a/packages/components/Menu/src/MenuItemRadio/MenuItemRadio.styling.ts +++ b/packages/components/Menu/src/MenuItemRadio/MenuItemRadio.styling.ts @@ -2,7 +2,7 @@ import { Platform } from 'react-native'; import type { Theme, UseStylingOptions } from '@fluentui-react-native/framework'; import { buildProps } from '@fluentui-react-native/framework'; -import { borderStyles, fontStyles, layoutStyles } from '@fluentui-react-native/tokens'; +import { borderStyles, fontStyles, layoutStyles } from '@fluentui-react-native/design/styling/tokens'; import type { MenuItemRadioProps, MenuItemRadioSlotProps, MenuItemRadioTokens } from './MenuItemRadio.types'; import { menuItemRadioName } from './MenuItemRadio.types'; diff --git a/packages/components/Menu/src/MenuList/MenuList.styling.ts b/packages/components/Menu/src/MenuList/MenuList.styling.ts index 471d944512..09cd883762 100644 --- a/packages/components/Menu/src/MenuList/MenuList.styling.ts +++ b/packages/components/Menu/src/MenuList/MenuList.styling.ts @@ -2,7 +2,7 @@ import { Platform } from 'react-native'; import type { Theme, UseStylingOptions } from '@fluentui-react-native/framework'; import { buildProps } from '@fluentui-react-native/framework'; -import { layoutStyles } from '@fluentui-react-native/tokens'; +import { layoutStyles } from '@fluentui-react-native/design/styling/tokens'; import type { MenuListProps, MenuListTokens, MenuListSlotProps } from './MenuList.types'; import { menuListName } from './MenuList.types'; diff --git a/packages/components/Menu/src/MenuList/MenuList.types.ts b/packages/components/Menu/src/MenuList/MenuList.types.ts index eb42c7a9e8..54d1c2da9f 100644 --- a/packages/components/Menu/src/MenuList/MenuList.types.ts +++ b/packages/components/Menu/src/MenuList/MenuList.types.ts @@ -4,7 +4,7 @@ import type { ScrollViewProps, View, AnimatableNumericValue } from 'react-native import type { IViewProps } from '@fluentui-react-native/adapters'; import type { FocusZoneProps } from '@fluentui-react-native/focus-zone'; import type { InteractionEvent } from '@fluentui-react-native/interactive-hooks'; -import type { IBackgroundColorTokens, LayoutTokens } from '@fluentui-react-native/tokens'; +import type { IBackgroundColorTokens, LayoutTokens } from '@fluentui-react-native/design/styling/tokens'; export const menuListName = 'MenuList'; diff --git a/packages/components/Menu/tsconfig.json b/packages/components/Menu/tsconfig.json index 979d1cabb7..72d42549d5 100644 --- a/packages/components/Menu/tsconfig.json +++ b/packages/components/Menu/tsconfig.json @@ -44,9 +44,6 @@ { "path": "../Text/tsconfig.json" }, - { - "path": "../../shim/tokens/tsconfig.json" - }, { "path": "../../framework/use-styling/tsconfig.json" } diff --git a/packages/components/MenuButton/package.json b/packages/components/MenuButton/package.json index 99b4a1171b..5fccef1cdf 100644 --- a/packages/components/MenuButton/package.json +++ b/packages/components/MenuButton/package.json @@ -33,9 +33,9 @@ "dependencies": { "@fluentui-react-native/button": "workspace:*", "@fluentui-react-native/contextual-menu": "workspace:*", + "@fluentui-react-native/design": "workspace:*", "@fluentui-react-native/framework-base": "workspace:*", "@fluentui-react-native/icon": "workspace:*", - "@fluentui-react-native/tokens": "workspace:*", "@uifabricshared/foundation-composable": "workspace:*", "@uifabricshared/foundation-compose": "workspace:*", "@uifabricshared/foundation-settings": "workspace:*" diff --git a/packages/components/MenuButton/src/MenuButton.macos.tsx b/packages/components/MenuButton/src/MenuButton.macos.tsx index c1ccab8be6..b56ed323d0 100644 --- a/packages/components/MenuButton/src/MenuButton.macos.tsx +++ b/packages/components/MenuButton/src/MenuButton.macos.tsx @@ -10,7 +10,7 @@ import type { ImageResolvedAssetSource } from 'react-native'; import type { IconProps } from '@fluentui-react-native/icon'; import { createIconProps } from '@fluentui-react-native/icon'; -import { backgroundColorTokens, borderTokens } from '@fluentui-react-native/tokens'; +import { backgroundColorTokens, borderTokens } from '@fluentui-react-native/design/styling/tokens'; import type { ISlots } from '@uifabricshared/foundation-composable'; import type { IUseComposeStyling } from '@uifabricshared/foundation-compose'; import { compose } from '@uifabricshared/foundation-compose'; diff --git a/packages/components/MenuButton/src/MenuButton.tsx b/packages/components/MenuButton/src/MenuButton.tsx index ea26c457b3..9558b11e0d 100644 --- a/packages/components/MenuButton/src/MenuButton.tsx +++ b/packages/components/MenuButton/src/MenuButton.tsx @@ -3,7 +3,7 @@ import React, { useRef, useState, useCallback } from 'react'; import { ButtonV1 as Button } from '@fluentui-react-native/button'; import { ContextualMenu, ContextualMenuItem, SubmenuItem, Submenu } from '@fluentui-react-native/contextual-menu'; -import { backgroundColorTokens, borderTokens } from '@fluentui-react-native/tokens'; +import { backgroundColorTokens, borderTokens } from '@fluentui-react-native/design/styling/tokens'; import type { ISlots } from '@uifabricshared/foundation-composable'; import type { IUseComposeStyling } from '@uifabricshared/foundation-compose'; import { compose } from '@uifabricshared/foundation-compose'; diff --git a/packages/components/MenuButton/src/MenuButton.types.ts b/packages/components/MenuButton/src/MenuButton.types.ts index b3c60bd01d..3fdf6cce64 100644 --- a/packages/components/MenuButton/src/MenuButton.types.ts +++ b/packages/components/MenuButton/src/MenuButton.types.ts @@ -1,7 +1,12 @@ import type { ButtonProps } from '@fluentui-react-native/button'; import type { ContextualMenuItemProps, ContextualMenuProps, SubmenuProps } from '@fluentui-react-native/contextual-menu'; import type { IconSourcesType } from '@fluentui-react-native/icon'; -import type { FontTokens, IForegroundColorTokens, IBackgroundColorTokens, IBorderTokens } from '@fluentui-react-native/tokens'; +import type { + FontTokens, + IForegroundColorTokens, + IBackgroundColorTokens, + IBorderTokens, +} from '@fluentui-react-native/design/styling/tokens'; import type { IRenderData } from '@uifabricshared/foundation-composable'; import type { XmlProps } from 'react-native-svg'; diff --git a/packages/components/MenuButton/tsconfig.json b/packages/components/MenuButton/tsconfig.json index e55d4239f4..f4bfdc3c30 100644 --- a/packages/components/MenuButton/tsconfig.json +++ b/packages/components/MenuButton/tsconfig.json @@ -23,9 +23,6 @@ { "path": "../../../scripts/tsconfig.json" }, - { - "path": "../../shim/tokens/tsconfig.json" - }, { "path": "../../deprecated/foundation-composable/tsconfig.json" }, @@ -34,6 +31,9 @@ }, { "path": "../../deprecated/foundation-settings/tsconfig.json" + }, + { + "path": "../../agentic/design/tsconfig.json" } ] } diff --git a/packages/components/Notification/package.json b/packages/components/Notification/package.json index babb8ce40f..7535825d41 100644 --- a/packages/components/Notification/package.json +++ b/packages/components/Notification/package.json @@ -41,7 +41,6 @@ "@fluentui-react-native/interactive-hooks": "workspace:*", "@fluentui-react-native/pressable": "workspace:*", "@fluentui-react-native/text": "workspace:*", - "@fluentui-react-native/tokens": "workspace:*", "@fluentui-react-native/use-styling": "workspace:*" }, "devDependencies": { diff --git a/packages/components/Notification/src/Notification.styling.ts b/packages/components/Notification/src/Notification.styling.ts index f6c0aab50a..4664c1d3bd 100644 --- a/packages/components/Notification/src/Notification.styling.ts +++ b/packages/components/Notification/src/Notification.styling.ts @@ -1,6 +1,6 @@ import type { Theme, UseStylingOptions } from '@fluentui-react-native/framework'; import { buildProps } from '@fluentui-react-native/framework'; -import { borderStyles, fontStyles, layoutStyles } from '@fluentui-react-native/tokens'; +import { borderStyles, fontStyles, layoutStyles } from '@fluentui-react-native/design/styling/tokens'; import { notification } from './Notification.types'; import type { NotificationTokens, NotificationSlotProps, NotificationProps } from './Notification.types'; diff --git a/packages/components/Notification/src/Notification.types.ts b/packages/components/Notification/src/Notification.types.ts index 268a961f8e..298f0a619d 100644 --- a/packages/components/Notification/src/Notification.types.ts +++ b/packages/components/Notification/src/Notification.types.ts @@ -6,7 +6,7 @@ import type { ShadowProps } from '@fluentui-react-native/experimental-shadow'; import type { IconProps, IconSourcesType } from '@fluentui-react-native/icon'; import type { InteractionEvent } from '@fluentui-react-native/interactive-hooks'; import type { ShadowToken } from '@fluentui-react-native/design/theming'; -import type { FontTokens, IBorderTokens, IColorTokens, LayoutTokens } from '@fluentui-react-native/tokens'; +import type { FontTokens, IBorderTokens, IColorTokens, LayoutTokens } from '@fluentui-react-native/design/styling/tokens'; import type { NotificationButtonColorStates } from './Notification.helper'; diff --git a/packages/components/Notification/tsconfig.json b/packages/components/Notification/tsconfig.json index cb6a219da2..a837e08264 100644 --- a/packages/components/Notification/tsconfig.json +++ b/packages/components/Notification/tsconfig.json @@ -47,9 +47,6 @@ { "path": "../Text/tsconfig.json" }, - { - "path": "../../shim/tokens/tsconfig.json" - }, { "path": "../../framework/use-styling/tsconfig.json" } diff --git a/packages/components/Persona/package.json b/packages/components/Persona/package.json index 5c0e08bf8e..fb55a59f72 100644 --- a/packages/components/Persona/package.json +++ b/packages/components/Persona/package.json @@ -31,10 +31,10 @@ }, "dependencies": { "@fluentui-react-native/adapters": "workspace:*", + "@fluentui-react-native/design": "workspace:*", "@fluentui-react-native/framework": "workspace:*", "@fluentui-react-native/framework-base": "workspace:*", "@fluentui-react-native/persona-coin": "workspace:*", - "@fluentui-react-native/tokens": "workspace:*", "@uifabricshared/foundation-composable": "workspace:*", "@uifabricshared/foundation-compose": "workspace:*", "@uifabricshared/foundation-settings": "workspace:*", diff --git a/packages/components/Persona/src/Persona.helpers.ts b/packages/components/Persona/src/Persona.helpers.ts index 594ad3bcd6..fc349b8af7 100644 --- a/packages/components/Persona/src/Persona.helpers.ts +++ b/packages/components/Persona/src/Persona.helpers.ts @@ -1,5 +1,5 @@ import type { PersonaSize } from '@fluentui-react-native/persona-coin'; -import type { FontTokens } from '@fluentui-react-native/tokens'; +import type { FontTokens } from '@fluentui-react-native/design/styling/tokens'; type IPersonaFontTable = { [key in PersonaSize]: FontTokens }; diff --git a/packages/components/Persona/src/Persona.tokens.texts.ts b/packages/components/Persona/src/Persona.tokens.texts.ts index ca06c4bd29..3dd53e7e92 100644 --- a/packages/components/Persona/src/Persona.tokens.texts.ts +++ b/packages/components/Persona/src/Persona.tokens.texts.ts @@ -3,7 +3,7 @@ import type { TextStyle } from 'react-native'; import type { ITextProps } from '@fluentui-react-native/adapters'; import type { Theme } from '@fluentui-react-native/framework'; import type { PersonaSize } from '@fluentui-react-native/persona-coin'; -import type { FontTokens } from '@fluentui-react-native/tokens'; +import type { FontTokens } from '@fluentui-react-native/design/styling/tokens'; import { styleFunction } from '@uifabricshared/foundation-tokens'; import { getTextFont, getSecondaryFont, getTertiaryFont, getOptionalFont } from './Persona.helpers'; diff --git a/packages/components/Persona/src/Persona.tsx b/packages/components/Persona/src/Persona.tsx index 9aa649c97f..948163b23b 100644 --- a/packages/components/Persona/src/Persona.tsx +++ b/packages/components/Persona/src/Persona.tsx @@ -3,7 +3,7 @@ import { View, Text } from 'react-native'; import { filterViewProps } from '@fluentui-react-native/adapters'; import { PersonaCoin } from '@fluentui-react-native/persona-coin'; -import { foregroundColorTokens } from '@fluentui-react-native/tokens'; +import { foregroundColorTokens } from '@fluentui-react-native/design/styling/tokens'; import type { ISlots, IRenderData } from '@uifabricshared/foundation-composable'; import type { IUseComposeStyling } from '@uifabricshared/foundation-compose'; import { compose } from '@uifabricshared/foundation-compose'; diff --git a/packages/components/Persona/src/Persona.types.ts b/packages/components/Persona/src/Persona.types.ts index 055aa0cb18..77acefc805 100644 --- a/packages/components/Persona/src/Persona.types.ts +++ b/packages/components/Persona/src/Persona.types.ts @@ -2,7 +2,7 @@ import type { ColorValue } from 'react-native'; import type { IViewProps, ITextProps } from '@fluentui-react-native/adapters'; import type { IPersonaCoinProps, IPersonaCoinTokens } from '@fluentui-react-native/persona-coin'; -import type { FontTokens } from '@fluentui-react-native/tokens'; +import type { FontTokens } from '@fluentui-react-native/design/styling/tokens'; import type { IRenderData } from '@uifabricshared/foundation-composable'; export const personaName = 'RNFPersona'; diff --git a/packages/components/Persona/tsconfig.json b/packages/components/Persona/tsconfig.json index eb7badafdf..d9df625ddd 100644 --- a/packages/components/Persona/tsconfig.json +++ b/packages/components/Persona/tsconfig.json @@ -23,9 +23,6 @@ { "path": "../../../scripts/tsconfig.json" }, - { - "path": "../../shim/tokens/tsconfig.json" - }, { "path": "../../deprecated/foundation-composable/tsconfig.json" }, @@ -37,6 +34,9 @@ }, { "path": "../../deprecated/foundation-tokens/tsconfig.json" + }, + { + "path": "../../agentic/design/tsconfig.json" } ] } diff --git a/packages/components/PersonaCoin/package.json b/packages/components/PersonaCoin/package.json index 7510e9d985..03a84f017c 100644 --- a/packages/components/PersonaCoin/package.json +++ b/packages/components/PersonaCoin/package.json @@ -34,7 +34,6 @@ "@fluentui-react-native/design": "workspace:*", "@fluentui-react-native/framework": "workspace:*", "@fluentui-react-native/framework-base": "workspace:*", - "@fluentui-react-native/tokens": "workspace:*", "@uifabricshared/foundation-composable": "workspace:*", "@uifabricshared/foundation-compose": "workspace:*", "@uifabricshared/foundation-settings": "workspace:*", diff --git a/packages/components/PersonaCoin/src/PersonaCoin.tsx b/packages/components/PersonaCoin/src/PersonaCoin.tsx index 875ecfa72f..11f95238bf 100644 --- a/packages/components/PersonaCoin/src/PersonaCoin.tsx +++ b/packages/components/PersonaCoin/src/PersonaCoin.tsx @@ -2,7 +2,7 @@ import { Image, View, Text } from 'react-native'; import { filterViewProps, filterImageProps } from '@fluentui-react-native/adapters'; -import { foregroundColorTokens } from '@fluentui-react-native/tokens'; +import { foregroundColorTokens } from '@fluentui-react-native/design/styling/tokens'; import type { ISlots, IRenderData } from '@uifabricshared/foundation-composable'; import { compose } from '@uifabricshared/foundation-compose'; import type { IUseComposeStyling } from '@uifabricshared/foundation-compose'; diff --git a/packages/components/PersonaCoin/src/PersonaCoin.types.ts b/packages/components/PersonaCoin/src/PersonaCoin.types.ts index 3a10861a66..49fc748956 100644 --- a/packages/components/PersonaCoin/src/PersonaCoin.types.ts +++ b/packages/components/PersonaCoin/src/PersonaCoin.types.ts @@ -1,7 +1,7 @@ import type { ImageProps, ViewProps, ImageURISource, TextProps, ColorValue } from 'react-native'; import type { IViewProps } from '@fluentui-react-native/adapters'; -import type { IBackgroundColorTokens, IForegroundColorTokens } from '@fluentui-react-native/tokens'; +import type { IBackgroundColorTokens, IForegroundColorTokens } from '@fluentui-react-native/design/styling/tokens'; import type { IRenderData } from '@uifabricshared/foundation-composable'; export const personaCoinName = 'RNFPersonaCoin'; diff --git a/packages/components/PersonaCoin/tsconfig.json b/packages/components/PersonaCoin/tsconfig.json index 82c3e9af0c..bc0ef7c578 100644 --- a/packages/components/PersonaCoin/tsconfig.json +++ b/packages/components/PersonaCoin/tsconfig.json @@ -23,9 +23,6 @@ { "path": "../../../scripts/tsconfig.json" }, - { - "path": "../../shim/tokens/tsconfig.json" - }, { "path": "../../deprecated/foundation-composable/tsconfig.json" }, diff --git a/packages/components/RadioGroup/package.json b/packages/components/RadioGroup/package.json index ff97dbe586..fcc92e38fb 100644 --- a/packages/components/RadioGroup/package.json +++ b/packages/components/RadioGroup/package.json @@ -39,7 +39,6 @@ "@fluentui-react-native/interactive-hooks": "workspace:*", "@fluentui-react-native/pressable": "workspace:*", "@fluentui-react-native/text": "workspace:*", - "@fluentui-react-native/tokens": "workspace:*", "@fluentui-react-native/use-styling": "workspace:*", "@uifabricshared/foundation-composable": "workspace:*", "@uifabricshared/foundation-compose": "workspace:*", diff --git a/packages/components/RadioGroup/src/Radio/Radio.styling.ts b/packages/components/RadioGroup/src/Radio/Radio.styling.ts index 8a1d8b283f..d843d04847 100644 --- a/packages/components/RadioGroup/src/Radio/Radio.styling.ts +++ b/packages/components/RadioGroup/src/Radio/Radio.styling.ts @@ -1,6 +1,6 @@ import type { Theme, UseStylingOptions } from '@fluentui-react-native/framework'; import { buildProps } from '@fluentui-react-native/framework'; -import { fontStyles, borderStyles } from '@fluentui-react-native/tokens'; +import { fontStyles, borderStyles } from '@fluentui-react-native/design/styling/tokens'; import type { RadioTokens, RadioSlotProps, RadioProps } from './Radio.types'; import { radioName } from './Radio.types'; diff --git a/packages/components/RadioGroup/src/Radio/Radio.types.ts b/packages/components/RadioGroup/src/Radio/Radio.types.ts index cec3ec8be4..51e176151b 100644 --- a/packages/components/RadioGroup/src/Radio/Radio.types.ts +++ b/packages/components/RadioGroup/src/Radio/Radio.types.ts @@ -10,7 +10,7 @@ import type { IBackgroundColorTokens, IBorderTokens, IColorTokens, -} from '@fluentui-react-native/tokens'; +} from '@fluentui-react-native/design/styling/tokens'; import type { SvgProps } from 'react-native-svg'; export const radioName = 'Radio'; diff --git a/packages/components/RadioGroup/src/RadioGroup/RadioGroup.styling.ts b/packages/components/RadioGroup/src/RadioGroup/RadioGroup.styling.ts index 72fa1cbcbf..8da24f73b6 100644 --- a/packages/components/RadioGroup/src/RadioGroup/RadioGroup.styling.ts +++ b/packages/components/RadioGroup/src/RadioGroup/RadioGroup.styling.ts @@ -1,6 +1,6 @@ import type { Theme, UseStylingOptions } from '@fluentui-react-native/framework'; import { buildProps } from '@fluentui-react-native/framework'; -import { fontStyles } from '@fluentui-react-native/tokens'; +import { fontStyles } from '@fluentui-react-native/design/styling/tokens'; import type { RadioGroupTokens, RadioGroupSlotProps, RadioGroupProps } from './RadioGroup.types'; import { radioGroupName } from './RadioGroup.types'; diff --git a/packages/components/RadioGroup/src/RadioGroup/RadioGroup.types.ts b/packages/components/RadioGroup/src/RadioGroup/RadioGroup.types.ts index ab92bf331e..db4fe461c1 100644 --- a/packages/components/RadioGroup/src/RadioGroup/RadioGroup.types.ts +++ b/packages/components/RadioGroup/src/RadioGroup/RadioGroup.types.ts @@ -3,7 +3,7 @@ import type { ColorValue, ViewStyle } from 'react-native'; import type { IViewProps } from '@fluentui-react-native/adapters'; import type { FocusZoneProps } from '@fluentui-react-native/focus-zone'; import type { TextProps } from '@fluentui-react-native/text'; -import type { IForegroundColorTokens, FontTokens } from '@fluentui-react-native/tokens'; +import type { IForegroundColorTokens, FontTokens } from '@fluentui-react-native/design/styling/tokens'; export const radioGroupName = 'RadioGroup'; diff --git a/packages/components/RadioGroup/src/legacy/RadioButton.tsx b/packages/components/RadioGroup/src/legacy/RadioButton.tsx index e40f283527..2482395e68 100644 --- a/packages/components/RadioGroup/src/legacy/RadioButton.tsx +++ b/packages/components/RadioGroup/src/legacy/RadioButton.tsx @@ -6,7 +6,13 @@ import { View } from 'react-native'; import { filterViewProps } from '@fluentui-react-native/adapters'; import { useAsPressable, useOnPressWithFocus, useViewCommandFocus } from '@fluentui-react-native/interactive-hooks'; import { Text } from '@fluentui-react-native/text'; -import { foregroundColorTokens, textTokens, borderTokens, backgroundColorTokens, getPaletteFromTheme } from '@fluentui-react-native/tokens'; +import { + foregroundColorTokens, + textTokens, + borderTokens, + backgroundColorTokens, + getPaletteFromTheme, +} from '@fluentui-react-native/design/styling/tokens'; import type { ISlots } from '@uifabricshared/foundation-composable'; import type { IUseComposeStyling } from '@uifabricshared/foundation-compose'; import { compose } from '@uifabricshared/foundation-compose'; diff --git a/packages/components/RadioGroup/src/legacy/RadioButton.types.ts b/packages/components/RadioGroup/src/legacy/RadioButton.types.ts index 2129328699..1dab09134b 100644 --- a/packages/components/RadioGroup/src/legacy/RadioButton.types.ts +++ b/packages/components/RadioGroup/src/legacy/RadioButton.types.ts @@ -4,7 +4,12 @@ import type { ViewProps } from 'react-native'; import type { IFocusable } from '@fluentui-react-native/interactive-hooks'; import type { IPressableProps } from '@fluentui-react-native/pressable'; import type { ITextProps } from '@fluentui-react-native/text'; -import type { FontTokens, IForegroundColorTokens, IBackgroundColorTokens, IBorderTokens } from '@fluentui-react-native/tokens'; +import type { + FontTokens, + IForegroundColorTokens, + IBackgroundColorTokens, + IBorderTokens, +} from '@fluentui-react-native/design/styling/tokens'; import type { IRenderData } from '@uifabricshared/foundation-composable'; import type { IViewProps } from '@fluentui-react-native/adapters'; diff --git a/packages/components/RadioGroup/src/legacy/RadioButton.win32.tsx b/packages/components/RadioGroup/src/legacy/RadioButton.win32.tsx index f1499939e0..e4dd350396 100644 --- a/packages/components/RadioGroup/src/legacy/RadioButton.win32.tsx +++ b/packages/components/RadioGroup/src/legacy/RadioButton.win32.tsx @@ -7,7 +7,13 @@ import { filterViewProps } from '@fluentui-react-native/adapters'; import type { KeyPressEvent } from '@fluentui-react-native/interactive-hooks'; import { useAsPressable, useViewCommandFocus, useKeyDownProps } from '@fluentui-react-native/interactive-hooks'; import { Text } from '@fluentui-react-native/text'; -import { foregroundColorTokens, textTokens, borderTokens, backgroundColorTokens, getPaletteFromTheme } from '@fluentui-react-native/tokens'; +import { + foregroundColorTokens, + textTokens, + borderTokens, + backgroundColorTokens, + getPaletteFromTheme, +} from '@fluentui-react-native/design/styling/tokens'; import type { ISlots } from '@uifabricshared/foundation-composable'; import type { IUseComposeStyling } from '@uifabricshared/foundation-compose'; import { compose } from '@uifabricshared/foundation-compose'; diff --git a/packages/components/RadioGroup/src/legacy/RadioGroup.tsx b/packages/components/RadioGroup/src/legacy/RadioGroup.tsx index 5e234d19cd..c1de47eab1 100644 --- a/packages/components/RadioGroup/src/legacy/RadioGroup.tsx +++ b/packages/components/RadioGroup/src/legacy/RadioGroup.tsx @@ -5,7 +5,7 @@ import { View } from 'react-native'; import { FocusZone } from '@fluentui-react-native/focus-zone'; import { useSelectedKey } from '@fluentui-react-native/interactive-hooks'; import { Text } from '@fluentui-react-native/text'; -import { foregroundColorTokens, textTokens } from '@fluentui-react-native/tokens'; +import { foregroundColorTokens, textTokens } from '@fluentui-react-native/design/styling/tokens'; import type { ISlots } from '@uifabricshared/foundation-composable'; import type { IUseComposeStyling } from '@uifabricshared/foundation-compose'; import { compose } from '@uifabricshared/foundation-compose'; diff --git a/packages/components/RadioGroup/src/legacy/RadioGroup.types.ts b/packages/components/RadioGroup/src/legacy/RadioGroup.types.ts index 6d781fee40..1b0131cd89 100644 --- a/packages/components/RadioGroup/src/legacy/RadioGroup.types.ts +++ b/packages/components/RadioGroup/src/legacy/RadioGroup.types.ts @@ -3,7 +3,7 @@ import type { ViewProps } from 'react-native'; import type { FocusZoneProps } from '@fluentui-react-native/focus-zone'; import type { ITextProps } from '@fluentui-react-native/text'; -import type { IForegroundColorTokens, FontTokens } from '@fluentui-react-native/tokens'; +import type { IForegroundColorTokens, FontTokens } from '@fluentui-react-native/design/styling/tokens'; import type { IRenderData } from '@uifabricshared/foundation-composable'; export const radioGroupName = 'RadioGroup'; diff --git a/packages/components/RadioGroup/tsconfig.json b/packages/components/RadioGroup/tsconfig.json index e8c7aaab3b..82457146a4 100644 --- a/packages/components/RadioGroup/tsconfig.json +++ b/packages/components/RadioGroup/tsconfig.json @@ -38,9 +38,6 @@ { "path": "../Text/tsconfig.json" }, - { - "path": "../../shim/tokens/tsconfig.json" - }, { "path": "../../framework/use-styling/tsconfig.json" }, diff --git a/packages/components/Stack/package.json b/packages/components/Stack/package.json index 7fc0e2f6b1..4f88701347 100644 --- a/packages/components/Stack/package.json +++ b/packages/components/Stack/package.json @@ -31,9 +31,9 @@ }, "dependencies": { "@fluentui-react-native/adapters": "workspace:*", + "@fluentui-react-native/design": "workspace:*", "@fluentui-react-native/framework": "workspace:*", "@fluentui-react-native/framework-base": "workspace:*", - "@fluentui-react-native/tokens": "workspace:*", "@uifabricshared/foundation-composable": "workspace:*", "@uifabricshared/foundation-compose": "workspace:*", "@uifabricshared/foundation-settings": "workspace:*", diff --git a/packages/components/Stack/src/Stack.tsx b/packages/components/Stack/src/Stack.tsx index 83bcae642f..e5b1341cb3 100644 --- a/packages/components/Stack/src/Stack.tsx +++ b/packages/components/Stack/src/Stack.tsx @@ -4,7 +4,7 @@ import { View } from 'react-native'; import type { StyleProp, ViewStyle } from 'react-native'; import { filterViewProps } from '@fluentui-react-native/adapters'; -import { backgroundColorTokens, borderTokens } from '@fluentui-react-native/tokens'; +import { backgroundColorTokens, borderTokens } from '@fluentui-react-native/design/styling/tokens'; import type { ISlots } from '@uifabricshared/foundation-composable'; import type { IUseComposeStyling } from '@uifabricshared/foundation-compose'; import { compose } from '@uifabricshared/foundation-compose'; diff --git a/packages/components/Stack/src/Stack.types.ts b/packages/components/Stack/src/Stack.types.ts index fefdbf0f6b..fbf7029144 100644 --- a/packages/components/Stack/src/Stack.types.ts +++ b/packages/components/Stack/src/Stack.types.ts @@ -1,7 +1,7 @@ import type { ViewStyle, ViewProps, DimensionValue } from 'react-native'; import type { Spacing } from '@fluentui-react-native/framework'; -import type { IBackgroundColorTokens, IBorderTokens, FontTokens } from '@fluentui-react-native/tokens'; +import type { IBackgroundColorTokens, IBorderTokens, FontTokens } from '@fluentui-react-native/design/styling/tokens'; import type { IRenderData } from '@uifabricshared/foundation-composable'; import type { IStackItemProps } from './StackItem/StackItem.types'; diff --git a/packages/components/Stack/tsconfig.json b/packages/components/Stack/tsconfig.json index 1da974d35b..3650505b40 100644 --- a/packages/components/Stack/tsconfig.json +++ b/packages/components/Stack/tsconfig.json @@ -23,9 +23,6 @@ { "path": "../Text/tsconfig.json" }, - { - "path": "../../shim/tokens/tsconfig.json" - }, { "path": "../../deprecated/foundation-composable/tsconfig.json" }, @@ -37,6 +34,9 @@ }, { "path": "../../deprecated/foundation-tokens/tsconfig.json" + }, + { + "path": "../../agentic/design/tsconfig.json" } ] } diff --git a/packages/components/Switch/package.json b/packages/components/Switch/package.json index ec5e75bc25..0134427fb5 100644 --- a/packages/components/Switch/package.json +++ b/packages/components/Switch/package.json @@ -35,7 +35,6 @@ "@fluentui-react-native/framework-base": "workspace:*", "@fluentui-react-native/interactive-hooks": "workspace:*", "@fluentui-react-native/text": "workspace:*", - "@fluentui-react-native/tokens": "workspace:*", "@fluentui-react-native/use-styling": "workspace:*" }, "devDependencies": { diff --git a/packages/components/Switch/src/Switch.styling.ts b/packages/components/Switch/src/Switch.styling.ts index 364bd4d797..da2295f410 100644 --- a/packages/components/Switch/src/Switch.styling.ts +++ b/packages/components/Switch/src/Switch.styling.ts @@ -2,7 +2,7 @@ import { Platform } from 'react-native'; import type { UseStylingOptions, Theme } from '@fluentui-react-native/framework'; import { buildProps } from '@fluentui-react-native/framework'; -import { borderStyles, layoutStyles, fontStyles } from '@fluentui-react-native/tokens'; +import { borderStyles, layoutStyles, fontStyles } from '@fluentui-react-native/design/styling/tokens'; import { switchName } from './Switch.types'; import type { SwitchTokens, SwitchSlotProps, SwitchProps } from './Switch.types'; diff --git a/packages/components/Switch/src/Switch.types.ts b/packages/components/Switch/src/Switch.types.ts index 0c7e5cfede..b1b7de1009 100644 --- a/packages/components/Switch/src/Switch.types.ts +++ b/packages/components/Switch/src/Switch.types.ts @@ -3,7 +3,7 @@ import type { Animated, ViewStyle, ColorValue, PressableProps, ViewProps, Animat import type { IFocusable, InteractionEvent, PressablePropsExtended, PressableState } from '@fluentui-react-native/interactive-hooks'; import type { TextProps } from '@fluentui-react-native/text'; -import type { FontTokens, IBorderTokens, IColorTokens, IShadowTokens, LayoutTokens } from '@fluentui-react-native/tokens'; +import type { FontTokens, IBorderTokens, IColorTokens, IShadowTokens, LayoutTokens } from '@fluentui-react-native/design/styling/tokens'; import type { PropsOf } from '@fluentui-react-native/framework-base'; export const switchName = 'Switch'; diff --git a/packages/components/Switch/tsconfig.json b/packages/components/Switch/tsconfig.json index 8ac7f5704e..01cc444214 100644 --- a/packages/components/Switch/tsconfig.json +++ b/packages/components/Switch/tsconfig.json @@ -29,9 +29,6 @@ { "path": "../Text/tsconfig.json" }, - { - "path": "../../shim/tokens/tsconfig.json" - }, { "path": "../../framework/use-styling/tsconfig.json" } diff --git a/packages/components/TabList/package.json b/packages/components/TabList/package.json index 70f3824e69..70ed471da8 100644 --- a/packages/components/TabList/package.json +++ b/packages/components/TabList/package.json @@ -38,7 +38,6 @@ "@fluentui-react-native/icon": "workspace:*", "@fluentui-react-native/interactive-hooks": "workspace:*", "@fluentui-react-native/text": "workspace:*", - "@fluentui-react-native/tokens": "workspace:*", "@fluentui-react-native/use-styling": "workspace:*" }, "devDependencies": { diff --git a/packages/components/TabList/src/Tab/Tab.types.ts b/packages/components/TabList/src/Tab/Tab.types.ts index b4a7ed453d..2dfcec31c1 100644 --- a/packages/components/TabList/src/Tab/Tab.types.ts +++ b/packages/components/TabList/src/Tab/Tab.types.ts @@ -11,7 +11,7 @@ import type { IBorderTokens, IForegroundColorTokens, LayoutTokens, -} from '@fluentui-react-native/tokens'; +} from '@fluentui-react-native/design/styling/tokens'; export const tabName = 'Tab'; diff --git a/packages/components/TabList/src/TabList/TabList.types.ts b/packages/components/TabList/src/TabList/TabList.types.ts index ff4d31d992..5622501e2a 100644 --- a/packages/components/TabList/src/TabList/TabList.types.ts +++ b/packages/components/TabList/src/TabList/TabList.types.ts @@ -3,7 +3,7 @@ import type { LayoutRectangle, View } from 'react-native'; import type { IViewProps } from '@fluentui-react-native/adapters'; import type { FocusZoneProps } from '@fluentui-react-native/focus-zone'; -import type { LayoutTokens } from '@fluentui-react-native/tokens'; +import type { LayoutTokens } from '@fluentui-react-native/design/styling/tokens'; import type { AnimatedIndicatorStyles } from '../TabListAnimatedIndicator/TabListAnimatedIndicator.types'; diff --git a/packages/components/TabList/tsconfig.json b/packages/components/TabList/tsconfig.json index 315dd5b548..1644446a07 100644 --- a/packages/components/TabList/tsconfig.json +++ b/packages/components/TabList/tsconfig.json @@ -38,9 +38,6 @@ { "path": "../Text/tsconfig.json" }, - { - "path": "../../shim/tokens/tsconfig.json" - }, { "path": "../../framework/use-styling/tsconfig.json" } diff --git a/packages/components/Text/package.json b/packages/components/Text/package.json index 6c023be2dd..bc31fb6f81 100644 --- a/packages/components/Text/package.json +++ b/packages/components/Text/package.json @@ -35,7 +35,6 @@ "@fluentui-react-native/framework": "workspace:*", "@fluentui-react-native/framework-base": "workspace:*", "@fluentui-react-native/interactive-hooks": "workspace:*", - "@fluentui-react-native/tokens": "workspace:*", "@uifabricshared/foundation-compose": "workspace:*" }, "devDependencies": { diff --git a/packages/components/Text/src/deprecated/Text.tsx b/packages/components/Text/src/deprecated/Text.tsx index b7978b605f..54a36beb75 100644 --- a/packages/components/Text/src/deprecated/Text.tsx +++ b/packages/components/Text/src/deprecated/Text.tsx @@ -1,7 +1,7 @@ import { Text as RNText } from 'react-native'; import { filterTextProps } from '@fluentui-react-native/adapters'; -import { foregroundColorTokens, textTokens } from '@fluentui-react-native/tokens'; +import { foregroundColorTokens, textTokens } from '@fluentui-react-native/design/styling/tokens'; import { compose } from '@uifabricshared/foundation-compose'; import { settings } from './Text.settings'; diff --git a/packages/components/Text/src/deprecated/Text.types.ts b/packages/components/Text/src/deprecated/Text.types.ts index b73c7185b6..d64e6ca362 100644 --- a/packages/components/Text/src/deprecated/Text.types.ts +++ b/packages/components/Text/src/deprecated/Text.types.ts @@ -1,5 +1,5 @@ import type { ITextProps as INativeTextProps } from '@fluentui-react-native/adapters'; -import type { FontTokens, FontVariantTokens, IForegroundColorTokens, IColorTokens } from '@fluentui-react-native/tokens'; +import type { FontTokens, FontVariantTokens, IForegroundColorTokens, IColorTokens } from '@fluentui-react-native/design/styling/tokens'; export const textName = 'RNFText'; diff --git a/packages/components/Text/tsconfig.json b/packages/components/Text/tsconfig.json index 93b4c34527..8186dc9df1 100644 --- a/packages/components/Text/tsconfig.json +++ b/packages/components/Text/tsconfig.json @@ -29,9 +29,6 @@ { "path": "../../utils/test-tools/tsconfig.json" }, - { - "path": "../../shim/tokens/tsconfig.json" - }, { "path": "../../deprecated/foundation-compose/tsconfig.json" } diff --git a/packages/deprecated/foundation-tokens/package.json b/packages/deprecated/foundation-tokens/package.json index 73ec8bd34f..a8e39c1146 100644 --- a/packages/deprecated/foundation-tokens/package.json +++ b/packages/deprecated/foundation-tokens/package.json @@ -33,8 +33,8 @@ "update-snapshots": "fluentui-scripts jest -u" }, "dependencies": { + "@fluentui-react-native/design": "workspace:*", "@fluentui-react-native/framework-base": "workspace:*", - "@fluentui-react-native/tokens": "workspace:*", "@types/node": "catalog:", "@uifabricshared/foundation-settings": "workspace:*" }, diff --git a/packages/deprecated/foundation-tokens/src/Token.types.ts b/packages/deprecated/foundation-tokens/src/Token.types.ts index a6b8c30652..a4ae7547fa 100644 --- a/packages/deprecated/foundation-tokens/src/Token.types.ts +++ b/packages/deprecated/foundation-tokens/src/Token.types.ts @@ -4,7 +4,7 @@ import type { StyleFactoryFunction, StyleFactoryFunctionRaw, StyleFactoryOperation, -} from '@fluentui-react-native/tokens'; +} from '@fluentui-react-native/design/styling/tokens'; import type { ICachedPropHandlers } from './Token.internal'; diff --git a/packages/deprecated/foundation-tokens/src/index.ts b/packages/deprecated/foundation-tokens/src/index.ts index e2afe99a3c..f872070aee 100644 --- a/packages/deprecated/foundation-tokens/src/index.ts +++ b/packages/deprecated/foundation-tokens/src/index.ts @@ -12,4 +12,4 @@ export type { } from './Token.types'; export { processTokens } from './Token'; export { buildComponentTokens } from './Token.function'; -export { styleFunction } from '@fluentui-react-native/tokens'; +export { styleFunction } from '@fluentui-react-native/design/styling/tokens'; diff --git a/packages/deprecated/foundation-tokens/tsconfig.json b/packages/deprecated/foundation-tokens/tsconfig.json index 64a365c31e..b0af7979ba 100644 --- a/packages/deprecated/foundation-tokens/tsconfig.json +++ b/packages/deprecated/foundation-tokens/tsconfig.json @@ -16,10 +16,10 @@ "path": "../../../scripts/tsconfig.json" }, { - "path": "../../shim/tokens/tsconfig.json" + "path": "../foundation-settings/tsconfig.json" }, { - "path": "../foundation-settings/tsconfig.json" + "path": "../../agentic/design/tsconfig.json" } ] } diff --git a/packages/deprecated/theme-registry/src/Registry.ts b/packages/deprecated/theme-registry/src/Registry.ts index 2b902af132..454a32fe79 100644 --- a/packages/deprecated/theme-registry/src/Registry.ts +++ b/packages/deprecated/theme-registry/src/Registry.ts @@ -178,7 +178,7 @@ interface IEntries { } /** - * @deprecated Use ThemeReference from @fluentui-react-native/theme instead. + * @deprecated Use ThemeReference from @fluentui-react-native/design/theming instead. * See https://github.com/microsoft/fluentui-react-native/blob/main/docs/pages/Guides/UpdateThemeProvider.md for details */ export function createThemeRegistry( diff --git a/packages/deprecated/theming-ramp/package.json b/packages/deprecated/theming-ramp/package.json index bfaa31ac9d..709de08153 100644 --- a/packages/deprecated/theming-ramp/package.json +++ b/packages/deprecated/theming-ramp/package.json @@ -55,6 +55,9 @@ "react-native-windows": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0" }, "peerDependenciesMeta": { + "@office-iss/react-native-win32": { + "optional": true + }, "@types/react": { "optional": true }, @@ -63,9 +66,6 @@ }, "react-native-windows": { "optional": true - }, - "@office-iss/react-native-win32": { - "optional": true } }, "furn": { diff --git a/packages/deprecated/theming-react-native/README.md b/packages/deprecated/theming-react-native/README.md index 76f6c66a1b..d4b629c5da 100644 --- a/packages/deprecated/theming-react-native/README.md +++ b/packages/deprecated/theming-react-native/README.md @@ -9,7 +9,7 @@ This package serves as an entry point which aggregates and re-exports some of th You may want a few different packages from this repo. Let's start with the following: - `@uifabricshared/theming-react-native` -- `@fluentui-react-native/themed-stylesheets` for styling react-native's primitives components. +- `@fluentui-react-native/design/styling/stylesheet` for styling React Native primitive components. E.g. In your package.json file: @@ -21,7 +21,7 @@ E.g. In your package.json file: "main": "lib/index.js", "dependencies": { "@uifabricshared/theming-react-native": "^0.2.0", - "@fluentui-react-native/themed-stylesheet": "^0.2.0" + "@fluentui-react-native/design": "^0.3.1" } } ``` diff --git a/packages/deprecated/theming-react-native/src/ThemeProvider.tsx b/packages/deprecated/theming-react-native/src/ThemeProvider.tsx index 78fd237f48..a224498b33 100644 --- a/packages/deprecated/theming-react-native/src/ThemeProvider.tsx +++ b/packages/deprecated/theming-react-native/src/ThemeProvider.tsx @@ -8,7 +8,7 @@ import { useThemeRegistry, ThemeRegistryContext } from './ThemeContext'; import type { IThemeProviderProps } from './ThemeProvider.types'; /** - * @deprecated Use ThemeProvider from @fluentui-react-native/theme instead. + * @deprecated Use ThemeProvider from @fluentui-react-native/design/theming instead. * See https://github.com/microsoft/fluentui-react-native/blob/main/docs/pages/Guides/UpdateThemeProvider.md for details */ export const ThemeProvider: React.FunctionComponent = (props: IThemeProviderProps) => { diff --git a/packages/experimental/MenuButton/package.json b/packages/experimental/MenuButton/package.json index 311220eb01..d0175c67a2 100644 --- a/packages/experimental/MenuButton/package.json +++ b/packages/experimental/MenuButton/package.json @@ -32,9 +32,9 @@ "dependencies": { "@fluentui-react-native/button": "workspace:*", "@fluentui-react-native/contextual-menu": "workspace:*", + "@fluentui-react-native/design": "workspace:*", "@fluentui-react-native/framework": "workspace:*", - "@fluentui-react-native/framework-base": "workspace:*", - "@fluentui-react-native/tokens": "workspace:*" + "@fluentui-react-native/framework-base": "workspace:*" }, "devDependencies": { "@babel/core": "catalog:", diff --git a/packages/experimental/MenuButton/src/MenuButton.types.ts b/packages/experimental/MenuButton/src/MenuButton.types.ts index da3a932358..04581bdaf1 100644 --- a/packages/experimental/MenuButton/src/MenuButton.types.ts +++ b/packages/experimental/MenuButton/src/MenuButton.types.ts @@ -1,6 +1,11 @@ import type { ButtonProps } from '@fluentui-react-native/button'; import type { ContextualMenuItemProps, ContextualMenuProps, SubmenuProps } from '@fluentui-react-native/contextual-menu'; -import type { FontTokens, IForegroundColorTokens, IBackgroundColorTokens, IBorderTokens } from '@fluentui-react-native/tokens'; +import type { + FontTokens, + IForegroundColorTokens, + IBackgroundColorTokens, + IBorderTokens, +} from '@fluentui-react-native/design/styling/tokens'; import type { XmlProps } from 'react-native-svg'; export const menuButtonName = 'MenuButton'; diff --git a/packages/experimental/MenuButton/tsconfig.json b/packages/experimental/MenuButton/tsconfig.json index 117d86a4e1..0a2d92e1b6 100644 --- a/packages/experimental/MenuButton/tsconfig.json +++ b/packages/experimental/MenuButton/tsconfig.json @@ -24,7 +24,7 @@ "path": "../../../scripts/tsconfig.json" }, { - "path": "../../shim/tokens/tsconfig.json" + "path": "../../agentic/design/tsconfig.json" } ] } diff --git a/packages/experimental/Shimmer/package.json b/packages/experimental/Shimmer/package.json index e7b8980350..ac383ae3ba 100644 --- a/packages/experimental/Shimmer/package.json +++ b/packages/experimental/Shimmer/package.json @@ -33,7 +33,6 @@ "@fluentui-react-native/design": "workspace:*", "@fluentui-react-native/framework": "workspace:*", "@fluentui-react-native/framework-base": "workspace:*", - "@fluentui-react-native/tokens": "workspace:*", "@fluentui-react-native/use-styling": "workspace:*", "assert-never": "^1.2.1" }, diff --git a/packages/experimental/Shimmer/src/Shimmer.types.shared.ts b/packages/experimental/Shimmer/src/Shimmer.types.shared.ts index b74ff61483..704fc43e58 100644 --- a/packages/experimental/Shimmer/src/Shimmer.types.shared.ts +++ b/packages/experimental/Shimmer/src/Shimmer.types.shared.ts @@ -1,6 +1,6 @@ import type { ColorValue, ViewProps } from 'react-native'; -import type { IBackgroundColorTokens } from '@fluentui-react-native/tokens'; +import type { IBackgroundColorTokens } from '@fluentui-react-native/design/styling/tokens'; import type { SvgProps } from 'react-native-svg'; export const shimmerName = 'Shimmer'; diff --git a/packages/experimental/Shimmer/tsconfig.json b/packages/experimental/Shimmer/tsconfig.json index a61a98cc1b..3cfa95e9c7 100644 --- a/packages/experimental/Shimmer/tsconfig.json +++ b/packages/experimental/Shimmer/tsconfig.json @@ -20,9 +20,6 @@ { "path": "../../../scripts/tsconfig.json" }, - { - "path": "../../shim/tokens/tsconfig.json" - }, { "path": "../../framework/use-styling/tsconfig.json" } diff --git a/packages/framework/framework/package.json b/packages/framework/framework/package.json index 41d1c02148..e7ba3562e6 100644 --- a/packages/framework/framework/package.json +++ b/packages/framework/framework/package.json @@ -36,7 +36,6 @@ "@fluentui-react-native/default-theme": "workspace:*", "@fluentui-react-native/design": "workspace:*", "@fluentui-react-native/framework-base": "workspace:*", - "@fluentui-react-native/tokens": "workspace:*", "@fluentui-react-native/use-slots": "workspace:*", "@fluentui-react-native/use-styling": "workspace:*", "@fluentui-react-native/use-tokens": "workspace:*" diff --git a/packages/framework/framework/src/index.ts b/packages/framework/framework/src/index.ts index 591727c555..de31d1f839 100644 --- a/packages/framework/framework/src/index.ts +++ b/packages/framework/framework/src/index.ts @@ -18,7 +18,7 @@ export { shadowTokens, textTokens, tokenBuilder, -} from '@fluentui-react-native/tokens'; +} from '@fluentui-react-native/design/styling/tokens'; export type { FontStyleTokens, FontTokens, @@ -30,7 +30,7 @@ export type { IShadowTokens, LayoutTokens, TokenBuilder, -} from '@fluentui-react-native/tokens'; +} from '@fluentui-react-native/design/styling/tokens'; export { renderSlot, stagedComponent, withSlots, useSlot } from '@fluentui-react-native/framework-base'; export type { RenderType as NativeReactType } from '@fluentui-react-native/framework-base'; diff --git a/packages/framework/framework/tsconfig.json b/packages/framework/framework/tsconfig.json index c9dbfdf63b..c04f8a8b1f 100644 --- a/packages/framework/framework/tsconfig.json +++ b/packages/framework/framework/tsconfig.json @@ -27,9 +27,6 @@ { "path": "../../../scripts/tsconfig.json" }, - { - "path": "../../shim/tokens/tsconfig.json" - }, { "path": "../use-slots/tsconfig.json" }, diff --git a/packages/shim/theme-tokens/package.json b/packages/shim/theme-tokens/package.json index e06106af2b..552b898c3b 100644 --- a/packages/shim/theme-tokens/package.json +++ b/packages/shim/theme-tokens/package.json @@ -55,6 +55,9 @@ "react-native-windows": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0" }, "peerDependenciesMeta": { + "@office-iss/react-native-win32": { + "optional": true + }, "@types/react": { "optional": true }, @@ -63,9 +66,6 @@ }, "react-native-windows": { "optional": true - }, - "@office-iss/react-native-win32": { - "optional": true } }, "rnx-kit": { diff --git a/packages/shim/theme-types/package.json b/packages/shim/theme-types/package.json index 380daf5e06..338ca45272 100644 --- a/packages/shim/theme-types/package.json +++ b/packages/shim/theme-types/package.json @@ -55,6 +55,9 @@ "react-native-windows": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0" }, "peerDependenciesMeta": { + "@office-iss/react-native-win32": { + "optional": true + }, "@types/react": { "optional": true }, @@ -63,9 +66,6 @@ }, "react-native-windows": { "optional": true - }, - "@office-iss/react-native-win32": { - "optional": true } }, "rnx-kit": { diff --git a/packages/shim/theme/package.json b/packages/shim/theme/package.json index 190f108954..30f123b4f2 100644 --- a/packages/shim/theme/package.json +++ b/packages/shim/theme/package.json @@ -56,6 +56,9 @@ "react-native-windows": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0" }, "peerDependenciesMeta": { + "@office-iss/react-native-win32": { + "optional": true + }, "@types/react": { "optional": true }, @@ -64,9 +67,6 @@ }, "react-native-windows": { "optional": true - }, - "@office-iss/react-native-win32": { - "optional": true } }, "furn": { diff --git a/packages/shim/themed-stylesheet/package.json b/packages/shim/themed-stylesheet/package.json index ac40fee0ed..cdf68d4a9e 100644 --- a/packages/shim/themed-stylesheet/package.json +++ b/packages/shim/themed-stylesheet/package.json @@ -56,6 +56,9 @@ "react-native-windows": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0" }, "peerDependenciesMeta": { + "@office-iss/react-native-win32": { + "optional": true + }, "@types/react": { "optional": true }, @@ -64,9 +67,6 @@ }, "react-native-windows": { "optional": true - }, - "@office-iss/react-native-win32": { - "optional": true } }, "furn": { diff --git a/packages/theming/android-theme/package.json b/packages/theming/android-theme/package.json index 942ae815bd..721b47f224 100644 --- a/packages/theming/android-theme/package.json +++ b/packages/theming/android-theme/package.json @@ -34,9 +34,7 @@ }, "dependencies": { "@fluentui-react-native/design": "workspace:*", - "@fluentui-react-native/framework-base": "workspace:*", - "@fluentui-react-native/theme-tokens": "workspace:*", - "@fluentui-react-native/theming-utils": "workspace:*" + "@fluentui-react-native/framework-base": "workspace:*" }, "devDependencies": { "@babel/core": "catalog:", diff --git a/packages/theming/android-theme/src/createAliasTokens.ts b/packages/theming/android-theme/src/createAliasTokens.ts index 6f08f83023..f6e55a87bc 100644 --- a/packages/theming/android-theme/src/createAliasTokens.ts +++ b/packages/theming/android-theme/src/createAliasTokens.ts @@ -1,7 +1,7 @@ import { memoize } from '@fluentui-react-native/framework-base'; -import { getAliasTokens, getShadowTokens } from '@fluentui-react-native/theme-tokens'; +import { getAliasTokens, getShadowTokens } from '@fluentui-react-native/design/tokens/legacy'; import type { AliasColorTokens, AppearanceOptions, ThemeShadowDefinition } from '@fluentui-react-native/design/theming'; -import { mapPipelineToShadow, mapPipelineToTheme } from '@fluentui-react-native/theming-utils'; +import { mapPipelineToShadow, mapPipelineToTheme } from '@fluentui-react-native/design/theming'; function createColorAliasTokensWorker(mode: AppearanceOptions): AliasColorTokens { const aliasTokens = getAliasTokens(mode); diff --git a/packages/theming/android-theme/src/createFontAliasTokens.ts b/packages/theming/android-theme/src/createFontAliasTokens.ts index 1b0bba1cb9..6f5494f58c 100644 --- a/packages/theming/android-theme/src/createFontAliasTokens.ts +++ b/packages/theming/android-theme/src/createFontAliasTokens.ts @@ -1,7 +1,7 @@ import { memoize } from '@fluentui-react-native/framework-base'; -import { getAliasTokens } from '@fluentui-react-native/theme-tokens'; +import { getAliasTokens } from '@fluentui-react-native/design/tokens/legacy'; import type { Variants } from '@fluentui-react-native/design/theming'; -import { mapFontPipelineToTheme } from '@fluentui-react-native/theming-utils'; +import { mapFontPipelineToTheme } from '@fluentui-react-native/design/theming'; function createFontAliasTokensWorker(): Partial { const aliasTokens = getAliasTokens('light'); diff --git a/packages/theming/android-theme/tsconfig.json b/packages/theming/android-theme/tsconfig.json index 65780a28c7..1e570850a1 100644 --- a/packages/theming/android-theme/tsconfig.json +++ b/packages/theming/android-theme/tsconfig.json @@ -17,12 +17,6 @@ }, { "path": "../../../scripts/tsconfig.json" - }, - { - "path": "../../shim/theme-tokens/tsconfig.json" - }, - { - "path": "../../shim/theming-utils/tsconfig.json" } ] } diff --git a/packages/theming/apple-theme/package.json b/packages/theming/apple-theme/package.json index 28559a68d5..0ebe3fe297 100644 --- a/packages/theming/apple-theme/package.json +++ b/packages/theming/apple-theme/package.json @@ -39,8 +39,6 @@ "@fluentui-react-native/design-tokens-macos": "catalog:", "@fluentui-react-native/experimental-appearance-additions": "workspace:*", "@fluentui-react-native/framework-base": "workspace:*", - "@fluentui-react-native/theme-tokens": "workspace:*", - "@fluentui-react-native/theming-utils": "workspace:*", "assert-never": "^1.2.1" }, "devDependencies": { diff --git a/packages/theming/apple-theme/src/createFontAliasTokens.ios.ts b/packages/theming/apple-theme/src/createFontAliasTokens.ios.ts index 7e415554dc..cacfcbf623 100644 --- a/packages/theming/apple-theme/src/createFontAliasTokens.ios.ts +++ b/packages/theming/apple-theme/src/createFontAliasTokens.ios.ts @@ -1,7 +1,7 @@ import aliasTokens from '@fluentui-react-native/design-tokens-ios/light/tokens-aliases.json'; // Font alias tokens should be the same for all color styles import { memoize } from '@fluentui-react-native/framework-base'; import type { Variants } from '@fluentui-react-native/design/theming'; -import { mapFontPipelineToTheme } from '@fluentui-react-native/theming-utils'; +import { mapFontPipelineToTheme } from '@fluentui-react-native/design/theming'; function createFontAliasTokensWorker(): Partial { return mapFontPipelineToTheme(aliasTokens); diff --git a/packages/theming/apple-theme/src/createMacOSAliasTokens.ts b/packages/theming/apple-theme/src/createMacOSAliasTokens.ts index e3991e8375..d2cc77eb70 100644 --- a/packages/theming/apple-theme/src/createMacOSAliasTokens.ts +++ b/packages/theming/apple-theme/src/createMacOSAliasTokens.ts @@ -1,7 +1,7 @@ import { memoize } from '@fluentui-react-native/framework-base'; import type { AliasColorTokens, AppearanceOptions } from '@fluentui-react-native/design/theming'; import type { ThemeShadowDefinition } from '@fluentui-react-native/design/theming'; -import { mapPipelineToTheme, mapPipelineToShadow } from '@fluentui-react-native/theming-utils'; +import { mapPipelineToTheme, mapPipelineToShadow } from '@fluentui-react-native/design/theming'; import { getMacOSAliasTokens, getMacOSShadowTokens } from './getMacOSTokens'; diff --git a/packages/theming/apple-theme/src/createiOSAliasTokens.ts b/packages/theming/apple-theme/src/createiOSAliasTokens.ts index f788ca8697..5f42550291 100644 --- a/packages/theming/apple-theme/src/createiOSAliasTokens.ts +++ b/packages/theming/apple-theme/src/createiOSAliasTokens.ts @@ -1,8 +1,8 @@ import { memoize } from '@fluentui-react-native/framework-base'; -import { getAliasTokens, getShadowTokens } from '@fluentui-react-native/theme-tokens'; +import { getAliasTokens, getShadowTokens } from '@fluentui-react-native/design/tokens/legacy'; import type { AliasColorTokens, AppearanceOptions } from '@fluentui-react-native/design/theming'; import type { ThemeShadowDefinition } from '@fluentui-react-native/design/theming'; -import { mapPipelineToTheme, mapPipelineToShadow } from '@fluentui-react-native/theming-utils'; +import { mapPipelineToTheme, mapPipelineToShadow } from '@fluentui-react-native/design/theming'; function createiOSColorAliasTokensWorker(mode: AppearanceOptions): AliasColorTokens { const aliasTokens = getAliasTokens(mode); diff --git a/packages/theming/apple-theme/tsconfig.json b/packages/theming/apple-theme/tsconfig.json index bcb0266426..3595c27d58 100644 --- a/packages/theming/apple-theme/tsconfig.json +++ b/packages/theming/apple-theme/tsconfig.json @@ -23,12 +23,6 @@ }, { "path": "../../../scripts/tsconfig.json" - }, - { - "path": "../../shim/theme-tokens/tsconfig.json" - }, - { - "path": "../../shim/theming-utils/tsconfig.json" } ] } diff --git a/packages/theming/default-theme/package.json b/packages/theming/default-theme/package.json index 468383ed78..7096a95844 100644 --- a/packages/theming/default-theme/package.json +++ b/packages/theming/default-theme/package.json @@ -35,8 +35,6 @@ "dependencies": { "@fluentui-react-native/design": "workspace:*", "@fluentui-react-native/framework-base": "workspace:*", - "@fluentui-react-native/theme-tokens": "workspace:*", - "@fluentui-react-native/theming-utils": "workspace:*", "assert-never": "^1.2.1" }, "devDependencies": { diff --git a/packages/theming/default-theme/src/createAliasTokens.ts b/packages/theming/default-theme/src/createAliasTokens.ts index 6f08f83023..f6e55a87bc 100644 --- a/packages/theming/default-theme/src/createAliasTokens.ts +++ b/packages/theming/default-theme/src/createAliasTokens.ts @@ -1,7 +1,7 @@ import { memoize } from '@fluentui-react-native/framework-base'; -import { getAliasTokens, getShadowTokens } from '@fluentui-react-native/theme-tokens'; +import { getAliasTokens, getShadowTokens } from '@fluentui-react-native/design/tokens/legacy'; import type { AliasColorTokens, AppearanceOptions, ThemeShadowDefinition } from '@fluentui-react-native/design/theming'; -import { mapPipelineToShadow, mapPipelineToTheme } from '@fluentui-react-native/theming-utils'; +import { mapPipelineToShadow, mapPipelineToTheme } from '@fluentui-react-native/design/theming'; function createColorAliasTokensWorker(mode: AppearanceOptions): AliasColorTokens { const aliasTokens = getAliasTokens(mode); diff --git a/packages/theming/default-theme/src/defaultTheme.ts b/packages/theming/default-theme/src/defaultTheme.ts index 28e466f187..a119dc4b19 100644 --- a/packages/theming/default-theme/src/defaultTheme.ts +++ b/packages/theming/default-theme/src/defaultTheme.ts @@ -1,6 +1,6 @@ import { Platform } from 'react-native'; -import { globalTokens } from '@fluentui-react-native/theme-tokens'; +import { globalTokens } from '@fluentui-react-native/design/tokens/legacy'; import type { Theme, Typography, Spacing, FontWeightValue, FontSize, FontSizes, Variants } from '@fluentui-react-native/design/theming'; import { fontWeightRegular, fontWeightSemibold } from '@fluentui-react-native/design/tokens/global'; diff --git a/packages/theming/default-theme/src/stockWebPalette.macos.ts b/packages/theming/default-theme/src/stockWebPalette.macos.ts index 468e6b7041..3502caf002 100644 --- a/packages/theming/default-theme/src/stockWebPalette.macos.ts +++ b/packages/theming/default-theme/src/stockWebPalette.macos.ts @@ -1,4 +1,4 @@ -import { globalTokens } from '@fluentui-react-native/theme-tokens'; +import { globalTokens } from '@fluentui-react-native/design/tokens/legacy'; import type { ThemeColorDefinition } from '@fluentui-react-native/design/theming'; import { colorBlack, colorBurgundyPrimary, colorRedPrimary, colorWhite } from '@fluentui-react-native/design/tokens/global'; diff --git a/packages/theming/default-theme/src/stockWebPalette.ts b/packages/theming/default-theme/src/stockWebPalette.ts index 2b6372bcbd..dd7b3b40cb 100644 --- a/packages/theming/default-theme/src/stockWebPalette.ts +++ b/packages/theming/default-theme/src/stockWebPalette.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/ban-ts-comment */ -import { globalTokens } from '@fluentui-react-native/theme-tokens'; +import { globalTokens } from '@fluentui-react-native/design/tokens/legacy'; import type { ThemeColorDefinition } from '@fluentui-react-native/design/theming'; import { colorBlack, colorBurgundyPrimary, colorRedPrimary, colorWhite } from '@fluentui-react-native/design/tokens/global'; diff --git a/packages/theming/default-theme/src/stockWebPalette.win32.ts b/packages/theming/default-theme/src/stockWebPalette.win32.ts index 468e6b7041..3502caf002 100644 --- a/packages/theming/default-theme/src/stockWebPalette.win32.ts +++ b/packages/theming/default-theme/src/stockWebPalette.win32.ts @@ -1,4 +1,4 @@ -import { globalTokens } from '@fluentui-react-native/theme-tokens'; +import { globalTokens } from '@fluentui-react-native/design/tokens/legacy'; import type { ThemeColorDefinition } from '@fluentui-react-native/design/theming'; import { colorBlack, colorBurgundyPrimary, colorRedPrimary, colorWhite } from '@fluentui-react-native/design/tokens/global'; diff --git a/packages/theming/default-theme/tsconfig.json b/packages/theming/default-theme/tsconfig.json index 476741ff14..7ac6019908 100644 --- a/packages/theming/default-theme/tsconfig.json +++ b/packages/theming/default-theme/tsconfig.json @@ -16,12 +16,6 @@ }, { "path": "../../../scripts/tsconfig.json" - }, - { - "path": "../../shim/theme-tokens/tsconfig.json" - }, - { - "path": "../../shim/theming-utils/tsconfig.json" } ] } diff --git a/packages/theming/win32-theme/package.json b/packages/theming/win32-theme/package.json index d7b636a9f6..e18c318f8e 100644 --- a/packages/theming/win32-theme/package.json +++ b/packages/theming/win32-theme/package.json @@ -36,9 +36,7 @@ "@fluentui-react-native/default-theme": "workspace:*", "@fluentui-react-native/design": "workspace:*", "@fluentui-react-native/design-tokens-win32": "catalog:", - "@fluentui-react-native/framework-base": "workspace:*", - "@fluentui-react-native/theme-tokens": "workspace:*", - "@fluentui-react-native/theming-utils": "workspace:*" + "@fluentui-react-native/framework-base": "workspace:*" }, "devDependencies": { "@babel/core": "catalog:", diff --git a/packages/theming/win32-theme/src/createBrandedThemeWithAlias.ts b/packages/theming/win32-theme/src/createBrandedThemeWithAlias.ts index 38768b5592..fa97b55337 100644 --- a/packages/theming/win32-theme/src/createBrandedThemeWithAlias.ts +++ b/packages/theming/win32-theme/src/createBrandedThemeWithAlias.ts @@ -1,6 +1,6 @@ import type { ColorValue } from 'react-native'; -import { globalTokens } from '@fluentui-react-native/theme-tokens'; +import { globalTokens } from '@fluentui-react-native/design/tokens/legacy'; import type { Theme, PartialTheme, AliasColorTokens } from '@fluentui-react-native/design/theming'; export function createBrandedThemeWithAlias(themeName: string, theme: Theme): PartialTheme { diff --git a/packages/theming/win32-theme/src/createFontAliasTokens.ts b/packages/theming/win32-theme/src/createFontAliasTokens.ts index f9e830394a..0bb272bf6e 100644 --- a/packages/theming/win32-theme/src/createFontAliasTokens.ts +++ b/packages/theming/win32-theme/src/createFontAliasTokens.ts @@ -1,6 +1,6 @@ import { memoize } from '@fluentui-react-native/framework-base'; import type { Variants } from '@fluentui-react-native/design/theming'; -import { mapFontPipelineToTheme } from '@fluentui-react-native/theming-utils'; +import { mapFontPipelineToTheme } from '@fluentui-react-native/design/theming'; import { getOfficeAliasTokens } from './getOfficeTokens'; diff --git a/packages/theming/win32-theme/src/createOfficeAliasTokens.ts b/packages/theming/win32-theme/src/createOfficeAliasTokens.ts index cad1af2b18..0b4f447d5d 100644 --- a/packages/theming/win32-theme/src/createOfficeAliasTokens.ts +++ b/packages/theming/win32-theme/src/createOfficeAliasTokens.ts @@ -1,6 +1,6 @@ import { memoize } from '@fluentui-react-native/framework-base'; import type { AliasColorTokens, ThemeShadowDefinition } from '@fluentui-react-native/design/theming'; -import { mapPipelineToShadow, mapPipelineToTheme } from '@fluentui-react-native/theming-utils'; +import { mapPipelineToShadow, mapPipelineToTheme } from '@fluentui-react-native/design/theming'; import { getOfficeAliasTokens, getOfficeShadowTokens } from './getOfficeTokens'; diff --git a/packages/theming/win32-theme/tsconfig.json b/packages/theming/win32-theme/tsconfig.json index ac58a5008a..6fc8279a14 100644 --- a/packages/theming/win32-theme/tsconfig.json +++ b/packages/theming/win32-theme/tsconfig.json @@ -20,12 +20,6 @@ }, { "path": "../../../scripts/tsconfig.json" - }, - { - "path": "../../shim/theme-tokens/tsconfig.json" - }, - { - "path": "../../shim/theming-utils/tsconfig.json" } ] } diff --git a/packages/utils/test-tools/package.json b/packages/utils/test-tools/package.json index 104cd0f3df..c0feef283d 100644 --- a/packages/utils/test-tools/package.json +++ b/packages/utils/test-tools/package.json @@ -52,6 +52,9 @@ "react-native-windows": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0" }, "peerDependenciesMeta": { + "@office-iss/react-native-win32": { + "optional": true + }, "@types/react": { "optional": true }, @@ -60,9 +63,6 @@ }, "react-native-windows": { "optional": true - }, - "@office-iss/react-native-win32": { - "optional": true } }, "furn": { diff --git a/yarn.lock b/yarn.lock index 3c5ed4296c..fd303e3e05 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2465,8 +2465,6 @@ __metadata: "@fluentui-react-native/design": "workspace:*" "@fluentui-react-native/framework-base": "workspace:*" "@fluentui-react-native/scripts": "workspace:*" - "@fluentui-react-native/theme-tokens": "workspace:*" - "@fluentui-react-native/theming-utils": "workspace:*" "@react-native-community/cli": "npm:^20.0.0" "@react-native-community/cli-platform-android": "npm:^20.0.0" "@react-native-community/cli-platform-ios": "npm:^20.0.0" @@ -2508,8 +2506,6 @@ __metadata: "@fluentui-react-native/experimental-appearance-additions": "workspace:*" "@fluentui-react-native/framework-base": "workspace:*" "@fluentui-react-native/scripts": "workspace:*" - "@fluentui-react-native/theme-tokens": "workspace:*" - "@fluentui-react-native/theming-utils": "workspace:*" "@react-native-community/cli": "npm:^20.0.0" "@react-native-community/cli-platform-android": "npm:^20.0.0" "@react-native-community/cli-platform-ios": "npm:^20.0.0" @@ -2552,7 +2548,6 @@ __metadata: "@fluentui-react-native/framework-base": "workspace:*" "@fluentui-react-native/icon": "workspace:*" "@fluentui-react-native/scripts": "workspace:*" - "@fluentui-react-native/tokens": "workspace:*" "@fluentui-react-native/use-styling": "workspace:*" "@office-iss/react-native-win32": "npm:^0.81.8" "@react-native-community/cli": "npm:^20.0.0" @@ -2603,7 +2598,6 @@ __metadata: "@fluentui-react-native/scripts": "workspace:*" "@fluentui-react-native/test-tools": "workspace:*" "@fluentui-react-native/text": "workspace:*" - "@fluentui-react-native/tokens": "workspace:*" "@fluentui-react-native/use-styling": "workspace:*" "@office-iss/react-native-win32": "npm:^0.81.8" "@react-native-community/cli": "npm:^20.0.0" @@ -2657,7 +2651,6 @@ __metadata: "@fluentui-react-native/styling-utils": "workspace:*" "@fluentui-react-native/test-tools": "workspace:*" "@fluentui-react-native/text": "workspace:*" - "@fluentui-react-native/tokens": "workspace:*" "@fluentui-react-native/use-styling": "workspace:*" "@office-iss/react-native-win32": "npm:^0.81.8" "@react-native-community/cli": "npm:^20.0.0" @@ -2752,7 +2745,6 @@ __metadata: "@fluentui-react-native/styling-utils": "workspace:*" "@fluentui-react-native/test-tools": "workspace:*" "@fluentui-react-native/text": "workspace:*" - "@fluentui-react-native/tokens": "workspace:*" "@fluentui-react-native/use-styling": "workspace:*" "@office-iss/react-native-win32": "npm:^0.81.8" "@react-native-community/cli": "npm:^20.0.0" @@ -2805,7 +2797,6 @@ __metadata: "@fluentui-react-native/scripts": "workspace:*" "@fluentui-react-native/test-tools": "workspace:*" "@fluentui-react-native/text": "workspace:*" - "@fluentui-react-native/tokens": "workspace:*" "@fluentui-react-native/use-styling": "workspace:*" "@office-iss/react-native-win32": "npm:^0.81.8" "@react-native-community/cli": "npm:^20.0.0" @@ -2931,6 +2922,7 @@ __metadata: "@babel/core": "catalog:" "@fluentui-react-native/adapters": "workspace:*" "@fluentui-react-native/callout": "workspace:*" + "@fluentui-react-native/design": "workspace:*" "@fluentui-react-native/focus-zone": "workspace:*" "@fluentui-react-native/framework-base": "workspace:*" "@fluentui-react-native/icon": "workspace:*" @@ -2938,7 +2930,6 @@ __metadata: "@fluentui-react-native/pressable": "workspace:*" "@fluentui-react-native/scripts": "workspace:*" "@fluentui-react-native/text": "workspace:*" - "@fluentui-react-native/tokens": "workspace:*" "@office-iss/react-native-win32": "npm:^0.81.8" "@react-native-community/cli": "npm:^20.0.0" "@react-native-community/cli-platform-android": "npm:^20.0.0" @@ -2987,8 +2978,6 @@ __metadata: "@fluentui-react-native/design": "workspace:*" "@fluentui-react-native/framework-base": "workspace:*" "@fluentui-react-native/scripts": "workspace:*" - "@fluentui-react-native/theme-tokens": "workspace:*" - "@fluentui-react-native/theming-utils": "workspace:*" "@office-iss/react-native-win32": "npm:^0.81.8" "@react-native-community/cli": "npm:^20.0.0" "@react-native-community/cli-platform-android": "npm:^20.0.0" @@ -3310,12 +3299,15 @@ __metadata: react-native-windows: "npm:^0.81.0" react-test-renderer: "npm:19.1.4" peerDependencies: + "@office-iss/react-native-win32": ^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0 "@types/react": ~18.2.0 || ~19.0.0 || ~19.1.4 react: 18.2.0 || 19.0.0 || 19.1.4 react-native: ^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.6 react-native-macos: ^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0 react-native-windows: ^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0 peerDependenciesMeta: + "@office-iss/react-native-win32": + optional: true "@types/react": optional: true react-native-macos: @@ -3337,7 +3329,6 @@ __metadata: "@fluentui-react-native/scripts": "workspace:*" "@fluentui-react-native/test-tools": "workspace:*" "@fluentui-react-native/text": "workspace:*" - "@fluentui-react-native/tokens": "workspace:*" "@office-iss/react-native-win32": "npm:^0.81.8" "@react-native-community/cli": "npm:^20.0.0" "@react-native-community/cli-platform-android": "npm:^20.0.0" @@ -3717,10 +3708,10 @@ __metadata: "@babel/core": "catalog:" "@fluentui-react-native/button": "workspace:*" "@fluentui-react-native/contextual-menu": "workspace:*" + "@fluentui-react-native/design": "workspace:*" "@fluentui-react-native/framework": "workspace:*" "@fluentui-react-native/framework-base": "workspace:*" "@fluentui-react-native/scripts": "workspace:*" - "@fluentui-react-native/tokens": "workspace:*" "@office-iss/react-native-win32": "npm:^0.81.8" "@react-native-community/cli": "npm:^20.0.0" "@react-native-community/cli-platform-android": "npm:^20.0.0" @@ -3854,7 +3845,6 @@ __metadata: "@fluentui-react-native/framework": "workspace:*" "@fluentui-react-native/framework-base": "workspace:*" "@fluentui-react-native/scripts": "workspace:*" - "@fluentui-react-native/tokens": "workspace:*" "@fluentui-react-native/use-styling": "workspace:*" "@react-native-community/cli": "npm:^20.0.0" "@react-native-community/cli-platform-android": "npm:^20.0.0" @@ -4013,7 +4003,6 @@ __metadata: "@fluentui-react-native/design": "workspace:*" "@fluentui-react-native/framework-base": "workspace:*" "@fluentui-react-native/scripts": "workspace:*" - "@fluentui-react-native/tokens": "workspace:*" "@fluentui-react-native/use-slots": "workspace:*" "@fluentui-react-native/use-styling": "workspace:*" "@fluentui-react-native/use-tokens": "workspace:*" @@ -4108,7 +4097,6 @@ __metadata: "@fluentui-react-native/styling-utils": "workspace:*" "@fluentui-react-native/test-tools": "workspace:*" "@fluentui-react-native/text": "workspace:*" - "@fluentui-react-native/tokens": "workspace:*" "@fluentui-react-native/use-styling": "workspace:*" "@react-native-community/cli": "npm:^20.0.0" "@react-native-community/cli-platform-android": "npm:^20.0.0" @@ -4192,13 +4180,13 @@ __metadata: dependencies: "@babel/core": "catalog:" "@fluentui-react-native/adapters": "workspace:*" + "@fluentui-react-native/design": "workspace:*" "@fluentui-react-native/framework": "workspace:*" "@fluentui-react-native/framework-base": "workspace:*" "@fluentui-react-native/interactive-hooks": "workspace:*" "@fluentui-react-native/scripts": "workspace:*" "@fluentui-react-native/test-tools": "workspace:*" "@fluentui-react-native/text": "workspace:*" - "@fluentui-react-native/tokens": "workspace:*" "@fluentui-react-native/use-styling": "workspace:*" "@react-native-community/cli": "npm:^20.0.0" "@react-native-community/cli-platform-android": "npm:^20.0.0" @@ -4241,10 +4229,10 @@ __metadata: "@babel/core": "catalog:" "@fluentui-react-native/button": "workspace:*" "@fluentui-react-native/contextual-menu": "workspace:*" + "@fluentui-react-native/design": "workspace:*" "@fluentui-react-native/framework-base": "workspace:*" "@fluentui-react-native/icon": "workspace:*" "@fluentui-react-native/scripts": "workspace:*" - "@fluentui-react-native/tokens": "workspace:*" "@office-iss/react-native-win32": "npm:^0.81.8" "@react-native-community/cli": "npm:^20.0.0" "@react-native-community/cli-platform-android": "npm:^20.0.0" @@ -4299,7 +4287,6 @@ __metadata: "@fluentui-react-native/scripts": "workspace:*" "@fluentui-react-native/test-tools": "workspace:*" "@fluentui-react-native/text": "workspace:*" - "@fluentui-react-native/tokens": "workspace:*" "@fluentui-react-native/use-styling": "workspace:*" "@office-iss/react-native-win32": "npm:^0.81.8" "@react-native-community/cli": "npm:^20.0.0" @@ -4354,7 +4341,6 @@ __metadata: "@fluentui-react-native/scripts": "workspace:*" "@fluentui-react-native/test-tools": "workspace:*" "@fluentui-react-native/text": "workspace:*" - "@fluentui-react-native/tokens": "workspace:*" "@fluentui-react-native/use-styling": "workspace:*" "@office-iss/react-native-win32": "npm:^0.81.8" "@react-native-community/cli": "npm:^20.0.0" @@ -4440,7 +4426,6 @@ __metadata: "@fluentui-react-native/framework": "workspace:*" "@fluentui-react-native/framework-base": "workspace:*" "@fluentui-react-native/scripts": "workspace:*" - "@fluentui-react-native/tokens": "workspace:*" "@office-iss/react-native-win32": "npm:^0.81.8" "@react-native-community/cli": "npm:^20.0.0" "@react-native-community/cli-platform-android": "npm:^20.0.0" @@ -4480,11 +4465,11 @@ __metadata: dependencies: "@babel/core": "catalog:" "@fluentui-react-native/adapters": "workspace:*" + "@fluentui-react-native/design": "workspace:*" "@fluentui-react-native/framework": "workspace:*" "@fluentui-react-native/framework-base": "workspace:*" "@fluentui-react-native/persona-coin": "workspace:*" "@fluentui-react-native/scripts": "workspace:*" - "@fluentui-react-native/tokens": "workspace:*" "@react-native-community/cli": "npm:^20.0.0" "@react-native-community/cli-platform-android": "npm:^20.0.0" "@react-native-community/cli-platform-ios": "npm:^20.0.0" @@ -4607,7 +4592,6 @@ __metadata: "@fluentui-react-native/scripts": "workspace:*" "@fluentui-react-native/test-tools": "workspace:*" "@fluentui-react-native/text": "workspace:*" - "@fluentui-react-native/tokens": "workspace:*" "@fluentui-react-native/use-styling": "workspace:*" "@office-iss/react-native-win32": "npm:^0.81.8" "@react-native-community/cli": "npm:^20.0.0" @@ -4822,11 +4806,11 @@ __metadata: dependencies: "@babel/core": "catalog:" "@fluentui-react-native/adapters": "workspace:*" + "@fluentui-react-native/design": "workspace:*" "@fluentui-react-native/framework": "workspace:*" "@fluentui-react-native/framework-base": "workspace:*" "@fluentui-react-native/scripts": "workspace:*" "@fluentui-react-native/text": "workspace:*" - "@fluentui-react-native/tokens": "workspace:*" "@office-iss/react-native-win32": "npm:^0.81.0" "@react-native-community/cli": "npm:^20.0.0" "@react-native-community/cli-platform-android": "npm:^20.0.0" @@ -4898,7 +4882,6 @@ __metadata: "@fluentui-react-native/scripts": "workspace:*" "@fluentui-react-native/test-tools": "workspace:*" "@fluentui-react-native/text": "workspace:*" - "@fluentui-react-native/tokens": "workspace:*" "@fluentui-react-native/use-styling": "workspace:*" "@office-iss/react-native-win32": "npm:^0.81.8" "@react-native-community/cli": "npm:^20.0.0" @@ -4947,7 +4930,6 @@ __metadata: "@fluentui-react-native/scripts": "workspace:*" "@fluentui-react-native/test-tools": "workspace:*" "@fluentui-react-native/text": "workspace:*" - "@fluentui-react-native/tokens": "workspace:*" "@fluentui-react-native/use-styling": "workspace:*" "@office-iss/react-native-win32": "npm:^0.81.8" "@react-native-community/cli": "npm:^20.0.0" @@ -4998,12 +4980,15 @@ __metadata: react-native: "npm:^0.81.6" react-test-renderer: "npm:19.1.4" peerDependencies: + "@office-iss/react-native-win32": ^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0 "@types/react": ~18.2.0 || ~19.0.0 || ~19.1.4 react: 18.2.0 || 19.0.0 || 19.1.4 react-native: ^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.6 react-native-macos: ^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0 react-native-windows: ^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0 peerDependenciesMeta: + "@office-iss/react-native-win32": + optional: true "@types/react": optional: true react-native-macos: @@ -5061,9 +5046,6 @@ __metadata: "@fluentui-react-native/switch": "workspace:*" "@fluentui-react-native/tablist": "workspace:*" "@fluentui-react-native/text": "workspace:*" - "@fluentui-react-native/theme": "workspace:*" - "@fluentui-react-native/theme-tokens": "workspace:*" - "@fluentui-react-native/themed-stylesheet": "workspace:*" "@fluentui-react-native/tooltip": "workspace:*" "@fluentui-react-native/vibrancy-view": "workspace:*" "@fluentui-react-native/win32-theme": "workspace:*" @@ -5276,7 +5258,6 @@ __metadata: "@fluentui-react-native/interactive-hooks": "workspace:*" "@fluentui-react-native/scripts": "workspace:*" "@fluentui-react-native/test-tools": "workspace:*" - "@fluentui-react-native/tokens": "workspace:*" "@react-native-community/cli": "npm:^20.0.0" "@react-native-community/cli-platform-android": "npm:^20.0.0" "@react-native-community/cli-platform-ios": "npm:^20.0.0" @@ -5309,7 +5290,7 @@ __metadata: languageName: unknown linkType: soft -"@fluentui-react-native/theme-tokens@workspace:*, @fluentui-react-native/theme-tokens@workspace:packages/shim/theme-tokens": +"@fluentui-react-native/theme-tokens@workspace:packages/shim/theme-tokens": version: 0.0.0-use.local resolution: "@fluentui-react-native/theme-tokens@workspace:packages/shim/theme-tokens" dependencies: @@ -5324,12 +5305,15 @@ __metadata: react: "npm:19.1.4" react-native: "npm:^0.81.6" peerDependencies: + "@office-iss/react-native-win32": ^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0 "@types/react": ~18.2.0 || ~19.0.0 || ~19.1.4 react: 18.2.0 || 19.0.0 || 19.1.4 react-native: ^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.6 react-native-macos: ^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0 react-native-windows: ^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0 peerDependenciesMeta: + "@office-iss/react-native-win32": + optional: true "@types/react": optional: true react-native-macos: @@ -5354,12 +5338,15 @@ __metadata: react: "npm:19.1.4" react-native: "npm:^0.81.6" peerDependencies: + "@office-iss/react-native-win32": ^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0 "@types/react": ~18.2.0 || ~19.0.0 || ~19.1.4 react: 18.2.0 || 19.0.0 || 19.1.4 react-native: ^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.6 react-native-macos: ^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0 react-native-windows: ^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0 peerDependenciesMeta: + "@office-iss/react-native-win32": + optional: true "@types/react": optional: true react-native-macos: @@ -5369,7 +5356,7 @@ __metadata: languageName: unknown linkType: soft -"@fluentui-react-native/theme@workspace:*, @fluentui-react-native/theme@workspace:packages/shim/theme": +"@fluentui-react-native/theme@workspace:packages/shim/theme": version: 0.0.0-use.local resolution: "@fluentui-react-native/theme@workspace:packages/shim/theme" dependencies: @@ -5385,12 +5372,15 @@ __metadata: react: "npm:19.1.4" react-native: "npm:^0.81.6" peerDependencies: + "@office-iss/react-native-win32": ^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0 "@types/react": ~18.2.0 || ~19.0.0 || ~19.1.4 react: 18.2.0 || 19.0.0 || 19.1.4 react-native: ^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.6 react-native-macos: ^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0 react-native-windows: ^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0 peerDependenciesMeta: + "@office-iss/react-native-win32": + optional: true "@types/react": optional: true react-native-macos: @@ -5400,7 +5390,7 @@ __metadata: languageName: unknown linkType: soft -"@fluentui-react-native/themed-stylesheet@workspace:*, @fluentui-react-native/themed-stylesheet@workspace:packages/shim/themed-stylesheet": +"@fluentui-react-native/themed-stylesheet@workspace:packages/shim/themed-stylesheet": version: 0.0.0-use.local resolution: "@fluentui-react-native/themed-stylesheet@workspace:packages/shim/themed-stylesheet" dependencies: @@ -5416,16 +5406,25 @@ __metadata: react: "npm:19.1.4" react-native: "npm:^0.81.6" peerDependencies: + "@office-iss/react-native-win32": ^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0 "@types/react": ~18.2.0 || ~19.0.0 || ~19.1.4 react: 18.2.0 || 19.0.0 || 19.1.4 react-native: ^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.6 + react-native-macos: ^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0 + react-native-windows: ^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0 peerDependenciesMeta: + "@office-iss/react-native-win32": + optional: true "@types/react": optional: true + react-native-macos: + optional: true + react-native-windows: + optional: true languageName: unknown linkType: soft -"@fluentui-react-native/theming-utils@workspace:*, @fluentui-react-native/theming-utils@workspace:packages/shim/theming-utils": +"@fluentui-react-native/theming-utils@workspace:packages/shim/theming-utils": version: 0.0.0-use.local resolution: "@fluentui-react-native/theming-utils@workspace:packages/shim/theming-utils" dependencies: @@ -5461,7 +5460,7 @@ __metadata: languageName: unknown linkType: soft -"@fluentui-react-native/tokens@workspace:*, @fluentui-react-native/tokens@workspace:packages/shim/tokens": +"@fluentui-react-native/tokens@workspace:packages/shim/tokens": version: 0.0.0-use.local resolution: "@fluentui-react-native/tokens@workspace:packages/shim/tokens" dependencies: @@ -5666,8 +5665,6 @@ __metadata: "@fluentui-react-native/design-tokens-win32": "catalog:" "@fluentui-react-native/framework-base": "workspace:*" "@fluentui-react-native/scripts": "workspace:*" - "@fluentui-react-native/theme-tokens": "workspace:*" - "@fluentui-react-native/theming-utils": "workspace:*" "@office-iss/react-native-win32": "npm:^0.81.8" "@react-native-community/cli": "npm:^20.0.0" "@react-native-community/cli-platform-android": "npm:^20.0.0" @@ -10919,9 +10916,9 @@ __metadata: resolution: "@uifabricshared/foundation-tokens@workspace:packages/deprecated/foundation-tokens" dependencies: "@babel/core": "catalog:" + "@fluentui-react-native/design": "workspace:*" "@fluentui-react-native/framework-base": "workspace:*" "@fluentui-react-native/scripts": "workspace:*" - "@fluentui-react-native/tokens": "workspace:*" "@office-iss/react-native-win32": "npm:^0.81.0" "@react-native-community/cli": "npm:^20.0.0" "@react-native-community/cli-platform-android": "npm:^20.0.0" @@ -11016,12 +11013,15 @@ __metadata: react: "npm:19.1.4" react-native: "npm:^0.81.6" peerDependencies: + "@office-iss/react-native-win32": ^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0 "@types/react": ~18.2.0 || ~19.0.0 || ~19.1.4 react: 18.2.0 || 19.0.0 || 19.1.4 react-native: ^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0 react-native-macos: ^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0 react-native-windows: ^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0 peerDependenciesMeta: + "@office-iss/react-native-win32": + optional: true "@types/react": optional: true react-native-macos: From 39bd93e7b66678c0432e039476210bb7d4c50965 Mon Sep 17 00:00:00 2001 From: Jason Morse Date: Wed, 26 Aug 2026 17:53:32 -0700 Subject: [PATCH 7/8] update dependency profiles --- packages/dependency-profiles/src/index.js | 48 +++++++++++------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/dependency-profiles/src/index.js b/packages/dependency-profiles/src/index.js index 6853dd08dc..cc67f0f5ec 100644 --- a/packages/dependency-profiles/src/index.js +++ b/packages/dependency-profiles/src/index.js @@ -222,14 +222,6 @@ module.exports = { "name": "@fluentui-react-native/framework", "version": "0.17.2" }, - "@fluentui-react-native/theme": { - "name": "@fluentui-react-native/theme", - "version": "0.14.2" - }, - "@fluentui-react-native/themed-stylesheet": { - "name": "@fluentui-react-native/themed-stylesheet", - "version": "1.10.2" - }, "@fluentui-react-native/use-slots": { "name": "@fluentui-react-native/use-slots", "version": "0.13.2" @@ -250,18 +242,6 @@ module.exports = { "name": "@fluentui-react-native/callout", "version": "0.29.2" }, - "@fluentui-react-native/android-theme": { - "name": "@fluentui-react-native/android-theme", - "version": "0.26.8" - }, - "@fluentui-react-native/apple-theme": { - "name": "@fluentui-react-native/apple-theme", - "version": "0.29.8" - }, - "@fluentui-react-native/default-theme": { - "name": "@fluentui-react-native/default-theme", - "version": "0.27.8" - }, "@fluentui-react-native/theme-tokens": { "name": "@fluentui-react-native/theme-tokens", "version": "0.29.2" @@ -270,10 +250,34 @@ module.exports = { "name": "@fluentui-react-native/theme-types", "version": "0.44.8" }, + "@fluentui-react-native/theme": { + "name": "@fluentui-react-native/theme", + "version": "0.14.2" + }, + "@fluentui-react-native/themed-stylesheet": { + "name": "@fluentui-react-native/themed-stylesheet", + "version": "1.10.2" + }, "@fluentui-react-native/theming-utils": { "name": "@fluentui-react-native/theming-utils", "version": "0.27.8" }, + "@fluentui-react-native/tokens": { + "name": "@fluentui-react-native/tokens", + "version": "0.24.8" + }, + "@fluentui-react-native/android-theme": { + "name": "@fluentui-react-native/android-theme", + "version": "0.26.8" + }, + "@fluentui-react-native/apple-theme": { + "name": "@fluentui-react-native/apple-theme", + "version": "0.29.8" + }, + "@fluentui-react-native/default-theme": { + "name": "@fluentui-react-native/default-theme", + "version": "0.27.8" + }, "@fluentui-react-native/win32-theme": { "name": "@fluentui-react-native/win32-theme", "version": "0.39.8" @@ -289,10 +293,6 @@ module.exports = { "@fluentui-react-native/styling-utils": { "name": "@fluentui-react-native/styling-utils", "version": "0.8.7" - }, - "@fluentui-react-native/tokens": { - "name": "@fluentui-react-native/tokens", - "version": "0.24.8" } }, "0.74": { From 3a513c7592b921996d0df6fa7b0e1a0354aaf485 Mon Sep 17 00:00:00 2001 From: Jason Morse Date: Wed, 26 Aug 2026 17:56:14 -0700 Subject: [PATCH 8/8] add changeset for additional packages --- .changeset/easy-cooks-work.md | 42 +++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 .changeset/easy-cooks-work.md diff --git a/.changeset/easy-cooks-work.md b/.changeset/easy-cooks-work.md new file mode 100644 index 0000000000..4e09449a00 --- /dev/null +++ b/.changeset/easy-cooks-work.md @@ -0,0 +1,42 @@ +--- +"@uifabricshared/theming-react-native": patch +"@uifabricshared/foundation-tokens": patch +"@fluentui-react-native/contextual-menu": patch +"@uifabricshared/theme-registry": patch +"@fluentui-react-native/notification": patch +"@uifabricshared/theming-ramp": patch +"@fluentui-react-native/experimental-menu-button": patch +"@fluentui-react-native/persona-coin": patch +"@fluentui-react-native/themed-stylesheet": patch +"@fluentui-react-native/menu-button": patch +"@fluentui-react-native/radio-group": patch +"@fluentui-react-native/android-theme": patch +"@fluentui-react-native/default-theme": patch +"@fluentui-react-native/experimental-shimmer": patch +"@fluentui-react-native/checkbox": patch +"@fluentui-react-native/dependency-profiles": patch +"@fluentui-react-native/framework": patch +"@fluentui-react-native/apple-theme": patch +"@fluentui-react-native/win32-theme": patch +"@fluentui-react-native/divider": patch +"@fluentui-react-native/persona": patch +"@fluentui-react-native/tablist": patch +"@fluentui-react-native/theming-utils": patch +"@fluentui-react-native/avatar": patch +"@fluentui-react-native/button": patch +"@fluentui-react-native/switch": patch +"@fluentui-react-native/theme-tokens": patch +"@fluentui-react-native/badge": patch +"@fluentui-react-native/input": patch +"@fluentui-react-native/stack": patch +"@fluentui-react-native/theme-types": patch +"@fluentui-react-native/chip": patch +"@fluentui-react-native/link": patch +"@fluentui-react-native/menu": patch +"@fluentui-react-native/text": patch +"@fluentui-react-native/design": patch +"@fluentui-react-native/tokens": patch +"@fluentui-react-native/theme": patch +--- + +update package references to use consolidated package directly