@worktile/theia 3.0.0-next.2 → 3.0.0-next.3

package/bundles/worktile-theia.umd.js

@@ -1415,24 +1415,7 @@
                 p.options = {};
             if (!p.nestedStructureByKey)
                 p.nestedStructureByKey = {};
-            // 如果有 key 重复则进行覆盖
-            for (var key in p.nestedStructureByKey) {
-                if (!editor.nestedStructureByKey[key]) {
-                    editor.nestedStructureByKey[key] = p.nestedStructureByKey[key];
-                }
-            }
-            if (!editor.pluginsByKey[p.key]) {
-                editor.plugins.push(p);
-                editor.pluginsByKey[p.key] = p;
-            }
-            else {
-                var index = editor.plugins.indexOf(editor.pluginsByKey[p.key]);
-                var mergedPlugin = _.defaultsDeep(p, editor.pluginsByKey[p.key]);
-                if (index >= 0) {
-                    editor.plugins[index] = mergedPlugin;
-                }
-                editor.pluginsByKey[p.key] = mergedPlugin;
-            }
+            editor.plugins.push(p);
             flattenDeepPlugins(editor, p.plugins);
         });
     };
@@ -1442,7 +1425,7 @@
         return (_a = editor === null || editor === void 0 ? void 0 : editor.plugins) !== null && _a !== void 0 ? _a : [];
     };
 
