@mailstep/design-system 0.6.3-beta.13 → 0.6.3-beta.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/ui/Blocks/CommonGrid/hooks/useManageColumn.js +11 -9
- package/ui/index.es.js +5698 -5708
- package/ui/index.umd.js +212 -212
package/package.json
CHANGED
|
@@ -20,13 +20,14 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
20
20
|
};
|
|
21
21
|
import { useCallback, useEffect, useMemo, useState } from 'react';
|
|
22
22
|
import { checksColumnsOrder, isColumnOn } from '../utils';
|
|
23
|
+
import isNumber from 'lodash/isNumber';
|
|
23
24
|
var useManageColumn = function (_a) {
|
|
24
25
|
var columns = _a.columns, gridSelectors = _a.gridSelectors, gridActions = _a.gridActions, onClose = _a.onClose, hideColumnConfig = _a.hideColumnConfig;
|
|
25
26
|
var resetGrid = gridActions.resetGrid, setColumnConfig = gridActions.setColumnConfig, setColumnsOrder = gridActions.setColumnsOrder;
|
|
26
27
|
var columnConfig = gridSelectors.columnConfig, columnsOrder = gridSelectors.columnsOrder;
|
|
27
|
-
var initialColumnsOrder = useMemo(function () { return columns.map(function (col) { return col.name; }); }, []);
|
|
28
|
+
var initialColumnsOrder = useMemo(function () { return columns === null || columns === void 0 ? void 0 : columns.map(function (col) { return col.name; }); }, [columns]);
|
|
28
29
|
var columnsOrderValue = (columnsOrder === null || columnsOrder === void 0 ? void 0 : columnsOrder.length) ? columnsOrder : initialColumnsOrder;
|
|
29
|
-
var _b = useState(__assign({}, columnConfig)), columnsConfigOptions = _b[0], setColumnsConfigOptions = _b[1];
|
|
30
|
+
var _b = useState(__assign({}, (columnConfig !== null && columnConfig !== void 0 ? columnConfig : {}))), columnsConfigOptions = _b[0], setColumnsConfigOptions = _b[1];
|
|
30
31
|
var _c = useState(columnsOrderValue), updatedColumnsOrder = _c[0], setUpdatedColumnsOrder = _c[1];
|
|
31
32
|
console.log(13, 'columnConfig', columnConfig);
|
|
32
33
|
console.log('columnsOrder', columnsOrder);
|
|
@@ -43,17 +44,18 @@ var useManageColumn = function (_a) {
|
|
|
43
44
|
setColumnConfig === null || setColumnConfig === void 0 ? void 0 : setColumnConfig(columnsConfigOptions);
|
|
44
45
|
setColumnsOrder === null || setColumnsOrder === void 0 ? void 0 : setColumnsOrder(updatedColumnsOrder);
|
|
45
46
|
onClose === null || onClose === void 0 ? void 0 : onClose();
|
|
46
|
-
}, [columnsConfigOptions, updatedColumnsOrder, onClose, setColumnConfig]);
|
|
47
|
+
}, [columnsConfigOptions, updatedColumnsOrder, onClose, setColumnConfig, setColumnsOrder]);
|
|
47
48
|
var resetColumnConfig = useCallback(function () {
|
|
48
49
|
setUpdatedColumnsOrder(initialColumnsOrder);
|
|
49
50
|
resetGrid === null || resetGrid === void 0 ? void 0 : resetGrid();
|
|
50
51
|
onClose === null || onClose === void 0 ? void 0 : onClose();
|
|
51
52
|
setColumnsConfigOptions(columnConfig || {});
|
|
52
|
-
}, [onClose, resetGrid, initialColumnsOrder]);
|
|
53
|
+
}, [onClose, resetGrid, initialColumnsOrder, columnConfig]);
|
|
53
54
|
var onCloseForm = useCallback(function () {
|
|
55
|
+
console.log('MAYBE<');
|
|
54
56
|
setUpdatedColumnsOrder(columnsOrderValue);
|
|
55
57
|
onClose === null || onClose === void 0 ? void 0 : onClose();
|
|
56
|
-
}, []);
|
|
58
|
+
}, [columnsOrderValue, onClose]);
|
|
57
59
|
var handleDragEnd = useCallback(function (isManageModal) {
|
|
58
60
|
if (isManageModal === void 0) { isManageModal = false; }
|
|
59
61
|
return function (item) {
|
|
@@ -64,20 +66,20 @@ var useManageColumn = function (_a) {
|
|
|
64
66
|
return;
|
|
65
67
|
}
|
|
66
68
|
var newOrderColumns = __spreadArray([], (isManageModal ? updatedColumnsOrder : columnsOrderValue), true);
|
|
67
|
-
console.log(newOrderColumns, from, to);
|
|
68
69
|
var fromIndex = newOrderColumns.findIndex(function (column) { return columns[from].name === column; });
|
|
69
|
-
var toIndex = newOrderColumns.findIndex(function (column) { return to && columns[to].name === column; });
|
|
70
|
+
var toIndex = newOrderColumns.findIndex(function (column) { return isNumber(to) && columns[to].name === column; });
|
|
71
|
+
console.log(newOrderColumns, from, to, fromIndex, toIndex);
|
|
70
72
|
// move column from a position to the new position
|
|
71
73
|
var column = newOrderColumns[fromIndex];
|
|
72
74
|
newOrderColumns.splice(fromIndex, 1);
|
|
73
|
-
newOrderColumns.splice(toIndex
|
|
75
|
+
newOrderColumns.splice(toIndex === -1 ? 0 : toIndex, 0, column);
|
|
74
76
|
if (!isManageModal) {
|
|
75
77
|
console.log('NONONO');
|
|
76
78
|
setColumnsOrder === null || setColumnsOrder === void 0 ? void 0 : setColumnsOrder(newOrderColumns);
|
|
77
79
|
}
|
|
78
80
|
setUpdatedColumnsOrder(newOrderColumns);
|
|
79
81
|
};
|
|
80
|
-
}, [columns, updatedColumnsOrder, columnsOrderValue]);
|
|
82
|
+
}, [columns, updatedColumnsOrder, columnsOrderValue, setColumnsOrder]);
|
|
81
83
|
var displayColumnsDefinitions = useMemo(function () {
|
|
82
84
|
return (!hideColumnConfig ? columns.filter(function (column) { return isColumnOn(column, columnConfig); }) : columns).toSorted(function (col1, col2) {
|
|
83
85
|
var i = (columnsOrderValue || []).indexOf(col1.name);
|