@blocknote/xl-docx-exporter 0.22.0 → 0.23.0

package/src/docx/defaultSchema/blocks.ts

@@ -3,6 +3,8 @@ import {
   COLORS_DEFAULT,
   DefaultBlockSchema,
   DefaultProps,
+  pageBreakSchema,
+  StyledText,
   UnreachableCaseError,
 } from "@blocknote/core";
 import {
@@ -11,6 +13,7 @@ import {
   ExternalHyperlink,
   IParagraphOptions,
   ImageRun,
+  PageBreak,
   Paragraph,
   ParagraphChild,
   ShadingType,
@@ -55,7 +58,7 @@ function blockPropsToStyles(
   };
 }
 export const docxBlockMappingForDefaultSchema: BlockMapping<
-  DefaultBlockSchema,
+  DefaultBlockSchema & typeof pageBreakSchema.blockSchema,
   any,
   any,
   | Promise<Paragraph[] | Paragraph | DocxTable>
@@ -131,17 +134,29 @@ export const docxBlockMappingForDefaultSchema: BlockMapping<
       ...caption(block.props, exporter),
     ];
   },
-  // TODO
-  codeBlock: (block, exporter) => {
+  codeBlock: (block) => {
+    const textContent = (block.content as StyledText<any>[])[0]?.text || "";
+
     return new Paragraph({
-      // ...blockPropsToStyles(block.props, exporter.options.colors),
       style: "Codeblock",
-      children: exporter.transformInlineContent(block.content),
-      // children: [
-      //   new TextRun({
-      //     text: block..type + " not implemented",
-      //   }),
-      // ],
+      shading: {
+        type: ShadingType.SOLID,
+        fill: "161616",
+        color: "161616",
+      },
+      children: [
+        ...textContent.split("\n").map((line, index) => {
+          return new TextRun({
+            text: line,
+            break: index > 0 ? 1 : 0,
+          });
+        }),
+      ],
+    });
+  },
+  pageBreak: () => {
+    return new Paragraph({
+      children: [new PageBreak()],
     });
   },
   image: async (block, exporter) => {

package/src/docx/defaultSchema/styles.ts

@@ -67,7 +67,7 @@ export const docxStyleMappingForDefaultSchema: StyleMapping<
       return {};
     }
     return {
-      font: "Courier New",
+      font: "GeistMono",
     };
   },
 };

package/src/docx/docxExporter.test.ts

@@ -1,4 +1,4 @@
-import { BlockNoteSchema } from "@blocknote/core";
+import { BlockNoteSchema, defaultBlockSpecs, PageBreak } from "@blocknote/core";
 import { testDocument } from "@shared/testDocument.js";
 import AdmZip from "adm-zip";
 import { Packer, Paragraph, TextRun } from "docx";
