@monolith-forensics/monolith-ui 1.3.24 → 1.3.25

package/dist/Table/TableProvider.js

@@ -51,6 +51,28 @@ const TableProvider = (_a) => {
     const [selectionStatus, setSelectionStatus] = useState((savedSelectionState === null || savedSelectionState === void 0 ? void 0 : savedSelectionState.selectionStatus) || SelectionStatus.None);
     const [excludedRowKeys, setExcludedRowKeys] = useState((savedSelectionState === null || savedSelectionState === void 0 ? void 0 : savedSelectionState.excludedRowKeys) || []);
     const [selectedRowKeys, setSelectedRowKeys] = useState((savedSelectionState === null || savedSelectionState === void 0 ? void 0 : savedSelectionState.selectedRowKeys) || []);
+    const calculateSelectionTotal = (selectionState, totalRecords, dataLength = 0) => {
+        switch (selectionState.selectionStatus) {
+            case SelectionStatus.All:
+                return totalRecords || dataLength;
+            case SelectionStatus.SomeIncluded:
+                return selectionState.selectedRowKeys.length;
+            case SelectionStatus.SomeExcluded:
+                return totalRecords
+                    ? totalRecords - selectionState.excludedRowKeys.length
+                    : dataLength - selectionState.excludedRowKeys.length;
+            default:
+                return 0;
+        }
+    };
+    const getCalculatedSelectionTotal = () => {
+        return calculateSelectionTotal({
+            selectedRowKeys,
+            excludedRowKeys,
+            selectionStatus,
+            totalSelected: 0,
+        }, props === null || props === void 0 ? void 0 : props.totalRecords, props.data.length);
+    };
     const getColumnState = (dataField) => {
         return columnState.find((col) => col.dataField === dataField);
     };
@@ -382,6 +404,7 @@ const TableProvider = (_a) => {
             selectedRowKeys,
             excludedRowKeys,
             selectionStatus,
+            totalSelected: 0,
         };
         if (props.data.length === selectedRowKeys.length + 1) {
             newSelectionState.selectionStatus = SelectionStatus.All;
@@ -395,11 +418,12 @@ const TableProvider = (_a) => {
         ];
         newSelectionState.excludedRowKeys =
             newSelectionState.excludedRowKeys.filter((k) => k !== key);
+        newSelectionState.totalSelected = calculateSelectionTotal(newSelectionState, props === null || props === void 0 ? void 0 : props.totalRecords, props.data.length);
         setSelectionStatus(newSelectionState.selectionStatus);
         setSelectedRowKeys(newSelectionState.selectedRowKeys);
         setExcludedRowKeys(newSelectionState.excludedRowKeys);
-        (_a = props.onSelectionChange) === null || _a === void 0 ? void 0 : _a.call(props, newSelectionState);
         saveSelectionState(newSelectionState);
+        (_a = props.onSelectionChange) === null || _a === void 0 ? void 0 : _a.call(props, newSelectionState);
     };
     const deselectRow = (row) => {
         var _a;
@@ -408,6 +432,7 @@ const TableProvider = (_a) => {
             selectedRowKeys,
             excludedRowKeys,
             selectionStatus,
+            totalSelected: 0,
         };
         if (selectionStatus === SelectionStatus.All ||
             selectionStatus === SelectionStatus.SomeExcluded) {
@@ -422,11 +447,12 @@ const TableProvider = (_a) => {
         }
         newSelectionState.selectedRowKeys =
             newSelectionState.selectedRowKeys.filter((k) => k !== row[key]);
+        newSelectionState.totalSelected = calculateSelectionTotal(newSelectionState, props === null || props === void 0 ? void 0 : props.totalRecords, props.data.length);
         setSelectionStatus(newSelectionState.selectionStatus);
         setSelectedRowKeys(newSelectionState.selectedRowKeys);
         setExcludedRowKeys(newSelectionState.excludedRowKeys);
-        (_a = props.onSelectionChange) === null || _a === void 0 ? void 0 : _a.call(props, newSelectionState);
         saveSelectionState(newSelectionState);
+        (_a = props.onSelectionChange) === null || _a === void 0 ? void 0 : _a.call(props, newSelectionState);
     };
     const selectAllRows = () => {
         var _a, _b;
@@ -435,15 +461,17 @@ const TableProvider = (_a) => {
             selectedRowKeys,
             excludedRowKeys,
             selectionStatus,
+            totalSelected: 0,
         };
         newSelectionState.selectedRowKeys = keys;
         newSelectionState.excludedRowKeys = [];
         newSelectionState.selectionStatus = SelectionStatus.All;
+        newSelectionState.totalSelected = calculateSelectionTotal(newSelectionState, props === null || props === void 0 ? void 0 : props.totalRecords, props.data.length);
         setSelectionStatus(newSelectionState.selectionStatus);
         setSelectedRowKeys(newSelectionState.selectedRowKeys);
         setExcludedRowKeys(newSelectionState.excludedRowKeys);
-        (_b = props.onSelectionChange) === null || _b === void 0 ? void 0 : _b.call(props, newSelectionState);
         saveSelectionState(newSelectionState);
+        (_b = props.onSelectionChange) === null || _b === void 0 ? void 0 : _b.call(props, newSelectionState);
     };
     const clearSelections = () => {
         var _a;
@@ -451,10 +479,12 @@ const TableProvider = (_a) => {
             selectedRowKeys,
             excludedRowKeys,
             selectionStatus,
+            totalSelected: 0,
         };
         newSelectionState.selectedRowKeys = [];
         newSelectionState.excludedRowKeys = [];
         newSelectionState.selectionStatus = SelectionStatus.None;
+        newSelectionState.totalSelected = calculateSelectionTotal(newSelectionState, props === null || props === void 0 ? void 0 : props.totalRecords, props.data.length);
         setSelectionStatus(newSelectionState.selectionStatus);
         setSelectedRowKeys(newSelectionState.selectedRowKeys);
         setExcludedRowKeys(newSelectionState.excludedRowKeys);
@@ -485,21 +515,8 @@ const TableProvider = (_a) => {
                 return false;
         }
     };
-    const getCalculatedSelectionTotal = () => {
-        switch (selectionStatus) {
-            case SelectionStatus.All:
-                return (props === null || props === void 0 ? void 0 : props.totalRecords) || props.data.length;
-            case SelectionStatus.SomeIncluded:
-                return selectedRowKeys.length;
-            case SelectionStatus.SomeExcluded:
-                return (props === null || props === void 0 ? void 0 : props.totalRecords)
-                    ? props.totalRecords - excludedRowKeys.length
-                    : props.data.length - excludedRowKeys.length;
-            default:
-                return 0;
-        }
-    };
     if (tableInstanceRef) {
+        console.log("set table instance ref");
         tableInstanceRef.current = {
             columnState,
             setColumnState: updateColumnState,
@@ -537,6 +554,7 @@ const TableProvider = (_a) => {
                 selectedRowKeys,
                 excludedRowKeys,
                 selectionStatus,
+                totalSelected: getCalculatedSelectionTotal(),
             }, selectRow,
             deselectRow,
             isRowSelected,

package/dist/Table/types.d.ts

@@ -40,6 +40,7 @@ export type SelectionState = {
     selectedRowKeys: string[];
     excludedRowKeys: string[];
     selectionStatus: SelectionStatus;
+    totalSelected: number;
 };
 export type SortState = {
     dataField: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monolith-forensics/monolith-ui",
-  "version": "1.3.24",
+  "version": "1.3.25",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Matt Danner (Monolith Forensics LLC)",