es-grid-template 1.9.68 → 1.9.70

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/es/table-component/header/TableHeadCell2.js +3 -2
  2. package/es/table-component/hook/useColumns.js +11 -11
  3. package/lib/table-component/header/TableHeadCell2.js +3 -2
  4. package/lib/table-component/hook/useColumns.js +11 -11
  5. package/package.json +1 -1
package/es/table-component/header/TableHeadCell2.js CHANGED
@@ -297,7 +297,8 @@ const TableHeadCell2 = props => {
297
297
  onChange: e => {
298
298
  table.getToggleAllRowsSelectedHandler()(e);
299
299
  const prevSelected = isSelectionChange?.rowsData ?? [];
300
- const allRowsInPage = table.getRowModel().flatRows;
300
+ const allRows = table.getRowModel().flatRows;
301
+ const allRowsInPage = allRows.map(it => it.original);
301
302
  if (table.getIsAllRowsSelected()) {
302
303
  const cc = excludeItems(prevSelected, allRowsInPage);
303
304
  setIsSelectionChange({
@@ -308,7 +309,7 @@ const TableHeadCell2 = props => {
308
309
  });
309
310
  } else {
310
311
  const abc = [...prevSelected, ...allRowsInPage];
311
- const newSeletedRows = removeDuplicatesByKey(abc, 'id');
312
+ const newSeletedRows = removeDuplicatesByKey(abc, 'rowId');
312
313
  setIsSelectionChange({
313
314
  isChange: true,
314
315
  type: 'all',
package/es/table-component/hook/useColumns.js CHANGED
@@ -270,7 +270,7 @@ export const toggleRowSelection = props => {
270
270
  isChange: true,
271
271
  type: 'rowSelected',
272
272
  rowData: row.original,
273
- rowsData: selectionSettings?.type === 'single' ? [row] : checkedRows
273
+ rowsData: selectionSettings?.type === 'single' ? [row.original] : checkedRows
274
274
  });
275
275
  }
276
276
  return;
@@ -278,14 +278,14 @@ export const toggleRowSelection = props => {
278
278
  if (row.subRows && row.subRows.length > 0) {
279
279
  // click vào row cha
280
280
 
281
- const allChild = getAllChildren(row);
281
+ const allChild = getAllChildren(row).map(it => it.original);
282
282
  toggleRowAndChildren(row, !row.getIsSelected());
283
283
  if (row.getIsSelected()) {
284
284
  // đã chọn
285
285
 
286
286
  // const aaa = isSelectionChange?.rowsData.filter((it) => it.id !== row.id)
287
287
 
288
- const newRowsSelected = excludeItems(prevSelected, [...allChild, row]);
288
+ const newRowsSelected = excludeItems(prevSelected, [...allChild, row.original]);
289
289
  setIsSelectionChange({
290
290
  isChange: true,
291
291
  type: 'rowSelected',
@@ -297,9 +297,9 @@ export const toggleRowSelection = props => {
297
297
 
298
298
  let checkedRows = [];
299
299
  if (row.subRows && row.subRows.length > 0) {
300
- checkedRows = [...prevSelected, row, ...allChild];
300
+ checkedRows = [...prevSelected, row.original, ...allChild];
301
301
  } else {
302
- checkedRows = [...prevSelected, row];
302
+ checkedRows = [...prevSelected, row.original];
303
303
  }
304
304
  setIsSelectionChange({
305
305
  isChange: true,
@@ -321,11 +321,11 @@ export const toggleRowSelection = props => {
321
321
  let newCheckedRows = [];
322
322
  if (rowParent) {}
323
323
  if (rowParent && countUnselectedChildren(row) === 1) {
324
- newCheckedRows = prevSelected.filter(it => it.id !== row.id && it.id !== rowParent.id);
324
+ newCheckedRows = prevSelected.filter(it => it.rowId !== row.id && it.rowId !== rowParent.id);
325
325
  } else {
326
326
  // xóa row ra list selected
327
327
  // const newRowsSelected = prevSelected.filter((it) => it.id !== row.id)
328
- newCheckedRows = prevSelected.filter(it => it.id !== row.id);
328
+ newCheckedRows = prevSelected.filter(it => it.rowId !== row.id);
329
329
  }
330
330
  setIsSelectionChange({
331
331
  isChange: true,
@@ -342,18 +342,18 @@ export const toggleRowSelection = props => {
342
342
  // nếu có cha và cha chưa được chọn và tất cả con đã chọn => thêm row cha vào
343
343
  if (rowParent && !rowParent.getIsSelected() && countUnselectedChildren(row) === 1) {
344
344
  rowParent.toggleSelected(!rowParent.getIsSelected());
345
- checkedRows = [...prevSelected, row, rowParent];
345
+ checkedRows = [...prevSelected, row.original, rowParent.original];
346
346
  } else {
347
347
  // chỉ thêm vào row hiện tại
348
348
 
349
- const isInclude = prevSelected.findIndex(it => it.id === cell.row.id);
349
+ const isInclude = prevSelected.findIndex(it => it.rowId === cell.row.id);
350
350
  if (isInclude > -1) {
351
351
  // cập nhật data row hiện tại
352
352
 
353
- prevSelected[isInclude] = row;
353
+ prevSelected[isInclude] = row.original;
354
354
  checkedRows = [...prevSelected];
355
355
  } else {
356
- checkedRows = [...prevSelected, row];
356
+ checkedRows = [...prevSelected, row.original];
357
357
  }
358
358
  }
359
359
  setIsSelectionChange({
package/lib/table-component/header/TableHeadCell2.js CHANGED
@@ -305,7 +305,8 @@ const TableHeadCell2 = props => {
305
305
  onChange: e => {
306
306
  table.getToggleAllRowsSelectedHandler()(e);
307
307
  const prevSelected = isSelectionChange?.rowsData ?? [];
308
- const allRowsInPage = table.getRowModel().flatRows;
308
+ const allRows = table.getRowModel().flatRows;
309
+ const allRowsInPage = allRows.map(it => it.original);
309
310
  if (table.getIsAllRowsSelected()) {
310
311
  const cc = (0, _utils.excludeItems)(prevSelected, allRowsInPage);
311
312
  setIsSelectionChange({
@@ -316,7 +317,7 @@ const TableHeadCell2 = props => {
316
317
  });
317
318
  } else {
318
319
  const abc = [...prevSelected, ...allRowsInPage];
319
- const newSeletedRows = (0, _utils.removeDuplicatesByKey)(abc, 'id');
320
+ const newSeletedRows = (0, _utils.removeDuplicatesByKey)(abc, 'rowId');
320
321
  setIsSelectionChange({
321
322
  isChange: true,
322
323
  type: 'all',
package/lib/table-component/hook/useColumns.js CHANGED
@@ -282,7 +282,7 @@ const toggleRowSelection = props => {
282
282
  isChange: true,
283
283
  type: 'rowSelected',
284
284
  rowData: row.original,
285
- rowsData: selectionSettings?.type === 'single' ? [row] : checkedRows
285
+ rowsData: selectionSettings?.type === 'single' ? [row.original] : checkedRows
286
286
  });
287
287
  }
288
288
  return;
@@ -290,14 +290,14 @@ const toggleRowSelection = props => {
290
290
  if (row.subRows && row.subRows.length > 0) {
291
291
  // click vào row cha
292
292
 
293
- const allChild = (0, _utils.getAllChildren)(row);
293
+ const allChild = (0, _utils.getAllChildren)(row).map(it => it.original);
294
294
  (0, _utils.toggleRowAndChildren)(row, !row.getIsSelected());
295
295
  if (row.getIsSelected()) {
296
296
  // đã chọn
297
297
 
298
298
  // const aaa = isSelectionChange?.rowsData.filter((it) => it.id !== row.id)
299
299
 
300
- const newRowsSelected = (0, _utils.excludeItems)(prevSelected, [...allChild, row]);
300
+ const newRowsSelected = (0, _utils.excludeItems)(prevSelected, [...allChild, row.original]);
301
301
  setIsSelectionChange({
302
302
  isChange: true,
303
303
  type: 'rowSelected',
@@ -309,9 +309,9 @@ const toggleRowSelection = props => {
309
309
 
310
310
  let checkedRows = [];
311
311
  if (row.subRows && row.subRows.length > 0) {
312
- checkedRows = [...prevSelected, row, ...allChild];
312
+ checkedRows = [...prevSelected, row.original, ...allChild];
313
313
  } else {
314
- checkedRows = [...prevSelected, row];
314
+ checkedRows = [...prevSelected, row.original];
315
315
  }
316
316
  setIsSelectionChange({
317
317
  isChange: true,
@@ -333,11 +333,11 @@ const toggleRowSelection = props => {
333
333
  let newCheckedRows = [];
334
334
  if (rowParent) {}
335
335
  if (rowParent && (0, _utils.countUnselectedChildren)(row) === 1) {
336
- newCheckedRows = prevSelected.filter(it => it.id !== row.id && it.id !== rowParent.id);
336
+ newCheckedRows = prevSelected.filter(it => it.rowId !== row.id && it.rowId !== rowParent.id);
337
337
  } else {
338
338
  // xóa row ra list selected
339
339
  // const newRowsSelected = prevSelected.filter((it) => it.id !== row.id)
340
- newCheckedRows = prevSelected.filter(it => it.id !== row.id);
340
+ newCheckedRows = prevSelected.filter(it => it.rowId !== row.id);
341
341
  }
342
342
  setIsSelectionChange({
343
343
  isChange: true,
@@ -354,18 +354,18 @@ const toggleRowSelection = props => {
354
354
  // nếu có cha và cha chưa được chọn và tất cả con đã chọn => thêm row cha vào
355
355
  if (rowParent && !rowParent.getIsSelected() && (0, _utils.countUnselectedChildren)(row) === 1) {
356
356
  rowParent.toggleSelected(!rowParent.getIsSelected());
357
- checkedRows = [...prevSelected, row, rowParent];
357
+ checkedRows = [...prevSelected, row.original, rowParent.original];
358
358
  } else {
359
359
  // chỉ thêm vào row hiện tại
360
360
 
361
- const isInclude = prevSelected.findIndex(it => it.id === cell.row.id);
361
+ const isInclude = prevSelected.findIndex(it => it.rowId === cell.row.id);
362
362
  if (isInclude > -1) {
363
363
  // cập nhật data row hiện tại
364
364
 
365
- prevSelected[isInclude] = row;
365
+ prevSelected[isInclude] = row.original;
366
366
  checkedRows = [...prevSelected];
367
367
  } else {
368
- checkedRows = [...prevSelected, row];
368
+ checkedRows = [...prevSelected, row.original];
369
369
  }
370
370
  }
371
371
  setIsSelectionChange({
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "es-grid-template",
3
- "version": "1.9.68",
3
+ "version": "1.9.70",
4
4
  "description": "es-grid-template",
5
5
  "keywords": [
6
6
  "react",