@mailstep/design-system 0.6.3-beta.14 → 0.6.3-beta.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mailstep/design-system",
-  "version": "0.6.3-beta.14",
+  "version": "0.6.3-beta.16",
   "license": "ISC",
   "type": "module",
   "main": "./ui/index.js",

package/ui/Blocks/CommonGrid/hooks/useManageColumn.js

@@ -20,7 +20,6 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { checksColumnsOrder, isColumnOn } from '../utils';
-import isNumber from 'lodash/isNumber';
 var useManageColumn = function (_a) {
     var columns = _a.columns, gridSelectors = _a.gridSelectors, gridActions = _a.gridActions, onClose = _a.onClose, hideColumnConfig = _a.hideColumnConfig;
     var resetGrid = gridActions.resetGrid, setColumnConfig = gridActions.setColumnConfig, setColumnsOrder = gridActions.setColumnsOrder;
@@ -29,10 +28,6 @@ var useManageColumn = function (_a) {
     var columnsOrderValue = (columnsOrder === null || columnsOrder === void 0 ? void 0 : columnsOrder.length) ? columnsOrder : initialColumnsOrder;
     var _b = useState(__assign({}, (columnConfig !== null && columnConfig !== void 0 ? columnConfig : {}))), columnsConfigOptions = _b[0], setColumnsConfigOptions = _b[1];
     var _c = useState(columnsOrderValue), updatedColumnsOrder = _c[0], setUpdatedColumnsOrder = _c[1];
-    console.log(13, 'columnConfig', columnConfig);
-    console.log('columnsOrder', columnsOrder);
-    console.log('columnsConfigOptions', columnsConfigOptions);
-    console.log('updatedColumnsOrder', updatedColumnsOrder);
     var columnsConfigValues = useMemo(function () {
         return columns === null || columns === void 0 ? void 0 : columns.filter(function (column) {
             var _a;
@@ -52,10 +47,18 @@ var useManageColumn = function (_a) {
         setColumnsConfigOptions(columnConfig || {});
     }, [onClose, resetGrid, initialColumnsOrder, columnConfig]);
     var onCloseForm = useCallback(function () {
-        console.log('MAYBE<');
         setUpdatedColumnsOrder(columnsOrderValue);
         onClose === null || onClose === void 0 ? void 0 : onClose();
     }, [columnsOrderValue, onClose]);
+    var getSortedColumns = useCallback(function (orderValues) {
+        return (!hideColumnConfig ? columns.filter(function (column) { return isColumnOn(column, columnConfig); }) : columns).toSorted(function (col1, col2) {
+            var i = (orderValues || []).indexOf(col1.name);
+            var j = (orderValues || []).indexOf(col2.name);
+            return i > j ? 1 : i < j ? -1 : 0;
+        });
+    }, [hideColumnConfig, columnConfig, columns]);
+    var displayColumnsDefinitions = useMemo(function () { return getSortedColumns(columnsOrderValue); }, [columnsOrderValue]);
+    var manageColumnsFormDefinitions = useMemo(function () { return getSortedColumns(updatedColumnsOrder); }, [updatedColumnsOrder]);
     var handleDragEnd = useCallback(function (isManageModal) {
         if (isManageModal === void 0) { isManageModal = false; }
         return function (item) {
@@ -65,35 +68,20 @@ var useManageColumn = function (_a) {
             if (to === from || !destination) {
                 return;
             }
+            var columns = isManageModal ? manageColumnsFormDefinitions : displayColumnsDefinitions;
             var newOrderColumns = __spreadArray([], (isManageModal ? updatedColumnsOrder : columnsOrderValue), true);
             var fromIndex = newOrderColumns.findIndex(function (column) { return columns[from].name === column; });
-            var toIndex = newOrderColumns.findIndex(function (column) { return isNumber(to) && columns[to].name === column; });
-            console.log(newOrderColumns, from, to, fromIndex, toIndex);
+            var toIndex = newOrderColumns.findIndex(function (column) { return columns[to !== null && to !== void 0 ? to : 0].name === column; });
             // move column from a position to the new position
             var column = newOrderColumns[fromIndex];
             newOrderColumns.splice(fromIndex, 1);
             newOrderColumns.splice(toIndex === -1 ? 0 : toIndex, 0, column);
             if (!isManageModal) {
-                console.log('NONONO');
                 setColumnsOrder === null || setColumnsOrder === void 0 ? void 0 : setColumnsOrder(newOrderColumns);
             }
             setUpdatedColumnsOrder(newOrderColumns);
         };
-    }, [columns, updatedColumnsOrder, columnsOrderValue, setColumnsOrder]);
-    var displayColumnsDefinitions = useMemo(function () {
-        return (!hideColumnConfig ? columns.filter(function (column) { return isColumnOn(column, columnConfig); }) : columns).toSorted(function (col1, col2) {
-            var i = (columnsOrderValue || []).indexOf(col1.name);
-            var j = (columnsOrderValue || []).indexOf(col2.name);
-            return i > j ? 1 : i < j ? -1 : 0;
-        });
-    }, [hideColumnConfig, columnConfig, columns, columnsOrderValue]);
-    var manageColumnsFormDefinitions = useMemo(function () {
-        return (!hideColumnConfig ? columns.filter(function (column) { return isColumnOn(column, columnConfig); }) : columns).toSorted(function (col1, col2) {
-            var i = (updatedColumnsOrder || []).indexOf(col1.name);
-            var j = (updatedColumnsOrder || []).indexOf(col2.name);
-            return i > j ? 1 : i < j ? -1 : 0;
-        });
-    }, [hideColumnConfig, columnConfig, columns, updatedColumnsOrder]);
+    }, [updatedColumnsOrder, columnsOrderValue, setColumnsOrder, manageColumnsFormDefinitions, displayColumnsDefinitions]);
     useEffect(function () {
         checksColumnsOrder(columnsOrderValue, columns);
     }, []);