Skip to content

fix(ThemeProvider): Only inject theme properties if they are not present #55

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

Merged
merged 1 commit into from
Jul 11, 2019
Merged

fix(ThemeProvider): Only inject theme properties if they are not present #55

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 5 additions & 3 deletions packages/main/src/components/ThemeProvider/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { createGenerateClassName, sap_fiori_3 } from '@ui5/webcomponents-react-base';
import boot from '@ui5/webcomponents-base/src/boot';
import { getCompactSize, getTheme } from '@ui5/webcomponents-base/src/Configuration';
import { injectThemeProperties } from '@ui5/webcomponents-base/src/theming/StyleInjection';
import { createGenerateClassName, sap_fiori_3 } from '@ui5/webcomponents-react-base';
import fiori3ThemeProperties from '@ui5/webcomponents/dist/themes/sap_fiori_3/parameters-bundle.css.json';
import React, { Fragment, PureComponent, ReactNode } from 'react';
import { JssProvider, ThemeProvider as ReactJssThemeProvider } from 'react-jss';
Expand All @@ -23,9 +23,11 @@ export class ThemeProvider extends PureComponent<ThemeProviderProps> {

constructor(props) {
super(props);
// inject default CSS custom parameters in head
boot().then((_) => {
injectThemeProperties(fiori3ThemeProperties._);
let existingThemingProperties = document.querySelector('head style[data-ui5-webcomponents-theme-properties]');
if (!existingThemingProperties || !existingThemingProperties.innerHTML) {
injectThemeProperties(fiori3ThemeProperties._);
}
});
}

Expand Down