@blankdotpage/cake 0.1.7 → 0.1.8

package/dist/cake/core/runtime.d.ts

@@ -46,6 +46,8 @@ export type InsertCommand = {
 /** Commands that can be applied directly by the engine */
 export type ApplyEditCommand = InsertCommand | {
     type: "insert-line-break";
+} | {
+    type: "insert-hard-line-break";
 } | {
     type: "delete-backward";
 } | {

package/dist/index.cjs

@@ -1078,10 +1078,10 @@ class CursorSourceBuilder {
   }
 }
 function isStructuralEdit(command) {
-  return command.type === "insert" || command.type === "delete-backward" || command.type === "delete-forward" || command.type === "insert-line-break" || command.type === "exit-block-wrapper";
+  return command.type === "insert" || command.type === "delete-backward" || command.type === "delete-forward" || command.type === "insert-line-break" || command.type === "insert-hard-line-break" || command.type === "exit-block-wrapper";
 }
 function isApplyEditCommand(command) {
-  return command.type === "insert" || command.type === "insert-line-break" || command.type === "delete-backward" || command.type === "delete-forward";
+  return command.type === "insert" || command.type === "insert-line-break" || command.type === "insert-hard-line-break" || command.type === "delete-backward" || command.type === "delete-forward";
 }
 function defineExtension(extension) {
   return extension;
@@ -1462,7 +1462,7 @@ function createRuntime(extensions) {
         nextAffinity: affinity === "backward" ? "forward" : "forward"
       };
     }
-    const replaceText = command.type === "insert" ? command.text : command.type === "insert-line-break" ? "\n" : command.type === "exit-block-wrapper" ? "\n" : "";
+    const replaceText = command.type === "insert" ? command.text : command.type === "insert-line-break" || command.type === "insert-hard-line-break" ? "\n" : command.type === "exit-block-wrapper" ? "\n" : "";
     const range = command.type === "delete-backward" && cursorStart === cursorEnd ? cursorStart === 0 ? { start: 0, end: 0 } : { start: cursorStart - 1, end: cursorStart } : command.type === "delete-forward" && cursorStart === cursorEnd ? cursorStart === docCursorLength ? { start: cursorStart, end: cursorStart } : { start: cursorStart, end: cursorStart + 1 } : { start: cursorStart, end: cursorEnd };
     const shouldReplacePlaceholder = command.type === "insert" && replaceText.length > 0 && range.start === range.end && graphemeAtCursor(lines, range.start) === "​";
     const effectiveRange = shouldReplacePlaceholder ? { start: range.start, end: Math.min(docCursorLength, range.start + 1) } : range;
@@ -4310,6 +4310,41 @@ function findLineStartInSource$1(source, sourceOffset) {
   }
   return lineStart;
 }
