@visns-studio/visns-components 5.7.19 → 5.8.0

package/package.json

@@ -82,7 +82,7 @@
         "react-dom": "^17.0.0 || ^18.0.0"
     },
     "name": "@visns-studio/visns-components",
-    "version": "5.7.19",
+    "version": "5.8.0",
     "description": "Various packages to assist in the development of our Custom Applications.",
     "main": "src/index.js",
     "files": [

package/src/components/crm/DataGrid.jsx

@@ -538,27 +538,43 @@ const DataGrid = forwardRef(
                             s[obj.id] = obj;
                         });
                         setSelected(s);
+                        // Update parent component's rowsSelected state
+                        if (setRowsSelected) {
+                            setRowsSelected(s);
+                        }
                     } else if (typeof param.selected === 'object') {
                         const selectedKey = Object.keys(param.selected)[0];
                         const isSelectedAlready =
                             selected.hasOwnProperty(selectedKey);
 
+                        let newSelected;
                         if (isSelectedAlready) {
-                            setSelected({});
+                            newSelected = {};
+                            setSelected(newSelected);
                         } else {
-                            setSelected((prevSelected) => ({
-                                ...prevSelected,
+                            newSelected = {
+                                ...selected,
                                 [selectedKey]: param.selected[selectedKey],
-                            }));
+                            };
+                            setSelected(newSelected);
+                        }
+
+                        // Update parent component's rowsSelected state
+                        if (setRowsSelected) {
+                            setRowsSelected(newSelected);
                         }
                     }
                 } else {
                     // Handle deselection directly without confirmation
                     setSelected(param.selected);
+                    // Update parent component's rowsSelected state
+                    if (setRowsSelected) {
+                        setRowsSelected(param.selected);
+                    }
                 }
             },
-            [selected]
-        ); // Including selected in the dependency array
+            [selected, setRowsSelected]
+        ); // Including selected and setRowsSelected in the dependency array
 
         const findUpdatedFilter = (filters, currentValues) => {
             for (const filter of filters) {

package/src/components/crm/generic/GenericIndex.jsx

@@ -410,6 +410,8 @@ function GenericIndex({
 
             const { data, method, message, url } = checkboxUpdateConfig;
 
+            console.info('Selected rows:', rowsSelectedRef.current);
+
             if (!Object.keys(rowsSelectedRef.current).length) {
                 toast.warning(message.warning);
                 return;
@@ -553,6 +555,7 @@ function GenericIndex({
                     setConfig={setConfig}
                     setTableData={setTableData}
                     setTotal={setTotal}
+                    setRowsSelected={setRowsSelected}
                     style={userProfile?.settings?.style || {}}
                     userProfile={userProfile}
                 />
@@ -570,7 +573,15 @@ function GenericIndex({
         }
 
         return null;
-    }, [config, subnav, windowHeight, userProfile, setConfig, setTotal]);
+    }, [
+        config,
+        subnav,
+        windowHeight,
+        userProfile,
+        setConfig,
+        setTotal,
+        setRowsSelected,
+    ]);
 
     const renderContentBasedOnType = useCallback(() => {
         switch (config.type) {
@@ -742,6 +753,7 @@ function GenericIndex({
                     <button className={styles.btn} onClick={handleCustomAction}>
                         {getFunctionConfig('customAction').label ||
                             'Custom Action'}
+                        aa
                     </button>
                 )}