@mailstep/design-system 0.6.3-beta.13 → 0.6.3-beta.15

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.
Files changed (4) hide show
  1. package/package.json +1 -1
  2. package/ui/Blocks/CommonGrid/hooks/useManageColumn.js +25 -24
  3. package/ui/index.es.js +7266 -7259
  4. package/ui/index.umd.js +320 -320
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mailstep/design-system",
3
- "version": "0.6.3-beta.13",
3
+ "version": "0.6.3-beta.15",
4
4
  "license": "ISC",
5
5
  "type": "module",
6
6
  "main": "./ui/index.js",
package/ui/Blocks/CommonGrid/hooks/useManageColumn.js CHANGED
@@ -24,9 +24,9 @@ var useManageColumn = function (_a) {
24
24
  var columns = _a.columns, gridSelectors = _a.gridSelectors, gridActions = _a.gridActions, onClose = _a.onClose, hideColumnConfig = _a.hideColumnConfig;
25
25
  var resetGrid = gridActions.resetGrid, setColumnConfig = gridActions.setColumnConfig, setColumnsOrder = gridActions.setColumnsOrder;
26
26
  var columnConfig = gridSelectors.columnConfig, columnsOrder = gridSelectors.columnsOrder;
27
- var initialColumnsOrder = useMemo(function () { return columns.map(function (col) { return col.name; }); }, []);
27
+ var initialColumnsOrder = useMemo(function () { return columns === null || columns === void 0 ? void 0 : columns.map(function (col) { return col.name; }); }, [columns]);
28
28
  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];
29
+ var _b = useState(__assign({}, (columnConfig !== null && columnConfig !== void 0 ? columnConfig : {}))), columnsConfigOptions = _b[0], setColumnsConfigOptions = _b[1];
30
30
  var _c = useState(columnsOrderValue), updatedColumnsOrder = _c[0], setUpdatedColumnsOrder = _c[1];
31
31
  console.log(13, 'columnConfig', columnConfig);
32
32
  console.log('columnsOrder', columnsOrder);
