@tiny-mce-umbraco/backoffice 16.0.0-rc3 → 16.0.0-rc4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist-cms/components/input-tiny-mce/input-tiny-mce.element.d.ts.map +1 -1
  2. package/dist-cms/components/input-tiny-mce/input-tiny-mce.element.js +9 -0
  3. package/package.json +3 -3
package/dist-cms/components/input-tiny-mce/input-tiny-mce.element.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"input-tiny-mce.element.d.ts","sourceRoot":"","sources":["../../../src/components/input-tiny-mce/input-tiny-mce.element.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAIpE,OAAO,KAAK,EAAe,MAAM,EAAoB,MAAM,+CAA+C,CAAC;AAE3G,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,yCAAyC,CAAC;;AAmCjG,qBACa,sBAAuB,SAAQ,2BAAsC;;IAEjF,aAAa,CAAC,EAAE,iCAAiC,CAAC;cAQ/B,cAAc;IAIjC,IAAa,KAAK,CAAC,QAAQ,EAAE,kBAAkB,GAAG,QAAQ,EAOzD;IAED,IAAa,KAAK,IAAI,kBAAkB,GAAG,QAAQ,CAElD;IAED;;;;;OAKG;IACH,IACW,QAAQ,YAElB;IACD,IAAW,QAAQ,CAAC,KAAK,SAAA,EAKxB;IAID,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAc;IAE9C,SAAS;IAIA,YAAY;IAsBZ,oBAAoB;IA0BvB,eAAe,CAAC,eAAe,EAAE,KAAK,CAAC,MAAM,CAAC;IAkUpD;;;OAGG;IACM,MAAM;IAIf,gBAAyB,MAAM,4BAkB7B;CACF;AAED,eAAe,sBAAsB,CAAC;AAEtC,OAAO,CAAC,MAAM,CAAC;IACd,UAAU,qBAAqB;QAC9B,oBAAoB,EAAE,sBAAsB,CAAC;KAC7C;CACD"}
1
+ {"version":3,"file":"input-tiny-mce.element.d.ts","sourceRoot":"","sources":["../../../src/components/input-tiny-mce/input-tiny-mce.element.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAIpE,OAAO,KAAK,EAAe,MAAM,EAAoB,MAAM,+CAA+C,CAAC;AAE3G,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,yCAAyC,CAAC;;AA0CjG,qBACa,sBAAuB,SAAQ,2BAAsC;;IAEjF,aAAa,CAAC,EAAE,iCAAiC,CAAC;cAQ/B,cAAc;IAIjC,IAAa,KAAK,CAAC,QAAQ,EAAE,kBAAkB,GAAG,QAAQ,EAOzD;IAED,IAAa,KAAK,IAAI,kBAAkB,GAAG,QAAQ,CAElD;IAED;;;;;OAKG;IACH,IACW,QAAQ,YAElB;IACD,IAAW,QAAQ,CAAC,KAAK,SAAA,EAKxB;IAID,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAc;IAE9C,SAAS;IAIA,YAAY;IAsBZ,oBAAoB;IA0BvB,eAAe,CAAC,eAAe,EAAE,KAAK,CAAC,MAAM,CAAC;IAsUpD;;;OAGG;IACM,MAAM;IAIf,gBAAyB,MAAM,4BAkB7B;CACF;AAED,eAAe,sBAAsB,CAAC;AAEtC,OAAO,CAAC,MAAM,CAAC;IACd,UAAU,qBAAqB;QAC9B,oBAAoB,EAAE,sBAAsB,CAAC;KAC7C;CACD"}
package/dist-cms/components/input-tiny-mce/input-tiny-mce.element.js CHANGED
@@ -52,6 +52,11 @@ async function onResize(e) {
52
52
  });
53
53
  e.target.setAttribute('data-mce-src', resizedPath);
54
54
  }
55
+ function mergeArrays(arr1, arr2) {
56
+ const a1 = Array.isArray(arr1) ? arr1 : arr1 ? [arr1] : [];
57
+ const a2 = Array.isArray(arr2) ? arr2 : arr2 ? [arr2] : [];
58
+ return Array.from(new Set([...a1, ...a2]));
59
+ }
55
60
  let UmbInputTinyMceElement = class UmbInputTinyMceElement extends UUIFormControlMixin(UmbLitElement, '') {
56
61
  constructor() {
57
62
  super(...arguments);
@@ -306,11 +311,15 @@ _UmbInputTinyMceElement_setTinyConfig = async function _UmbInputTinyMceElement_s
306
311
  }
307
312
  // Extend with additional configuration options
308
313
  if (additionalConfig) {
314
+ const mergedPlugins = mergeArrays(additionalConfig.plugins, config.plugins);
309
315
  config = umbDeepMerge(additionalConfig, config);
316
+ config.plugins = mergedPlugins;
310
317
  }
311
318
  if (appSettingsConfig) {
312
319
  if (appSettingsConfig.richTextEditor) {
320
+ const mergedPlugins = mergeArrays(appSettingsConfig.richTextEditor.plugins, config.plugins);
313
321
  config = umbDeepMerge(appSettingsConfig.richTextEditor.customConfig, config);
322
+ config.plugins = mergedPlugins;
314
323
  }
315
324
  if (appSettingsConfig.config) {
316
325
  config = umbDeepMerge(appSettingsConfig.config.customConfig, config);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tiny-mce-umbraco/backoffice",
3
- "version": "16.0.0-rc3",
3
+ "version": "16.0.0-rc4",
4
4
  "description": "This Umbraco CMS package enables access to the TinyMCE-based Rich Text Editor (RTE) in version 16 and above. It also supports the use of TinyMCE Premium plugins with a valid subscription. Additional features include streamlined configuration for RTE Data Types in Umbraco and enhanced settings that support direct JSON-based configuration via .NET (appsettings.config).",
5
5
  "keywords": [
6
6
  "umbraco",
@@ -40,7 +40,7 @@
40
40
  "@rollup/plugin-json": "^6.1.0",
41
41
  "@rollup/plugin-node-resolve": "^16.0.0",
42
42
  "@rollup/plugin-replace": "^6.0.2",
43
- "@umbraco-cms/backoffice": "^16.0.0-rc4",
43
+ "@umbraco-cms/backoffice": "^16.0.0-rc6",
44
44
  "chalk": "^5.3.0",
45
45
  "cross-env": "7.0.3",
46
46
  "eslint": "^9.25.1",
@@ -55,7 +55,7 @@
55
55
  "vite-tsconfig-paths": "^5.1.4"
56
56
  },
57
57
  "peerDependencies": {
58
- "@umbraco-cms/backoffice": "^16.0.0-rc4",
58
+ "@umbraco-cms/backoffice": "^16.0.0-rc6",
59
59
  "tinymce": "^6.8.5",
60
60
  "tinymce-i18n": "^24.12.30"
61
61
  }