<DataTable />チェックまわりのバグ改修 (#401)

* tweak * tweak
voyagegroup · Jun 29, 2021 · 57bfe13 · 57bfe13
1 parent 1056a9f
commit 57bfe13
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/components/DataTable/DataTable.tsx b/src/components/DataTable/DataTable.tsx
@@ -481,6 +481,9 @@ const DataTable = <T extends DataTableBaseData>({
                                 <CellCheckbox
                                   selected={selectedRows.includes(item.id)}
                                   rowSpan={calculateRowSpan(displayData, index)}
+                                  {...(disableCheckWhenClickRow && {
+                                    onClick: handleSelectCheckbox(item.id),
+                                  })}
                                 />
                               )}
                             {columns.map((column) =>

diff --git a/src/components/DataTable/internal/CellCheckbox/CellCheckbox.tsx b/src/components/DataTable/internal/CellCheckbox/CellCheckbox.tsx
@@ -18,8 +18,8 @@ export const CellCheckbox: React.FunctionComponent<Props> = ({
   ...rest
 }) => {
   const handleClick = (event: React.MouseEvent<HTMLInputElement>) => {
-    if (onClick) return onClick(event);
-    return event.stopPropagation();
+    event.stopPropagation();
+    if (onClick) onClick(event);
   };
   const Component = header ? Styled.HeaderCell : Styled.StandardCell;
   return (

diff --git a/src/components/DataTable/internal/CellRadio/CellRadio.tsx b/src/components/DataTable/internal/CellRadio/CellRadio.tsx
@@ -15,10 +15,14 @@ export const CellRadio: React.FunctionComponent<Props> = ({
   onClick,
   ...rest
 }) => {
+  const handleClick = (event: React.MouseEvent<HTMLInputElement>) => {
+    event.stopPropagation();
+    if (onClick) onClick(event);
+  };
   const Component = header ? Styled.HeaderCell : Styled.StandardCell;
   return (
     <Component {...rest}>
-      {!header && <RadioButton checked={selected} onClick={onClick} />}
+      {!header && <RadioButton checked={selected} onClick={handleClick} />}
     </Component>
   );
 };