@ashx-j/lunr-tui 0.2.26 → 0.2.28

package/dist/components/editor.js

@@ -106,7 +106,7 @@ function segmentWithMarkers(text, baseSegmenter, families) {
  */
 export function wordWrapLine(line, maxWidth, preSegmented) {
     if (!line || maxWidth <= 0) {
-        return [{ text: "", startIndex: 0, endIndex: 0 }];
+        return [{ text: "", startIndex: 0, endIndex: line.length }];
     }
     const lineWidth = visibleWidth(line);
     if (lineWidth <= maxWidth) {
@@ -148,11 +148,17 @@ export function wordWrapLine(line, maxWidth, preSegmented) {
             wrapOppIndex = -1;
         }
         if (gWidth > maxWidth) {
-            // Single atomic segment wider than maxWidth (e.g. paste marker
-            // in a narrow terminal). Re-wrap it at grapheme granularity.
-            // The segment remains logically atomic for cursor
-            // movement / editing — the split is purely visual for word-wrap layout.
-            const subChunks = wordWrapLine(grapheme, maxWidth);
+            const subSegments = [...graphemeSegmenter.segment(grapheme)];
+            if (subSegments.length === 1) {
+                // Keep the source range even when this grapheme cannot occupy its two cells.
+                chunks.push({ text: "�", startIndex: charIndex, endIndex: charIndex + grapheme.length });
+                chunkStart = charIndex + grapheme.length;
+                currentWidth = 0;
+                wrapOppIndex = -1;
+                continue;
+            }
+            // Split a multi-grapheme atomic marker visually, while keeping editing atomic.
+            const subChunks = wordWrapLine(grapheme, maxWidth, subSegments);
             for (let j = 0; j < subChunks.length - 1; j++) {
                 const sc = subChunks[j];
                 chunks.push({ text: sc.text, startIndex: charIndex + sc.startIndex, endIndex: charIndex + sc.endIndex });
@@ -184,7 +190,9 @@ export function wordWrapLine(line, maxWidth, preSegmented) {
         }
     }
     // Push final chunk.
-    chunks.push({ text: line.slice(chunkStart), startIndex: chunkStart, endIndex: line.length });
+    if (chunkStart < line.length || chunks.length === 0) {
+        chunks.push({ text: line.slice(chunkStart), startIndex: chunkStart, endIndex: line.length });
+    }
     return chunks;
 }
 const SLASH_COMMAND_SELECT_LIST_LAYOUT = {
@@ -262,7 +270,11 @@ export class Editor {
     // to.
     snappedFromCursorCol = null;
     // Undo support
-    undoStack = new UndoStack();
+    // Attachment maps are copied only when membership changes; snapshots share file metadata.
+    undoStack = new UndoStack((snapshot) => ({
+        state: structuredClone(snapshot.state),
+        images: snapshot.images,
+    }));
     onSubmit;
     onChange;
     disableSubmit = false;
@@ -400,6 +412,8 @@ export class Editor {
         // No cached state to invalidate currently
     }
     render(width) {
+        if (width <= 0)
+            return [];
         const maxPadding = Math.max(0, Math.floor((width - 1) / 2));
         const paddingX = Math.min(this.paddingX, maxPadding);
         const contentWidth = Math.max(1, width - paddingX * 2);
@@ -494,7 +508,7 @@ export class Editor {
         if (linesBelow > 0) {
             const indicator = `─── ↓ ${linesBelow} more `;
             const remaining = width - visibleWidth(indicator);
-            result.push(this.borderColor(indicator + "─".repeat(Math.max(0, remaining))));
+            result.push(this.borderColor(truncateToWidth(indicator + "─".repeat(Math.max(0, remaining)), width, "")));
         }
         else {
             result.push(horizontal.repeat(width));
@@ -815,18 +829,14 @@ export class Editor {
                         if (isLastChunk) {
                             // Last chunk: cursor belongs here if >= startIndex
                             hasCursorInChunk = cursorPos >= chunk.startIndex;
-                            adjustedCursorPos = cursorPos - chunk.startIndex;
+                            adjustedCursorPos = Math.min(cursorPos - chunk.startIndex, chunk.text.length);
                         }
                         else {
                             // Non-last chunk: cursor belongs here if in range [startIndex, endIndex)
                             // But we need to handle the visual position in the trimmed text
                             hasCursorInChunk = cursorPos >= chunk.startIndex && cursorPos < chunk.endIndex;
                             if (hasCursorInChunk) {
-                                adjustedCursorPos = cursorPos - chunk.startIndex;
-                                // Clamp to text length (in case cursor was in trimmed whitespace)
-                                if (adjustedCursorPos > chunk.text.length) {
-                                    adjustedCursorPos = chunk.text.length;
-                                }
+                                adjustedCursorPos = Math.min(cursorPos - chunk.startIndex, chunk.text.length);
                             }
                         }
                     }
@@ -846,6 +856,14 @@ export class Editor {
                 }
             }
         }
+        // At one column there is no spare cell for an end cursor.
+        if (contentWidth === 1) {
+            const cursorLine = layoutLines.find((line) => line.hasCursor);
+            if (cursorLine?.text && cursorLine.cursorPos === cursorLine.text.length) {
+                cursorLine.hasCursor = false;
+                layoutLines.splice(layoutLines.indexOf(cursorLine) + 1, 0, { text: "", hasCursor: true, cursorPos: 0 });
+            }
+        }
         return layoutLines;
     }
     getText() {
@@ -876,16 +894,14 @@ export class Editor {
         this.cancelAutocomplete();
         this.lastAction = null;
         this.exitHistoryBrowsing();
-        this.pastes.clear();
-        this.pasteCounter = 0;
-        this.images.clear();
-        this.imageCounter = 0;
-        // Keep submittedImages: submitValue() snapshots chips, then setText("") runs.
         const normalized = this.normalizeText(text);
-        // Push undo snapshot if content differs (makes programmatic changes undoable)
         if (this.getText() !== normalized) {
             this.pushUndoSnapshot();
         }
+        this.pastes.clear();
+        this.pasteCounter = 0;
+        this.images = new Map();
+        // Keep submittedImages: submitValue() snapshots chips, then setText("") runs.
         this.setTextInternal(normalized);
     }
     /**
@@ -913,7 +929,9 @@ export class Editor {
         this.exitHistoryBrowsing();
         this.imageCounter++;
         const id = this.imageCounter;
-        this.images.set(id, { id, path: attachment.path, mimeType: attachment.mimeType });
+        const images = new Map(this.images);
+        images.set(id, { id, path: attachment.path, mimeType: attachment.mimeType });
+        this.images = images;
         this.insertTextAtCursorInternal(formatImageMarker(id));
         return id;
     }
@@ -922,13 +940,14 @@ export class Editor {
      * Used by /edit so `[image_n]` stays a chip instead of becoming a path.
      */
     restoreImageMarkers(attachments) {
-        this.images.clear();
+        const images = new Map();
         this.imageCounter = 0;
         for (const attachment of attachments) {
-            this.images.set(attachment.id, { ...attachment });
+            images.set(attachment.id, { ...attachment });
             if (attachment.id > this.imageCounter)
                 this.imageCounter = attachment.id;
         }
+        this.images = images;
     }
     /** Pending image chips still in the editor, in first-appearance order. */
     getPendingImages() {
@@ -945,7 +964,7 @@ export class Editor {
     takePendingImages() {
         const pending = this.submittedImages.length > 0 ? this.submittedImages : this.getPendingImages();
         this.submittedImages = [];
-        this.images.clear();
+        this.images = new Map();
         this.imageCounter = 0;
         return pending;
     }
@@ -1148,7 +1167,7 @@ export class Editor {
         this.state = { lines: [""], cursorLine: 0, cursorCol: 0 };
         this.pastes.clear();
         this.pasteCounter = 0;
-        this.images.clear();
+        this.images = new Map();
         this.imageCounter = 0;
         this.exitHistoryBrowsing();
         this.scrollOffset = 0;
@@ -1192,7 +1211,9 @@ export class Editor {
             }
             else if (isImageSegmented) {
                 const targetId = Number(isImageSegmented[1]);
-                this.images.delete(targetId);
+                const images = new Map(this.images);
+                images.delete(targetId);
+                this.images = images;
             }
             line = this.state.lines[this.state.cursorLine] || "";
             const before = line.slice(0, this.state.cursorCol - graphemeLength);
@@ -1501,7 +1522,9 @@ export class Editor {
             const graphemeLength = firstGrapheme ? firstGrapheme.segment.length : 1;
             const deletedImage = firstGrapheme ? IMAGE_MARKER_SINGLE.exec(firstGrapheme.segment) : null;
             if (deletedImage) {
-                this.images.delete(Number(deletedImage[1]));
+                const images = new Map(this.images);
+                images.delete(Number(deletedImage[1]));
+                this.images = images;
             }
             const before = currentLine.slice(0, this.state.cursorCol);
             const after = currentLine.slice(this.state.cursorCol + graphemeLength);
@@ -1784,14 +1807,17 @@ export class Editor {
         }
     }
     pushUndoSnapshot() {
-        this.undoStack.push(this.state);
+        this.undoStack.push({ state: this.state, images: this.images });
     }
     undo() {
         this.exitHistoryBrowsing();
         const snapshot = this.undoStack.pop();
         if (!snapshot)
             return;
-        Object.assign(this.state, snapshot);
+        Object.assign(this.state, snapshot.state);
+        this.images = snapshot.images;
+        for (const id of this.images.keys())
+            this.imageCounter = Math.max(this.imageCounter, id);
         this.lastAction = null;
         this.preferredVisualCol = null;
         if (this.onChange) {