@knovator/pagecreator-admin 1.6.9 → 1.6.10

package/index.cjs

@@ -7201,6 +7201,7 @@ const WidgetForm = ({
   const [blogCategories, setBlogCategories] = React.useState([]);
   const [blogCategoriesLoading, setBlogCategoriesLoading] = React.useState(false);
   const pagesLoadedRef = React.useRef(false);
+  const blogCategoryInitialized = React.useRef(false);
   React.useEffect(() => {
     if (data && formState === 'UPDATE') {
       const widgetType = widgetTypes.find(type => type.value === (data === null || data === void 0 ? void 0 : data.widgetType));
@@ -7265,20 +7266,21 @@ const WidgetForm = ({
   }, [currentItemsType, baseUrl, token, widgetRoutesPrefix, blogCategories.length]);
   // Set blog category and limit when editing a widget
   React.useEffect(() => {
-    if (formState === 'UPDATE' && data && currentItemsType === 'blog' && blogCategories.length > 0) {
+    if (formState === 'UPDATE' && data && currentItemsType === 'blog' && blogCategories.length > 0 && !blogCategoryInitialized.current) {
       // Set blog category if it exists in the data
-      if (data.blogCategory && !blogCategory) {
+      if (data.blogCategory) {
         const savedCategory = blogCategories.find(cat => cat.value === data.blogCategory);
         if (savedCategory) {
           setBlogCategory(savedCategory);
+          blogCategoryInitialized.current = true;
         }
       }
       // Set blog limit if it exists in the data
-      if (data.blogLimit && blogLimit === 10) {
+      if (data.blogLimit) {
         setBlogLimit(data.blogLimit);
       }
     }
-  }, [formState, data, currentItemsType, blogCategories, blogCategory, blogLimit]);
+  }, [formState, data, currentItemsType, blogCategories]);
   // Clear collectionItems when using blog category/limit (server will handle fetching latest blogs)
   React.useEffect(() => {
     if (currentItemsType === 'blog') {
@@ -7295,8 +7297,13 @@ const WidgetForm = ({
       setBlogCategory(null);
       setBlogLimit(10);
       setBlogCategories([]);
+      blogCategoryInitialized.current = false;
     }
   }, [currentItemsType]);
+  // Reset initialization flag when opening a different widget or changing form state
+  React.useEffect(() => {
+    blogCategoryInitialized.current = false;
+  }, [data === null || data === void 0 ? void 0 : data._id, formState]);
   // Watch blogLimit form value and update state
   const watchedBlogLimit = watch('blogLimit');
   React.useEffect(() => {

package/index.js

@@ -7189,6 +7189,7 @@ const WidgetForm = ({
   const [blogCategories, setBlogCategories] = useState([]);
   const [blogCategoriesLoading, setBlogCategoriesLoading] = useState(false);
   const pagesLoadedRef = useRef(false);
+  const blogCategoryInitialized = useRef(false);
   useEffect(() => {
     if (data && formState === 'UPDATE') {
       const widgetType = widgetTypes.find(type => type.value === (data === null || data === void 0 ? void 0 : data.widgetType));
@@ -7253,20 +7254,21 @@ const WidgetForm = ({
   }, [currentItemsType, baseUrl, token, widgetRoutesPrefix, blogCategories.length]);
   // Set blog category and limit when editing a widget
   useEffect(() => {
-    if (formState === 'UPDATE' && data && currentItemsType === 'blog' && blogCategories.length > 0) {
+    if (formState === 'UPDATE' && data && currentItemsType === 'blog' && blogCategories.length > 0 && !blogCategoryInitialized.current) {
       // Set blog category if it exists in the data
-      if (data.blogCategory && !blogCategory) {
+      if (data.blogCategory) {
         const savedCategory = blogCategories.find(cat => cat.value === data.blogCategory);
         if (savedCategory) {
           setBlogCategory(savedCategory);
+          blogCategoryInitialized.current = true;
         }
       }
       // Set blog limit if it exists in the data
-      if (data.blogLimit && blogLimit === 10) {
+      if (data.blogLimit) {
         setBlogLimit(data.blogLimit);
       }
     }
-  }, [formState, data, currentItemsType, blogCategories, blogCategory, blogLimit]);
+  }, [formState, data, currentItemsType, blogCategories]);
   // Clear collectionItems when using blog category/limit (server will handle fetching latest blogs)
   useEffect(() => {
     if (currentItemsType === 'blog') {
@@ -7283,8 +7285,13 @@ const WidgetForm = ({
       setBlogCategory(null);
       setBlogLimit(10);
       setBlogCategories([]);
+      blogCategoryInitialized.current = false;
     }
   }, [currentItemsType]);
+  // Reset initialization flag when opening a different widget or changing form state
+  useEffect(() => {
+    blogCategoryInitialized.current = false;
+  }, [data === null || data === void 0 ? void 0 : data._id, formState]);
   // Watch blogLimit form value and update state
   const watchedBlogLimit = watch('blogLimit');
   useEffect(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knovator/pagecreator-admin",
-  "version": "1.6.9",
+  "version": "1.6.10",
   "dependencies": {
     "classnames": "^2.3.1",
     "react-beautiful-dnd": "^13.1.0",