@ones-editor/editor 1.1.31-beta.2 → 1.1.31-beta.3

package/@ones-editor/ui-base/src/command-bar/command-bar.d.ts

@@ -1,6 +1,6 @@
 import { TypedEmitter } from 'tiny-typed-emitter';
 import { CloseReason, CommandItem, Closeable } from '../../../../@ones-editor/core';
-import { AbstractManualCommandBar, AbstractCommandBar, CommandBarEvents, CommandBarOptions, CommandItemElement, CreateManualCommandBarFunction, ManualShowCommandBarOptions } from './types';
+import { AbstractManualCommandBar, AbstractCommandBar, CommandBarEvents, CommandBarOptions, CommandItemElement, CreateManualCommandBarFunction, ManualShowCommandBarOptions, SelectItemFrom } from './types';
 import 'tippy.js/dist/tippy.css';
 export default abstract class CommandBar extends TypedEmitter<CommandBarEvents> implements AbstractCommandBar {
     content: HTMLElement;
@@ -30,7 +30,7 @@ export default abstract class CommandBar extends TypedEmitter<CommandBarEvents>
     private getPrevItemIndex;
     private getNextItemIndex;
     protected clearSelectedItem(): void;
-    selectItem(id: string): void;
+    selectItem(id: string, from?: SelectItemFrom): void;
     private lastEnterPauseTime;
     private startPauseMouseEnter;
     private handleItemMouseEnter;

package/@ones-editor/ui-base/src/command-bar/types.d.ts

@@ -66,3 +66,4 @@ export type CreateManualCommandBarFunction = (parentItem: CommandItem, closeable
 export type PopoverOptions = {
     overflowBoundary?: Element;
 };
+export type SelectItemFrom = 'event' | 'manual';

package/dist/index.js

@@ -8278,8 +8278,8 @@ var __publicField = (obj, key, value) => {
       }
       div.style.position = "fixed";
       div.style.opacity = "0";
-      const body = /<body[^>]*>([\s\S]*)<\/body>/.exec(html != null ? html : "");
-      div.innerHTML = body ? body[1] : html != null ? html : "";
+      const body = /<body(\s+[^>]*)?>([\s\S]*)<\/body>/.exec(html != null ? html : "");
+      div.innerHTML = body ? body[2] : html != null ? html : "";
       document.body.appendChild(div);
       select(div);
       document.execCommand("copy");
@@ -27628,6 +27628,33 @@ ${codeText}
         this.endGroup();
       }
     }
+    verifyPos(pos) {
+      const block = this.editor.getBlockById(pos.blockId);
+      if (pos.isSimple()) {
+        const ok = pos.offset >= 0 && pos.offset <= getBlockTextLength$4(this.editor, block);
+        if (!ok) {
+          assert(logger$2I, false, "invalid block position, out of range");
+        }
+      } else {
+        const childContainerId = pos.childContainerId;
+        const container = this.editor.getContainerById(childContainerId);
+        const ok = !!container;
+        if (!ok) {
+          assert(logger$2I, false, "invalid complex block position, no container found");
+        }
+      }
+    }
+    checkRange() {
+      const { start, end } = this.editor.selection.range;
+      try {
+        this.verifyPos(start);
+        this.verifyPos(end);
+      } catch (err) {
+        logger$2I.error(`undo: failed to restore caret pos: ${err.message}`);
+        const firstBlock = this.editor.getFirstBlock();
+        this.editor.selection.setRange(createBlockSimpleRange(this.editor, firstBlock, 0), { noScroll: true });
+      }
+    }
     undo() {
       if (this.undoCursor === -1) {
         this.undoCursor = this.actions.length;
@@ -27653,6 +27680,7 @@ ${codeText}
         return false;
       } finally {
         this.undoRedoing = false;
+        this.checkRange();
       }
     }
     redo() {
@@ -27682,6 +27710,7 @@ ${codeText}
         return false;
       } finally {
         this.undoRedoing = false;
+        this.checkRange();
       }
     }
     canUndo() {
@@ -37150,7 +37179,7 @@ ${codeText}
         removeClass(elem, "selected");
       }
     }
