From bf21f0ed04a0ad08eb0f143d93277d20c2593a24 Mon Sep 17 00:00:00 2001 From: Ben Howell Date: Mon, 25 Mar 2024 16:04:25 -0700 Subject: [PATCH 1/3] chore(xplat): Update canUseDOM to be aware of ReactNative --- .../react-platform-adapter-preview/package.json | 1 - .../react-platform-adapter-preview/src/index.ts | 2 +- .../src/components/FluentProvider/renderFluentProvider.tsx | 4 ++-- packages/react-components/react-utilities/package.json | 1 + .../react-components/react-utilities/src/ssr/canUseDOM.ts | 4 +++- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/react-components/react-platform-adapter-preview/package.json b/packages/react-components/react-platform-adapter-preview/package.json index 22e7454d9665a..9385dc2478568 100644 --- a/packages/react-components/react-platform-adapter-preview/package.json +++ b/packages/react-components/react-platform-adapter-preview/package.json @@ -36,7 +36,6 @@ "dependencies": { "@fluentui/react-shared-contexts": "^9.15.0", "@fluentui/react-theme": "^9.1.17", - "@fluentui/react-utilities": "^9.18.3", "@griffel/core": "^1.14.1", "@griffel/react": "^1.5.14", "@swc/helpers": "^0.5.1", diff --git a/packages/react-components/react-platform-adapter-preview/src/index.ts b/packages/react-components/react-platform-adapter-preview/src/index.ts index dcfc60dde7547..04468db613d4c 100644 --- a/packages/react-components/react-platform-adapter-preview/src/index.ts +++ b/packages/react-components/react-platform-adapter-preview/src/index.ts @@ -9,5 +9,5 @@ export { shorthands } from './styling/shorthands'; export { isReactNative } from './utilities/isReactNative'; // re-export some griffel types to have fluent use the griffel adapter instead of griffel directly -export { useRenderer_unstable, TextDirectionProvider } from '@griffel/react'; export { makeStyles as makeStylesCore } from '@griffel/core'; +export { TextDirectionProvider, useRenderer_unstable } from '@griffel/react'; diff --git a/packages/react-components/react-provider/src/components/FluentProvider/renderFluentProvider.tsx b/packages/react-components/react-provider/src/components/FluentProvider/renderFluentProvider.tsx index e7897e20eac77..ce82b01be72da 100644 --- a/packages/react-components/react-provider/src/components/FluentProvider/renderFluentProvider.tsx +++ b/packages/react-components/react-provider/src/components/FluentProvider/renderFluentProvider.tsx @@ -13,7 +13,7 @@ import { } from '@fluentui/react-shared-contexts'; import type { FluentProviderContextValues, FluentProviderState, FluentProviderSlots } from './FluentProvider.types'; import { IconDirectionContextProvider } from '@fluentui/react-icons'; -import { isReactNative, XPlatProvider } from '@fluentui/react-platform-adapter-preview'; +import { XPlatProvider } from '@fluentui/react-platform-adapter-preview'; /** * Render the final JSX of FluentProvider @@ -41,7 +41,7 @@ export const renderFluentProvider_unstable = ( - {canUseDOM() || isReactNative ? null : ( + {canUseDOM() ? null : (