@mailstep/design-system 0.6.3-beta.2 → 0.6.3-beta.3

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 +18 -12
  3. package/ui/index.es.js +276 -274
  4. package/ui/index.umd.js +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mailstep/design-system",
3
- "version": "0.6.3-beta.2",
3
+ "version": "0.6.3-beta.3",
4
4
  "license": "ISC",
5
5
  "type": "module",
6
6
  "main": "./ui/index.js",
package/ui/Blocks/CommonGrid/hooks/useManageColumn.js CHANGED
@@ -18,14 +18,21 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
18
18
  }
19
19
  return to.concat(ar || Array.prototype.slice.call(from));
20
20
  };
21
- import { useCallback, useMemo, useState } from 'react';
21
+ import { useCallback, useEffect, useMemo, useState } from 'react';
22
22
  var useManageColumn = function (_a) {
23
23
  var columns = _a.columns, gridSelectors = _a.gridSelectors, gridActions = _a.gridActions, onClose = _a.onClose;
24
24
  var resetGrid = gridActions.resetGrid, setColumnConfig = gridActions.setColumnConfig, setColumnsOrder = gridActions.setColumnsOrder;
25
25
  var columnConfig = gridSelectors.columnConfig, columnsOrder = gridSelectors.columnsOrder;
26
26
  var _b = useState(__assign({}, columnConfig)), columnsConfigOptions = _b[0], setColumnsConfigOptions = _b[1];
27
- var _c = useState(columnsOrder || []), updatedColumnsOrder = _c[0], setUpdatedColumnsOrder = _c[1];
28
- console.log('columnConfig', columnConfig, 'columnsOrder', columnsOrder, 'columnsConfigOptions', columnsConfigOptions, 'updatedColumnsOrder', updatedColumnsOrder);
27
+ var _c = useState(columnsOrder || columns.map(function (col) { return col.name; })), updatedColumnsOrder = _c[0], setUpdatedColumnsOrder = _c[1];
28
+ console.log('columnConfig', columnConfig);
29
+ console.log('columnsOrder', columnsOrder);
30
+ console.log('columnsConfigOptions', columnsConfigOptions);
31
+ console.log('updatedColumnsOrder', updatedColumnsOrder);
32
+ console.log('columns', columns);
33
+ useEffect(function () {
34
+ (columnsOrder === null || columnsOrder === void 0 ? void 0 : columnsOrder.length) && (setUpdatedColumnsOrder === null || setUpdatedColumnsOrder === void 0 ? void 0 : setUpdatedColumnsOrder(columnsOrder));
35
+ }, [columnsOrder]);
29
36
  var columnsConfigValues = useMemo(function () {
30
37
  return columns === null || columns === void 0 ? void 0 : columns.filter(function (column) {
31
38
  var _a;
@@ -33,21 +40,20 @@ var useManageColumn = function (_a) {
33
40
  return (column === null || column === void 0 ? void 0 : column.alwaysOn) || typeof isHidden === 'boolean' ? !isHidden : !(column === null || column === void 0 ? void 0 : column.defaultHidden);
34
41
  }).map(function (column) { return column.name; });
35
42
  }, [columnConfig, columns]);
43
+ var columnsOrderValues = useMemo(function () {
44
+ var order = (columnsOrder === null || columnsOrder === void 0 ? void 0 : columnsOrder.length) ? columnsOrder : columns.map(function (column) { return column.name; });
45
+ return order;
46
+ }, [columns, columnsOrder]);
36
47
  var onConfirmForm = useCallback(function () {
37
- setColumnConfig === null || setColumnConfig === void 0 ? void 0 : setColumnConfig(columnsConfigOptions);
38
- setColumnsOrder === null || setColumnsOrder === void 0 ? void 0 : setColumnsOrder(updatedColumnsOrder);
39
- onClose === null || onClose === void 0 ? void 0 : onClose();
48
+ (setColumnConfig === null || setColumnConfig === void 0 ? void 0 : setColumnConfig(columnsConfigOptions)) && (setColumnsOrder === null || setColumnsOrder === void 0 ? void 0 : setColumnsOrder(updatedColumnsOrder)) && (onClose === null || onClose === void 0 ? void 0 : onClose());
40
49
  }, [columnsConfigOptions, updatedColumnsOrder, onClose, setColumnConfig]);
41
50
  var resetColumnConfig = useCallback(function () {
42
- setUpdatedColumnsOrder(columnsOrder || []);
43
- if (resetGrid) {
44
- resetGrid();
45
- onClose === null || onClose === void 0 ? void 0 : onClose();
46
- }
51
+ setUpdatedColumnsOrder(columnsOrderValues);
52
+ (resetGrid === null || resetGrid === void 0 ? void 0 : resetGrid()) && (onClose === null || onClose === void 0 ? void 0 : onClose());
47
53
  setColumnsConfigOptions(columnConfig || {});
48
54
  }, [onClose, resetGrid]);
49
55
  var onCloseForm = useCallback(function () {
50
- setUpdatedColumnsOrder(columnsOrder !== null && columnsOrder !== void 0 ? columnsOrder : []);
56
+ setUpdatedColumnsOrder(columnsOrderValues);
51
57
  onClose === null || onClose === void 0 ? void 0 : onClose();
52
58
  }, []);
53
59
  var handleDragEnd = useCallback(function (item) {