-    selectItem(id) {
+    selectItem(id, from = "event") {
       const exists = this.getSelectedItem();
       if (exists) {
         if (exists.id === id) {
@@ -37166,7 +37195,7 @@ ${codeText}
       if (item) {
         addClass(item, "selected");
         this.emit("selectionChange", this, item.getAttribute("data-id") || "");
-        if (!this.options.disableSelectedScroll) {
+        if (!this.options.disableSelectedScroll && from === "event") {
           item.scrollIntoView({ block: "nearest" });
         }
       } else {
@@ -38056,7 +38085,7 @@ ${codeText}
       if (items.length > 0) {
         const firstItem = items.find((item) => item.type !== "section" && item.type !== "separator");
         if (firstItem) {
-          this.menu.selectItem(firstItem.id);
+          this.menu.selectItem(firstItem.id, "manual");
         }
       }
     }
@@ -40057,16 +40086,21 @@ ${codeText}
       children.forEach((containerId, index2) => {
         const cellColSpan = this._data[`${containerId}_colSpan`] || 1;
         const cellRowSpan = this._data[`${containerId}_rowSpan`] || 1;
+        const cellBackground = this._data[`${containerId}_background`] || "";
         for (let y = 0; y < cellRowSpan; y++) {
           for (let x = 0; x < cellColSpan; x++) {
-            this._rows[row + y].setCell(col + x, {
+            const cellData = {
               col,
               row,
               containerId,
               virtual: x !== 0 || y !== 0,
               colSpan: cellColSpan,
               rowSpan: cellRowSpan
-            });
+            };
+            if (cellBackground) {
+              cellData.background = cellBackground;
+            }
+            this._rows[row + y].setCell(col + x, cellData);
           }
         }
         const next = this.getNextEmptyCell(col, row);
@@ -40102,6 +40136,14 @@ ${codeText}
     }
   }
   const logger$2d = getLogger("table-data");
+  function getBackgroundFromCell(cell) {
+    for (const cls of Array.from(cell.classList)) {
+      if (cls.startsWith("style-bg-color-")) {
+        return cls;
+      }
+    }
+    return "";
+  }
   function getCellChildContainer(cell) {
     const container = cell.firstElementChild;
     assert(logger$2d, container, "no child element for cell");
@@ -40114,6 +40156,7 @@ ${codeText}
     assert(logger$2d, block, "no parent block for table");
     const cellIds = [];
     const spanData = {};
+    const backgroundData = {};
     Array.from(table.rows).forEach((row) => {
       Array.from(row.cells).forEach((cell) => {
         const container = getCellChildContainer(cell);
@@ -40123,6 +40166,10 @@ ${codeText}
           spanData[`${containerId}_colSpan`] = cell.colSpan;
           spanData[`${containerId}_rowSpan`] = cell.rowSpan;
         }
+        const background = getBackgroundFromCell(cell);
+        if (background) {
+          backgroundData[`${containerId}_background`] = background;
+        }
       });
     });
     const rows = table.rows.length;
@@ -40134,7 +40181,8 @@ ${codeText}
       cols,
       children: cellIds,
       colsWidth: Array(cols).fill(100),
-      ...spanData
+      ...spanData,
+      ...backgroundData
     };
     return tableData;
   }
@@ -40153,6 +40201,7 @@ ${codeText}
       __publicField(this, "col");
       __publicField(this, "colSpan");
       __publicField(this, "rowSpan");
+      __publicField(this, "background");
       __publicField(this, "virtual");
       __publicField(this, "table");
       this.table = table;
@@ -40162,6 +40211,9 @@ ${codeText}
       this.colSpan = cellData.colSpan;
       this.rowSpan = cellData.rowSpan;
       this.virtual = cellData.virtual;
+      if (cellData.background) {
+        this.background = cellData.background;
+      }
     }
     get cell() {
       const container = this.container;
@@ -40858,6 +40910,7 @@ ${codeText}
       assert(logger$27, !cellData.virtual, "should not split virtual cell");
       assert(logger$27, cellData.colSpan > 1 || cellData.rowSpan > 1, "cell does not has span data");
       const virtualCellContainers = grid.getVirtualCellContainersGrid();
+      const newCellContainers = [];
       for (let y = 0; y < cellData.rowSpan; y++) {
         for (let x = 0; x < cellData.colSpan; x++) {
           if (y === 0 && x === 0) {
@@ -40867,12 +40920,19 @@ ${codeText}
           const colIndex = x + cellData.col;
           const newContainerId = createEmptyContainer(editor.doc);
           virtualCellContainers[rowIndex][colIndex] = newContainerId;
+          newCellContainers.push(newContainerId);
         }
       }
       const oldData = editor.getBlockData(block);
       const newData = cloneDeep__default.default(oldData);
       newData[`${cellData.containerId}_colSpan`] = null;
       newData[`${cellData.containerId}_rowSpan`] = null;
+      const background = cellData.background;
+      if (background && newCellContainers.length > 0) {
+        newCellContainers.forEach((containerId) => {
+          newData[`${containerId}_background`] = background;
+        });
+      }
       newData.children = TableGrid.virtualCellContainersGridToChildren(virtualCellContainers);
       const blocks = editor.getChildContainerData(cellData.containerId);
       const focusedBlock = blocks[0];
@@ -42757,10 +42817,48 @@ ${codeText}
           }
         }
       }
-      editor.doc.endBatchUpdate();
+      const updatePayload = {};
+      const deletedContainerIds = [];
+      for (let col = 0; col < tempGrid.colCount; col++) {
+        for (let row = 0; row < tempGrid.rowCount; row++) {
+          const tempCellData = tempGrid.getCell({ col, row });
+          const destCol = currentCol + col;
+          const destRow = currentRow + row;
+          const destIndex = { col: destCol, row: destRow };
+          const cell = grid.getCell(destIndex);
+          const containerId = cell.containerId;
+          if (!tempCellData.virtual) {
+            if (tempCellData.colSpan !== 1) {
+              updatePayload[`${containerId}_colSpan`] = tempCellData.colSpan;
+            }
+            if (tempCellData.rowSpan !== 1) {
+              updatePayload[`${containerId}_rowSpan`] = tempCellData.rowSpan;
+            }
+            if (tempCellData.background) {
+              updatePayload[`${containerId}_background`] = tempCellData.background;
+            }
+          } else {
+            deletedContainerIds.push(containerId);
+          }
+        }
+      }
+      const oldBlockData = editor.getBlockData(tableBlock);
+      if (deletedContainerIds.length > 0) {
+        deletedContainerIds.forEach((containerId) => {
+          oldBlockData.children = oldBlockData.children.filter((id) => id !== containerId);
+        });
+      }
+      const unsafeTableData = {
+        ...oldBlockData,
+        ...updatePayload
+      };
+      tableData2Grid(unsafeTableData);
       assert(logger$1V, lastContainer, "no last container");
       const lastBlock2 = getLastChildBlock(lastContainer);
       editor.selection.selectBlock(lastBlock2, getBlockTextLength$4(editor, lastBlock2));
+      const safetyTableData = unsafeTableData;
+      editor.updateBlockData(tableBlock, safetyTableData);
+      editor.doc.endBatchUpdate();
     });
   }
   const logger$1U = getLogger("paste-in-table-block");
