vuewrite 0.0.7 → 0.0.9

package/dist/vuewrite.d.ts

@@ -29,10 +29,17 @@ export declare type Block = {
     text: string;
     type?: string;
     styles: Style[];
+    editable?: boolean;
 };
 
 export declare type Decorator = (style: Style) => HTMLAttributes | undefined;
 
+declare type HistoryAction = {
+    type: "insertText" | "setText";
+    blocks: Block[];
+    selection: TextEditorSelection;
+};
+
 export declare type Style = {
     start: number;
     end: number;
@@ -48,9 +55,11 @@ text: string;
 styles?: Style[] | undefined;
 type?: string | undefined;
 }[] | undefined;
+parser?: TextParser | undefined;
 styles?: Style[] | undefined;
 autofocus?: boolean | undefined;
 autoselect?: boolean | undefined;
+preventMultiline?: boolean | undefined;
 }>, {
 currentStyles: ComputedRef<Map<string, Style>>;
 currentBlock: ComputedRef<    {
@@ -63,6 +72,7 @@ end: number;
 style: string;
 meta?: any;
 }[];
+editable?: boolean | undefined;
 } | null>;
 isCollapsed: ComputedRef<boolean>;
 selection: {
@@ -84,6 +94,7 @@ insertBlock: (blockData: Partial<Block>) => void;
 addNewLine: () => void;
 removeNewLine: () => void;
 selectAll: () => void;
+pushHistory: (type: "insertText" | "setText") => void;
 getClientRects: (selection: TextEditorSelection) => DOMRectList;
 }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
 keydown: (...args: any[]) => void;
@@ -97,9 +108,11 @@ text: string;
 styles?: Style[] | undefined;
 type?: string | undefined;
 }[] | undefined;
+parser?: TextParser | undefined;
 styles?: Style[] | undefined;
 autofocus?: boolean | undefined;
 autoselect?: boolean | undefined;
+preventMultiline?: boolean | undefined;
 }>>> & {
 onKeydown?: ((...args: any[]) => any) | undefined;
 "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
@@ -108,9 +121,22 @@ onKeydown?: ((...args: any[]) => any) | undefined;
     placeholder?(_: {}): any;
 }>;
 