+function isInsideBlockquote(source, sourcePos) {
+  const lineStart = findLineStartInSource$1(source, sourcePos);
+  const lineContent = source.slice(
+    lineStart,
+    source.indexOf("\n", lineStart) === -1 ? source.length : source.indexOf("\n", lineStart)
+  );
+  return BLOCKQUOTE_PATTERN.test(lineContent);
+}
+function handleExitBlockquote(state) {
+  const { source, selection, map, runtime } = state;
+  const cursorPos = Math.min(selection.start, selection.end);
+  const sourcePos = map.cursorToSource(
+    cursorPos,
+    selection.affinity ?? "forward"
+  );
+  if (!isInsideBlockquote(source, sourcePos)) {
+    return null;
+  }
+  let lineEnd = source.indexOf("\n", sourcePos);
+  if (lineEnd === -1) {
+    lineEnd = source.length;
+  }
+  const newSource = source.slice(0, lineEnd) + "\n" + source.slice(lineEnd);
+  const next = runtime.createState(newSource);
+  const newCursorOffset = lineEnd + 1;
+  const caretCursor = next.map.sourceToCursor(newCursorOffset, "forward");
+  return {
+    source: newSource,
+    selection: {
+      start: caretCursor.cursorOffset,
+      end: caretCursor.cursorOffset,
+      affinity: "forward"
+    }
+  };
+}
 function handleToggleBlockquote(state) {
   const { source, selection, map, runtime } = state;
   const cursorPos = Math.min(selection.start, selection.end);
@@ -4355,6 +4390,9 @@ const blockquoteExtension = defineExtension({
     if (command.type === "toggle-blockquote") {
       return handleToggleBlockquote(state);
     }
+    if (command.type === "insert-hard-line-break") {
+      return handleExitBlockquote(state);
+    }
     return null;
   },
   parseBlock(source, start, context) {
@@ -6808,6 +6846,21 @@ function hitTestFromLayout(params) {
   const caretX = (cursorOffsetInLine) => {
     return measureCaretXOnRow(cursorOffsetInLine) ?? approximateX(cursorOffsetInLine);
   };
+  const rowLeftEdge = row.rect.left;
+  const rowRightEdge = row.rect.left + row.rect.width;
+  if (relativeX < rowLeftEdge) {
+    return {
+      cursorOffset: lineStartOffset + row.startOffset,
+      pastRowEnd: false
+    };
+  }
+  if (relativeX > rowRightEdge) {
+    const isEndOfLine2 = row.endOffset === lineInfo.cursorLength;
+    return {
+      cursorOffset: lineStartOffset + row.endOffset,
+      pastRowEnd: !isEndOfLine2 && row.endOffset < lineInfo.cursorLength
+    };
+  }
   let low = row.startOffset;
   let high = row.endOffset;
   while (low < high) {
@@ -6837,7 +6890,7 @@ function hitTestFromLayout(params) {
       return candidateA;
     }
     const mid = (xA + xB) / 2;
-    return relativeX >= mid ? candidateA : candidateB;
+    return relativeX > mid ? candidateA : candidateB;
   })();
   const endX = caretX(row.endOffset);
   {
@@ -8380,6 +8433,7 @@ class CakeEngine {
     this.recordHistory(command.type);
     this.state = nextState;
     this.render();
+    this.flushOverlayUpdate();
     (_a = this.onChange) == null ? void 0 : _a.call(this, this.state.source, this.state.selection);
     this.scheduleScrollCaretIntoView();
     if (shouldOpenLinkPopover) {
@@ -8389,6 +8443,7 @@ class CakeEngine {
     }
     if (options == null ? void 0 : options.restoreFocus) {
       this.focus();
+      this.applySelection(this.state.selection);
     }
     return true;
   }
@@ -8488,9 +8543,7 @@ class CakeEngine {
     this.detachDragListeners();
   }
   handleFocusIn() {
-    queueMicrotask(() => {
-      this.scheduleOverlayUpdate();
-    });
+    this.flushOverlayUpdate();
   }
   handleFocusOut() {
     queueMicrotask(() => {
@@ -8974,7 +9027,7 @@ class CakeEngine {
     if (cmdOrCtrl && event.key === "Enter") {
       event.preventDefault();
       this.keydownHandledBeforeInput = true;
-      this.applyEdit({ type: "insert-line-break" });
+      this.applyEdit({ type: "insert-hard-line-break" });
       queueMicrotask(() => {
         this.keydownHandledBeforeInput = false;
       });

package/dist/index.js

@@ -1076,10 +1076,10 @@ class CursorSourceBuilder {
   }
 }
 function isStructuralEdit(command) {
-  return command.type === "insert" || command.type === "delete-backward" || command.type === "delete-forward" || command.type === "insert-line-break" || command.type === "exit-block-wrapper";
+  return command.type === "insert" || command.type === "delete-backward" || command.type === "delete-forward" || command.type === "insert-line-break" || command.type === "insert-hard-line-break" || command.type === "exit-block-wrapper";
 }
 function isApplyEditCommand(command) {
-  return command.type === "insert" || command.type === "insert-line-break" || command.type === "delete-backward" || command.type === "delete-forward";
+  return command.type === "insert" || command.type === "insert-line-break" || command.type === "insert-hard-line-break" || command.type === "delete-backward" || command.type === "delete-forward";
 }
 function defineExtension(extension) {
   return extension;
@@ -1460,7 +1460,7 @@ function createRuntime(extensions) {
         nextAffinity: affinity === "backward" ? "forward" : "forward"
       };
     }
-    const replaceText = command.type === "insert" ? command.text : command.type === "insert-line-break" ? "\n" : command.type === "exit-block-wrapper" ? "\n" : "";
+    const replaceText = command.type === "insert" ? command.text : command.type === "insert-line-break" || command.type === "insert-hard-line-break" ? "\n" : command.type === "exit-block-wrapper" ? "\n" : "";
     const range = command.type === "delete-backward" && cursorStart === cursorEnd ? cursorStart === 0 ? { start: 0, end: 0 } : { start: cursorStart - 1, end: cursorStart } : command.type === "delete-forward" && cursorStart === cursorEnd ? cursorStart === docCursorLength ? { start: cursorStart, end: cursorStart } : { start: cursorStart, end: cursorStart + 1 } : { start: cursorStart, end: cursorEnd };
     const shouldReplacePlaceholder = command.type === "insert" && replaceText.length > 0 && range.start === range.end && graphemeAtCursor(lines, range.start) === "​";
     const effectiveRange = shouldReplacePlaceholder ? { start: range.start, end: Math.min(docCursorLength, range.start + 1) } : range;
@@ -4308,6 +4308,41 @@ function findLineStartInSource$1(source, sourceOffset) {
   }
   return lineStart;
 }
+function isInsideBlockquote(source, sourcePos) {
+  const lineStart = findLineStartInSource$1(source, sourcePos);
+  const lineContent = source.slice(
+    lineStart,
+    source.indexOf("\n", lineStart) === -1 ? source.length : source.indexOf("\n", lineStart)
+  );
+  return BLOCKQUOTE_PATTERN.test(lineContent);
+}
+function handleExitBlockquote(state) {
+  const { source, selection, map, runtime } = state;
+  const cursorPos = Math.min(selection.start, selection.end);
+  const sourcePos = map.cursorToSource(
+    cursorPos,
+    selection.affinity ?? "forward"
+  );
+  if (!isInsideBlockquote(source, sourcePos)) {
+    return null;
+  }
+  let lineEnd = source.indexOf("\n", sourcePos);
+  if (lineEnd === -1) {
+    lineEnd = source.length;
+  }
+  const newSource = source.slice(0, lineEnd) + "\n" + source.slice(lineEnd);
+  const next = runtime.createState(newSource);
+  const newCursorOffset = lineEnd + 1;
+  const caretCursor = next.map.sourceToCursor(newCursorOffset, "forward");
+  return {
+    source: newSource,
+    selection: {
+      start: caretCursor.cursorOffset,
+      end: caretCursor.cursorOffset,
+      affinity: "forward"
+    }
+  };
+}
 function handleToggleBlockquote(state) {
   const { source, selection, map, runtime } = state;
   const cursorPos = Math.min(selection.start, selection.end);
@@ -4353,6 +4388,9 @@ const blockquoteExtension = defineExtension({
     if (command.type === "toggle-blockquote") {
       return handleToggleBlockquote(state);
     }
+    if (command.type === "insert-hard-line-break") {
+      return handleExitBlockquote(state);
+    }
     return null;
   },
   parseBlock(source, start, context) {
@@ -6806,6 +6844,21 @@ function hitTestFromLayout(params) {
   const caretX = (cursorOffsetInLine) => {
     return measureCaretXOnRow(cursorOffsetInLine) ?? approximateX(cursorOffsetInLine);
   };
+  const rowLeftEdge = row.rect.left;
+  const rowRightEdge = row.rect.left + row.rect.width;
+  if (relativeX < rowLeftEdge) {
+    return {
+      cursorOffset: lineStartOffset + row.startOffset,
+      pastRowEnd: false
+    };
+  }
+  if (relativeX > rowRightEdge) {
+    const isEndOfLine2 = row.endOffset === lineInfo.cursorLength;
+    return {
+      cursorOffset: lineStartOffset + row.endOffset,
+      pastRowEnd: !isEndOfLine2 && row.endOffset < lineInfo.cursorLength
+    };
+  }
   let low = row.startOffset;
   let high = row.endOffset;
   while (low < high) {
@@ -6835,7 +6888,7 @@ function hitTestFromLayout(params) {
       return candidateA;
     }
     const mid = (xA + xB) / 2;
-    return relativeX >= mid ? candidateA : candidateB;
+    return relativeX > mid ? candidateA : candidateB;
   })();
   const endX = caretX(row.endOffset);
   {
@@ -8378,6 +8431,7 @@ class CakeEngine {
     this.recordHistory(command.type);
     this.state = nextState;
     this.render();
+    this.flushOverlayUpdate();
     (_a = this.onChange) == null ? void 0 : _a.call(this, this.state.source, this.state.selection);
     this.scheduleScrollCaretIntoView();
     if (shouldOpenLinkPopover) {
@@ -8387,6 +8441,7 @@ class CakeEngine {
     }
     if (options == null ? void 0 : options.restoreFocus) {
       this.focus();
+      this.applySelection(this.state.selection);
     }
     return true;
   }
@@ -8486,9 +8541,7 @@ class CakeEngine {
     this.detachDragListeners();
   }
   handleFocusIn() {
-    queueMicrotask(() => {
-      this.scheduleOverlayUpdate();
-    });
+    this.flushOverlayUpdate();
   }
   handleFocusOut() {
     queueMicrotask(() => {
@@ -8972,7 +9025,7 @@ class CakeEngine {
     if (cmdOrCtrl && event.key === "Enter") {
       event.preventDefault();
       this.keydownHandledBeforeInput = true;
-      this.applyEdit({ type: "insert-line-break" });
+      this.applyEdit({ type: "insert-hard-line-break" });
       queueMicrotask(() => {
         this.keydownHandledBeforeInput = false;
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blankdotpage/cake",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "type": "module",
   "main": "dist/index.cjs",
   "module": "dist/index.js",