@@ -10,7 +10,9 @@ import { DOCXExporter } from "./docxExporter.js";
 describe("exporter", () => {
   it("should export a document", { timeout: 10000 }, async () => {
     const exporter = new DOCXExporter(
-      BlockNoteSchema.create(),
+      BlockNoteSchema.create({
+        blockSpecs: { ...defaultBlockSpecs, pageBreak: PageBreak },
+      }),
       docxDefaultSchemaMappings
     );
     const doc = await exporter.toDocxJsDocument(testDocument);
@@ -33,7 +35,9 @@ describe("exporter", () => {
     { timeout: 10000 },
     async () => {
       const exporter = new DOCXExporter(
-        BlockNoteSchema.create(),
+        BlockNoteSchema.create({
+          blockSpecs: { ...defaultBlockSpecs, pageBreak: PageBreak },
+        }),
         docxDefaultSchemaMappings
       );
 

package/src/docx/docxExporter.ts

@@ -142,17 +142,35 @@ export class DOCXExporter<
     // Unfortunately, loading the variable font doesn't work
     // "./src/fonts/Inter-VariableFont_opsz,wght.ttf",
 
-    let font = await loadFileBuffer(
+    let interFont = await loadFileBuffer(
       await import("@shared/assets/fonts/inter/Inter_18pt-Regular.ttf")
     );
+    let geistMonoFont = await loadFileBuffer(
+      await import("@shared/assets/fonts/GeistMono-Regular.ttf")
+    );
 
-    if (font instanceof ArrayBuffer) {
-      // conversionw with Polyfill needed because docxjs requires Buffer
+    if (
+      interFont instanceof ArrayBuffer ||
+      geistMonoFont instanceof Uint8Array
+    ) {
+      // conversion with Polyfill needed because docxjs requires Buffer
       const Buffer = (await import("buffer")).Buffer;
-      font = Buffer.from(font);
+
+      if (interFont instanceof ArrayBuffer) {
+        interFont = Buffer.from(interFont);
+      }
+      if (geistMonoFont instanceof ArrayBuffer) {
+        geistMonoFont = Buffer.from(geistMonoFont);
+      }
     }
 
-    return [{ name: "Inter", data: font as Buffer }];
+    return [
+      { name: "Inter", data: interFont as Buffer },
+      {
+        name: "GeistMono",
+        data: geistMonoFont as Buffer,
+      },
+    ];
   }
 
   protected async createDefaultDocumentOptions(): Promise<DocumentOptions> {

package/src/docx/template/word/styles.xml

@@ -983,8 +983,8 @@
         <w:basedOn w:val="Normal" />
         <w:rPr>
             <w:noProof />
-            <w:color w:val="e1e4e8" />
-            <w:shd w:fill="161616" />
+            <w:color w:val="ffffff"/>
+            <w:rFonts w:ascii="GeistMono" w:cs="GeistMono" w:eastAsia="GeistMono" w:hAnsi="GeistMono"/>
         </w:rPr>
     </w:style>
 </w:styles>

package/types/src/docx/defaultSchema/blocks.d.ts

@@ -1,3 +1,3 @@
-import { BlockMapping, DefaultBlockSchema } from "@blocknote/core";
+import { BlockMapping, DefaultBlockSchema, pageBreakSchema } from "@blocknote/core";
 import { Table as DocxTable, Paragraph, ParagraphChild } from "docx";
-export declare const docxBlockMappingForDefaultSchema: BlockMapping<DefaultBlockSchema, any, any, Promise<Paragraph[] | Paragraph | DocxTable> | Paragraph[] | Paragraph | DocxTable, ParagraphChild>;
+export declare const docxBlockMappingForDefaultSchema: BlockMapping<DefaultBlockSchema & typeof pageBreakSchema.blockSchema, any, any, Promise<Paragraph[] | Paragraph | DocxTable> | Paragraph[] | Paragraph | DocxTable, ParagraphChild>;

package/types/src/docx/defaultSchema/index.d.ts

@@ -446,6 +446,23 @@ export declare const docxDefaultSchemaMappings: {
                 fileBlockAccept: string[];
             }, any, import("@blocknote/core").InlineContentSchema, import("@blocknote/core").StyleSchema>;
         };
+    }> & import("@blocknote/core").BlockSchemaFromSpecs<{
+        pageBreak: {
+            config: {
+                type: "pageBreak";
+                propSchema: {};
+                content: "none";
+                isFileBlock: false;
+                isSelectable: false;
+            };
+            implementation: import("@blocknote/core").TiptapBlockImplementation<{
+                type: "pageBreak";
+                propSchema: {};
+                content: "none";
+                isFileBlock: false;
+                isSelectable: false;
+            }, any, import("@blocknote/core").InlineContentSchema, import("@blocknote/core").StyleSchema>;
+        };
     }>, any, any, import("docx").Table | import("docx").Paragraph | import("docx").Paragraph[] | Promise<import("docx").Table | import("docx").Paragraph | import("docx").Paragraph[]>, import("docx").ParagraphChild>;
     inlineContentMapping: import("@blocknote/core").InlineContentMapping<import("@blocknote/core").InlineContentSchemaFromSpecs<{
         text: {