@@ -43,17 +43,32 @@ var useManageColumn = function (_a) {
43
43
  setColumnConfig === null || setColumnConfig === void 0 ? void 0 : setColumnConfig(columnsConfigOptions);
44
44
  setColumnsOrder === null || setColumnsOrder === void 0 ? void 0 : setColumnsOrder(updatedColumnsOrder);
45
45
  onClose === null || onClose === void 0 ? void 0 : onClose();
46
- }, [columnsConfigOptions, updatedColumnsOrder, onClose, setColumnConfig]);
46
+ }, [columnsConfigOptions, updatedColumnsOrder, onClose, setColumnConfig, setColumnsOrder]);
47
47
  var resetColumnConfig = useCallback(function () {
48
48
  setUpdatedColumnsOrder(initialColumnsOrder);
49
49
  resetGrid === null || resetGrid === void 0 ? void 0 : resetGrid();
50
50
  onClose === null || onClose === void 0 ? void 0 : onClose();
51
51
  setColumnsConfigOptions(columnConfig || {});
52
- }, [onClose, resetGrid, initialColumnsOrder]);
52
+ }, [onClose, resetGrid, initialColumnsOrder, columnConfig]);
53
53
  var onCloseForm = useCallback(function () {
54
+ console.log('MAYBE<');
54
55
  setUpdatedColumnsOrder(columnsOrderValue);
55
56
  onClose === null || onClose === void 0 ? void 0 : onClose();
56
- }, []);
57
+ }, [columnsOrderValue, onClose]);
58
+ var displayColumnsDefinitions = useMemo(function () {
59
+ return (!hideColumnConfig ? columns.filter(function (column) { return isColumnOn(column, columnConfig); }) : columns).toSorted(function (col1, col2) {
60
+ var i = (columnsOrderValue || []).indexOf(col1.name);
61
+ var j = (columnsOrderValue || []).indexOf(col2.name);
62
+ return i > j ? 1 : i < j ? -1 : 0;
63
+ });
64
+ }, [hideColumnConfig, columnConfig, columns, columnsOrderValue]);
65
+ var manageColumnsFormDefinitions = useMemo(function () {
66
+ return (!hideColumnConfig ? columns.filter(function (column) { return isColumnOn(column, columnConfig); }) : columns).toSorted(function (col1, col2) {
67
+ var i = (updatedColumnsOrder || []).indexOf(col1.name);
68
+ var j = (updatedColumnsOrder || []).indexOf(col2.name);
69
+ return i > j ? 1 : i < j ? -1 : 0;
70
+ });
71
+ }, [hideColumnConfig, columnConfig, columns, updatedColumnsOrder]);
57
72
  var handleDragEnd = useCallback(function (isManageModal) {
58
73
  if (isManageModal === void 0) { isManageModal = false; }
59
74
  return function (item) {
@@ -63,35 +78,21 @@ var useManageColumn = function (_a) {
63
78
  if (to === from || !destination) {
64
79
  return;
65
80
  }
81
+ var columns = isManageModal ? manageColumnsFormDefinitions : displayColumnsDefinitions;
66
82
  var newOrderColumns = __spreadArray([], (isManageModal ? updatedColumnsOrder : columnsOrderValue), true);
67
- console.log(newOrderColumns, from, to);
68
83
  var fromIndex = newOrderColumns.findIndex(function (column) { return columns[from].name === column; });
69
- var toIndex = newOrderColumns.findIndex(function (column) { return to && columns[to].name === column; });
84
+ var toIndex = newOrderColumns.findIndex(function (column) { return columns[to !== null && to !== void 0 ? to : 0].name === column; });
85
+ console.log(newOrderColumns, from, to, fromIndex, toIndex);
70
86
  // move column from a position to the new position
71
87
  var column = newOrderColumns[fromIndex];
72
88
  newOrderColumns.splice(fromIndex, 1);
73
- newOrderColumns.splice(toIndex < 0 ? 0 : toIndex, 0, column);
89
+ newOrderColumns.splice(toIndex === -1 ? 0 : toIndex, 0, column);
74
90
  if (!isManageModal) {
75
- console.log('NONONO');
76
91
  setColumnsOrder === null || setColumnsOrder === void 0 ? void 0 : setColumnsOrder(newOrderColumns);
77
92
  }
78
93
  setUpdatedColumnsOrder(newOrderColumns);
79
94
  };
80
- }, [columns, updatedColumnsOrder, columnsOrderValue]);
81
- var displayColumnsDefinitions = useMemo(function () {
82
- return (!hideColumnConfig ? columns.filter(function (column) { return isColumnOn(column, columnConfig); }) : columns).toSorted(function (col1, col2) {
83
- var i = (columnsOrderValue || []).indexOf(col1.name);
84
- var j = (columnsOrderValue || []).indexOf(col2.name);
85
- return i > j ? 1 : i < j ? -1 : 0;
86
- });
87
- }, [hideColumnConfig, columnConfig, columns, columnsOrderValue]);
88
- var manageColumnsFormDefinitions = useMemo(function () {
89
- return (!hideColumnConfig ? columns.filter(function (column) { return isColumnOn(column, columnConfig); }) : columns).toSorted(function (col1, col2) {
90
- var i = (updatedColumnsOrder || []).indexOf(col1.name);
91
- var j = (updatedColumnsOrder || []).indexOf(col2.name);
92
- return i > j ? 1 : i < j ? -1 : 0;
93
- });
94
- }, [hideColumnConfig, columnConfig, columns, updatedColumnsOrder]);
95
+ }, [updatedColumnsOrder, columnsOrderValue, setColumnsOrder, manageColumnsFormDefinitions, displayColumnsDefinitions]);
95
96
  useEffect(function () {
96
97
  checksColumnsOrder(columnsOrderValue, columns);
97
98
  }, []);