From 2ed6a9817bc6c5dd8d349a15db8b8d39a2391ea7 Mon Sep 17 00:00:00 2001
From: Lukas <lukas742@gmx.net>
Date: Wed, 22 Apr 2020 13:33:32 +0200
Subject: [PATCH] fix(AnalyticalTable): fix multi-select checkbox (#445)

---
 .../AnalyticalTable/hooks/useRowSelectionColumn.tsx      | 9 ++++++++-
 .../AnalyticalTable/hooks/useSingleRowStateSelection.ts  | 5 +++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/main/src/components/AnalyticalTable/hooks/useRowSelectionColumn.tsx b/packages/main/src/components/AnalyticalTable/hooks/useRowSelectionColumn.tsx
index e6eda5a6f96..5a617f05ff8 100644
--- a/packages/main/src/components/AnalyticalTable/hooks/useRowSelectionColumn.tsx
+++ b/packages/main/src/components/AnalyticalTable/hooks/useRowSelectionColumn.tsx
@@ -56,7 +56,14 @@ const Cell = ({ row, webComponentsReactProperties: { selectionBehavior, selectio
   if (selectionMode === TableSelectionMode.SINGLE_SELECT) {
     return <div style={divStyle} onClick={handleCellClick} />;
   }
-  return <CheckBox {...row.getToggleRowSelectedProps()} onChange={handleCellClick} style={customCheckBoxStyling} />;
+  return (
+    <CheckBox
+      {...row.getToggleRowSelectedProps()}
+      onChange={handleCellClick}
+      style={customCheckBoxStyling}
+      data-name="internal_selection_column"
+    />
+  );
 };
 
 /*
diff --git a/packages/main/src/components/AnalyticalTable/hooks/useSingleRowStateSelection.ts b/packages/main/src/components/AnalyticalTable/hooks/useSingleRowStateSelection.ts
index 5cb019748dd..275d7dacce1 100644
--- a/packages/main/src/components/AnalyticalTable/hooks/useSingleRowStateSelection.ts
+++ b/packages/main/src/components/AnalyticalTable/hooks/useSingleRowStateSelection.ts
@@ -40,8 +40,9 @@ const useInstance = (instance) => {
   const selectSingleRow = useCallback(
     (row, e, selectionCellClick = false) => {
       if (
-        tagNamesWhichShouldNotSelectARow.has(e.target.tagName) &&
-        !(e.markerAllowTableRowSelection === true || e.nativeEvent?.markerAllowTableRowSelection === true)
+        e.target?.dataset?.name !== 'internal_selection_column' &&
+        !(e.markerAllowTableRowSelection === true || e.nativeEvent?.markerAllowTableRowSelection === true) &&
+        tagNamesWhichShouldNotSelectARow.has(e.target.tagName)
       ) {
         return;
       }