Skip to content

Commit b1d4bd7

Browse files
committed
fix(registry): restore a lifted visibility even when copying styles throws
1 parent 9452d1d commit b1d4bd7

6 files changed

Lines changed: 51 additions & 11 deletions

File tree

‎packages/cli/src/registry/motionBlurShutter.browser.test.ts‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ describe("motion-blur declarative attribute", () => {
592592
const own = document.createElement("span");
593593
const inheriting = document.createElement("span");
594594
target.word.append(own, inheriting);
595-
target.word.style.visibility = "hidden";
595+
target.word.style.setProperty("visibility", "hidden", "important");
596596
const mocked = globalThis.getComputedStyle;
597597
const resolved = (element: Element, value: string) =>
598598
Object.assign(Object.create(mocked(element)), ["visibility"], {
@@ -617,7 +617,27 @@ describe("motion-blur declarative attribute", () => {
617617
expect((copy.children[0] as HTMLElement).style.visibility).toBe("hidden");
618618
expect((copy.children[1] as HTMLElement).style.visibility).toBe("");
619619
expect(target.word.style.visibility).toBe("hidden");
620+
expect(target.word.style.getPropertyPriority("visibility")).toBe("important");
621+
});
622+
623+
it("puts a hidden target's visibility back when copying its styles throws", async () => {
624+
const warn = vi.spyOn(console, "warn").mockImplementation(() => {});
625+
const target = declare("");
626+
const child = document.createElement("span");
627+
target.word.append(child);
628+
target.word.style.visibility = "hidden";
629+
const mocked = globalThis.getComputedStyle;
630+
globalThis.getComputedStyle = ((element: Element) => {
631+
if (element === child) throw new Error("no style");
632+
return mocked(element);
633+
}) as typeof globalThis.getComputedStyle;
634+
635+
target.register();
636+
637+
expect(target.groups()).toHaveLength(0);
638+
expect(target.word.style.visibility).toBe("hidden");
620639
expect(target.word.style.getPropertyPriority("visibility")).toBe("");
640+
warn.mockRestore();
621641
});
622642

623643
it("leaves a target alone when another composition registers", async () => {

‎registry/blocks/gooey-split/gooey-split.html‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,12 @@
355355
var inline = el.style.getPropertyValue("visibility");
356356
var priority = el.style.getPropertyPriority("visibility");
357357
if (hidden) el.style.setProperty("visibility", "visible", "important");
358-
var styles = resolvedStyles(el, []);
359-
if (hidden) el.style.setProperty("visibility", inline, priority);
358+
var styles;
359+
try {
360+
styles = resolvedStyles(el, []);
361+
} finally {
362+
if (hidden) el.style.setProperty("visibility", inline, priority);
363+
}
360364
s.perspective = parentPerspective(el);
361365
for (var c = 0; c < clones.length; c++) {
362366
paintResolvedStyles(clones[c], styles, { i: 0 });

‎registry/components/motion-blur/demo.html‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,8 +477,12 @@
477477
var inline = el.style.getPropertyValue("visibility");
478478
var priority = el.style.getPropertyPriority("visibility");
479479
if (hidden) el.style.setProperty("visibility", "visible", "important");
480-
var styles = resolvedStyles(el, []);
481-
if (hidden) el.style.setProperty("visibility", inline, priority);
480+
var styles;
481+
try {
482+
styles = resolvedStyles(el, []);
483+
} finally {
484+
if (hidden) el.style.setProperty("visibility", inline, priority);
485+
}
482486
s.perspective = parentPerspective(el);
483487
for (var c = 0; c < clones.length; c++) {
484488
paintResolvedStyles(clones[c], styles, { i: 0 });

‎registry/components/motion-blur/motion-blur.html‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,8 +346,12 @@
346346
var inline = el.style.getPropertyValue("visibility");
347347
var priority = el.style.getPropertyPriority("visibility");
348348
if (hidden) el.style.setProperty("visibility", "visible", "important");
349-
var styles = resolvedStyles(el, []);
350-
if (hidden) el.style.setProperty("visibility", inline, priority);
349+
var styles;
350+
try {
351+
styles = resolvedStyles(el, []);
352+
} finally {
353+
if (hidden) el.style.setProperty("visibility", inline, priority);
354+
}
351355
s.perspective = parentPerspective(el);
352356
for (var c = 0; c < clones.length; c++) {
353357
paintResolvedStyles(clones[c], styles, { i: 0 });

‎registry/components/shutter-slam/demo.html‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,12 @@
307307
var inline = el.style.getPropertyValue("visibility");
308308
var priority = el.style.getPropertyPriority("visibility");
309309
if (hidden) el.style.setProperty("visibility", "visible", "important");
310-
var styles = resolvedStyles(el, []);
311-
if (hidden) el.style.setProperty("visibility", inline, priority);
310+
var styles;
311+
try {
312+
styles = resolvedStyles(el, []);
313+
} finally {
314+
if (hidden) el.style.setProperty("visibility", inline, priority);
315+
}
312316
s.perspective = parentPerspective(el);
313317
for (var c = 0; c < clones.length; c++) {
314318
paintResolvedStyles(clones[c], styles, { i: 0 });

‎registry/components/shutter-slam/shutter-slam.html‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,8 +341,12 @@
341341
var inline = el.style.getPropertyValue("visibility");
342342
var priority = el.style.getPropertyPriority("visibility");
343343
if (hidden) el.style.setProperty("visibility", "visible", "important");
344-
var styles = resolvedStyles(el, []);
345-
if (hidden) el.style.setProperty("visibility", inline, priority);
344+
var styles;
345+
try {
346+
styles = resolvedStyles(el, []);
347+
} finally {
348+
if (hidden) el.style.setProperty("visibility", inline, priority);
349+
}
346350
s.perspective = parentPerspective(el);
347351
for (var c = 0; c < clones.length; c++) {
348352
paintResolvedStyles(clones[c], styles, { i: 0 });

0 commit comments

Comments
 (0)