@worktile/theia 3.0.0-next.4 → 3.0.0-next.5

package/bundles/worktile-theia.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('@angular/forms'), require('slate-angular'), require('ngx-tethys/core'), require('is-hotkey'), require('slate'), require('slate-history'), require('rxjs'), require('ngx-tethys/popover'), require('ngx-tethys/icon'), require('ngx-tethys/input'), require('@atinc/selene'), require('lodash'), require('@angular/cdk/overlay'), require('marked'), require('ngx-tethys/alert'), require('rxjs/operators'), require('ngx-tethys/uploader'), require('@angular/platform-browser'), require('ngx-tethys/progress'), require('ngx-tethys/nav'), require('ngx-tethys/tooltip'), require('ng-codemirror'), require('ngx-tethys/notify'), require('ngx-tethys/action-menu'), require('ngx-tethys/switch'), require('ngx-tethys/resizable'), require('is-url'), require('ngx-tethys/button'), require('ngx-tethys/form'), require('ngx-tethys/shared'), require('ngx-tethys'), require('@angular/cdk/coercion'), require('@angular/cdk/portal'), require('ngx-tethys/list'), require('ngx-tethys/autocomplete'), require('ngx-tethys/avatar'), require('ngx-tethys/select')) :
-    typeof define === 'function' && define.amd ? define('@worktile/theia', ['exports', '@angular/core', '@angular/common', '@angular/forms', 'slate-angular', 'ngx-tethys/core', 'is-hotkey', 'slate', 'slate-history', 'rxjs', 'ngx-tethys/popover', 'ngx-tethys/icon', 'ngx-tethys/input', '@atinc/selene', 'lodash', '@angular/cdk/overlay', 'marked', 'ngx-tethys/alert', 'rxjs/operators', 'ngx-tethys/uploader', '@angular/platform-browser', 'ngx-tethys/progress', 'ngx-tethys/nav', 'ngx-tethys/tooltip', 'ng-codemirror', 'ngx-tethys/notify', 'ngx-tethys/action-menu', 'ngx-tethys/switch', 'ngx-tethys/resizable', 'is-url', 'ngx-tethys/button', 'ngx-tethys/form', 'ngx-tethys/shared', 'ngx-tethys', '@angular/cdk/coercion', '@angular/cdk/portal', 'ngx-tethys/list', 'ngx-tethys/autocomplete', 'ngx-tethys/avatar', 'ngx-tethys/select'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.worktile = global.worktile || {}, global.worktile.theia = {}), global.ng.core, global.ng.common, global.ng.forms, global.i1, global.core, global.isHotkey, global.slate, global.slateHistory, global.rxjs, global.i1$1, global.i4, global.i5, global.selene, global._lodash, global.ng.cdk.overlay, global.marked, global.i1$2, global.rxjs.operators, global.uploader, global.ng.platformBrowser, global.i6, global.i3, global.i5$1, global.i8, global.i1$4, global.i2$1, global.i5$2, global.i9, global.isUrl, global.i1$5, global.i2$2, global.i5$3, global.i1$6, global.ng.cdk.coercion, global.ng.cdk.portal, global.i1$7, global.autocomplete, global.avatar, global.select));
-})(this, (function (exports, i0, i10, i4$1, i1, core, isHotkey, slate, slateHistory, rxjs, i1$1, i4, i5, selene, _lodash, i2, marked, i1$2, operators, uploader, i1$3, i6, i3, i5$1, i8, i1$4, i2$1, i5$2, i9, isUrl, i1$5, i2$2, i5$3, i1$6, coercion, portal, i1$7, autocomplete, avatar, select) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('@angular/forms'), require('slate-angular'), require('ngx-tethys/core'), require('is-hotkey'), require('slate'), require('slate-history'), require('rxjs'), require('ngx-tethys/popover'), require('ngx-tethys/icon'), require('ngx-tethys/input'), require('@atinc/selene'), require('lodash'), require('ngx-tethys/util'), require('@angular/cdk/overlay'), require('marked'), require('ngx-tethys/alert'), require('rxjs/operators'), require('ngx-tethys/uploader'), require('@angular/platform-browser'), require('ngx-tethys/progress'), require('ngx-tethys/nav'), require('ngx-tethys/tooltip'), require('ng-codemirror'), require('ngx-tethys/notify'), require('ngx-tethys/action-menu'), require('ngx-tethys/switch'), require('ngx-tethys/resizable'), require('is-url'), require('ngx-tethys/button'), require('ngx-tethys/form'), require('ngx-tethys/shared'), require('ngx-tethys'), require('@angular/cdk/coercion'), require('@angular/cdk/portal'), require('ngx-tethys/list'), require('ngx-tethys/autocomplete'), require('ngx-tethys/avatar'), require('ngx-tethys/select')) :
+    typeof define === 'function' && define.amd ? define('@worktile/theia', ['exports', '@angular/core', '@angular/common', '@angular/forms', 'slate-angular', 'ngx-tethys/core', 'is-hotkey', 'slate', 'slate-history', 'rxjs', 'ngx-tethys/popover', 'ngx-tethys/icon', 'ngx-tethys/input', '@atinc/selene', 'lodash', 'ngx-tethys/util', '@angular/cdk/overlay', 'marked', 'ngx-tethys/alert', 'rxjs/operators', 'ngx-tethys/uploader', '@angular/platform-browser', 'ngx-tethys/progress', 'ngx-tethys/nav', 'ngx-tethys/tooltip', 'ng-codemirror', 'ngx-tethys/notify', 'ngx-tethys/action-menu', 'ngx-tethys/switch', 'ngx-tethys/resizable', 'is-url', 'ngx-tethys/button', 'ngx-tethys/form', 'ngx-tethys/shared', 'ngx-tethys', '@angular/cdk/coercion', '@angular/cdk/portal', 'ngx-tethys/list', 'ngx-tethys/autocomplete', 'ngx-tethys/avatar', 'ngx-tethys/select'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.worktile = global.worktile || {}, global.worktile.theia = {}), global.ng.core, global.ng.common, global.ng.forms, global.i1, global.core, global.isHotkey, global.slate, global.slateHistory, global.rxjs, global.i1$1, global.i4, global.i5, global.selene, global._lodash, global.util, global.ng.cdk.overlay, global.marked, global.i1$2, global.rxjs.operators, global.uploader, global.ng.platformBrowser, global.i6, global.i3, global.i5$1, global.i8, global.i1$4, global.i2$1, global.i5$2, global.i9, global.isUrl, global.i1$5, global.i2$2, global.i5$3, global.i1$6, global.ng.cdk.coercion, global.ng.cdk.portal, global.i1$7, global.autocomplete, global.avatar, global.select));
+})(this, (function (exports, i0, i10, i4$1, i1, core, isHotkey, slate, slateHistory, rxjs, i1$1, i4, i5, selene, _lodash, util, i2, marked, i1$2, operators, uploader, i1$3, i6, i3, i5$1, i8, i1$4, i2$1, i5$2, i9, isUrl, i1$5, i2$2, i5$3, i1$6, coercion, portal, i1$7, autocomplete, avatar, select) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -1445,7 +1445,10 @@
                 newOptions[option] = _.union(options[option], override.options[option]);
                 continue;
             }
-            newOptions[option] = options[option];
+            if (util.isObject(options[option])) {
+                newOptions[option] = _.assign(options[option], override.options[option]);
+            }
+            newOptions[option] = override.options[option];
         }
         plugin.options = newOptions;
         return plugin;
