@worktile/theia 14.2.30 → 14.2.32

package/fesm2020/worktile-theia.mjs

@@ -76,7 +76,7 @@ const isGlobalCollapsed = (editor) => {
 class TheBaseElementComponent extends BaseElementComponent {
     onContextChange() {
         super.onContextChange();
-        if (this.selection) {
+        if (this.selection && this.editor && this.editor.isVoid(this.element)) {
             this.nativeElement.classList.add(`slate-selected-element`);
             if (this.isCollapsed && isGlobalCollapsed(this.editor)) {
                 this.nativeElement.classList.add(`slate-focus-element`);
@@ -936,9 +936,15 @@ const isEmptyParagraphElement = (editor, element) => {
     const isEmpty = isAncestorEmpty(editor, element);
     return isParagraph && isEmpty;
 };
-const isStrictEmptyParagraphElement = (editor, element) => {
+/**
+ * 判断元素是否是空段落，仅仅包含空格或者\n算空段落
+ * @param editor
+ * @param element
+ * @returns
+ */
+const isLogicEmptyParagraphElement = (editor, element) => {
     const text = Node.string(element).replace(/(\s|\n)*$/g, '');
-    return isEmptyParagraphElement(editor, element) && text.length === 0;
+    return text.length === 0 && !element.children.some(n => Editor.isInline(editor, n));
 };
 
 const isParagraph = (editor) => {
@@ -2455,7 +2461,7 @@ var index$1 = /*#__PURE__*/Object.freeze({
     isCollapsed: isCollapsed,
     isEmptyParagraph: isEmptyParagraph,
     isEmptyParagraphElement: isEmptyParagraphElement,
-    isStrictEmptyParagraphElement: isStrictEmptyParagraphElement,
+    isLogicEmptyParagraphElement: isLogicEmptyParagraphElement,
     isParagraph: isParagraph,
     isBlockActive: isBlockActive,
     isIncludeTypes: isIncludeTypes,
@@ -11547,7 +11553,7 @@ class TheTableToolbarComponent {
                     this.tableStore.setSelectedCellsBackgroundColor(newColor);
                 }
                 this.selectedColor = newColor;
-            });
+            }, 'bottomLeft', 4);
         });
     }
     setFullscreen(event) {
@@ -11687,7 +11693,7 @@ class TheTableContextMenuService {
                 },
                 deactiveHandle: (event) => {
                     if (event.relatedTarget instanceof HTMLElement) {
-                        if (event.relatedTarget.classList.contains('color-container')) {
+                        if (event.relatedTarget.classList.contains('color-select-container')) {
                             return;
                         }
                     }
@@ -14143,15 +14149,18 @@ const withTable = (editor) => {
         onChange();
         // adujst selection when selection is in hidden cell
         // just hook set_selection
-        const isCollapsed = editor.selection && Range.isCollapsed(editor.selection);
-        const isSelectionOperation = editor.operations.every(op => Operation.isSelectionOperation(op));
-        if (isCollapsed && isSelectionOperation) {
-            const opts = new TableOptions();
-            const tablePosition = TablePosition.create(opts, editor, editor.selection.anchor.path);
-            if (tablePosition.isInTable() && tablePosition.cell.hidden) {
-                TableEditor.selectOriginCell(editor, tablePosition.table, tablePosition.getRowIndex(), tablePosition.getColumnIndex(), false);
+        try {
+            const isCollapsed = editor.selection && Range.isCollapsed(editor.selection);
+            const isSelectionOperation = editor.operations.every(op => Operation.isSelectionOperation(op));
+            if (isCollapsed && isSelectionOperation) {
+                const opts = new TableOptions();
+                const tablePosition = TablePosition.create(opts, editor, editor.selection.anchor.path);
+                if (tablePosition.isInTable() && tablePosition.cell.hidden) {
+                    TableEditor.selectOriginCell(editor, tablePosition.table, tablePosition.getRowIndex(), tablePosition.getColumnIndex(), false);
+                }
             }
         }
+        catch (error) { }
     };
     return editor;
 };