@worktile/theia 3.0.1 → 3.0.2

package/bundles/worktile-theia.umd.js

@@ -1429,12 +1429,32 @@
 
     var getPluginOptions = function (editor, key) { var _a, _b; return (_b = (_a = getPlugin(editor, key)) === null || _a === void 0 ? void 0 : _a.options) !== null && _b !== void 0 ? _b : {}; };
 
+    var mergeArray = function (origin, source) {
+        if (!Array.isArray(source))
+            return source;
+        var _loop_1 = function (i) {
+            var value = source[i];
+            if (util.isObject(value) && (value === null || value === void 0 ? void 0 : value.key) && origin.some(function (item) { return (item === null || item === void 0 ? void 0 : item.key) === (value === null || value === void 0 ? void 0 : value.key); })) {
+                var index = origin.findIndex(function (item) { return (item === null || item === void 0 ? void 0 : item.key) === (value === null || value === void 0 ? void 0 : value.key); });
+                origin[index] = Object.assign(Object.assign({}, origin[index]), value);
+                return "continue";
+            }
+            if (origin.includes(source[i]))
+                return "continue";
+            origin.push(source[i]);
+        };
+        for (var i = 0; i < source.length; i++) {
+            _loop_1(i);
+        }
+        return origin;
+    };
+
     var mergeOptions = function (plugin, override) {
         var options = plugin.options;
         var newOptions = {};
         for (var option in options) {
-            if (Array.isArray(options[option])) {
-                newOptions[option] = _.union(options[option], override.options[option]);
+            if (Array.isArray(options[option]) && override.options[option]) {
+                newOptions[option] = mergeArray(options[option], override.options[option]);
                 continue;
             }
             if (util.isObject(options[option])) {
@@ -1463,7 +1483,6 @@
                 newPlugins.forEach(function (p) {
                     if (editor.pluginsByKey[p.key]) {
                         mergeOptions(p, plugin.overrideByKey[p.key]);
-                        editor.pluginsByKey[p.key] = _.defaultsDeep(p, plugin.overrideByKey[p.key]);
                     }
                 });
             }
@@ -13334,7 +13353,7 @@
         ]
     });
 
-    var internalPlugins = [
+    var internalPlugins = function () { return [
         createTheHistoryPlugin(),
         createAutoInsertDataPlugin(),
         createRemoveEmptyPlugin(),
@@ -13369,7 +13388,7 @@
         createDeserializeMdPlugin(),
         createQuickInsertPlugin(),
         createInlineCodePlugin()
-    ];
+    ]; };
 
     var HOTKEYS = {
         'mod+b': exports.MarkTypes.bold,
@@ -14194,7 +14213,8 @@
         TheEditorComponent.prototype.initialize = function () {
             var _this = this;
             var _a, _b;
-            var plugins = __spreadArray(__spreadArray([], __read(internalPlugins)), __read(this.thePlugins));
+            var defaultPlugins = internalPlugins();
+            var plugins = __spreadArray(__spreadArray([], __read(defaultPlugins)), __read(this.thePlugins));
             this.editor = withTheia(slateHistory.withHistory(i1.withAngular(slate.createEditor(), CLIPBOARD_FORMAT_KEY)), plugins);
             this.generateDecorate();
             this.editor.disabled = (_a = this.theOptions) === null || _a === void 0 ? void 0 : _a.disabled;
@@ -14914,6 +14934,7 @@
     exports.internalPlugins = internalPlugins;
     exports.isCleanEmptyParagraph = isCleanEmptyParagraph;
     exports.isPureEmptyParagraph = isPureEmptyParagraph;
+    exports.mergeArray = mergeArray;
     exports.mergeDeepPlugins = mergeDeepPlugins;
     exports.mergeElementOptions = mergeElementOptions;
     exports.mergeOptions = mergeOptions;