From 453602a44021e9ee4afdb3602c2b352f1e7faa9e Mon Sep 17 00:00:00 2001
From: Steffen Becker <stffn.becker@gmail.com>
Date: Wed, 24 Jun 2026 22:44:14 +0200
Subject: [PATCH] fix: type errors

---
 src/lib/editor/HeaderFooterLayer.svelte | 4 ++--
 src/lib/import/odt.ts                   | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/lib/editor/HeaderFooterLayer.svelte b/src/lib/editor/HeaderFooterLayer.svelte
index d072fbf..ffd897e 100644
--- a/src/lib/editor/HeaderFooterLayer.svelte
+++ b/src/lib/editor/HeaderFooterLayer.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { Editor, generateHTML } from '@tiptap/core';
+  import { Editor, generateHTML, type Content } from '@tiptap/core';
   import { hfExtensions } from './hfExtensions';
   import { hfIsEmpty, DEFAULT_HF_DISTANCES, type HfDoc, type HfZone, type HfDistances } from '../storage/headerFooter';
   import { cmToPx, type PageMargins } from '../storage/pageMargins';
@@ -131,7 +131,7 @@
     const ed = new Editor({
       element: mount,
       extensions: hfExtensions(zone === 'header' ? 'Header…' : 'Footer…'),
-      content: zoneDoc(zone) ?? emptyDoc(),
+      content: (zoneDoc(zone) ?? emptyDoc()) as Content,
       // No autofocus: its scrollIntoView nudges the page so the just-clicked zone
       // appears to jump. Focus the zone explicitly without scrolling instead.
       onTransaction: () => {
diff --git a/src/lib/import/odt.ts b/src/lib/import/odt.ts
index 00b801e..eebf954 100644
--- a/src/lib/import/odt.ts
+++ b/src/lib/import/odt.ts
@@ -5,6 +5,7 @@ import { DEFAULT_ORDERED_TYPE, orderedTypeFromFormat } from '../editor/orderedLi
 import { PX_PER_CM, cmToPx, type PageMargins } from '../storage/pageMargins';
 import type { Orientation } from '../storage/pageOrientation';
 import { languageFromOdf, NO_LANGUAGE, type DocumentLanguage } from '../storage/documentLanguage';
+import type { HfDoc } from '../storage/headerFooter';
 
 // .odt → TipTap JSON, inverting export/odt.ts. Editor-expressible content becomes its
 // native node/mark/attr; values matching the editor's defaults are suppressed so round
@@ -24,8 +25,8 @@ export interface OdtImportResult {
   margins: PageMargins | null;
   orientation: Orientation | null;
   // Single-paragraph docs in the hfExtensions schema; null = no zone.
-  header: Node | null;
-  footer: Node | null;
+  header: HfDoc;
+  footer: HfDoc;
   // Edge→zone distance (cm): header from top, footer from bottom. null = no zone.
   headerDistanceCm: number | null;
   footerDistanceCm: number | null;
@@ -212,7 +213,7 @@ export function importOdt(bytes: Uint8Array): OdtImportResult {
 
 // A header/footer zone → one single-paragraph doc (hfExtensions schema). Multiple
 // paragraphs collapse to hard line breaks; block structures flatten to their text.
-function convertHfZone(zoneEl: Element, ctx: Ctx): Node | null {
+function convertHfZone(zoneEl: Element, ctx: Ctx): HfDoc {
   const inline: Node[] = [];
   let textAlign: string | null = null;