kylefang/styled-components
1
0
Fork 0
mirror of https://github.com/zhigang1992/styled-components.git synced 2026-01-12 22:52:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Backport #3551 to v5 (#3566)

Browse Source
This commit is contained in:
Phil Pluckthun
2021-08-24 10:39:51 +01:00
committed by GitHub
parent 459a8b6fd9
commit 9d60b24257
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/styled-components/src/constructors/createGlobalStyle.js
View File

@@ -51,15 +51,19 @@ export default function createGlobalStyle(
);
}
if (__SERVER__) {
if (styleSheet.server) {
renderStyles(instance, props, styleSheet, theme, stylis);
} else {
}
if (!__SERVER__) {
// this conditional is fine because it is compiled away for the relevant builds during minification,
// resulting in a single unguarded hook call
// eslint-disable-next-line react-hooks/rules-of-hooks
useLayoutEffect(() => {
renderStyles(instance, props, styleSheet, theme, stylis);
return () => globalStyle.removeStyles(instance, styleSheet);
if (!styleSheet.server) {
renderStyles(instance, props, styleSheet, theme, stylis);
return () => globalStyle.removeStyles(instance, styleSheet);
}
}, [instance, props, styleSheet, theme, stylis]);
}

5
packages/styled-components/src/sheet/Sheet.js
View File

@@ -31,6 +31,8 @@ export default class StyleSheet implements Sheet {
options: SheetOptions;
server: boolean;
tag: void | GroupedTag;
/** Register a group ID to give it an index */
@@ -50,9 +52,10 @@ export default class StyleSheet implements Sheet {
this.gs = globalStyles;
this.names = new Map(names);
this.server = !!options.isServer;
// We rehydrate only once and use the sheet that is created first
if (!this.options.isServer && IS_BROWSER && SHOULD_REHYDRATE) {
if (!this.server && IS_BROWSER && SHOULD_REHYDRATE) {
SHOULD_REHYDRATE = false;
rehydrateSheet(this);
}