Skip to content

Commit 376c368

Browse files
authored
Merge pull request #2000 from dxc-technology/jialecl-OpenSansImport
Reverted back Open sans import due to issues with globalStyles
2 parents 66c6f2c + a3aa219 commit 376c368

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

lib/src/HalstackContext.tsx

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useMemo } from "react";
22
import Color from "color";
3-
import { createGlobalStyle } from "styled-components";
3+
import styled from "styled-components";
44
import {
55
AdvancedTheme,
66
OpinionatedTheme,
@@ -395,19 +395,20 @@ type HalstackProviderPropsType = {
395395
const HalstackProvider = ({ theme, advancedTheme, labels, children }: HalstackProviderPropsType): JSX.Element => {
396396
const parsedTheme = useMemo(
397397
() => (theme ? parseTheme(theme) : advancedTheme ? parseAdvancedTheme(advancedTheme) : componentTokens),
398-
[theme, advancedTheme],
398+
[theme, advancedTheme]
399399
);
400400
const parsedLabels = useMemo(() => (labels ? parseLabels(labels) : defaultTranslatedComponentLabels), [labels]);
401401

402402
return (
403-
<HalstackContext.Provider value={parsedTheme}>
404-
<GlobalStyle />
405-
<HalstackLanguageContext.Provider value={parsedLabels}>{children}</HalstackLanguageContext.Provider>
406-
</HalstackContext.Provider>
403+
<Halstack>
404+
<HalstackContext.Provider value={parsedTheme}>
405+
<HalstackLanguageContext.Provider value={parsedLabels}>{children}</HalstackLanguageContext.Provider>
406+
</HalstackContext.Provider>
407+
</Halstack>
407408
);
408409
};
409410

410-
const GlobalStyle = createGlobalStyle`
411+
const Halstack = styled.div`
411412
@import url("https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300;0,400;0,600;0,700;0,800;1,300;1,400;1,600;1,700;1,800&display=swap");
412413
`;
413414

0 commit comments

Comments
 (0)