@mailstep/design-system 0.7.53-beta.5 → 0.7.53-beta.6

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 (5) hide show
  1. package/package.json +1 -1
  2. package/ui/Blocks/CommonGrid/hooks/useManageColumn.js +9 -0
  3. package/ui/Blocks/CommonGrid/store/index.js +1 -1
  4. package/ui/index.es.js +412 -409
  5. package/ui/index.umd.js +48 -48
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mailstep/design-system",
3
- "version": "0.7.53-beta.5",
3
+ "version": "0.7.53-beta.6",
4
4
  "license": "ISC",
5
5
  "type": "module",
6
6
  "main": "./ui/index.js",
package/ui/Blocks/CommonGrid/hooks/useManageColumn.js CHANGED
@@ -25,6 +25,7 @@ var useManageColumn = function (_a) {
25
25
  var resetGrid = gridActions.resetGrid, setColumnConfig = gridActions.setColumnConfig, setColumnsOrder = gridActions.setColumnsOrder;
26
26
  var columnConfig = gridSelectors.columnConfig, columnsOrder = gridSelectors.columnsOrder;
27
27
  var initialColumnsOrder = useMemo(function () { return columns === null || columns === void 0 ? void 0 : columns.map(function (col) { return col.name; }); }, [columns]);
28
+ console.log('columnsOrder', columnsOrder);
28
29
  // the length of columnsOrder is changed after using the setColumnsOrder
29
30
  var columnsOrderValue = (columnsOrder === null || columnsOrder === void 0 ? void 0 : columnsOrder.length) ? columnsOrder : initialColumnsOrder;
30
31
  // columnsConfigOptions contains switch changes from the manageColumnForm (isHidden || {})
@@ -64,6 +65,10 @@ var useManageColumn = function (_a) {
64
65
  var sortFunction = function (col1, col2) {
65
66
  var i = (orderValues || []).indexOf(col1.name);
66
67
  var j = (orderValues || []).indexOf(col2.name);
68
+ // if orderValues is defined but the column is not in the order list, keep the default position by column definition
69
+ if (orderValues && (orderValues === null || orderValues === void 0 ? void 0 : orderValues.length) > 0 && i === -1) {
70
+ return 0;
71
+ }
67
72
  return i > j ? 1 : i < j ? -1 : 0;
68
73
  };
69
74
  var sortedList = __spreadArray([], list, true).sort(sortFunction);
@@ -79,11 +84,15 @@ var useManageColumn = function (_a) {
79
84
  if (!over || active.id === over.id) {
80
85
  return;
81
86
  }
87
+ console.log('updatedColumnsOrder', updatedColumnsOrder);
82
88
  var newOrderColumns = __spreadArray([], updatedColumnsOrder, true);
83
89
  var fromIndex = updatedColumnsOrder.findIndex(function (column) { return column === active.id; });
84
90
  var toIndex = updatedColumnsOrder.findIndex(function (column) { return column === over.id; });
85
91
  newOrderColumns.splice(fromIndex, 1);
86
92
  newOrderColumns.splice(toIndex === -1 ? 0 : toIndex, 0, active.id);
93
+ console.log('newOrderColumns', newOrderColumns);
94
+ console.log('fromIndex', fromIndex);
95
+ console.log('toIndex', toIndex);
87
96
  if (!isManageModal) {
88
97
  setColumnsOrder === null || setColumnsOrder === void 0 ? void 0 : setColumnsOrder(newOrderColumns);
89
98
  }
package/ui/Blocks/CommonGrid/store/index.js CHANGED
@@ -26,7 +26,7 @@ export var initialState = {
26
26
  columnConfig: {},
27
27
  filter: {},
28
28
  columnsWidth: {},
29
- columnsOrder: [],
29
+ columnsOrder: ['actions-cell-cg', 'hiddenColumn', 'textColumn', 'enumColumn', 'numberColumn', 'dateColumn', 'boolColumn', 'advancedColumn', 'complexColumn', 'stickyColumn'],
30
30
  defaultSorting: []
31
31
  };
32
32
  export var actionPrefix = '@store/CommonGrid';