@worktile/theia 19.1.5 → 19.1.7

package/components/listbox/listbox.d.ts

@@ -77,7 +77,7 @@ export declare class TheListboxDirective implements AfterContentInit {
     setPreviousLineActive(): void;
     enterNextGroup(): void;
     enterPreviousGroup(): void;
-    setActiveItem(previous: TheListboxOptionDirective | null, option: TheListboxOptionDirective, type: TheListboxChangeEventType): void;
+    setActiveItem(previous: TheListboxOptionDirective | null, option: TheListboxOptionDirective, type: TheListboxChangeEventType, triggerFrom?: 'mouse' | 'keyboard'): void;
     getOption(key: ThePluginMenuItemKey): TheListboxOptionDirective;
     clearActiveItem(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<TheListboxDirective, never>;

package/editor.component.d.ts

@@ -1,7 +1,8 @@
 import { ChangeDetectorRef, DestroyRef, ElementRef, EventEmitter, Injector, NgZone, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewContainerRef } from '@angular/core';
 import { ThyIconRegistry } from 'ngx-tethys/icon';
 import { Descendant, Editor, Element, NodeEntry, Range, Text } from 'slate';
-import { DOMRange, SlateError } from 'slate-angular';
+import { SlateError } from 'slate-angular';
+import { DOMRange } from 'slate-dom';
 import { TheTemplate, TheText, TheToolbarComponent } from './components';
 import { TheEditor, TheOptions, ThePresetConfig, ThePlugin, ToolbarEntity, DomEventDataInfo } from './interfaces';
 import { TheContextService } from './services/context.service';

package/fesm2022/worktile-theia.mjs

@@ -10,8 +10,9 @@ import { cloneDeep, map, assign, defaults, groupBy, uniq, isEqual } from 'lodash
 export { assign, cloneDeep, debounce, defaults, groupBy, isEqual, map, uniq } from 'lodash';
 import { Editor, Element, Span, Range, Path, Node, Point, Text, Transforms, Operation, createEditor } from 'slate';
 import * as i4 from 'slate-angular';
-import { FAKE_LEFT_BLOCK_CARD_OFFSET, FAKE_RIGHT_BLOCK_CARD_OFFSET, NODE_TO_PARENT, NODE_TO_INDEX, getClipboardData, AngularEditor, hotkeys, getPlainText as getPlainText$1, createClipboardData, setClipboardData, isClipboardWriteSupported, BaseElementComponent, IS_SAFARI, ELEMENT_TO_COMPONENT, NODE_TO_ELEMENT, BaseTextComponent, SlateModule, hasBlockCard, isCardLeft, SlateChildrenOutlet, EDITOR_TO_ELEMENT, defaultScrollSelectionIntoView, getDataTransferClipboard, withAngular } from 'slate-angular';
+import { FAKE_LEFT_BLOCK_CARD_OFFSET, FAKE_RIGHT_BLOCK_CARD_OFFSET, getClipboardData, AngularEditor, hotkeys, getPlainText as getPlainText$1, createClipboardData, setClipboardData, isClipboardWriteSupported, BaseElementComponent, IS_SAFARI, ELEMENT_TO_COMPONENT, BaseTextComponent, SlateModule, hasBlockCard, isCardLeft, SlateChildrenOutlet, defaultScrollSelectionIntoView, getDataTransferClipboard, withAngular } from 'slate-angular';
 import { HistoryEditor, withHistory } from 'slate-history';
+import { NODE_TO_PARENT, NODE_TO_INDEX, NODE_TO_ELEMENT, EDITOR_TO_ELEMENT } from 'slate-dom';
 import { TheiaConverter } from '@atinc/selene';
 import { isObject, isArray, isString, isUndefined } from 'ngx-tethys/util';
 import * as i1 from 'ngx-tethys/popover';
@@ -4324,12 +4325,15 @@ class TheListboxDirective {
         }
         this.setActiveItem(this.activeOption, groups[newGroupIndex].getLast(), 'turn');
     }
-    setActiveItem(previous, option, type) {
+    setActiveItem(previous, option, type, triggerFrom = 'keyboard') {
         if (previous) {
             previous.setActive(false);
         }
         option.setActive(true);
         this.activeOption = option;
+        if (triggerFrom === 'mouse' && type === 'turn') {
+            return;
+        }
         this.theListboxChange.emit({ option, type });
     }
     getOption(key) {
@@ -7988,7 +7992,7 @@ class ThePluginMenuComponent {
         if (listBox) {
             const activeOption = listBox.activeOption;
             const newActiveOption = listBox.getOption(menu?.key);
-            listBox.setActiveItem(activeOption, newActiveOption, 'turn');
+            listBox.setActiveItem(activeOption, newActiveOption, 'turn', 'mouse');
         }
     }
     listBoxOptionMouseleave(e, menu) {
@@ -8469,12 +8473,12 @@ const closeConversionHint = (editor) => {
     }
 };
 const withDeserializeMd = (editor) => {
-    const { insertFragmentData, onKeydown } = editor;
+    const { customInsertFragmentData, onKeydown } = editor;
     editor.onKeydown = (event) => {
         closeConversionHint(editor);
         onKeydown(event);
     };
-    editor.insertFragmentData = async (data) => {
+    editor.customInsertFragmentData = async (data) => {
         const popover = editor.injector.get(ThyPopover);
         const viewContainerRef = editor.injector.get(ViewContainerRef);
         const cdr = editor.injector.get(ChangeDetectorRef);
@@ -8545,7 +8549,7 @@ const withDeserializeMd = (editor) => {
                 cdr.markForCheck();
             });
         }
-        return insertFragmentData(data);
+        return customInsertFragmentData(data);
     };
     return editor;
 };
@@ -10394,8 +10398,8 @@ const createTheHistoryPlugin = createPluginFactory({
 });
 
 const withInsertDataByInvalidType = (editor) => {
-    const { insertFragmentData } = editor;
-    editor.insertFragmentData = async (data) => {
+    const { customInsertFragmentData } = editor;
+    editor.customInsertFragmentData = async (data) => {
         const fragment = await extractFragment(data);
         if (fragment) {
             const isContinue = insertDataByInvalidType(editor, fragment);
@@ -10403,7 +10407,7 @@ const withInsertDataByInvalidType = (editor) => {
                 return true;
             }
         }
-        return insertFragmentData(data);
+        return customInsertFragmentData(data);
     };
     return editor;
 };
@@ -10425,7 +10429,7 @@ const withMoveSelection = (editor) => {
     editor.onClick = (event) => {
         const domSelection = window.getSelection();
         if (domSelection && !domSelection.isCollapsed && event.detail >= 2 && editor.selection) {
-            const slateSelection = AngularEditor.toSlateRange(editor, domSelection);
+            const slateSelection = AngularEditor.toSlateRange(editor, domSelection, { exactMatch: false, suppressThrow: false });
             const isNextStart = slateSelection.focus.offset === 0;
             if (Range.isExpanded(slateSelection) && Range.isForward(slateSelection) && isNextStart) {
                 const beforePoint = Editor.before(editor, slateSelection.focus);
@@ -10655,24 +10659,24 @@ const createResetTypePlugin = createPluginFactory({
 });
 
 const withDeserializeHTML = (editor) => {
-    const { insertFragmentData } = editor;
-    editor.insertFragmentData = async (data) => {
+    const { customInsertFragmentData } = editor;
+    editor.customInsertFragmentData = async (data) => {
         const clipboardData = await getClipboardData(data);
         if (!clipboardData?.elements && clipboardData?.html) {
             const htmlDom = new DOMParser().parseFromString(clipboardData?.html, 'text/html');
             const fragment = TheiaConverter.convertToTheia(Array.from(htmlDom.body.children));
             // 识别粘贴的 HTML 只有纯链接, 跳至 link
             if (fragment.length === 1 && fragment.every(block => isUrl(block?.children?.[0]?.['text']))) {
-                return insertFragmentData(data);
+                return customInsertFragmentData(data);
             }
             // 无法识别HTML内容时后退一下：识别纯文本
             if (fragment.every(block => block.type === ElementKinds.paragraph && isLogicEmptyParagraphElement(editor, block))) {
-                return insertFragmentData(data);
+                return customInsertFragmentData(data);
             }
             // 识出纯图片并且粘贴板中存在文件则不进行处理, hook 直接右键复制图片的场景，流转到上传图片流程
             // 后续需要做识别html图片后自动上传处理
             if (fragment.length === 1 && fragment[0].type === ElementKinds.image && data.files.length > 0) {
-                return insertFragmentData(data);
+                return customInsertFragmentData(data);
             }
             // 过滤 text 节点的 color/background-color 属性
             fragment.forEach(node => filterTextFormat(node));
@@ -10696,7 +10700,7 @@ const withDeserializeHTML = (editor) => {
             Transforms.insertFragment(editor, fragment);
             return true;
         }
-        return insertFragmentData(data);
+        return customInsertFragmentData(data);
     };
     return editor;
 };
@@ -10810,7 +10814,7 @@ const cleanHeadingEffect = (editor, path) => {
     }
 };
 const withHeading = (editor) => {
-    const { insertBreak, isVisible, apply, deleteBackward, onClick } = editor;
+    const { insertBreak, isVisible, apply, deleteBackward, mousedown } = editor;
     editor.apply = operation => {
         try {
             if (operation.type === 'merge_node' && operation.path.length === 1) {
@@ -10926,7 +10930,7 @@ const withHeading = (editor) => {
         }
         return isVisible(node);
     };
-    editor.onClick = (event) => {
+    editor.mousedown = (event) => {
         const target = event.target;
         if (target instanceof HTMLElement && target.classList.contains('slate-editable-container')) {
             const index = editor.children.length - 1;
@@ -10935,6 +10939,7 @@ const withHeading = (editor) => {
                 const path = [index];
                 const collapsedStandardHeadings = getCollapsedStandardHeadingAbove(editor, path);
                 if (collapsedStandardHeadings.length > 0) {
+                    event.preventDefault();
                     const headingPath = collapsedStandardHeadings[collapsedStandardHeadings.length - 1];
                     const headingNode = editor.children[headingPath[0]];
                     const dom = AngularEditor.toDOMNode(editor, headingNode);
@@ -10951,10 +10956,13 @@ const withHeading = (editor) => {
                             Transforms.insertNodes(editor, createEmptyParagraph(), { at: [index + 1] });
                             Transforms.select(editor, [index + 1]);
                         }
+                        AngularEditor.focus(editor);
                     }
                 }
+                return;
             }
         }
+        mousedown(event);
     };
     return editor;
 };
@@ -11581,11 +11589,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.14", ngImpo
             }] } });
 
 const withImage = (editor) => {
-    const { insertFragmentData, isVoid, renderElement, isBlockCard, mousedown } = editor;
+    const { customInsertFragmentData, isVoid, renderElement, isBlockCard, mousedown } = editor;
     editor.isVoid = (element) => {
         return element.type === ElementKinds.image || isVoid(element);
     };
-    editor.insertFragmentData = async (data) => {
+    editor.customInsertFragmentData = async (data) => {
         const clipboardData = await getClipboardData(data);
         if (clipboardData?.files?.length) {
             const imageFiles = [];
@@ -11600,7 +11608,7 @@ const withImage = (editor) => {
                 return true;
             }
         }
-        return insertFragmentData(data);
+        return customInsertFragmentData(data);
     };
     editor.renderElement = (element) => {
         if (element.type === ElementKinds.image) {
@@ -12148,7 +12156,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.14", ngImpo
             }] } });
 
 const withLink = (editor) => {
-    const { insertText, isInline, insertFragmentData, renderElement } = editor;
+    const { insertText, isInline, customInsertFragmentData, renderElement } = editor;
     editor.isInline = (element) => {
         return element.type === ElementKinds.link ? true : isInline(element);
     };
@@ -12161,7 +12169,7 @@ const withLink = (editor) => {
             insertText(text);
         }
     };
-    editor.insertFragmentData = async (data) => {
+    editor.customInsertFragmentData = async (data) => {
         const clipboardData = await getClipboardData(data);
         const text = clipboardData?.text;
         if (!clipboardData?.elements && text && isUrl(text)) {
@@ -12182,7 +12190,7 @@ const withLink = (editor) => {
                 return true;
             }
         }
-        return insertFragmentData(data);
+        return customInsertFragmentData(data);
     };
     editor.renderElement = (element) => {
         if (element.type === ElementKinds.link) {
@@ -12939,7 +12947,7 @@ const unwrapList = (editor) => {
 };
 
 const withList = (editor) => {
-    const { insertBreak, deleteBackward, onKeydown, insertFragmentData, setFragmentData, renderElement } = editor;
+    const { insertBreak, deleteBackward, onKeydown, customInsertFragmentData, setFragmentData, renderElement } = editor;
     const validLiChildrenTypes = getPluginOptions(editor, PluginKeys.list)?.validLiChildrenTypes ?? [];
     const resetBlockTypesListRule = {
         types: [ElementKinds.listItem],
@@ -13106,7 +13114,7 @@ const withList = (editor) => {
         }
         deleteBackward(unit);
     };
-    editor.insertFragmentData = async (data) => {
+    editor.customInsertFragmentData = async (data) => {
         const fragment = await extractFragment(data);
         if (fragment) {
             const aboveEntry = Editor.above(editor, {
@@ -13122,7 +13130,7 @@ const withList = (editor) => {
                 return true;
             }
         }
-        return insertFragmentData(data);
+        return customInsertFragmentData(data);
     };
     editor.onKeydown = (event) => {
         const isContinue = !onKeyDownList(event, editor);
@@ -14095,7 +14103,7 @@ class TableStore {
     }
     selectCellOngoing(cell, editor, event) {
         const pos = createTablePosition(editor);
-        if (AngularEditor.isReadonly(editor) || !editor.selection || !pos?.table) {
+        if (AngularEditor.isReadOnly(editor) || !editor.selection || !pos?.table) {
             return;
         }
         let isChanged;
@@ -14259,7 +14267,7 @@ class TableStore {
      * @param cellElement 单元格元素
      */
     setAreaSelectionCells(cellElement, event) {
-        if (AngularEditor.isReadonly(this.editor) || !this.editor.selection || !this.isPrepareSelecting) {
+        if (AngularEditor.isReadOnly(this.editor) || !this.editor.selection || !this.isPrepareSelecting) {
             return;
         }
         const currentCellPath = AngularEditor.findPath(this.editor, cellElement);
@@ -14998,7 +15006,7 @@ class TableService {
      * @param editor 编辑器对象
      */
     selectStartPreventDefault(e) {
-        const isReadonly = AngularEditor.isReadonly(this.tableStore.editor);
+        const isReadonly = AngularEditor.isReadOnly(this.tableStore.editor);
         const cells = this.tableStore.getSelectedCellPositions();
         if (!isReadonly && e.shiftKey && cells.length > 1) {
             e.preventDefault();
@@ -16877,7 +16885,7 @@ const normalizeTable = (table) => {
 };
 
 const withTable = (editor) => {
-    const { deleteBackward, deleteForward, onKeydown, setFragmentData, insertFragmentData, normalizeNode, isBlockCard, renderElement, deleteCutData, isContainer, onChange, onClick, mousedown } = editor;
+    const { deleteBackward, deleteForward, onKeydown, setFragmentData, customInsertFragmentData, normalizeNode, isBlockCard, renderElement, deleteCutData, isContainer, onChange, onClick, mousedown } = editor;
     editor.deleteBackward = unit => {
         const opts = new TableOptions();
         if (!isSelectionInTable(opts, editor)) {
@@ -16915,7 +16923,7 @@ const withTable = (editor) => {
             const isMergedCell = isSelectedCellMerged(editor);
             const domSelection = window.getSelection();
             if (domSelection && !domSelection.isCollapsed && editor.selection) {
-                const slateSelection = AngularEditor.toSlateRange(editor, domSelection);
+                const slateSelection = AngularEditor.toSlateRange(editor, domSelection, { exactMatch: false, suppressThrow: false });
                 const opts = new TableOptions();
                 const startPosition = TablePosition.create(opts, editor, slateSelection.anchor.path);
                 const endPosition = TablePosition.create(opts, editor, slateSelection.focus.path);
@@ -17130,7 +17138,7 @@ const withTable = (editor) => {
         }
         setFragmentData(data, originEvent);
     };
-    editor.insertFragmentData = async (data) => {
+    editor.customInsertFragmentData = async (data) => {
         const fragment = await extractFragment(data);
         if (fragment) {
             const opts = new TableOptions();
@@ -17203,9 +17211,9 @@ const withTable = (editor) => {
                     });
                 });
             }
-            return insertFragmentData(data);
+            return customInsertFragmentData(data);
         }
-        return insertFragmentData(data);
+        return customInsertFragmentData(data);
     };
     editor.normalizeNode = ([node, path]) => {
         if (Element.isElement(node) && node.type === ElementKinds.table) {