@@ -2363,18 +2366,78 @@
         return parentEntry;
     };
 
-    var isTypesInParent = function (editor, types) {
-        if (!Array.isArray(types)) {
-            types = [types];
-        }
+    var getInsertElementsPath = function (editor, allowParentTypes) {
         var _a = __read(getBlockAbove(editor), 2), anchorPath = _a[1];
         if (!anchorPath)
             return false;
-        var parentEntry = slate.Editor.above(editor, { match: function (n) { return types.includes(n.type); } });
+        var parentEntry = slate.Editor.above(editor, { match: function (n) { return slate.Editor.isBlock(editor, n) && allowParentTypes.includes(n.type); } });
         if (!parentEntry)
             return false;
-        var _b = __read(parentEntry, 1), parentNode = _b[0];
-        return types.includes(parentNode.type);
+        var _b = __read(anchorBlockEntry(editor), 2), anchorBlockPath = _b[1];
+        var currentNodePath = anchorBlockPath.slice(0, parentEntry[1].length + 1);
+        var illegalParentEntry = null;
+        var _loop_1 = function () {
+            var _illegalParentEntry = parentEntry &&
+                slate.Editor.above(editor, {
+                    mode: 'lowest',
+                    at: parentEntry[1],
+                    match: function (n) { return n.type && !allowParentTypes.includes(n.type); }
+                });
+            if (_illegalParentEntry) {
+                var childType = editor.nestedStructureByKey[_illegalParentEntry[0].type];
+                if (!childType) {
+                    illegalParentEntry = _illegalParentEntry;
+                }
+                if (allowParentTypes.includes(childType)) {
+                    var rootKey_1 = findNestedStructureRootType(editor, _illegalParentEntry[0].type, '');
+                    parentEntry =
+                        parentEntry &&
+                            slate.Editor.above(editor, {
+                                mode: 'lowest',
+                                at: parentEntry[1],
+                                match: function (n) { return n.type && n.type === rootKey_1; }
+                            });
+                }
+                else {
+                    parentEntry = _illegalParentEntry;
+                }
+            }
+            else {
+                return "break";
+            }
+        };
+        // 循环获取最外层的不可插入节点
+        while (true) {
+            var state_1 = _loop_1();
+            if (state_1 === "break")
+                break;
+        }
+        // 获取不可插入节点的根层节点
+        if (illegalParentEntry) {
+            var rootKey_2 = findNestedStructureRootType(editor, illegalParentEntry[0].type, '');
+            if (rootKey_2 && illegalParentEntry[0].type !== rootKey_2) {
+                illegalParentEntry = slate.Editor.above(editor, {
+                    mode: 'lowest',
+                    at: parentEntry[1],
+                    match: function (n) { return n.type && n.type === rootKey_2; }
+                });
+            }
+            currentNodePath = illegalParentEntry && illegalParentEntry[1];
+        }
+        return currentNodePath && slate.Path.next(currentNodePath);
+    };
+    // 获取具有嵌套关系的根类型
+    var findNestedStructureRootType = function (editor, type, rootKey) {
+        var parentKey = _lodash__namespace.findKey(editor.nestedStructureByKey, function (value) {
+            return value === type;
+        });
+        if (parentKey) {
+            rootKey = parentKey;
+            return findNestedStructureRootType(editor, parentKey, rootKey);
+        }
+        else {
+            return rootKey || type;
+        }
     };
 
     var isContainNestedType = function (editor, types) {
@@ -2452,7 +2515,7 @@
         isBlockCardCursor: isBlockCardCursor,
         isEmptyParagraphByPath: isEmptyParagraphByPath,
         isContainer: isContainer,
-        isTypesInParent: isTypesInParent,
+        getInsertElementsPath: getInsertElementsPath,
         isContainNestedType: isContainNestedType,
         anchorBlock: anchorBlock,
         anchorBlockEntry: anchorBlockEntry,
@@ -2470,19 +2533,13 @@
         }
         var type = element.type;
         var allowParentTypes = ((_a = getPluginOptions(editor, type)) === null || _a === void 0 ? void 0 : _a.allowParentTypes) || [];
-        var isAllowInsert = isTypesInParent(editor, allowParentTypes);
+        var insertNodePath = getInsertElementsPath(editor, allowParentTypes);
         var _b = __read(anchorBlockEntry(editor), 2), anchorBlock = _b[0], anchorBlockPath = _b[1];
         var isEmpty = slate.Editor.isEmpty(editor, anchorBlock);
-        var isContainNested = isContainNestedType(editor, allowParentTypes);
-        if (isAllowInsert && isContainNested) {
-            var _c = __read(slate.Editor.above(editor, {
-                match: function (n) { return slate.Editor.isBlock(editor, n) && allowParentTypes.includes(n.type); },
-                at: editor.selection
-            }), 2), containerPath_1 = _c[1];
+        if (insertNodePath) {
             slate.Editor.withoutNormalizing(editor, function () {
-                var containerPathFirstPath = anchorBlockPath.slice(0, containerPath_1.length + 1);
-                slate.Transforms.insertNodes(editor, element, { at: slate.Path.next(containerPathFirstPath) });
-                slate.Transforms.select(editor, slate.Editor.start(editor, slate.Path.next(containerPathFirstPath)));
+                slate.Transforms.insertNodes(editor, element, { at: insertNodePath });
+                slate.Transforms.select(editor, slate.Editor.start(editor, insertNodePath));
                 if (isEmpty) {
                     slate.Transforms.removeNodes(editor, { at: anchorBlockPath });
                 }
@@ -4708,8 +4765,8 @@
             }
         ],
         nestedStructureByKey: (_c = {},
-            _c[exports.ElementKinds.bulletedList] = [exports.ElementKinds.listItem],
-            _c[exports.ElementKinds.numberedList] = [exports.ElementKinds.listItem],
+            _c[exports.ElementKinds.bulletedList] = exports.ElementKinds.listItem,
+            _c[exports.ElementKinds.numberedList] = exports.ElementKinds.listItem,
             _c),
         toolbarItems: [
             {
@@ -12046,8 +12103,8 @@
         key: exports.PluginKeys.table,
         withOverrides: withTable,
         nestedStructureByKey: (_a = {},
-            _a[exports.ElementKinds.table] = [exports.ElementKinds.tableRow],
-            _a[exports.ElementKinds.tableRow] = [exports.ElementKinds.tableCell],
+            _a[exports.ElementKinds.table] = exports.ElementKinds.tableRow,
+            _a[exports.ElementKinds.tableRow] = exports.ElementKinds.tableCell,
             _a),
         toolbarItems: [
             {