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.

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

[fix] Removal of empty stylesheets created from transitions #7260

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 2 additions & 7 deletions src/runtime/internal/dom.ts
Expand Up @@ -154,14 +154,9 @@ export function get_root_for_style(node: Node): ShadowRoot | Document {
return node.ownerDocument;
}

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) {
export function append_stylesheet(node: ShadowRoot | Document, style: HTMLStyleElement) {
append((node as Document).head || node, style);
return style.sheet as CSSStyleSheet;
}

export function append_hydration(target: NodeEx, node: NodeEx) {
Expand Down
19 changes: 10 additions & 9 deletions src/runtime/internal/style_manager.ts
@@ -1,8 +1,8 @@
import { append_empty_stylesheet, get_root_for_style } from './dom';
import { append_stylesheet, detach, element, get_root_for_style } from './dom';
import { raf } from './environment';

interface StyleInformation {
stylesheet: CSSStyleSheet;
style_element: HTMLStyleElement;
rules: Record<string, true>;
}

Expand All @@ -20,8 +20,8 @@ function hash(str: string) {
return hash >>> 0;
}

function create_style_information(doc: Document | ShadowRoot, node: Element & ElementCSSInlineStyle) {
const info = { stylesheet: append_empty_stylesheet(node), rules: {} };
function create_style_information(doc: Document | ShadowRoot) {
const info = { style_element: element('style'), rules: {} };
managed_styles.set(doc, info);
return info;
}
Expand All @@ -39,9 +39,10 @@ export function create_rule(node: Element & ElementCSSInlineStyle, a: number, b:
const name = `__svelte_${hash(rule)}_${uid}`;
const doc = get_root_for_style(node);

const { stylesheet, rules } = managed_styles.get(doc) || create_style_information(doc, node);

const { style_element, rules } = managed_styles.get(doc) || create_style_information(doc);
if (!rules[name]) {
const stylesheet = append_stylesheet(doc, style_element);
rules[name] = true;
stylesheet.insertRule(`@keyframes ${name} ${rule}`, stylesheet.cssRules.length);
}
Expand All @@ -50,6 +51,7 @@ export function create_rule(node: Element & ElementCSSInlineStyle, a: number, b:
node.style.animation = `${animation ? `${animation}, ` : ''}${name} ${duration}ms linear ${delay}ms 1 both`;

active += 1;

return name;
}

Expand All @@ -71,9 +73,8 @@ export function clear_rules() {
raf(() => {
if (active) return;
managed_styles.forEach(info => {
const { stylesheet } = info;
let i = stylesheet.cssRules.length;
while (i--) stylesheet.deleteRule(i);
const { style_element } = info;
detach(style_element);
info.rules = {};
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can also be removed

});
managed_styles.clear();
Expand Down
18 changes: 18 additions & 0 deletions test/runtime/samples/style_manager-cleanup/_config.js
@@ -0,0 +1,18 @@
export default {
skip_if_ssr: true,
skip_if_hydrate: true,
skip_if_hydrate_from_ssr: true,
tanhauhau marked this conversation as resolved.
Show resolved Hide resolved

async test({ raf, assert, component, window }) {
component.visible = true;
raf.tick(100);
component.visible = false;
raf.tick(200);
raf.tick(0);

assert.htmlEqual(
window.document.head.innerHTML,
''
);
}
};
14 changes: 14 additions & 0 deletions test/runtime/samples/style_manager-cleanup/main.svelte
@@ -0,0 +1,14 @@
<script>
export let visible = false;

function foo(node, params) {
return {
duration: 100,
css: () => ''
};
}
</script>

{#if visible}
<div transition:foo></div>
{/if}