@worktile/theia 3.0.0 → 3.0.3

package/bundles/worktile-theia.umd.js

@@ -1410,7 +1410,7 @@
         if (!plugins)
             return;
         plugins.forEach(function (plugin) {
-            var p = plugin;
+            var p = _.cloneDeep(plugin);
             if (!p.options)
                 p.options = {};
             if (!p.nestedStructureByKey)
@@ -1425,30 +1425,43 @@
         return (_a = editor === null || editor === void 0 ? void 0 : editor.plugins) !== null && _a !== void 0 ? _a : [];
     };
 
-    var getPluginByKey = function (editor) {
-        var plugins = {};
-        if (editor === null || editor === void 0 ? void 0 : editor.pluginsByKey) {
-            return editor.pluginsByKey;
-        }
-        return plugins;
-    };
+    var getPlugin = function (editor, key) { return editor.pluginsByKey[key]; };
 
-    var getPlugin = function (editor, key) { return getPluginByKey(editor)[key]; };
+    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 getPluginOptions = function (editor, key) { var _a; return (_a = getPlugin(editor, key).options) !== null && _a !== void 0 ? _a : {}; };
+    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]);
+        var newOptions = options;
+        for (var option in override.options) {
+            if (Array.isArray(override.options[option]) && newOptions[option]) {
+                newOptions[option] = mergeArray(newOptions[option], override.options[option]);
                 continue;
             }
-            if (util.isObject(options[option])) {
-                newOptions[option] = _.assign(options[option], override.options[option]);
+            if (util.isObject(override.options[option]) && newOptions[option]) {
+                newOptions[option] = _.assign(newOptions[option], override.options[option]);
+                continue;
             }
-            newOptions[option] = override.options[option] ? override.options[option] : options[option];
+            newOptions[option] = override.options[option];
         }
         plugin.options = newOptions;
     };
@@ -1470,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]);
                     }
                 });
             }
@@ -1523,7 +1535,7 @@
 
     var createPluginFactory = function (defaultPlugin) { return function (override, overrideByKey) {
         if (overrideByKey === void 0) { overrideByKey = {}; }
-        return defaultPlugin;
+        return _.cloneDeep(defaultPlugin);
     }; };
 
     var toolbarInitialize = function (toolbarItems, global, inline, quick) {
@@ -6544,6 +6556,7 @@
 
     var defaultAutoFormatRules = [
         {
+            key: exports.ElementKinds.heading_1,
             type: exports.ElementKinds.heading_1,
             markup: '#',
             format: function (editor) {
@@ -6551,6 +6564,7 @@
             }
         },
         {
+            key: exports.ElementKinds.heading_2,
             type: exports.ElementKinds.heading_2,
             markup: '##',
             format: function (editor) {
@@ -6558,6 +6572,7 @@
             }
         },
         {
+            key: exports.ElementKinds.heading_3,
             type: exports.ElementKinds.heading_3,
             markup: '###',
             format: function (editor) {
@@ -6565,6 +6580,7 @@
             }
         },
         {
+            key: exports.ElementKinds.heading_4,
             type: exports.ElementKinds.heading_4,
             markup: '####',
             format: function (editor) {
@@ -6572,6 +6588,7 @@
             }
         },
         {
+            key: exports.ElementKinds.heading_5,
             type: exports.ElementKinds.heading_5,
             markup: '#####',
             format: function (editor) {
@@ -6579,6 +6596,7 @@
             }
         },
         {
+            key: exports.ElementKinds.heading_6,
             type: exports.ElementKinds.heading_6,
             markup: '######',
             format: function (editor) {
@@ -6586,6 +6604,7 @@
             }
         },
         {
+            key: exports.ElementKinds.blockquote,
             type: exports.ElementKinds.blockquote,
             markup: ['>'],
             format: function (editor) {
@@ -6593,30 +6612,35 @@
             }
         },
         {
+            key: exports.MarkTypes.bold,
             type: exports.MarkTypes.bold,
             between: ['**', '**'],
             mode: 'inline',
             insertTrigger: true
         },
         {
+            key: exports.MarkTypes.bold + "__",
             type: exports.MarkTypes.bold,
             between: ['__', '__'],
             mode: 'inline',
             insertTrigger: true
         },
         {
+            key: exports.MarkTypes.italic,
             type: exports.MarkTypes.italic,
             between: ['*', '*'],
             mode: 'inline',
             insertTrigger: true
         },
         {
+            key: exports.MarkTypes.italic + "_",
             type: exports.MarkTypes.italic,
             between: ['_', '_'],
             mode: 'inline',
             insertTrigger: true
         },
         {
+            key: exports.ElementKinds.inlineCode,
             type: exports.ElementKinds.inlineCode,
             between: ['`', '`'],
             mode: 'inline',
@@ -6626,12 +6650,14 @@
             }
         },
         {
+            key: exports.MarkTypes.strike,
             type: exports.MarkTypes.strike,
             between: ['~~', '~~'],
             mode: 'inline',
             insertTrigger: true
         },
         {
+            key: exports.ElementKinds.code,
             type: exports.ElementKinds.code,
             markup: '```',
             format: function (editor) {
@@ -6639,6 +6665,7 @@
             }
         },
         {
+            key: exports.ElementKinds.listItem,
             type: exports.ElementKinds.listItem,
             markup: [],
             match: function (editor) {
@@ -6649,8 +6676,8 @@
             }
         },
         {
-            type: exports.ElementKinds.listItem,
             key: exports.ElementKinds.numberedList,
+            type: exports.ElementKinds.listItem,
             markup: [],
             match: function (editor, textFromBlockStart) {
                 return isParagraph(editor) && /^-?\d+(\.|\))$/.test(textFromBlockStart) ? [textFromBlockStart] : [];
@@ -6667,6 +6694,7 @@
             }
         },
         {
+            key: exports.ElementKinds.checkItem,
             type: exports.ElementKinds.checkItem,
             markup: [],
             match: function (editor) {
@@ -6677,6 +6705,7 @@
             }
         },
         {
+            key: exports.ElementKinds.hr,
             type: exports.ElementKinds.hr,
             markup: '---',
             insertTrigger: true
@@ -13341,7 +13370,7 @@
         ]
     });
 
-    var internalPlugins = [
+    var internalPlugins = function () { return [
         createTheHistoryPlugin(),
         createAutoInsertDataPlugin(),
         createRemoveEmptyPlugin(),
@@ -13376,7 +13405,7 @@
         createDeserializeMdPlugin(),
         createQuickInsertPlugin(),
         createInlineCodePlugin()
-    ];
+    ]; };
 
     var HOTKEYS = {
         'mod+b': exports.MarkTypes.bold,
@@ -14201,7 +14230,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;
@@ -14909,7 +14939,6 @@
     exports.getElementWidth = getElementWidth;
     exports.getEndBlock = getEndBlock;
     exports.getPlugin = getPlugin;
-    exports.getPluginByKey = getPluginByKey;
     exports.getPluginOptions = getPluginOptions;
     exports.getPlugins = getPlugins;
     exports.getRowsTotalHeight = getRowsTotalHeight;
@@ -14922,6 +14951,7 @@
     exports.internalPlugins = internalPlugins;
     exports.isCleanEmptyParagraph = isCleanEmptyParagraph;
     exports.isPureEmptyParagraph = isPureEmptyParagraph;
+    exports.mergeArray = mergeArray;
     exports.mergeDeepPlugins = mergeDeepPlugins;
     exports.mergeElementOptions = mergeElementOptions;
     exports.mergeOptions = mergeOptions;