Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(xplat): XPlatProvider correctly formats variable names for strict dom ThemeProvider #30792

Merged
merged 3 commits into from
Mar 16, 2024
Merged

fix(xplat): XPlatProvider correctly formats variable names for strict dom ThemeProvider #30792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d3502a
fix(xplat): XPlatProvider correctly formats variable names for strict…
behowell Mar 15, 2024
ec6dd60
Merge branch 'xplat' of https://github.com/microsoft/fluentui into xp…
behowell Mar 15, 2024
426ae0a
Make sure `theme` is not undefined
behowell Mar 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions packages/react-components/react-platform-adapter/src/XPlatProvider/XPlatProvider.native.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
import * as React from 'react';
import { contexts } from 'react-strict-dom';
import { type XPlatProviderProps } from './XPlatProvider.types';
import { createCustomVariablesFromTheme } from './createCustomVariablesFromTheme';

// css variables insertion should be suppressed in native
export const suppressCssVariableInsertion = true;

export const XPlatProvider: React.FunctionComponent<XPlatProviderProps> = props => {
const { theme, children } = props;
const customProps = React.useMemo(() => createCustomVariablesFromTheme(theme), [theme]);
const { theme = {}, children } = props;

// customProperties should be in the form of { '--camelCasedVariable': 'value' }
return <contexts.ThemeProvider customProperties={customProps} children={children} />;
// customProperties should be in the form of { 'camelCasedVariable': 'value' }
return <contexts.ThemeProvider customProperties={theme} children={children} />;
};
14 changes: 0 additions & 14 deletions ...act-components/react-platform-adapter/src/XPlatProvider/createCustomVariablesFromTheme.ts
View file
Open in desktop

This file was deleted.

Loading