@@ -55325,6 +55423,15 @@ $$${mathData.mathjaxText}$$
     return getTableSelectedContainers(editor, block, from, to);
   }
   const logger$1q = getLogger("table-selection-to-doc");
+  function getSelectedCellColors(blockData, selectedCellContainers) {
+    return selectedCellContainers.reduce((acc, containerId) => {
+      const existColorKey = getCellBkgColorKey(containerId);
+      if (blockData[existColorKey]) {
+        acc[existColorKey] = blockData[existColorKey];
+      }
+      return acc;
+    }, {});
+  }
   function selectionToDoc(editor, selectedBlock) {
     const { start, end, block } = selectedBlock;
     const blockType = getBlockType(block);
@@ -55401,6 +55508,7 @@ $$${mathData.mathjaxText}$$
     const colsWidth = getTableColumnWidths(getBlockTable(block)).slice(fromCol, toCol + 1);
     const id = genId();
     const type = blockType;
+    const selectedCellColors = getSelectedCellColors(blockData, children);
     const newBlock = {
       id,
       type,
@@ -55408,6 +55516,7 @@ $$${mathData.mathjaxText}$$
       colsWidth,
       rows: toRow - fromRow + 1,
       cols: toCol - fromCol + 1,
+      ...selectedCellColors,
       ...spanData
     };
     const newDoc = {
@@ -60232,9 +60341,12 @@ ${codeText}
     if (eleRect.width > width || eleRect.height >= MAX_HEIGHT_PIXEL) {
       return "";
     }
-    const orgDataUrl = await domToImage__default.default.toSvg(element);
-    const svgDataUrl = orgDataUrl.replace(/margin-block:.*?;/, "").replace(/margin:.*?;/, "");
-    return svgDataUrl;
+    const orgDataUrl = await domToImage__default.default.toPng(element, {
+      style: {
+        margin: 0
+      }
+    });
+    return orgDataUrl;
   }
   const logger$11 = getLogger("drag-preview-image");
   class DragPreviewImage {
@@ -77508,7 +77620,7 @@ ${data.flowchartText}
         }
       }
     });