+declare class TextEditorHistory {
+    actions: HistoryAction[];
+    currentCursor: number;
+    private store;
+    constructor(store: TextEditorStore);
+    tickStarted: boolean;
+    push(type: HistoryAction["type"]): void;
+    private applyAction;
+    undo(): void;
+    redo(): void;
+}
+
 export declare type TextEditorRef = Pick<TextEditorStore, "currentStyles" | "currentBlock" | "isCollapsed" | "selection" | "toggleStyle" | "applyStyle" | "removeStyle" | "insertText" | "insertBlock" | "addNewLine" | "removeNewLine" | "selectAll"> & {
     isFocused: boolean;
     getClientRects: (selection: TextEditorSelection) => DOMRectList;
+    pushHistory: TextEditorHistory["push"];
 };
 
 declare type TextEditorSelection = {
@@ -125,6 +151,7 @@ declare type TextEditorSelection = {
 };
 
 declare class TextEditorStore {
+    history: TextEditorHistory;
     blocks: {
         id: string;
         text: string;
@@ -135,6 +162,7 @@ declare class TextEditorStore {
             style: string;
             meta?: any;
         }[];
+        editable?: boolean | undefined;
     }[];
     selection: {
         anchor: {
@@ -159,6 +187,7 @@ declare class TextEditorStore {
     style: string;
     meta?: any;
     }[];
+    editable?: boolean | undefined;
     } | null>;
     get currentBlock(): {
         id: string;
@@ -170,10 +199,12 @@ declare class TextEditorStore {
             style: string;
             meta?: any;
         }[];
+        editable?: boolean | undefined;
     } | null;
     _selectedText: ComputedRef<string>;
     get selectedText(): string;
     moveOffset(newOffset: number): void;
+    concatBlocks(start: Block, end: Block): void;
     removeNewLine(): void;
     onInput(_e: Event): void;
     addNewLine(): void;
@@ -198,4 +229,6 @@ declare class TextEditorStore {
     selectAll(): void;
 }
 
+declare type TextParser = (text: string) => Style[];
+
 export { }

package/dist/vuewrite.js

@@ -4,7 +4,7 @@ var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
-import { getCurrentScope, onScopeDispose, unref, watch, reactive, computed, ref, defineComponent, getCurrentInstance, openBlock, createBlock, resolveDynamicComponent, createElementBlock, normalizeProps, mergeProps, h, nextTick, useSlots, onMounted, Fragment, renderList, renderSlot, createCommentVNode } from "vue";
+import { getCurrentScope, onScopeDispose, unref, watch, nextTick, reactive, computed, ref, defineComponent, getCurrentInstance, openBlock, createBlock, resolveDynamicComponent, createElementBlock, normalizeProps, mergeProps, h, useSlots, onMounted, Fragment, renderList, renderSlot, createCommentVNode } from "vue";
 function tryOnScopeDispose(fn) {
   if (getCurrentScope()) {
     onScopeDispose(fn);
@@ -140,8 +140,85 @@ const isEqual = (a, b) => {
   }
   return true;
 };
+class TextEditorHistory {
+  constructor(store) {
+    __publicField(this, "actions", []);
+    __publicField(this, "currentCursor", 0);
+    __publicField(this, "store");
+    __publicField(this, "tickStarted", false);
+    this.store = store;
+    window.showHistory = () => console.log(this.actions);
+  }
+  push(type) {
+    var _a;
+    if (this.currentCursor + 1 < this.actions.length) {
+      this.actions.length = this.currentCursor + 1;
+    }
+    const lastAction = this.actions.length > 0 && this.currentCursor === this.actions.length - 1 ? this.actions[this.actions.length - 1] : null;
+    const selection = JSON.parse(JSON.stringify(this.store.selection));
+    if (type === "insertText") {
+      const currentBlock = JSON.parse(JSON.stringify(this.store.currentBlock));
+      if (lastAction && lastAction.type === type && ((_a = lastAction.blocks[0]) == null ? void 0 : _a.id) === currentBlock.id) {
+        lastAction.blocks = [currentBlock];
+        lastAction.selection = selection;
+      } else {
+        this.actions.push({ type, blocks: [currentBlock], selection });
+      }
+    } else if (type === "setText") {
+      const blocks = JSON.parse(JSON.stringify(this.store.blocks));
+      if (this.tickStarted && lastAction) {
+        lastAction.blocks = blocks;
+        lastAction.selection = selection;
+      } else {
+        this.actions.push({ type: "setText", blocks, selection });
+      }
+    }
+    this.currentCursor = this.actions.length - 1;
+    if (!this.tickStarted && type === "setText") {
+      this.tickStarted = true;
+      nextTick(() => {
+        this.tickStarted = false;
+      });
+    }
+  }
+  applyAction(action) {
+    if (action.type === "setText") {
+      for (let i = 0; i < action.blocks.length; i++) {
+        if (i >= this.store.blocks.length) {
+          this.store.blocks.push({ ...action.blocks[i] });
+        } else {
+          Object.assign(this.store.blocks[i], action.blocks[i]);
+        }
+      }
+      if (this.store.blocks.length > action.blocks.length) {
+        this.store.blocks.length = action.blocks.length;
+      }
+    } else {
+      for (let _block of action.blocks) {
+        const block = this.store.blocks.find((block2) => block2.id === _block.id);
+        if (block) {
+          block.text = _block.text;
+        }
+      }
+    }
+    Object.assign(this.store.selection, action.selection);
+  }
+  undo() {
+    if (this.currentCursor === 0)
+      return;
+    this.currentCursor--;
+    this.applyAction(this.actions[this.currentCursor]);
+  }
+  redo() {
+    if (this.currentCursor >= this.actions.length - 1)
+      return;
+    this.currentCursor++;
+    this.applyAction(this.actions[this.currentCursor]);
+  }
+}
 class TextEditorStore {
   constructor() {
+    __publicField(this, "history", new TextEditorHistory(this));
     __publicField(this, "blocks", reactive([{ id: uid(), text: "", styles: [] }]));
     __publicField(this, "selection", reactive({
       anchor: { blockId: this.blocks[0].id, offset: 0 },
@@ -202,18 +279,34 @@ class TextEditorStore {
     this.selection.anchor.offset = newOffset;
     this.selection.focus.offset = newOffset;
   }
+  concatBlocks(start, end) {
+    for (let style of end.styles) {
+      style.start += start.text.length;
+      style.end += start.text.length;
+      start.styles.push(style);
+    }
+    start.text = start.text + end.text;
+  }
   removeNewLine() {
     const blockIndex = this.blocks.findIndex((item) => item.id === this.selection.anchor.blockId);
     if (blockIndex < 1)
       return;
+    if (this.blocks[blockIndex - 1].editable === false) {
+      this.blocks.splice(blockIndex - 1, 1);
+    } else {
+      this.concatBlocks(this.blocks[blockIndex - 1], this.blocks[blockIndex]);
+      this.blocks.splice(blockIndex, 1);
+    }
     this.selection.anchor.blockId = this.blocks[blockIndex - 1].id;
     this.selection.focus.blockId = this.blocks[blockIndex - 1].id;
     this.selection.anchor.offset = this.blocks[blockIndex - 1].text.length;
     this.selection.focus.offset = this.blocks[blockIndex - 1].text.length;
-    this.blocks.splice(blockIndex, 1);
+    this.history.push("setText");
   }
   onInput(_e) {
     const ev = _e;
+    if (ev.defaultPrevented)
+      return;
     ev.preventDefault();
     const collapsed = this.isCollapsed;
     if (!collapsed)
@@ -224,7 +317,11 @@ class TextEditorStore {
     if ((ev.inputType === "deleteContentBackward" || ev.inputType === "deleteContentForward") && collapsed) {
       if (ev.inputType === "deleteContentBackward") {
         if (this.selection.anchor.offset === 0) {
-          this.removeNewLine();
+          if (block.type) {
+            delete block.type;
+          } else {
+            this.removeNewLine();
+          }
         } else {
           const offset = Math.max(0, this.selection.focus.offset - 1);
           block.text = block.text.slice(0, offset) + block.text.slice(this.selection.focus.offset);
@@ -234,7 +331,11 @@ class TextEditorStore {
       if (ev.inputType === "deleteContentForward") {
         const blockIndex = this.blocks.findIndex((item) => item.id === this.selection.anchor.blockId);
         if (this.selection.anchor.offset === this.blocks[blockIndex].text.length) {
-          this.blocks.splice(blockIndex + 1, 1);
+          const nextBlock = this.blocks[blockIndex + 1];
+          if (nextBlock) {
+            this.blocks.splice(blockIndex + 1, 1);
+            this.concatBlocks(this.blocks[blockIndex - 1], this.blocks[blockIndex]);
+          }
         } else {
           block.text = block.text.slice(0, this.selection.focus.offset) + block.text.slice(this.selection.focus.offset + 1);
           this.moveStyles(block, this.selection.focus.offset + 1, 1);
@@ -243,6 +344,7 @@ class TextEditorStore {
     }
     if (ev.inputType === "insertText") {
       this.insertText(ev.data);
+      this.history.push("insertText");
     }
   }
   addNewLine() {
@@ -256,13 +358,15 @@ class TextEditorStore {
     this.blocks.splice(index + 1, 0, block);
     this.selection.anchor = { blockId: block.id, offset: 0 };
     this.selection.focus = { blockId: block.id, offset: 0 };
+    this.history.push("setText");
   }
   insertText(data) {
     const block = this.currentBlock;
     if (!block)
       return;
-    block.text = block.text.slice(0, this.selection.focus.offset) + data + block.text.slice(this.selection.focus.offset);
-    this.moveOffset(clamp(this.selection.focus.offset + data.length, 0, block.text.length));
+    const text = data.replace(/\r/g, "");
+    block.text = block.text.slice(0, this.selection.focus.offset) + text + block.text.slice(this.selection.focus.offset);
+    this.moveOffset(clamp(this.selection.focus.offset + text.length, 0, block.text.length));
   }
   insertBlock(blockData) {
     if (!this.currentBlock)
@@ -277,6 +381,10 @@ class TextEditorStore {
       Object.assign(this.selection, selection);
     }
     Object.assign(this.currentBlock, blockData);
+    if (blockData.editable === false && this.currentBlock === this.blocks[this.blocks.length - 1]) {
+      this.addNewLine();
+    }
+    this.history.push("setText");
   }
   get startAndEnd() {
     const a = this.blocks.findIndex((block) => block.id === this.selection.anchor.blockId);
@@ -421,7 +529,8 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   props: {
     block: {},
     slots: {},
-    decorator: { type: Function }
+    decorator: { type: Function },
+    parser: {}
   },
   emits: ["postrender"],
   setup(__props, { emit: __emit }) {
@@ -505,6 +614,8 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
     const content = () => {
       const block = props.block;
+      if (block.editable === false)
+        return null;
       if (block.text.length === 0) {
         cleanTree(1);
         return [h("br")];
@@ -518,6 +629,12 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         markers.push([style.start, style]);
         markers.push([style.end, style]);
       }
+      if (props.parser) {
+        for (let style of props.parser(text)) {
+          markers.push([style.start, style]);
+          markers.push([style.end, style]);
+        }
+      }
       markers.sort((a, b) => a[0] - b[0]);
       let currentIndex = 0;
       const activeStyles = /* @__PURE__ */ new Set();
@@ -560,9 +677,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     decorator: { type: Function },
     single: { type: Boolean },
     modelValue: {},
+    parser: { type: Function },
     styles: {},
     autofocus: { type: Boolean },
-    autoselect: { type: Boolean }
+    autoselect: { type: Boolean },
+    preventMultiline: { type: Boolean }
   },
   emits: ["keydown", "update:modelValue", "update:styles"],
   setup(__props, { expose: __expose, emit: __emit }) {
@@ -621,46 +740,47 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return;
       if (e.code === "Enter") {
         e.preventDefault();
-        if (e.shiftKey || props.single) {
+        if (!props.preventMultiline && (e.shiftKey || props.single)) {
           store.insertText("\n");
         } else {
           store.addNewLine();
         }
       }
-      if (e.code === "Backspace") {
-        if (store.isCollapsed && store.selection.anchor.offset === 0) {
-          e.preventDefault();
-          if (store.currentBlock && store.currentBlock.type) {
-            delete store.currentBlock.type;
-          } else {
-            store.removeNewLine();
-          }
-        }
-      }
       if ((e.ctrlKey || e.metaKey) && !e.shiftKey && !e.altKey) {
         if (e.code === "KeyB" || e.code === "KeyI" || e.code === "KeyU") {
           e.preventDefault();
         }
       }
+      if ((e.ctrlKey || e.metaKey) && e.code === "KeyZ" && !e.shiftKey) {
+        e.preventDefault();
+        store.history.undo();
+      }
+      if ((e.ctrlKey || e.metaKey) && (e.code === "KeyY" || e.shiftKey && e.code === "KeyZ")) {
+        e.preventDefault();
+        store.history.redo();
+      }
     };
     let cachedSelection = {};
     useEventListener(document, "selectionchange", () => {
       const sel = window.getSelection();
-      const anchor = findParent(sel.anchorNode, (el) => el.hasAttribute("data-vw-block-id"));
+      const anchor = findParent(sel.anchorNode, (el) => el.hasAttribute("data-vw-block-id") && el.parentElement === textEditorRef.value);
       if (anchor) {
-        const offset = anchor === sel.anchorNode ? 0 : calcOffsetToNode(anchor, sel.anchorNode) + sel.anchorOffset;
+        const isNonEditable = anchor.getAttribute("contenteditable") === "false";
+        const offset = isNonEditable || anchor === sel.focusNode ? 0 : calcOffsetToNode(anchor, sel.anchorNode) + sel.anchorOffset;
         store.selection.anchor = { blockId: anchor.getAttribute("data-vw-block-id"), offset };
       }
-      const focus = findParent(sel.focusNode, (el) => el.hasAttribute("data-vw-block-id"));
+      const focus = findParent(sel.focusNode, (el) => el.hasAttribute("data-vw-block-id") && el.parentElement === textEditorRef.value);
       if (focus) {
-        const offset = anchor === sel.focusNode ? 0 : calcOffsetToNode(focus, sel.focusNode) + sel.focusOffset;
+        const isNonEditable = focus.getAttribute("contenteditable") === "false";
+        const offset = isNonEditable || focus === sel.focusNode ? 0 : calcOffsetToNode(focus, sel.focusNode) + sel.focusOffset;
         store.selection.focus = { blockId: focus.getAttribute("data-vw-block-id"), offset };
       }
-      if (store.isFocused.value !== !!focus || !!anchor) {
+      if (store.isFocused.value !== (!!focus || !!anchor)) {
         store.isFocused.value = !!focus || !!anchor;
       }
-      if (!anchor && !focus)
+      if (anchor && focus) {
         cachedSelection = JSON.parse(JSON.stringify(store.selection));
+      }
     });
     let postRendered = false;
     const onPostRender = () => {
@@ -688,6 +808,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       if (isEqual(store.selection, cachedSelection))
         return;
+      if (store.selection.anchor.blockId === store.selection.focus.blockId && store.currentBlock && store.currentBlock.editable === false) {
+        return;
+      }
       const anchor = getNode(store.selection.anchor.blockId);
       const focus = getNode(store.selection.focus.blockId);
       const nativeSelection = window.getSelection();
@@ -710,15 +833,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         (_b = textEditorRef.value) == null ? void 0 : _b.focus();
         store.selectAll();
       }
+      store.history.push("setText");
     });
     const onCopy = (e) => {
       e.preventDefault();
       navigator.clipboard.writeText(store.selectedText);
+      store.history.push("setText");
     };
     const onCut = (e) => {
       e.preventDefault();
       navigator.clipboard.writeText(store.selectedText);
       store.deleteSelected();
+      store.history.push("setText");
     };
     const onPaste = (e) => {
       var _a;
@@ -727,6 +853,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (!text)
         return;
       store.insertText(text);
+      store.history.push("setText");
     };
     const getClientRects = (selection) => {
       const anchor = getNode(selection.anchor.blockId);
@@ -753,6 +880,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       addNewLine: store.addNewLine.bind(store),
       removeNewLine: store.removeNewLine.bind(store),
       selectAll: store.selectAll.bind(store),
+      pushHistory: store.history.push.bind(store.history),
       getClientRects
     });
     return (_ctx, _cache) => {
@@ -760,7 +888,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         ref_key: "textEditorRef",
         ref: textEditorRef,
         contenteditable: "",
-        onInput: _cache[0] || (_cache[0] = //@ts-ignore
+        onBeforeinput: _cache[0] || (_cache[0] = //@ts-ignore
         (...args) => unref(store).onInput && unref(store).onInput(...args)),
         onKeydown: onKeyDown,
         onCopy,
@@ -773,10 +901,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             block,
             slots: unref(slots),
             decorator: props.decorator,
+            parser: props.parser,
             onPostrender: onPostRender
-          }, null, 8, ["block", "slots", "decorator"]);
+          }, null, 8, ["block", "slots", "decorator", "parser"]);
         }), 128)),
-        unref(store).blocks.length === 1 && unref(store).blocks[0].text === "" ? renderSlot(_ctx.$slots, "placeholder", { key: 0 }) : createCommentVNode("", true)
+        unref(store).blocks.length === 1 && unref(store).blocks[0].text === "" && !unref(store).blocks[0].type ? renderSlot(_ctx.$slots, "placeholder", { key: 0 }) : createCommentVNode("", true)
       ], 544);
     };
   }

package/package.json

@@ -2,7 +2,7 @@
   "name": "vuewrite",
   "description": "Rich Text Editor based on Vue3 reactivity",
   "private": false,
-  "version": "0.0.7",
+  "version": "0.0.9",
   "type": "module",
   "license": "MIT",
   "author": "den59k",