Skip to content

Tweaks for supposedly properly hydrating in solid #173

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.

Sign up for GitHub

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

Closed
amadeus wants to merge 1 commit into from
Closed

Tweaks for supposedly properly hydrating in solid #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions apps/solid-diff-demo/src/components/FileDiffSSR.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,12 @@ export function FileDiffSSR(props: FileDiffSSRProps) {
// Don't call hydrate() - that would re-render content and cause duplication.
// Instead, just set the fileContainer reference to attach event handlers.
fileDiffInstance = new FileDiff(props.options ?? {}, true);
// @ts-expect-error - fileContainer is private but needed for SSR hydration
fileDiffInstance.fileContainer = fileDiffRef;

fileDiffInstance.hydrate({
oldFile: props.oldFile,
newFile: props.newFile,
fileContainer: fileDiffRef,
});

// Hydrate annotation slots with interactive SolidJS components
if (props.annotations.length > 0 && props.renderAnnotation != null) {
Expand Down Expand Up @@ -100,9 +104,10 @@ export function FileDiffSSR(props: FileDiffSSRProps) {
{isServer && (
<>
{/* Declarative Shadow DOM - browsers parse this and create a shadow root */}
<template shadowrootmode="open">
<div innerHTML={props.preloadedHTML} />
</template>
<template
shadowrootmode="open"
innerHTML={props.preloadedHTML}
></template>
{/* Render static annotation slots on server.
Client will clear these and mount interactive components. */}
<For each={props.annotations}>
Expand Down
7 changes: 4 additions & 3 deletions apps/solid-diff-demo/src/lib/preload-diff.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import type { DiffLineAnnotation } from '@pierre/precision-diffs';
import { preloadMultiFileDiff } from '@pierre/precision-diffs/ssr';
import { cache } from '@solidjs/router';

import { NEW_FILE, OLD_FILE } from '../diff-data';
import OLD_FILE from '../../../demo/src/mocks/fileNew.txt?raw';
import NEW_FILE from '../../../demo/src/mocks/fileOld.txt?raw';

/**
* Type definition for annotation metadata.
Expand Down Expand Up @@ -38,8 +39,8 @@ export const getPreloadedDiff = cache(async () => {
'use server';

const preloadedFileDiff = await preloadMultiFileDiff<AnnotationMetadata>({
oldFile: OLD_FILE,
newFile: NEW_FILE,
oldFile: { name: 'file.ts', contents: OLD_FILE },
newFile: { name: 'file.ts', contents: NEW_FILE },
options: {
theme: 'pierre-dark',
diffStyle: 'split',
Expand Down
Loading