Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/resize-observer-server-owners.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@solid-primitives/resize-observer": patch
---

Fix Solid 2 hydration owner counting with a transparent resize observer effect and matching window size onSettled calls.
18 changes: 11 additions & 7 deletions packages/resize-observer/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { makeEventListener } from "@solid-primitives/event-listener";
import { createHydratableSingletonRoot } from "@solid-primitives/rootless";
import { createHydratableStaticStore, createStaticStore } from "@solid-primitives/static-store";
import { createStaticStore } from "@solid-primitives/static-store";
import {
access,
asArray,
Expand All @@ -10,7 +10,7 @@ import {
noop,
filterNonNullable,
} from "@solid-primitives/utils";
import { type Accessor, createEffect, onCleanup, sharedConfig } from "solid-js";
import { type Accessor, createEffect, onSettled, onCleanup, sharedConfig } from "solid-js";
import { isServer } from "@solidjs/web";

type ResizeObserverEntryGeneric<T extends Element> = ResizeObserverEntry & { readonly target: T };
Expand Down Expand Up @@ -98,6 +98,7 @@ export function createResizeObserver<T extends Element>(
handleDiffArray(refs, prev, observe, unobserve);
prev = refs;
},
{ transparent: true },
);
}

Expand All @@ -124,11 +125,14 @@ export function getWindowSize(): Size {
* );
*/
export function createWindowSize(): Readonly<Size> {
if (isServer) {
return WINDOW_SIZE_FALLBACK;
}
const [size, setSize] = createHydratableStaticStore(WINDOW_SIZE_FALLBACK, getWindowSize);
makeEventListener(window, "resize", () => setSize(getWindowSize()));
const [size, setSize] = createStaticStore(
isServer || sharedConfig.hydrating ? WINDOW_SIZE_FALLBACK : getWindowSize(),
);
if (isServer || sharedConfig.hydrating)
onSettled(() => {
setSize(getWindowSize());
});
if (!isServer) makeEventListener(window, "resize", () => setSize(getWindowSize()));
return size;
}

Expand Down
20 changes: 19 additions & 1 deletion packages/resize-observer/test/hydration.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
type HydrationRoundTripResult,
} from "../../../scripts/test-utils/hydration-harness.ts";

describe("createElementSize hydration", () => {
describe("resize-observer hydration", () => {
let result: HydrationRoundTripResult | undefined;
const targets = new Set<Element>();
const disconnect = vi.fn(() => targets.clear());
Expand Down Expand Up @@ -32,6 +32,24 @@ describe("createElementSize hydration", () => {
vi.unstubAllGlobals();
});

it("hydrates resize primitives and their following sibling", async () => {
result = await renderHydrationRoundTrip(
`
import { createResizeObserver, createWindowSize } from "@solid-primitives/resize-observer";
export default function App() {
createResizeObserver([], () => {});
const size = createWindowSize();
return <><div>{size.width}</div><p ref={el => { el.dataset.bound = "yes"; }}>after resize</p></>;
}
`,
import.meta.dirname,
);
expect(result.consoleMessages).toEqual([]);
expect(result.container.querySelector("p")).toBe(result.serverNodes[1]);
expect(result.container.querySelector("p")?.dataset.bound).toBe("yes");
expect(result.container.querySelector("div")?.textContent).toBe(String(window.innerWidth));
});

it.each(["accessor", "element"])(
"hydrates the %s target without replacing server nodes",
async path => {
Expand Down
Loading