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

package/bundles/worktile-theia.umd.js

@@ -1448,10 +1448,9 @@
             if (util.isObject(options[option])) {
                 newOptions[option] = _.assign(options[option], override.options[option]);
             }
-            newOptions[option] = override.options[option];
+            newOptions[option] = override.options[option] ? override.options[option] : options[option];
         }
         plugin.options = newOptions;
-        return plugin;
     };
 
     var combinePlugins = function (editor) {
@@ -1470,7 +1469,7 @@
                 var newPlugins = _plugins.filter(function (p) { return plugin.overrideByKey[p.key]; });
                 newPlugins.forEach(function (p) {
                     if (editor.pluginsByKey[p.key]) {
-                        p = mergeOptions(p, plugin.overrideByKey[p.key]);
+                        mergeOptions(p, plugin.overrideByKey[p.key]);
                         editor.pluginsByKey[p.key] = _.defaultsDeep(p, plugin.overrideByKey[p.key]);
                     }
                 });
@@ -2526,19 +2525,19 @@
         someNode: someNode
     });
 
-    var insertElements = function (editor, element) {
+    var insertElements = function (editor, elements) {
         var _a;
         if (slate.Range.isExpanded(editor.selection)) {
             slate.Editor.deleteFragment(editor);
         }
-        var type = element.type;
+        var type = !util.isArray(elements) ? elements.type : elements[0].type; // 后期处理复制粘贴需要修改
         var allowParentTypes = ((_a = getPluginOptions(editor, type)) === null || _a === void 0 ? void 0 : _a.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);
         if (insertNodePath) {
             slate.Editor.withoutNormalizing(editor, function () {
-                slate.Transforms.insertNodes(editor, element, { at: insertNodePath });
+                slate.Transforms.insertNodes(editor, elements, { at: insertNodePath });
                 slate.Transforms.select(editor, slate.Editor.start(editor, insertNodePath));
                 if (isEmpty) {
                     slate.Transforms.removeNodes(editor, { at: anchorBlockPath });
@@ -2547,7 +2546,7 @@
             return;
         }
         var nextPath = slate.Path.next([anchorBlockPath[0]]);
-        slate.Transforms.insertNodes(editor, element, { at: nextPath });
+        slate.Transforms.insertNodes(editor, elements, { at: nextPath });
         if (isEmpty && anchorBlockPath.length === 1) {
             slate.Transforms.delete(editor, { at: anchorBlockPath });
             slate.Transforms.select(editor, slate.Editor.start(editor, anchorBlockPath));
@@ -3120,12 +3119,7 @@
                 finally { if (e_1) throw e_1.error; }
             }
             if (imageNodes.length > 0) {
-                var at = editor.selection;
-                slate.Transforms.insertNodes(editor, imageNodes, { at: at });
-                if (isCollapsed(editor.selection) && isEmptyParagraph(editor)) {
-                    slate.Transforms.removeNodes(editor, { at: at });
-                    slate.Transforms.select(editor, at);
-                }
+                insertElements(editor, imageNodes);
             }
         },
         verifyImage: function (editor, image) {