Merge pull request #373 from shesha-io/fix/datalist-selections

Fix/datalist selections
shesha-io · Jul 21, 2023 · 358ef44 · 358ef44
2 parents 136e807 + 6c26430
commit 358ef44
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/shesha-reactjs/src/components/dataList/index.tsx b/shesha-reactjs/src/components/dataList/index.tsx
@@ -62,6 +62,8 @@ export const DataList: FC<Partial<IDataListProps>> = ({
  })
  );
  } else {
+ if (typeof onSelectRow !== 'function') return;
+
  if (onSelectRow) onSelectRow(index, row);
  }
  };

diff --git a/shesha-reactjs/src/providers/dataTableSelection/index.tsx b/shesha-reactjs/src/providers/dataTableSelection/index.tsx
@@ -23,10 +23,7 @@ const DataTableSelectionProvider: FC<PropsWithChildren<IDataTableSelectionProvid
  const selectedId = state.selectedRow?.id;
  const currentId = row?.id;
 
- // change selection only when the id differs
- if (selectedId !== currentId){
- dispatch(setSelectedRowAction({ index, row, id: row?.id }));
- }
+ dispatch(setSelectedRowAction(selectedId !== currentId ? { index, row, id: row?.id } : null));
  };
 
  const setMultiSelectedRow = (rows: Row[] | Row) => {