Skip to content

Commit df050f8

Browse files
committed
fix(xplat): Fix FluentProvider, don't render style tag on native
1 parent 9f87d08 commit df050f8

File tree

5 files changed

+8
-2
lines changed

5 files changed

+8
-2
lines changed

packages/react-components/react-platform-adapter-preview/etc/react-platform-adapter-preview.api.md

+3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ export const getStylesFromClassName: (className: string) => {
2020
[key: string]: unknown;
2121
}[];
2222

23+
// @public (undocumented)
24+
export const isReactNative: () => boolean;
25+
2326
// @public (undocumented)
2427
export const jsxPlatformAdapter: (reactJsx: JSXRuntime) => JSXRuntime;
2528

packages/react-components/react-platform-adapter-preview/src/index.ts

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export { makeResetStyles } from './styling/makeResetStyles';
66
export { makeStyles } from './styling/makeStyles';
77
export { mergeClasses } from './styling/mergeClasses';
88
export { shorthands } from './styling/shorthands';
9+
export { isReactNative } from './utilities/isReactNative';
910

1011
// re-export some griffel types to have fluent use the griffel adapter instead of griffel directly
1112
export { useRenderer_unstable, TextDirectionProvider } from '@griffel/react';
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const isReactNative = () => true;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const isReactNative = () => false;

packages/react-components/react-provider/src/components/FluentProvider/renderFluentProvider.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
} from '@fluentui/react-shared-contexts';
1414
import type { FluentProviderContextValues, FluentProviderState, FluentProviderSlots } from './FluentProvider.types';
1515
import { IconDirectionContextProvider } from '@fluentui/react-icons';
16-
import { XPlatProvider } from '@fluentui/react-platform-adapter-preview';
16+
import { isReactNative, XPlatProvider } from '@fluentui/react-platform-adapter-preview';
1717

1818
/**
1919
* Render the final JSX of FluentProvider
@@ -41,7 +41,7 @@ export const renderFluentProvider_unstable = (
4141
<IconDirectionContextProvider value={contextValues.iconDirection}>
4242
<OverridesProvider value={contextValues.overrides_unstable}>
4343
<state.root>
44-
{canUseDOM() ? null : (
44+
{canUseDOM() || isReactNative() ? null : (
4545
<style
4646
// Using dangerous HTML because react can escape characters
4747
// which can lead to invalid CSS.

0 commit comments

Comments
 (0)