-    editor.version = "1.1.31-beta.2";
+    editor.version = "1.1.31-beta.3";
     if (Logger$2.level === LogLevel.DEBUG) {
       window.setReauthFail = (fail) => {
         window.isReauthError = fail;
@@ -77550,61 +77662,54 @@ ${data.flowchartText}
       },
       shortcuts: [TableShortcuts, FindReplaceShortcuts, TextStyleShortcuts, DefaultShortcuts]
     });
-    try {
-      editor.editorCommandProviders.registerCommandProvider(new TextCommandProvider(editor));
-      editor.input.addHandler(new MarkdownInputHandler());
-      editor.input.addHandler(
-        new EnforceWithDocumentTitleHandler(editor, {
-          hideTitle: options.hideTitle,
-          headingLevel: 1,
-          titlePlaceholder: i18n$1.t("placeholder.common.title"),
-          contentPlaceholder: i18n$1.t("placeholder.common.content"),
-          readonlyTitlePlaceholder: i18n$1.t("placeholder.local.readonlyTitle"),
-          addPlaceholderToAllCurrentEmptyBlock: true
-        })
+    editor.editorCommandProviders.registerCommandProvider(new TextCommandProvider(editor));
+    editor.input.addHandler(new MarkdownInputHandler());
+    editor.input.addHandler(
+      new EnforceWithDocumentTitleHandler(editor, {
+        hideTitle: options.hideTitle,
+        headingLevel: 1,
+        titlePlaceholder: i18n$1.t("placeholder.common.title"),
+        contentPlaceholder: i18n$1.t("placeholder.common.content"),
+        readonlyTitlePlaceholder: i18n$1.t("placeholder.local.readonlyTitle"),
+        addPlaceholderToAllCurrentEmptyBlock: true
+      })
+    );
+    editor.input.addHandler(new OnesEditorQuickMenu(editor, (_h = options.componentsOptions) == null ? void 0 : _h.quickMenu));
+    editor.input.addHandler(new PasteSpecialHandler(editor));
+    editor.input.addHandler(new OnesEditorPasteHandler(editor));
+    editor.input.addHandler(new BlockLockerPasteHandler());
+    editor.input.addHandler(new ListPasteHandler());
+    editor.addCustom("block-menu", (editor2) => new OnesEditorBlockMenuButton(editor2));
+    if (!clientType.isMobile) {
+      editor.addCustom("editor-tooltip", () => new OnesEditorTooltip(editor));
+    }
+    editor.addCustom("image-paste-handler", () => new ImagePasteHandler(editor));
+    if (options == null ? void 0 : options.enableComments) {
+      editor.addCustom(
+        "editor-comments",
+        (editor2) => new OnesEditorComments(editor2, new LocalDocCommentsProvider(editor2, doc2))
       );
-      editor.input.addHandler(new OnesEditorQuickMenu(editor, (_h = options.componentsOptions) == null ? void 0 : _h.quickMenu));
-      editor.input.addHandler(new PasteSpecialHandler(editor));
-      editor.input.addHandler(new OnesEditorPasteHandler(editor));
-      editor.input.addHandler(new BlockLockerPasteHandler());
-      editor.input.addHandler(new ListPasteHandler());
-      editor.addCustom("block-menu", (editor2) => new OnesEditorBlockMenuButton(editor2));
-      if (!clientType.isMobile) {
-        editor.addCustom("editor-tooltip", () => new OnesEditorTooltip(editor));
-      }
-      editor.addCustom("image-paste-handler", () => new ImagePasteHandler(editor));
-      if (options == null ? void 0 : options.enableComments) {
-        editor.addCustom(
-          "editor-comments",
-          (editor2) => new OnesEditorComments(editor2, new LocalDocCommentsProvider(editor2, doc2))
-        );
-      }
-      if (options.enableContextMenu !== false) {
-        editor.addCustom("editor-context-menu", (editor2) => new OnesEditorContextMenu(editor2));
+    }
+    if (options.enableContextMenu !== false) {
+      editor.addCustom("editor-context-menu", (editor2) => new OnesEditorContextMenu(editor2));
+    }
+    editor.addCustom("heading-collapse", () => new HeadingBlockCollapseButton(editor));
+    editor.addListener("clickLink", (editor2, event, link2) => {
+      var _a2;
+      if ((_a2 = options == null ? void 0 : options.events) == null ? void 0 : _a2.onClickLink) {
+        options.events.onClickLink(editor2, event, link2);
+        return;
       }
-      editor.addCustom("heading-collapse", () => new HeadingBlockCollapseButton(editor));
-      editor.addListener("clickLink", (editor2, event, link2) => {
-        var _a2;
-        if ((_a2 = options == null ? void 0 : options.events) == null ? void 0 : _a2.onClickLink) {
-          options.events.onClickLink(editor2, event, link2);
-          return;
-        }
-        const href = link2.getAttribute("link");
-        if (href) {
-          if (editor2.readonly || event.ctrlKey || event.metaKey) {
-            window.open(href, "_blank");
-          }
+      const href = link2.getAttribute("link");
+      if (href) {
+        if (editor2.readonly || event.ctrlKey || event.metaKey) {
+          window.open(href, "_blank");
         }
-      });
-      editor.addCustom(DOC_RE_AUTH_KEYS, (editor2) => new DocReAuthCallbacks(editor2));
-      OnesEditorToolbar.register(editor);
-      editor.version = "1.1.31-beta.2";
-    } catch (error2) {
-      if (options.readonly) {
-        editor.readonly = true;
       }
-      throw error2;
-    }
+    });
+    editor.addCustom(DOC_RE_AUTH_KEYS, (editor2) => new DocReAuthCallbacks(editor2));
+    OnesEditorToolbar.register(editor);
+    editor.version = "1.1.31-beta.3";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {

package/dist/types.d.ts

@@ -99,5 +99,4 @@ export interface CreateLocalEditorOptions {
     events?: EditorEvents;
     componentsOptions?: EditorComponentOptions;
     hideTitle?: boolean;
-    readonly?: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ones-editor/editor",
-  "version": "1.1.31-beta.2",
+  "version": "1.1.31-beta.3",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",