@blankdotpage/cake 0.1.15 → 0.1.16

package/dist/cake/extensions/list/list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../src/cake/extensions/list/list.ts"],"names":[],"mappings":"AAygCA,+CAA+C;AAC/C,MAAM,MAAM,uBAAuB,GAAG;IAAE,IAAI,EAAE,oBAAoB,CAAA;CAAE,CAAC;AAErE,iDAAiD;AACjD,MAAM,MAAM,yBAAyB,GAAG;IAAE,IAAI,EAAE,sBAAsB,CAAA;CAAE,CAAC;AAEzE,kCAAkC;AAClC,MAAM,MAAM,WAAW,GAAG,uBAAuB,GAAG,yBAAyB,CAAC;AAE9E,eAAO,MAAM,sBAAsB,kCAmGjC,CAAC"}
+{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../src/cake/extensions/list/list.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAGnB,MAAM,oBAAoB,CAAC;AAqgC5B,+CAA+C;AAC/C,MAAM,MAAM,uBAAuB,GAAG;IAAE,IAAI,EAAE,oBAAoB,CAAA;CAAE,CAAC;AAErE,iDAAiD;AACjD,MAAM,MAAM,yBAAyB,GAAG;IAAE,IAAI,EAAE,sBAAsB,CAAA;CAAE,CAAC;AAEzE,kCAAkC;AAClC,MAAM,MAAM,WAAW,GAAG,uBAAuB,GAAG,yBAAyB,CAAC;AAE9E,eAAO,MAAM,sBAAsB,EAAE,aA0HpC,CAAC"}

package/dist/cake/extensions/list/list.js

@@ -1,4 +1,3 @@
-import { defineExtension, } from "../../core/runtime";
 import { mergeInlineForRender } from "../../dom/render";
 import { parseListRange, serializeListRange, convertToPlainText, getLineInfo, getListPrefixLength, isListLine, parseListItem, countNumberedItemsBefore, } from "./list-ast";
 // Match list lines - capture exactly one space after marker, rest goes to content
@@ -763,9 +762,9 @@ function getParagraphText(block) {
     }
     return text;
 }
