fix transition

pull/7831/head
Yuichiro Yamashita 4 years ago
parent 556ad97f47
commit 2638249951

@ -154,7 +154,13 @@ export function get_root_for_style(node: Node): ShadowRoot | Document {
return node.ownerDocument; return node.ownerDocument;
} }
export function append_stylesheet(node: ShadowRoot | Document, style: HTMLStyleElement) { export function append_empty_stylesheet(node: Node) {
const style_element = element('style') as HTMLStyleElement;
append_stylesheet(get_root_for_style(node), style_element);
return style_element.sheet as CSSStyleSheet;
}
function append_stylesheet(node: ShadowRoot | Document, style: HTMLStyleElement) {
append((node as Document).head || node, style); append((node as Document).head || node, style);
return style.sheet as CSSStyleSheet; return style.sheet as CSSStyleSheet;
} }

@ -1,8 +1,8 @@
import { append_stylesheet, detach, element, get_root_for_style } from './dom'; import { append_empty_stylesheet, detach, get_root_for_style } from './dom';
import { raf } from './environment'; import { raf } from './environment';
interface StyleInformation { interface StyleInformation {
style_element: HTMLStyleElement; stylesheet: CSSStyleSheet;
rules: Record<string, true>; rules: Record<string, true>;
} }
@ -20,8 +20,8 @@ function hash(str: string) {
return hash >>> 0; return hash >>> 0;
} }
function create_style_information(doc: Document | ShadowRoot) { function create_style_information(doc: Document | ShadowRoot, node: Element & ElementCSSInlineStyle) {
const info = { style_element: element('style'), rules: {} }; const info = { stylesheet: append_empty_stylesheet(node), rules: {} };
managed_styles.set(doc, info); managed_styles.set(doc, info);
return info; return info;
} }
@ -39,10 +39,9 @@ export function create_rule(node: Element & ElementCSSInlineStyle, a: number, b:
const name = `__svelte_${hash(rule)}_${uid}`; const name = `__svelte_${hash(rule)}_${uid}`;
const doc = get_root_for_style(node); const doc = get_root_for_style(node);
const { style_element, rules } = managed_styles.get(doc) || create_style_information(doc); const { stylesheet, rules } = managed_styles.get(doc) || create_style_information(doc, node);
if (!rules[name]) { if (!rules[name]) {
const stylesheet = append_stylesheet(doc, style_element);
rules[name] = true; rules[name] = true;
stylesheet.insertRule(`@keyframes ${name} ${rule}`, stylesheet.cssRules.length); stylesheet.insertRule(`@keyframes ${name} ${rule}`, stylesheet.cssRules.length);
} }
@ -72,8 +71,9 @@ export function clear_rules() {
raf(() => { raf(() => {
if (active) return; if (active) return;
managed_styles.forEach(info => { managed_styles.forEach(info => {
const { style_element } = info; const { ownerNode } = info.stylesheet;
detach(style_element); // there is no ownerNode if it runs on jsdom.
if (ownerNode) detach(ownerNode);
}); });
managed_styles.clear(); managed_styles.clear();
}); });

Loading…
Cancel
Save