@blankdotpage/cake 0.1.45 → 0.1.47

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

@@ -1 +1 @@
-{"version":3,"file":"italic.d.ts","sourceRoot":"","sources":["../../../../src/cake/extensions/italic/italic.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAInB,MAAM,oBAAoB,CAAC;AAS5B,eAAO,MAAM,eAAe,EAAE,aA0H7B,CAAC"}
+{"version":3,"file":"italic.d.ts","sourceRoot":"","sources":["../../../../src/cake/extensions/italic/italic.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAInB,MAAM,oBAAoB,CAAC;AAsC5B,eAAO,MAAM,eAAe,EAAE,aA+H7B,CAAC"}

package/dist/cake/extensions/italic/italic.js

@@ -1,5 +1,25 @@
 import { CursorSourceBuilder } from "../../core/mapping/cursor-source-map";
 const ITALIC_KIND = "italic";
+function findItalicClose(source, start, end, marker) {
+    if (marker === "_") {
+        return source.indexOf("_", start + 1);
+    }
+    let fallback = -1;
+    for (let i = start + 1; i < end; i += 1) {
+        if (source[i] !== "*") {
+            continue;
+        }
+        const prevIsStar = source[i - 1] === "*";
+        const nextIsStar = source[i + 1] === "*";
+        if (!prevIsStar && !nextIsStar) {
+            return i;
+        }
+        if (fallback === -1) {
+            fallback = i;
+        }
+    }
+    return fallback;
+}
 export const italicExtension = (editor) => {
     const disposers = [];
     disposers.push(editor.registerToggleInline({ kind: ITALIC_KIND, markers: ["*", "_"] }));
@@ -34,7 +54,7 @@ export const italicExtension = (editor) => {
         if (char === "*" && start > 0 && source[start - 1] === "*") {
             return null;
         }
-        const close = source.indexOf(char, start + 1);
+        const close = findItalicClose(source, start, end, char);
         if (close === -1 || close >= end) {
             return null;
         }

package/dist/cake/extensions/link/link-popover.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"link-popover.d.ts","sourceRoot":"","sources":["../../../../src/cake/extensions/link/link-popover.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AA0DlD,wBAAgB,eAAe,CAAC,EAC9B,MAAM,EACN,MAAM,GACP,EAAE;IACD,MAAM,EAAE,UAAU,CAAC;IACnB,MAAM,CAAC,EAAE,mBAAmB,CAAC;CAC9B,kDAkXA"}
+{"version":3,"file":"link-popover.d.ts","sourceRoot":"","sources":["../../../../src/cake/extensions/link/link-popover.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AA0DlD,wBAAgB,eAAe,CAAC,EAC9B,MAAM,EACN,MAAM,GACP,EAAE;IACD,MAAM,EAAE,UAAU,CAAC;IACnB,MAAM,CAAC,EAAE,mBAAmB,CAAC;CAC9B,kDAiYA"}

package/dist/cake/extensions/link/link-popover.js

@@ -155,6 +155,10 @@ export function CakeLinkPopover({ editor, styles, }) {
     useEffect(() => {
         function handleUpdate() {
             if (stateRef.current.status !== "closed") {
+                const anchor = anchorRef.current;
+                if (!anchor || !anchor.isConnected) {
+                    close();
+                }
                 return;
             }
             const selection = editor.getSelection();
@@ -230,6 +234,11 @@ export function CakeLinkPopover({ editor, styles, }) {
         if (state.status !== "open") {
             return;
         }
+        const selection = getSelection();
+        if (!selection) {
+            close();
+            return;
+        }
         const draftValue = inputRef.current?.value ?? state.draftUrl;
         const trimmed = draftValue.trim();
         if (!trimmed) {
@@ -237,8 +246,13 @@ export function CakeLinkPopover({ editor, styles, }) {
             return;
         }
         const nextUrl = ensureHttpsProtocol(trimmed);
-        const anchor = anchorRef.current;
-        anchor?.setAttribute("href", nextUrl);
+        executeCommand({
+            type: "set-link-url",
+            start: selection.start,
+            end: selection.end,
+            url: nextUrl,
+            selectLabel: state.url.trim() === "",
+        });
         setState({
             status: "open",
             url: nextUrl,

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

@@ -12,8 +12,16 @@ export type UnlinkCommand = {
     start: number;
     end: number;
 };
+/** Command to update the URL for an existing link */
+export type SetLinkUrlCommand = {
+    type: "set-link-url";
+    start: number;
+    end: number;
+    url: string;
+    selectLabel?: boolean;
+};
 /** All link extension commands */
-export type LinkCommand = WrapLinkCommand | UnlinkCommand;
+export type LinkCommand = WrapLinkCommand | UnlinkCommand | SetLinkUrlCommand;
 export type OnRequestLinkInput = (editor: CakeEditor) => Promise<{
     url: string;
     text: string;

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

@@ -1 +1 @@
-{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../../../../src/cake/extensions/link/link.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAGnB,MAAM,oBAAoB,CAAC;AAU5B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAI3D,8CAA8C;AAC9C,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,WAAW,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,wCAAwC;AACxC,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,kCAAkC;AAClC,MAAM,MAAM,WAAW,GAAG,eAAe,GAAG,aAAa,CAAC;AAE1D,MAAM,MAAM,kBAAkB,GAAG,CAC/B,MAAM,EAAE,UAAU,KACf,OAAO,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CAAC;AAEnD,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,MAAM,CAAC,EAAE,mBAAmB,CAAC;CAC9B,CAAC;AAqVF,wBAAgB,aAAa,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC;AACvE,wBAAgB,aAAa,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,aAAa,CAAC"}
+{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../../../../src/cake/extensions/link/link.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAGnB,MAAM,oBAAoB,CAAC;AAU5B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AA2F3D,8CAA8C;AAC9C,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,WAAW,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,wCAAwC;AACxC,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,qDAAqD;AACrD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,kCAAkC;AAClC,MAAM,MAAM,WAAW,GAAG,eAAe,GAAG,aAAa,GAAG,iBAAiB,CAAC;AAE9E,MAAM,MAAM,kBAAkB,GAAG,CAC/B,MAAM,EAAE,UAAU,KACf,OAAO,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CAAC;AAEnD,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,MAAM,CAAC,EAAE,mBAAmB,CAAC;CAC9B,CAAC;AAkcF,wBAAgB,aAAa,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC;AACvE,wBAAgB,aAAa,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,aAAa,CAAC"}

package/dist/cake/extensions/link/link.js

@@ -5,6 +5,73 @@ import { getDocLines } from "../../editor/selection/selection-layout";
 import { cursorOffsetToVisibleOffset, getVisibleText, } from "../../editor/selection/visible-text";
 import { ensureHttpsProtocol, isUrl } from "../../shared/url";
 const LINK_KIND = "link";
+function countBoundaryWrappers(fragment) {
+    let count = 0;
+    let index = 0;
+    while (index < fragment.length) {
+        if (fragment.startsWith("</u>", index)) {
+            count += 1;
+            index += 4;
+            continue;
+        }
+        if (fragment.startsWith("<u>", index)) {
+            count += 1;
+            index += 3;
+            continue;
+        }
+        if (fragment.startsWith("**", index)) {
+            count += 1;
+            index += 2;
+            continue;
+        }
+        if (fragment.startsWith("~~", index)) {
+            count += 1;
+            index += 2;
+            continue;
+        }
+        const char = fragment[index] ?? "";
+        if (char === "*" || char === "_") {
+            count += 1;
+        }
+        index += 1;
+    }
+    return count;
+}
+function findEnclosingLinkRange(source, from, to) {
+    if (source.length === 0) {
+        return null;
+    }
+    const start = Math.max(0, Math.min(from, source.length));
+    const end = Math.max(0, Math.min(to, source.length));
+    if (start >= end) {
+        return null;
+    }
+    let linkStart = source.lastIndexOf("[", start);
+    while (linkStart !== -1) {
+        // Skip image syntax ![...](...)
+        if (linkStart > 0 && source[linkStart - 1] === "!") {
+            linkStart = source.lastIndexOf("[", linkStart - 1);
+            continue;
+        }
+        const labelClose = source.indexOf("](", linkStart + 1);
+        if (labelClose === -1) {
+            linkStart = source.lastIndexOf("[", linkStart - 1);
+            continue;
+        }
+        const urlClose = source.indexOf(")", labelClose + 2);
+        if (urlClose === -1) {
+            linkStart = source.lastIndexOf("[", linkStart - 1);
+            continue;
+        }
+        const labelStart = linkStart + 1;
+        const labelEnd = labelClose;
+        if (labelStart <= start && end <= labelEnd) {
+            return { linkStart, labelStart, labelEnd, urlClose };
+        }
+        linkStart = source.lastIndexOf("[", linkStart - 1);
+    }
+    return null;
+}
 function isDomSelectionInsideLink(editor) {
     if (typeof window === "undefined") {
         return false;
@@ -126,6 +193,56 @@ function installLinkExtension(editor, options) {
                 },
             };
         }
+        if (command.type === "set-link-url") {
+            const cursorPos = Math.min(command.start, command.end);
+            const sourcePos = state.map.cursorToSource(cursorPos, "forward");
+            const source = state.source;
+            // Search backwards for the opening bracket
+            let linkStart = sourcePos;
+            while (linkStart > 0 && source[linkStart] !== "[") {
+                linkStart--;
+            }
+            if (source[linkStart] !== "[") {
+                return null;
+            }
+            // Find the ]( separator
+            const labelClose = source.indexOf("](", linkStart + 1);
+            if (labelClose === -1) {
+                return null;
+            }
+            // Find the closing )
+            const urlClose = source.indexOf(")", labelClose + 2);
+            if (urlClose === -1) {
+                return null;
+            }
+            const nextSource = source.slice(0, labelClose + 2) +
+                command.url +
+                source.slice(urlClose);
+            const nextState = state.runtime.createState(nextSource);
+            if (command.selectLabel) {
+                const labelStartSource = linkStart + 1;
+                const labelEndSource = labelClose;
+                const startCursor = nextState.map.sourceToCursor(labelStartSource, "forward");
+                const endCursor = nextState.map.sourceToCursor(labelEndSource, "backward");
+                return {
+                    source: nextSource,
+                    selection: {
+                        start: startCursor.cursorOffset,
+                        end: endCursor.cursorOffset,
+                        affinity: "forward",
+                    },
+                };
+            }
+            const endCursor = nextState.map.sourceToCursor(labelClose, "backward");
+            return {
+                source: nextSource,
+                selection: {
+                    start: endCursor.cursorOffset,
+                    end: endCursor.cursorOffset,
+                    affinity: "backward",
+                },
+            };
+        }
         if (command.type !== "wrap-link") {
             return null;
         }
@@ -149,11 +266,39 @@ function installLinkExtension(editor, options) {
             }
             return null;
         }
-        const from = state.map.cursorToSource(cursorStart, "forward");
-        const to = state.map.cursorToSource(cursorEnd, "backward");
-        if (from === to) {
+        const innerFrom = state.map.cursorToSource(cursorStart, "forward");
+        const innerTo = state.map.cursorToSource(cursorEnd, "backward");
+        if (innerFrom === innerTo) {
             return null;
         }
+        // Treat wrap-link as a toggle when the selection is already within the
+        // same link label. This matches toolbar expectations for active link.
+        const existingLink = findEnclosingLinkRange(state.source, innerFrom, innerTo);
+        if (existingLink) {
+            const label = state.source.slice(existingLink.labelStart, existingLink.labelEnd);
+            const nextSource = state.source.slice(0, existingLink.linkStart) +
+                label +
+                state.source.slice(existingLink.urlClose + 1);
+            const nextState = state.runtime.createState(nextSource);
+            const nextStart = nextState.map.sourceToCursor(existingLink.linkStart, "forward");
+            const nextEnd = nextState.map.sourceToCursor(existingLink.linkStart + label.length, "backward");
+            return {
+                source: nextSource,
+                selection: {
+                    start: nextStart.cursorOffset,
+                    end: nextEnd.cursorOffset,
+                    affinity: "forward",
+                },
+            };
+        }
+        const outerFrom = state.map.cursorToSource(cursorStart, "backward");
+        const outerTo = state.map.cursorToSource(cursorEnd, "forward");
+        const leftBoundary = state.source.slice(outerFrom, innerFrom);
+        const rightBoundary = state.source.slice(innerTo, outerTo);
+        const hasNestedBoundaryWrappers = countBoundaryWrappers(leftBoundary) > 1 ||
+            countBoundaryWrappers(rightBoundary) > 1;
+        const from = hasNestedBoundaryWrappers ? outerFrom : innerFrom;
+        const to = hasNestedBoundaryWrappers ? outerTo : innerTo;
         const label = state.source.slice(from, to);
         const url = command.url ?? "";
         const linkMarkdown = `[${label}](${url})`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blankdotpage/cake",
-  "version": "0.1.45",
+  "version": "0.1.47",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",