@node-red/editor-api 4.1.6 → 4.1.8

package/lib/editor/theme.js

@@ -133,7 +133,7 @@ async function loadThemePlugin () {
             }
             // check and load page settings from theme
             if (themePlugin.page) {
-                if (themePlugin.page.favicon  && !theme.page.favicon) {
+                if (themePlugin.page.favicon) {
                     const result = serveFilesFromTheme(
                         [themePlugin.page.favicon],
                         themeApp,
@@ -145,7 +145,7 @@ async function loadThemePlugin () {
                         themeContext.page.favicon = result[0]
                     }
                 }
-                if (themePlugin.page.tabicon && themePlugin.page.tabicon.icon && !theme.page.tabicon) {
+                if (themePlugin.page.tabicon && themePlugin.page.tabicon.icon) {
                     const result = serveFilesFromTheme(
                         [themePlugin.page.tabicon.icon],
                         themeApp,
@@ -158,14 +158,13 @@ async function loadThemePlugin () {
                         themeContext.page.tabicon.colour = themeContext.page.tabicon.colour || themeContext.page.tabicon.colour
                     }
                 }
-                // if the plugin has a title AND the users settings.js does NOT
-                if (themePlugin.page.title && !theme.page.title) {
+                if (themePlugin.page.title) {
                     themeContext.page.title = themePlugin.page.title || themeContext.page.title
                 }
             }
             // check and load header settings from theme
             if (themePlugin.header) {
-                if (themePlugin.header.image && !theme.header.image) {
+                if (themePlugin.header.image) {
                     const result = serveFilesFromTheme(
                         [themePlugin.header.image],
                         themeApp,
@@ -176,17 +175,27 @@ async function loadThemePlugin () {
                         // update themeContext header image
                         themeContext.header.image = result[0]
                     }
+                } else if (themePlugin.header.image === false) {
+                    themeContext.header.image = false
                 }
-                // if the plugin has a title AND the users settings.js does NOT have a title
-                if (themePlugin.header.title && !theme.header.title) {
-                    themeContext.header.title = themePlugin.header.title || themeContext.header.title
+                // if the plugin has a title
+                if (themePlugin.header.hasOwnProperty('title')) {
+                    themeContext.header.title = themePlugin.header.title
                 }
-                // if the plugin has a header url AND the users settings.js does NOT
-                if (themePlugin.header.url && !theme.header.url) {
-                    themeContext.header.url = themePlugin.header.url || themeContext.header.url
+                // if the plugin has a header url
+                if (themePlugin.header.hasOwnProperty('url')) {
+                    themeContext.header.url = themePlugin.header.url
                 }
             }
 
+            if (themePlugin.menu) {
+                themeSettings.menu = Object.assign({}, themeSettings.menu, themePlugin.menu);
+            }
+
+            if (themePlugin.help) {
+                themeSettings.help = themePlugin.help;
+            }
+
             if (Array.isArray(themePlugin.palette?.theme)) {
                 themeSettings.palette = themeSettings.palette || {};
                 themeSettings.palette.theme = themePlugin.palette.theme;
@@ -198,6 +207,10 @@ async function loadThemePlugin () {
                     }
                 })
             }
+            if (Array.isArray(themePlugin.palette?.categories)) {
+                themeSettings.palette = themeSettings.palette || {};
+                themeSettings.palette.categories = themePlugin.palette.categories;
+            }
 
             // These settings are not exposed under `editorTheme`, so we don't have a merge strategy for them
             // If they're defined in the theme plugin, they replace any settings.js values.
@@ -380,6 +393,10 @@ module.exports = {
             themeSettings.tours = theme.tours;
         }
 
+        if (theme.hasOwnProperty("help")) {
+            themeSettings.tours = theme.help;
+        }
+
         return themeApp;
     },
     context: async function() {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-api",
-    "version": "4.1.6",
+    "version": "4.1.8",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "4.1.6",
-        "@node-red/editor-client": "4.1.6",
+        "@node-red/util": "4.1.8",
+        "@node-red/editor-client": "4.1.8",
         "bcryptjs": "3.0.3",
         "body-parser": "1.20.4",
         "clone": "2.1.2",
@@ -26,7 +26,7 @@
         "express": "4.22.1",
         "memorystore": "1.6.7",
         "mime": "3.0.0",
-        "multer": "2.0.2",
+        "multer": "2.1.1",
         "mustache": "4.2.0",
         "oauth2orize": "1.12.0",
         "passport-http-bearer": "1.0.1",