-export const plainTextListExtension = defineExtension({
-    name: "plain-text-list",
-    keybindings: [
+export const plainTextListExtension = (editor) => {
+    const disposers = [];
+    disposers.push(editor.registerKeybindings([
         {
             key: "8",
             meta: true,
@@ -790,8 +789,8 @@ export const plainTextListExtension = defineExtension({
             shift: true,
             command: { type: "toggle-numbered-list" },
         },
-    ],
-    onEdit(command, state) {
+    ]));
+    disposers.push(editor.registerOnEdit((command, state) => {
         if (command.type === "insert-line-break") {
             return handleInsertLineBreak(state);
         }
@@ -817,8 +816,8 @@ export const plainTextListExtension = defineExtension({
             return handleMarkerSwitch(state, command.text);
         }
         return null;
-    },
-    renderBlock(block, context) {
+    }));
+    disposers.push(editor.registerBlockRenderer((block, context) => {
         if (block.type !== "paragraph") {
             return null;
         }
@@ -855,5 +854,9 @@ export const plainTextListExtension = defineExtension({
             }
         }
         return element;
-    },
-});
+    }));
+    return () => disposers
+        .splice(0)
+        .reverse()
+        .forEach((d) => d());
+};

package/dist/cake/extensions/scrollbar/index.d.ts

@@ -1,2 +1,3 @@
-export declare const scrollbarExtension: import("../../..").CakeExtension;
+import type { CakeExtension } from "../../core/runtime";
+export declare const scrollbarExtension: CakeExtension;
 //# sourceMappingURL=index.d.ts.map

package/dist/cake/extensions/scrollbar/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/cake/extensions/scrollbar/index.tsx"],"names":[],"mappings":"AA2RA,eAAO,MAAM,kBAAkB,kCAK7B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/cake/extensions/scrollbar/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAiSxD,eAAO,MAAM,kBAAkB,EAAE,aAGhC,CAAC"}

package/dist/cake/extensions/scrollbar/index.js

@@ -1,6 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useCallback, useEffect, useRef, useState } from "react";
-import { defineExtension } from "../../core/runtime";
 const THUMB_MIN_HEIGHT = 30;
 const SCROLL_HIDE_DELAY = 500;
 const TRACK_PADDING = 8;
@@ -190,7 +189,9 @@ function ScrollbarOverlay({ container }) {
     };
     const getThumbColor = () => {
         if (isDarkMode) {
-            return isDragging ? "rgba(255, 255, 255, 0.5)" : "rgba(255, 255, 255, 0.3)";
+            return isDragging
+                ? "rgba(255, 255, 255, 0.5)"
+                : "rgba(255, 255, 255, 0.3)";
         }
         return isDragging ? "rgba(0, 0, 0, 0.5)" : "rgba(0, 0, 0, 0.3)";
     };
@@ -208,9 +209,10 @@ function ScrollbarOverlay({ container }) {
     };
     return (_jsx("div", { style: wrapperStyle, children: _jsx("div", { "data-testid": "custom-scrollbar", "aria-hidden": "true", style: trackStyle, onClick: handleTrackClick, onMouseEnter: () => setIsHovered(true), onMouseLeave: () => setIsHovered(false), children: _jsx("div", { "data-testid": "scrollbar-thumb", style: thumbStyle, onMouseDown: handleThumbMouseDown }) }) }));
 }
-export const scrollbarExtension = defineExtension({
-    name: "scrollbar",
-    renderOverlay(context) {
-        return _jsx(ScrollbarOverlay, { container: context.container });
-    },
-});
+function ScrollbarUI({ editor }) {
+    return _jsx(ScrollbarOverlay, { container: editor.getContainer() });
+}
+export const scrollbarExtension = (editor) => {
+    const unmount = editor.registerUI(ScrollbarUI);
+    return () => unmount();
+};

package/dist/cake/extensions/strikethrough/strikethrough.d.ts

@@ -1,2 +1,3 @@
-export declare const strikethroughExtension: import("../../..").CakeExtension;
+import { type CakeExtension } from "../../core/runtime";
+export declare const strikethroughExtension: CakeExtension;
 //# sourceMappingURL=strikethrough.d.ts.map

package/dist/cake/extensions/strikethrough/strikethrough.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"strikethrough.d.ts","sourceRoot":"","sources":["../../../../src/cake/extensions/strikethrough/strikethrough.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,sBAAsB,kCAuFjC,CAAC"}
+{"version":3,"file":"strikethrough.d.ts","sourceRoot":"","sources":["../../../../src/cake/extensions/strikethrough/strikethrough.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAInB,MAAM,oBAAoB,CAAC;AAS5B,eAAO,MAAM,sBAAsB,EAAE,aAoHpC,CAAC"}

package/dist/cake/extensions/strikethrough/strikethrough.js

@@ -1,10 +1,9 @@
-import { defineExtension, } from "../../core/runtime";
 import { CursorSourceBuilder } from "../../core/mapping/cursor-source-map";
 const STRIKE_KIND = "strikethrough";
-export const strikethroughExtension = defineExtension({
-    name: "strikethrough",
-    toggleInline: { kind: STRIKE_KIND, markers: ["~~"] },
-    keybindings: [
+export const strikethroughExtension = (editor) => {
+    const disposers = [];
+    disposers.push(editor.registerToggleInline({ kind: STRIKE_KIND, markers: ["~~"] }));
+    disposers.push(editor.registerKeybindings([
         {
             key: "x",
             meta: true,
@@ -17,16 +16,18 @@ export const strikethroughExtension = defineExtension({
             shift: true,
             command: { type: "toggle-strikethrough" },
         },
-    ],
-    inlineWrapperAffinity: [{ kind: STRIKE_KIND, inclusive: true }],
-    onEdit(command) {
+    ]));
+    disposers.push(editor.registerInlineWrapperAffinity([
+        { kind: STRIKE_KIND, inclusive: true },
+    ]));
+    disposers.push(editor.registerOnEdit((command) => {
         // Handle semantic command by delegating to toggle-inline
         if (command.type === "toggle-strikethrough") {
             return { type: "toggle-inline", marker: "~~" };
         }
         return null;
-    },
-    parseInline(source, start, end, context) {
+    }));
+    disposers.push(editor.registerParseInline((source, start, end, context) => {
         if (source.slice(start, start + 2) !== "~~") {
             return null;
         }
@@ -46,8 +47,8 @@ export const strikethroughExtension = defineExtension({
             },
             nextPos: close + 2,
         };
-    },
-    serializeInline(inline, context) {
+    }));
+    disposers.push(editor.registerSerializeInline((inline, context) => {
         if (inline.type !== "inline-wrapper" || inline.kind !== STRIKE_KIND) {
             return null;
         }
@@ -59,8 +60,8 @@ export const strikethroughExtension = defineExtension({
         }
         builder.appendSourceOnly("~~");
         return builder.build();
-    },
-    normalizeInline(inline) {
+    }));
+    disposers.push(editor.registerNormalizeInline((inline) => {
         if (inline.type !== "inline-wrapper" || inline.kind !== STRIKE_KIND) {
             return inline;
         }
@@ -68,8 +69,8 @@ export const strikethroughExtension = defineExtension({
             return null;
         }
         return inline;
-    },
-    renderInline(inline, context) {
+    }));
+    disposers.push(editor.registerInlineRenderer((inline, context) => {
         if (inline.type !== "inline-wrapper" || inline.kind !== STRIKE_KIND) {
             return null;
         }
@@ -80,5 +81,9 @@ export const strikethroughExtension = defineExtension({
             }
         }
         return element;
-    },
-});
+    }));
+    return () => disposers
+        .splice(0)
+        .reverse()
+        .forEach((d) => d());
+};

package/dist/cake/extensions/types.d.ts

@@ -1,4 +1,4 @@
-import type { CakeExtension } from "../core/runtime";
+import type { CakeExtension } from "../editor/extension-types";
 export type CakeExtensionBundle = {
     name: string;
     extensions: CakeExtension[];

package/dist/cake/extensions/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/cake/extensions/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,aAAa,EAAE,CAAC;CAC7B,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/cake/extensions/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE/D,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,aAAa,EAAE,CAAC;CAC7B,CAAC"}

package/dist/cake/extensions/underline/underline.d.ts

@@ -1,2 +1,3 @@
-export declare const underlineExtension: import("../../..").CakeExtension;
+import { type CakeExtension } from "../../core/runtime";
+export declare const underlineExtension: CakeExtension;
 //# sourceMappingURL=underline.d.ts.map

package/dist/cake/extensions/underline/underline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"underline.d.ts","sourceRoot":"","sources":["../../../../src/cake/extensions/underline/underline.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,kBAAkB,kCAyE7B,CAAC"}
+{"version":3,"file":"underline.d.ts","sourceRoot":"","sources":["../../../../src/cake/extensions/underline/underline.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAInB,MAAM,oBAAoB,CAAC;AAS5B,eAAO,MAAM,kBAAkB,EAAE,aAsHhC,CAAC"}

package/dist/cake/extensions/underline/underline.js

@@ -1,21 +1,35 @@
-import { defineExtension, } from "../../core/runtime";
 import { CursorSourceBuilder } from "../../core/mapping/cursor-source-map";
 const UNDERLINE_KIND = "underline";
-export const underlineExtension = defineExtension({
-    name: "underline",
-    toggleInline: { kind: UNDERLINE_KIND, markers: [{ open: "<u>", close: "</u>" }] },
-    keybindings: [
-        { key: "u", meta: true, shift: false, command: { type: "toggle-underline" } },
-        { key: "u", ctrl: true, shift: false, command: { type: "toggle-underline" } },
-    ],
-    inlineWrapperAffinity: [{ kind: UNDERLINE_KIND, inclusive: true }],
-    onEdit(command) {
+export const underlineExtension = (editor) => {
+    const disposers = [];
+    disposers.push(editor.registerToggleInline({
+        kind: UNDERLINE_KIND,
+        markers: [{ open: "<u>", close: "</u>" }],
+    }));
+    disposers.push(editor.registerKeybindings([
+        {
+            key: "u",
+            meta: true,
+            shift: false,
+            command: { type: "toggle-underline" },
+        },
+        {
+            key: "u",
+            ctrl: true,
+            shift: false,
+            command: { type: "toggle-underline" },
+        },
+    ]));
+    disposers.push(editor.registerInlineWrapperAffinity([
+        { kind: UNDERLINE_KIND, inclusive: true },
+    ]));
+    disposers.push(editor.registerOnEdit((command) => {
         if (command.type === "toggle-underline") {
             return { type: "toggle-inline", marker: "<u>" };
         }
         return null;
-    },
-    parseInline(source, start, end, context) {
+    }));
+    disposers.push(editor.registerParseInline((source, start, end, context) => {
         if (source.slice(start, start + 3) !== "<u>") {
             return null;
         }
@@ -32,9 +46,10 @@ export const underlineExtension = defineExtension({
             },
             nextPos: close + 4,
         };
-    },
-    serializeInline(inline, context) {
-        if (inline.type !== "inline-wrapper" || inline.kind !== UNDERLINE_KIND) {
+    }));
+    disposers.push(editor.registerSerializeInline((inline, context) => {
+        if (inline.type !== "inline-wrapper" ||
+            inline.kind !== UNDERLINE_KIND) {
             return null;
         }
         const builder = new CursorSourceBuilder();
@@ -45,8 +60,8 @@ export const underlineExtension = defineExtension({
         }
         builder.appendSourceOnly("</u>");
         return builder.build();
-    },
-    normalizeInline(inline) {
+    }));
+    disposers.push(editor.registerNormalizeInline((inline) => {
         if (inline.type !== "inline-wrapper" || inline.kind !== UNDERLINE_KIND) {
             return inline;
         }
@@ -54,8 +69,8 @@ export const underlineExtension = defineExtension({
             return null;
         }
         return inline;
-    },
-    renderInline(inline, context) {
+    }));
+    disposers.push(editor.registerInlineRenderer((inline, context) => {
         if (inline.type !== "inline-wrapper" || inline.kind !== UNDERLINE_KIND) {
             return null;
         }
@@ -67,5 +82,9 @@ export const underlineExtension = defineExtension({
             }
         }
         return element;
-    },
-});
+    }));
+    return () => disposers
+        .splice(0)
+        .reverse()
+        .forEach((d) => d());
+};

package/dist/cake/index.d.ts

@@ -1,2 +1,2 @@
-export type { EditCommand, CoreEditCommand, ExtensionCommand } from "./core/runtime";
+export type { EditCommand, CoreEditCommand, ExtensionCommand, } from "./core/runtime";
 //# sourceMappingURL=index.d.ts.map

package/dist/cake/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cake/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,WAAW,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cake/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,WAAW,EACX,eAAe,EACf,gBAAgB,GACjB,MAAM,gBAAgB,CAAC"}

package/dist/cake/react/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cake/react/index.tsx"],"names":[],"mappings":"AASA,OAAO,KAAK,EACV,aAAa,EACb,WAAW,EAEZ,MAAM,iBAAiB,CAAC;AAczB,MAAM,MAAM,mBAAmB,GAAG;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;CACnC,CAAC;AAEF,MAAM,WAAW,gBAAgB;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAChC,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAChC,iBAAiB,CAAC,EAAE,CAClB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,UAAU,GAAG,SAAS,KAC9B,IAAI,CAAC;IACV,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B,UAAU,EAAE,aAAa,EAAE,CAAC;IAC5B,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,UAAU,KAAK,IAAI,CAAC;CACvC;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IAC5B,KAAK,EAAE,CAAC,SAAS,CAAC,EAAE,mBAAmB,KAAK,IAAI,CAAC;IACjD,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,QAAQ,EAAE,MAAM,OAAO,CAAC;IACxB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB;;;;;;;;;;;;OAYG;IACH,cAAc,EAAE,CACd,OAAO,EAAE,WAAW,EACpB,OAAO,CAAC,EAAE;QAAE,YAAY,CAAC,EAAE,OAAO,CAAA;KAAE,KACjC,OAAO,CAAC;IACb,WAAW,EAAE,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAChD,QAAQ,EAAE,MAAM,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAC1D,eAAe,EAAE,MAAM,MAAM,CAAC;IAC9B,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,WAAW,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACzD;AAED,eAAO,MAAM,UAAU,kHAiQrB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cake/react/index.tsx"],"names":[],"mappings":"AASA,OAAO,KAAK,EACV,aAAa,EAEb,WAAW,EACZ,MAAM,iBAAiB,CAAC;AAczB,MAAM,MAAM,mBAAmB,GAAG;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;CACnC,CAAC;AAEF,MAAM,WAAW,gBAAgB;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAChC,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAChC,iBAAiB,CAAC,EAAE,CAClB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,UAAU,GAAG,SAAS,KAC9B,IAAI,CAAC;IACV,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B,UAAU,EAAE,aAAa,EAAE,CAAC;IAC5B,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,UAAU,KAAK,IAAI,CAAC;CACvC;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IAC5B,KAAK,EAAE,CAAC,SAAS,CAAC,EAAE,mBAAmB,KAAK,IAAI,CAAC;IACjD,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,QAAQ,EAAE,MAAM,OAAO,CAAC;IACxB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB;;;;;;;;;;;;OAYG;IACH,cAAc,EAAE,CACd,OAAO,EAAE,WAAW,EACpB,OAAO,CAAC,EAAE;QAAE,YAAY,CAAC,EAAE,OAAO,CAAA;KAAE,KACjC,OAAO,CAAC;IACb,WAAW,EAAE,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAChD,QAAQ,EAAE,MAAM,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAC1D,eAAe,EAAE,MAAM,MAAM,CAAC;IAC9B,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,WAAW,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACzD;AAED,eAAO,MAAM,UAAU,kHAmNtB,CAAC"}

package/dist/cake/react/index.js

@@ -1,5 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Fragment, forwardRef, useEffect, useImperativeHandle, useRef, useState, } from "react";
+import { forwardRef, useEffect, useImperativeHandle, useRef, useState, } from "react";
+import { createPortal } from "react-dom";
 import { CakeEditor as CakeEditorEngine } from "../editor/cake-editor";
 function toEngineSelection(selection) {
     if (!selection) {
@@ -18,9 +19,8 @@ export const CakeEditor = forwardRef(function CakeEditor(props, outerRef) {
     const onSelectionChangeRef = useRef(props.onSelectionChange);
     const lastEmittedValueRef = useRef(null);
     const lastEmittedSelectionRef = useRef(null);
-    const [contentRoot, setContentRoot] = useState(null);
+    const [uiComponents, setUiComponents] = useState([]);
     const extensionsRef = useRef(props.extensions);
-    const hasOverlayExtensions = extensionsRef.current.some((ext) => ext.renderOverlay);
     useEffect(() => {
         onChangeRef.current = props.onChange;
         onSelectionChangeRef.current = props.onSelectionChange;
@@ -52,11 +52,11 @@ export const CakeEditor = forwardRef(function CakeEditor(props, outerRef) {
             },
         });
         engineRef.current = engine;
-        setContentRoot(engine.getContentRoot());
+        setUiComponents(engine.getUIComponents());
         return () => {
             engine.destroy();
             engineRef.current = null;
-            setContentRoot(null);
+            setUiComponents([]);
         };
     }, []);
     useEffect(() => {
@@ -174,52 +174,10 @@ export const CakeEditor = forwardRef(function CakeEditor(props, outerRef) {
     const containerClassName = props.className
         ? `cake ${props.className}`
         : "cake";
-    const overlayContext = containerRef.current && contentRoot
-        ? {
-            container: containerRef.current,
-            contentRoot,
-            toOverlayRect: (rect) => {
-                const containerRect = containerRef.current?.getBoundingClientRect();
-                if (!containerRect) {
-                    return {
-                        top: rect.top,
-                        left: rect.left,
-                        width: rect.width,
-                        height: rect.height,
-                    };
-                }
-                return {
-                    top: rect.top - containerRect.top,
-                    left: rect.left - containerRect.left,
-                    width: rect.width,
-                    height: rect.height,
-                };
-            },
-            insertText: (text) => {
-                engineRef.current?.insertText(text);
-            },
-            replaceText: (oldText, newText) => {
-                engineRef.current?.replaceText(oldText, newText);
-            },
-            getSelection: () => {
-                const selection = engineRef.current?.getSelection();
-                if (!selection) {
-                    return null;
-                }
-                const focus = selection.start === selection.end
-                    ? selection.start
-                    : Math.max(selection.start, selection.end);
-                return { start: focus, end: focus };
-            },
-            executeCommand: (command) => {
-                return engineRef.current?.executeCommand(command) ?? false;
-            },
-        }
-        : null;
     return (_jsxs("div", { style: { position: "relative", height: "100%" }, children: [_jsx("div", { ref: containerRef, className: containerClassName, style: containerStyle, "data-placeholder": props.placeholder, onBlur: (event) => {
                     props.onBlur?.(event.nativeEvent);
-                } }), overlayContext && hasOverlayExtensions
-                ? extensionsRef.current.map((extension) => extension.renderOverlay ? (_jsx(Fragment, { children: extension.renderOverlay(overlayContext) }, extension.name)) : null)
+                } }), engineRef.current && uiComponents.length > 0
+                ? createPortal(uiComponents.map((Component, index) => (_jsx(Component, { editor: engineRef.current }, index))), engineRef.current.getOverlayRoot())
                 : null] }));
 });
 CakeEditor.displayName = "CakeEditor";

package/dist/cake/test/harness.d.ts

@@ -1,6 +1,6 @@
 import { CakeEditor } from "../editor/cake-editor";
 import type { Selection } from "../core/types";
-import type { CakeExtension } from "../core/runtime";
+import type { CakeExtension } from "../editor/extension-types";
 export interface SelectionRectInfo {
     top: number;
     left: number;

package/dist/cake/test/harness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"harness.d.ts","sourceRoot":"","sources":["../../../src/cake/test/harness.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"harness.d.ts","sourceRoot":"","sources":["../../../src/cake/test/harness.ts"],"names":[],"mappings":"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"}

package/dist/cake/test/harness.js

@@ -38,54 +38,10 @@ export function createTestHarness(valueOrOptions) {
     let overlayRoot = null;
     if (options.renderOverlays) {
         const overlayContainer = engine.getOverlayRoot();
-        const contentRoot = engine.getContentRoot();
-        if (!overlayContainer || !contentRoot) {
-            throw new Error("Missing overlay root for extensions");
-        }
-        const overlayContext = {
-            container,
-            contentRoot,
-            overlayRoot: overlayContainer,
-            toOverlayRect: (rect) => {
-                const containerRect = container.getBoundingClientRect();
-                return {
-                    top: rect.top - containerRect.top,
-                    left: rect.left - containerRect.left,
-                    width: rect.width,
-                    height: rect.height,
-                };
-            },
-            insertText: (text) => {
-                engine.insertText(text);
-            },
-            replaceText: (oldText, newText) => {
-                engine.replaceText(oldText, newText);
-            },
-            getSelection: () => {
-                const selection = engine.getSelection();
-                if (!selection) {
-                    return null;
-                }
-                const focus = selection.start === selection.end
-                    ? selection.start
-                    : Math.max(selection.start, selection.end);
-                return { start: focus, end: focus };
-            },
-            executeCommand: (command) => {
-                return engine.executeCommand(command);
-            },
-        };
-        const overlayElements = extensions.flatMap((extension) => {
-            if (!extension.renderOverlay) {
-                return [];
-            }
-            const rendered = extension.renderOverlay(overlayContext);
-            if (!rendered) {
-                return [];
-            }
-            return [createElement(Fragment, { key: extension.name }, rendered)];
-        });
         overlayRoot = createRoot(overlayContainer);
+        const overlayElements = engine
+            .getUIComponents()
+            .map((Component, index) => createElement(Component, { key: index, editor: engine }));
         overlayRoot.render(createElement(Fragment, null, ...overlayElements));
     }
     function getContentRoot() {
@@ -318,9 +274,7 @@ export function createTestHarness(valueOrOptions) {
             }
             // Note: Layout model endOffset is exclusive, but old harness used inclusive.
             // Convert to inclusive by subtracting 1 (unless it's an empty row).
-            const inclusiveEndOffset = row.endOffset > row.startOffset
-                ? row.endOffset - 1
-                : row.startOffset;
+            const inclusiveEndOffset = row.endOffset > row.startOffset ? row.endOffset - 1 : row.startOffset;
             return {
                 startOffset: lineLayout.lineStartOffset + row.startOffset,
                 endOffset: lineLayout.lineStartOffset + inclusiveEndOffset,

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export { CakeEditor } from "./cake/editor/cake-editor";
-export type { CakeExtension, EditCommand } from "./cake/core/runtime";
+export type { CakeExtension } from "./cake/editor/extension-types";
+export type { EditCommand } from "./cake/core/runtime";
 export * from "./cake/extensions";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACtE,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,YAAY,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,YAAY,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,cAAc,mBAAmB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blankdotpage/cake",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,6 +29,8 @@
     "test:browser": "vitest run --project browser",
     "typecheck": "tsc -p tsconfig.json --noEmit",
     "lint": "eslint .",
+    "format": "prettier --write .",
+    "format:check": "prettier --check .",
     "check": "npm run test && npm run build",
     "demo": "npm --workspace demo run dev"
   },
@@ -51,6 +53,7 @@
     "@vitest/browser": "^4.0.17",
     "@vitest/browser-playwright": "^4.0.17",
     "playwright": "^1.46.0",
+    "prettier": "^3.8.1",
     "typescript": "^5.5.4",
     "vite": "^5.4.1",
     "vitest": "^4.0.17",