From 836ec0aef2a1f9c2cb0bac7a386301803d118eef Mon Sep 17 00:00:00 2001
From: Mateusz Tylka <mattyl@st.amu.edu.pl>
Date: Fri, 11 Aug 2023 13:10:56 +0200
Subject: [PATCH] ColumnFilterButton correction and table DOM structure
 correction

---
 .../components/DesktopTable/DesktopTable.js   | 58 ++++++++++---------
 .../components/TableHeader/TableHeader.js     | 24 ++++----
 .../components/TableRowItems/TableRowItems.js |  4 +-
 .../components/TableRowTags/TableRowTags.js   |  2 +-
 .../generic/Table/styles/TableStyle.js        |  7 ---
 5 files changed, 49 insertions(+), 46 deletions(-)

diff --git a/src/components/generic/Table/components/DesktopTable/DesktopTable.js b/src/components/generic/Table/components/DesktopTable/DesktopTable.js
index f8b9b9c..0089561 100644
--- a/src/components/generic/Table/components/DesktopTable/DesktopTable.js
+++ b/src/components/generic/Table/components/DesktopTable/DesktopTable.js
@@ -8,32 +8,38 @@ import RowsBackgroundStyle from '../../styles/RowsBackgroundStyle';
 const DesktopTable = (props) => {
   return (
     <TableStyle rowFooter={props.rowFooter}>
-      <TableHeader
-        orderedKeys={props.orderedKeys}
-        sortByUpdate={props.sortByUpdate}
-        tableUpdate={props.tableUpdate}
-      />
-      {props.elements.map((item, i) => {
-        return (
-          <tr key={`table-row-${i}`} className="TableStyle__tr">
-            <TableRowItems orderedKeys={props.orderedKeys} item={item} i={i} />
-            <TableRowFooter
-              deleteItem={() => {
-                props.setItemToHandle(item);
-                props.setDeletePopUp(true);
-              }}
-              editItem={() => {
-                props.setItemToHandle(item);
-                props.setEditPopUp(true);
-              }}
-              rowFooter={props.rowFooter}
-              item={item}
-              i={i}
-            />
-            <RowsBackgroundStyle i={i} />
-          </tr>
-        );
-      })}
+      <tbody>
+        <TableHeader
+          orderedKeys={props.orderedKeys}
+          sortByUpdate={props.sortByUpdate}
+          tableUpdate={props.tableUpdate}
+        />
+        {props.elements.map((item, i) => {
+          return (
+            <tr key={`table-row-${i}`} className="TableStyle__tr">
+              <TableRowItems
+                orderedKeys={props.orderedKeys}
+                item={item}
+                i={i}
+              />
+              <TableRowFooter
+                deleteItem={() => {
+                  props.setItemToHandle(item);
+                  props.setDeletePopUp(true);
+                }}
+                editItem={() => {
+                  props.setItemToHandle(item);
+                  props.setEditPopUp(true);
+                }}
+                rowFooter={props.rowFooter}
+                item={item}
+                i={i}
+              />
+              <RowsBackgroundStyle i={i} as="td" />
+            </tr>
+          );
+        })}
+      </tbody>
     </TableStyle>
   );
 };
diff --git a/src/components/generic/Table/components/TableHeader/TableHeader.js b/src/components/generic/Table/components/TableHeader/TableHeader.js
index 10f798c..78eb488 100644
--- a/src/components/generic/Table/components/TableHeader/TableHeader.js
+++ b/src/components/generic/Table/components/TableHeader/TableHeader.js
@@ -25,17 +25,19 @@ const TableHeader = (props) => {
               props.tableUpdate();
             }}
           >
-            {keyValue}
-            <FlexRow
-              as="span"
-              className="TableStyle__sort-button"
-              column={keyValue}
-            >
-              <ColumnFilterIcon
-                index={i}
-                active={activeIcon}
-                rotateIcon={rotateActiveIcon}
-              />
+            <FlexRow as="span" alignmentX="flex-start" gap="8px" width="100%">
+              {keyValue}
+              <FlexRow
+                as="span"
+                className="TableStyle__sort-button"
+                column={keyValue}
+              >
+                <ColumnFilterIcon
+                  index={i}
+                  active={activeIcon}
+                  rotateIcon={rotateActiveIcon}
+                />
+              </FlexRow>
             </FlexRow>
           </th>
         );
diff --git a/src/components/generic/Table/components/TableRowItems/TableRowItems.js b/src/components/generic/Table/components/TableRowItems/TableRowItems.js
index 29c479b..be52267 100644
--- a/src/components/generic/Table/components/TableRowItems/TableRowItems.js
+++ b/src/components/generic/Table/components/TableRowItems/TableRowItems.js
@@ -21,7 +21,9 @@ const TableRowItems = ({ orderedKeys, item, i }) => {
         return (
           <td key={`table-item-${i}-${j}`} className="TableStyle__td">
             {IS_MOBILE() && (
-              <Container className="mobile-table-header">{keyValue}</Container>
+              <Container as="span" className="mobile-table-header">
+                {keyValue}
+              </Container>
             )}
             {renderValue(keyValue)}
             {keyValue === '#' && i + 1}
diff --git a/src/components/generic/Table/components/TableRowTags/TableRowTags.js b/src/components/generic/Table/components/TableRowTags/TableRowTags.js
index a647907..d872575 100644
--- a/src/components/generic/Table/components/TableRowTags/TableRowTags.js
+++ b/src/components/generic/Table/components/TableRowTags/TableRowTags.js
@@ -3,7 +3,7 @@ import { FlexRow } from '../../../../../utils/containers';
 
 const TableRowTags = ({ item, i }) => {
   return (
-    <FlexRow className="TableStyle__tags-container">
+    <FlexRow as="span" className="TableStyle__tags-container">
       {renderTags(item.tags)}
     </FlexRow>
   );
diff --git a/src/components/generic/Table/styles/TableStyle.js b/src/components/generic/Table/styles/TableStyle.js
index 707faf9..f5b7e1b 100644
--- a/src/components/generic/Table/styles/TableStyle.js
+++ b/src/components/generic/Table/styles/TableStyle.js
@@ -6,7 +6,6 @@ const TableStyle = styled.table`
   width: 100%;
 
   .TableStyle__th {
-    position: relative;
     cursor: pointer;
     * {
       cursor: pointer;
@@ -62,12 +61,6 @@ const TableStyle = styled.table`
     gap: 4px;
     padding: 0 2px;
   }
-
-  .TableStyle__sort-button {
-    position: absolute;
-    top: 15px;
-    right: 16%;
-  }
 `;
 
 export default TableStyle;