@bigbinary/neeto-themes-frontend 3.1.0 → 3.1.2

package/dist/NeetoThemesBuilder.js

@@ -1191,11 +1191,13 @@ var Customize = function Customize(_ref) {
   var _useConfigStore = useConfigStore(function (store) {
       return {
         themePropertiesSchema: store["themePropertiesSchema"],
-        entityType: store["entityType"]
+        entityType: store["entityType"],
+        isFetchingSchema: store["isFetchingSchema"]
       };
     }, shallow),
     themePropertiesSchema = _useConfigStore.themePropertiesSchema,
-    entityType = _useConfigStore.entityType;
+    entityType = _useConfigStore.entityType,
+    isFetchingSchema = _useConfigStore.isFetchingSchema;
   var _useParams = useParams(),
     themeId = _useParams.themeId;
   var _useThemeStore = useThemeStore(function (store) {
@@ -1217,7 +1219,8 @@ var Customize = function Customize(_ref) {
     }),
     _useFetchTheme$data = _useFetchTheme.data,
     themeData = _useFetchTheme$data === void 0 ? {} : _useFetchTheme$data,
-    isLoading = _useFetchTheme.isLoading;
+    isLoadingTheme = _useFetchTheme.isLoadingTheme;
+  var isLoading = isFetchingSchema || isLoadingTheme;
   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);
   var isEditingCurrentlyAppliedTheme = themeId === (currentTheme === null || currentTheme === void 0 ? void 0 : currentTheme.id);
@@ -1267,12 +1270,12 @@ var Customize = function Customize(_ref) {
     });
   };
   useEffect(function () {
-    if (isNotNil(themeId) && !isLoading) {
+    if (isNotNil(themeId) && !isLoadingTheme) {
       setThemeState({
         previewingTheme: themeData
       });
     }
-  }, [themeData, isLoading]);
+  }, [isLoadingTheme]);
   if (isLoading) {
     return /*#__PURE__*/jsx(PageLoader, {});
   }
@@ -2075,11 +2078,7 @@ var Sidebar = function Sidebar(_ref) {
     });
   };
   var navigateToThemesScreen = function navigateToThemesScreen(themeId) {
-    setTheme(currentTheme);
     highlightTheme(isPresent(themeId) ? themeId : currentTheme === null || currentTheme === void 0 ? void 0 : currentTheme.id);
-    setThemeState({
-      previewingTheme: currentTheme
-    });
     history.push(buildUrl(buildPathname(routes.themes.index)));
     themeToEdit.current = null;
   };