@bigbinary/neeto-themes-frontend 4.2.4-beta1 → 4.2.4-beta3

package/dist/cjs/NeetoThemesBuilder.js

@@ -1476,9 +1476,13 @@ var Customize = function Customize(_ref) {
     _useListThemes$data2$ = _useListThemes$data2.defaultThemes,
     defaultThemes = _useListThemes$data2$ === void 0 ? [] : _useListThemes$data2$,
     isLoadingSystemThemes = _useListThemes.isLoading;
-  var themeToCustomize = isCustomizingSystemTheme ? buildSystemThemeCopy(neetoCist.findBy({
+  var sourceTheme = isCustomizingSystemTheme ? neetoCist.findBy({
     id: sourceThemeId
-  }, defaultThemes)) : themeData;
+  }, defaultThemes) : null;
+  var systemThemeCopy = react.useMemo(function () {
+    return buildSystemThemeCopy(sourceTheme);
+  }, [sourceTheme === null || sourceTheme === void 0 ? void 0 : sourceTheme.id]);
+  var themeToCustomize = isCustomizingSystemTheme ? systemThemeCopy : themeData;
   var isLoading = isFetchingSchema || isLoadingTheme || isCustomizingSystemTheme && isLoadingSystemThemes;
   var isThemeGlobalTheme = themeId && (globalTheme === null || globalTheme === void 0 ? void 0 : globalTheme.id) === themeId;
   var isCurrentThemeAndGlobalThemeSame = (currentTheme === null || currentTheme === void 0 ? void 0 : currentTheme.id) === (globalTheme === null || globalTheme === void 0 ? void 0 : globalTheme.id);
@@ -1528,10 +1532,16 @@ var Customize = function Customize(_ref) {
             onApplyThemeSuccess === null || onApplyThemeSuccess === void 0 || onApplyThemeSuccess(theme);
           case 9:
             onCreateTheme(theme);
+            if (isNewThemeRoute()) {
+              _context.next = 12;
+              break;
+            }
+            return _context.abrupt("return");
+          case 12:
             history.replace(utils$1.buildUrl(buildPathname(useGlobalThemesApi.routes.themes.edit), {
               themeId: theme.id
             }));
-          case 11:
+          case 13:
           case "end":
             return _context.stop();
         }