-    var getPluginsByKey = function (editor) {
+    var getPluginByKey = function (editor) {
         var plugins = {};
         if (editor === null || editor === void 0 ? void 0 : editor.pluginsByKey) {
             return editor.pluginsByKey;
@@ -1450,7 +1433,7 @@
         return plugins;
     };
 
-    var getPlugin = function (editor, key) { return getPluginsByKey(editor)[key]; };
+    var getPlugin = function (editor, key) { return getPluginByKey(editor)[key]; };
 
     var getPluginOptions = function (editor, key) { var _a; return (_a = getPlugin(editor, key).options) !== null && _a !== void 0 ? _a : {}; };
 
@@ -1468,30 +1451,165 @@
         return plugin;
     };
 
-    /**
-     * 将每个 plugin 从 `overrideByKey` 递归深度合并到具有相同 key 的 plugin（plugin > plugin.plugins）。
-     */
-    var overridePluginsByKey = function (plugin, overrideByKey, nested) {
-        if (overrideByKey === void 0) { overrideByKey = {}; }
-        if (overrideByKey[plugin.key]) {
-            plugin = mergeOptions(plugin, overrideByKey[plugin.key]);
-            var _a = overrideByKey[plugin.key], pluginOverridesPlugins = _a.plugins, pluginOverrides = __rest(_a, ["plugins"]);
-            plugin = _.defaultsDeep(pluginOverrides, plugin);
-            if (!nested) {
-                pluginOverridesPlugins === null || pluginOverridesPlugins === void 0 ? void 0 : pluginOverridesPlugins.forEach(function (pOverrides) {
-                    if (!plugin.plugins)
-                        plugin.plugins = [];
-                    var found = plugin.plugins.find(function (p) { return p.key === pOverrides.key; });
-                    if (!found)
-                        plugin.plugins.push(pOverrides);
+    var combinePlugins = function (editor) {
+        // withOverrides
+        editor.plugins.forEach(function (plugin) {
+            if (plugin.withOverrides) {
+                editor = plugin.withOverrides(editor, plugin);
+            }
+        });
+        return editor;
+    };
+
+    var mergeDeepPlugins = function (editor, _plugins) {
+        _plugins.forEach(function (plugin) {
+            if (plugin.overrideByKey) {
+                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]);
+                        editor.pluginsByKey[p.key] = _.defaultsDeep(p, plugin.overrideByKey[p.key]);
+                    }
                 });
             }
+        });
+    };
+
+    var nestedStructureByKey = function (editor, plugins) {
+        // 如果有 key 重复则进行覆盖
+        plugins.forEach(function (p) {
+            for (var key in p.nestedStructureByKey) {
+                if (!editor.nestedStructureByKey[key]) {
+                    editor.nestedStructureByKey[key] = p.nestedStructureByKey[key];
+                }
+            }
+        });
+    };
+
+    var pluginsByKey = function (editor, plugins) {
+        if (!plugins)
+            return;
+        plugins.forEach(function (p) {
+            if (!editor.pluginsByKey[p.key]) {
+                editor.pluginsByKey[p.key] = p;
+            }
+        });
+    };
+
+    var withTheia = function (editor, plugins) {
+        if (plugins === void 0) { plugins = []; }
+        var e = editor;
+        e.renderElement = function (element) { return null; };
+        e.renderLeaf = function (text) { return null; };
+        e.isContainer = function (value) { return false; };
+        e.extraElementOptions = [];
+        e.disabled = false;
+        e.plugins = [];
+        e.pluginsByKey = {};
+        e.nestedStructureByKey = {};
+        // withOverridesByKey
+        flattenDeepPlugins(e, plugins);
+        // mount pluginsByKey
+        pluginsByKey(e, plugins);
+        // mount nestedStructureByKey
+        nestedStructureByKey(e, e.plugins);
+        // merge plugin to pluginByKey
+        mergeDeepPlugins(e, e.plugins);
+        e = combinePlugins(e);
+        return e;
+    };
+
+    var createPluginFactory = function (defaultPlugin) { return function (override, overrideByKey) {
+        if (overrideByKey === void 0) { overrideByKey = {}; }
+        return defaultPlugin;
+    }; };
+
+    var toolbarInitialize = function (toolbarItems, global, inline, quick) {
+        if (global === void 0) { global = DefaultGlobalToolbarDefinition; }
+        if (inline === void 0) { inline = DefaultInlineToolbarDefinition; }
+        if (quick === void 0) { quick = DefaultQuickToolbarDefinition; }
+        var toolbarDefinition = {
+            global: global,
+            inline: inline,
+            quick: quick
+        };
+        var toolbarOperations = new Map();
+        toolbarItems.forEach(function (i) { return toolbarOperations.set(i.key, i); });
+        var toolbarEntity = nextToolbarEntity(toolbarDefinition, toolbarOperations);
+        return {
+            toolbarDefinition: toolbarDefinition,
+            toolbarOperations: toolbarOperations,
+            toolbarEntity: toolbarEntity
+        };
+    };
+    var nextToolbarEntity = function (toolbarDefinition, toolbarItems) {
+        var entity = {};
+        for (var defKey in toolbarDefinition) {
+            entity[defKey] = getToolbarItemByKeys(toolbarDefinition[defKey], toolbarItems);
         }
-        if (plugin.plugins) {
-            plugin.plugins = plugin.plugins.map(function (p) { return overridePluginsByKey(p, overrideByKey, true); });
+        return entity;
+    };
+    var getToolbarItemByKeys = function (keys, toolbarItems) {
+        var items = [];
+        keys.forEach(function (key) {
+            if (key === "split") {
+                items.push({ key: "split" });
+                return;
+            }
+            var item = toolbarItems.get(key);
+            if (item && item.includes) {
+                items.push(Object.assign(Object.assign({}, item), { includes: getToolbarItemByKeys(item.includes, toolbarItems) }));
+                return;
+            }
+            if (item) {
+                items.push(item);
+            }
+        });
+        return items;
+    };
+    var createToolbar = function (editor, toolbar) {
+        var toolbarItems = editor === null || editor === void 0 ? void 0 : editor.plugins.reduce(function (prevItems, nextPlugin) {
+            var _a;
+            prevItems.push.apply(prevItems, __spreadArray([], __read(((_a = nextPlugin === null || nextPlugin === void 0 ? void 0 : nextPlugin.toolbarItems) !== null && _a !== void 0 ? _a : []))));
+            return prevItems;
+        }, []);
+        var toolbarOption = toolbarInitialize(toolbarItems, toolbar === null || toolbar === void 0 ? void 0 : toolbar.global, toolbar === null || toolbar === void 0 ? void 0 : toolbar.inline, toolbar === null || toolbar === void 0 ? void 0 : toolbar.quick);
+        var globalToolbarClass = ['the-global-toolbar', getToolbarClass(editor)];
+        var toolbarEntity = toolbarOption.toolbarEntity;
+        return {
+            globalToolbarClass: globalToolbarClass,
+            toolbarEntity: toolbarEntity
+        };
+    };
+
+    var UNDOING = new WeakMap();
+    var REDOING = new WeakMap();
+    var withTheHistory = function (editor) {
+        var undo = editor.undo, redo = editor.redo;
+        editor.undo = function () {
+            UNDOING.set(editor, true);
+            undo();
+            UNDOING.set(editor, false);
+        };
+        editor.redo = function () {
+            REDOING.set(editor, true);
+            redo();
+            REDOING.set(editor, false);
+        };
+        return editor;
+    };
+    var TheHistoryEditor = {
+        isUndoing: function (editor) {
+            return UNDOING.get(editor);
+        },
+        isRedoing: function (editor) {
+            return REDOING.get(editor);
         }
-        return plugin;
     };
+    var createTheHistoryPlugin = createPluginFactory({
+        key: exports.PluginKeys.theHistory,
+        withOverrides: withTheHistory
+    });
 
     var setMarks = function (editor, marks, at) {
         slate.Transforms.setNodes(editor, marks, {
@@ -1521,8 +1639,6 @@
         }
     };
 
-    var insertElement = function (editor, element) { return editor.insertElement(element); };
-
     var isAncestor = function (node) { return slate.Element.isElement(node) || slate.Editor.isEditor(node); };
 
     var getLastChild$1 = function (node, level) {
@@ -2347,7 +2463,7 @@
         someNode: someNode
     });
 
-    var insertElementNext = function (editor, element) {
+    var insertElements = function (editor, element) {
         var _a;
         if (slate.Range.isExpanded(editor.selection)) {
             slate.Editor.deleteFragment(editor);
@@ -2575,8 +2691,7 @@
         __proto__: null,
         setMarks: setMarks,
         clearMarks: clearMarks,
-        insertElement: insertElement,
-        insertElementNext: insertElementNext,
+        insertElements: insertElements,
         insertParagraph: insertParagraph,
         setNode: setNode,
         unwrapNodesByType: unwrapNodesByType,
@@ -2593,134 +2708,6 @@
         handleContinualInsertBreak: handleContinualInsertBreak
     });
 
-    var withTheia = function (editor, plugins) {
-        if (plugins === void 0) { plugins = []; }
-        var e = editor;
-        e.renderElement = function (element) { return null; };
-        e.renderLeaf = function (text) { return null; };
-        e.insertElement = function (element) { return insertElementNext(e, element); };
-        e.isContainer = function (value) { return false; };
-        e.extraElementOptions = [];
-        e.disabled = false;
-        e.plugins = [];
-        e.pluginsByKey = {};
-        e.nestedStructureByKey = {};
-        // withOverridesByKey
-        flattenDeepPlugins(e, plugins);
-        // 如果 plugin.overrideByKey 存在，则把 plugin.overrideByKey 中的所有 key 覆盖到 editor.pluginsByKey 中
-        editor.plugins.forEach(function (plugin) {
-            if (plugin.overrideByKey) {
-                var newPlugins = editor.plugins.map(function (p) {
-                    return overridePluginsByKey(p, plugin.overrideByKey);
-                });
-                editor.plugins = [];
-                editor.pluginsByKey = {};
-                // 再次扁平化覆盖
-                flattenDeepPlugins(editor, newPlugins);
-            }
-        });
-        // withOverrides
-        e.plugins.forEach(function (plugin) {
-            if (plugin.withOverrides) {
-                e = plugin.withOverrides(e, plugin);
-            }
-        });
-        return e;
-    };
-
-    var createPluginFactory = function (defaultPlugin) { return function (override, overrideByKey) {
-        if (overrideByKey === void 0) { overrideByKey = {}; }
-        overrideByKey[defaultPlugin.key] = override;
-        return overridePluginsByKey(Object.assign({}, defaultPlugin), overrideByKey);
-    }; };
-
-    var toolbarInitialize = function (toolbarItems, global, inline, quick) {
-        if (global === void 0) { global = DefaultGlobalToolbarDefinition; }
-        if (inline === void 0) { inline = DefaultInlineToolbarDefinition; }
-        if (quick === void 0) { quick = DefaultQuickToolbarDefinition; }
-        var toolbarDefinition = {
-            global: global,
-            inline: inline,
-            quick: quick
-        };
-        var toolbarOperations = new Map();
-        toolbarItems.forEach(function (i) { return toolbarOperations.set(i.key, i); });
-        var toolbarEntity = nextToolbarEntity(toolbarDefinition, toolbarOperations);
-        return {
-            toolbarDefinition: toolbarDefinition,
-            toolbarOperations: toolbarOperations,
-            toolbarEntity: toolbarEntity
-        };
-    };
-    var nextToolbarEntity = function (toolbarDefinition, toolbarItems) {
-        var entity = {};
-        for (var defKey in toolbarDefinition) {
-            entity[defKey] = getToolbarItemByKeys(toolbarDefinition[defKey], toolbarItems);
-        }
-        return entity;
-    };
-    var getToolbarItemByKeys = function (keys, toolbarItems) {
-        var items = [];
-        keys.forEach(function (key) {
-            if (key === "split") {
-                items.push({ key: "split" });
-                return;
-            }
-            var item = toolbarItems.get(key);
-            if (item && item.includes) {
-                items.push(Object.assign(Object.assign({}, item), { includes: getToolbarItemByKeys(item.includes, toolbarItems) }));
-                return;
-            }
-            if (item) {
-                items.push(item);
-            }
-        });
-        return items;
-    };
-    var createToolbar = function (editor, toolbar) {
-        var toolbarItems = editor === null || editor === void 0 ? void 0 : editor.plugins.reduce(function (prevItems, nextPlugin) {
-            var _a;
-            prevItems.push.apply(prevItems, __spreadArray([], __read(((_a = nextPlugin === null || nextPlugin === void 0 ? void 0 : nextPlugin.toolbarItems) !== null && _a !== void 0 ? _a : []))));
-            return prevItems;
-        }, []);
-        var toolbarOption = toolbarInitialize(toolbarItems, toolbar === null || toolbar === void 0 ? void 0 : toolbar.global, toolbar === null || toolbar === void 0 ? void 0 : toolbar.inline, toolbar === null || toolbar === void 0 ? void 0 : toolbar.quick);
-        var globalToolbarClass = ['the-global-toolbar', getToolbarClass(editor)];
-        var toolbarEntity = toolbarOption.toolbarEntity;
-        return {
-            globalToolbarClass: globalToolbarClass,
-            toolbarEntity: toolbarEntity
-        };
-    };
-
-    var UNDOING = new WeakMap();
-    var REDOING = new WeakMap();
-    var withTheHistory = function (editor) {
-        var undo = editor.undo, redo = editor.redo;
-        editor.undo = function () {
-            UNDOING.set(editor, true);
-            undo();
-            UNDOING.set(editor, false);
-        };
-        editor.redo = function () {
-            REDOING.set(editor, true);
-            redo();
-            REDOING.set(editor, false);
-        };
-        return editor;
-    };
-    var TheHistoryEditor = {
-        isUndoing: function (editor) {
-            return UNDOING.get(editor);
-        },
-        isRedoing: function (editor) {
-            return REDOING.get(editor);
-        }
-    };
-    var createTheHistoryPlugin = createPluginFactory({
-        key: exports.PluginKeys.theHistory,
-        withOverrides: withTheHistory
-    });
-
     var TheConversionHintComponent = /** @class */ (function () {
         function TheConversionHintComponent() {
             this.duration = 10000;
@@ -4410,7 +4397,6 @@
                 }
                 // wrap
                 ListEditor.buildListItem(editor);
-                // Todo: types
                 slate.Transforms.wrapNodes(editor, { type: type, children: [], start: startIndex }, {
                     at: editor.selection,
                     match: function (node) { return slate.Element.isElement(node) && node.type === exports.ElementKinds.listItem; }
@@ -4925,7 +4911,7 @@
 
     var HrEditor = {
         insertHr: function (editor) {
-            insertElement(editor, { type: exports.ElementKinds.hr, children: [{ text: '' }] });
+            insertElements(editor, { type: exports.ElementKinds.hr, children: [{ text: '' }] });
         }
     };
 
@@ -5545,7 +5531,7 @@
         }
         // Create the table node
         var table = createTable(opts, columns, rows, getCellContent);
-        insertElement(editor, table);
+        insertElements(editor, table);
     }
 
     /**
@@ -6416,13 +6402,13 @@
 
     var BlockquoteEditor = {
         toggleBlockquote: function (editor) {
+            var _a;
             var isActive = isBlockActive(editor, exports.ElementKinds.blockquote);
+            var allowParentTypes = ((_a = getPluginOptions(editor, exports.PluginKeys.blockquote)) === null || _a === void 0 ? void 0 : _a.allowParentTypes) || [];
             if (!isActive) {
-                var blockquoteElement = {
-                    type: exports.ElementKinds.blockquote,
-                    children: [createEmptyParagraph()]
-                };
-                insertElement(editor, blockquoteElement);
+                slate.Transforms.wrapNodes(editor, { type: exports.ElementKinds.blockquote, children: [] }, {
+                    mode: 'lowest'
+                });
             }
             else {
                 slate.Transforms.unwrapNodes(editor, { match: function (n) { return slate.Element.isElement(n) && n.type === exports.ElementKinds.blockquote; } });
@@ -6510,7 +6496,7 @@
                     language: DEFAULT_LANGUAGE.value,
                     children: [{ text: '' }]
                 };
-                insertElement(editor, codeElement);
+                insertElements(editor, codeElement);
             }
             else {
                 var codeElement = {
@@ -6519,7 +6505,7 @@
                     language: DEFAULT_LANGUAGE.value,
                     children: [{ text: '' }]
                 };
-                insertElement(editor, codeElement);
+                insertElements(editor, codeElement);
             }
         }
     };
@@ -14873,6 +14859,7 @@
     exports.autoFocus = autoFocus;
     exports.autoScrollViewHandle = autoScrollViewHandle;
     exports.coercePixelsFromCssValue = coercePixelsFromCssValue;
+    exports.combinePlugins = combinePlugins;
     exports.createEmptyParagraph = createEmptyParagraph;
     exports.createPluginFactory = createPluginFactory;
     exports.createToolbar = createToolbar;
@@ -14890,9 +14877,9 @@
     exports.getElementWidth = getElementWidth;
     exports.getEndBlock = getEndBlock;
     exports.getPlugin = getPlugin;
+    exports.getPluginByKey = getPluginByKey;
     exports.getPluginOptions = getPluginOptions;
     exports.getPlugins = getPlugins;
-    exports.getPluginsByKey = getPluginsByKey;
     exports.getRowsTotalHeight = getRowsTotalHeight;
     exports.getStartBlock = getStartBlock;
     exports.getToolbarClass = getToolbarClass;
@@ -14903,10 +14890,12 @@
     exports.internalPlugins = internalPlugins;
     exports.isCleanEmptyParagraph = isCleanEmptyParagraph;
     exports.isPureEmptyParagraph = isPureEmptyParagraph;
+    exports.mergeDeepPlugins = mergeDeepPlugins;
     exports.mergeElementOptions = mergeElementOptions;
     exports.mergeOptions = mergeOptions;
-    exports.overridePluginsByKey = overridePluginsByKey;
+    exports.nestedStructureByKey = nestedStructureByKey;
     exports.plainToTheia = plainToTheia;
+    exports.pluginsByKey = pluginsByKey;
     exports.setEditorUUID = setEditorUUID;
     exports.useElementStyle = useElementStyle;
     exports.withTheia = withTheia;