From f46c3748e74e8a314b75ddc955f4952ede2e8bf7 Mon Sep 17 00:00:00 2001
From: Janne Savolainen <janne.savolainen@live.fi>
Date: Wed, 2 Feb 2022 13:10:01 +0200
Subject: [PATCH] Fix sorting of table rows

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
---
 .../components/item-object-list/content.tsx   | 54 +++++++++----------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/src/renderer/components/item-object-list/content.tsx b/src/renderer/components/item-object-list/content.tsx
index 08392359ec..a71832af4b 100644
--- a/src/renderer/components/item-object-list/content.tsx
+++ b/src/renderer/components/item-object-list/content.tsx
@@ -209,37 +209,35 @@ export class ItemListLayoutContent<I extends ItemObject> extends React.Component
       return null;
     }
 
+    const { store, isConfigurable, isSelectable, customizeTableRowProps } = this.props;
+
+    const enabledItems = this.props
+      .getItems()
+      .filter((item) => !customizeTableRowProps(item).disabled);
+
     return (
       <TableHead showTopLine nowrap>
-        <Observer>
-          {() => {
-            const { store, isConfigurable, isSelectable, customizeTableRowProps } = this.props;
-            const enabledItems = this.props.getItems().filter(item => !customizeTableRowProps(item).disabled);
+        {isSelectable && (
+          <Observer>
+            {() => (
+              <TableCell
+                checkbox
+                isChecked={store.isSelectedAll(enabledItems)}
+                onClick={prevDefault(() => store.toggleSelectionAll(enabledItems))}
+              />
+            )}
+          </Observer>
 
-            return (
-              <>
-                {isSelectable && (
-                  <TableCell
-                    checkbox
-                    isChecked={store.isSelectedAll(enabledItems)}
-                    onClick={prevDefault(() =>
-                      store.toggleSelectionAll(enabledItems),
-                    )}
-                  />
-                )}
-                {renderTableHeader.map(
-                  (cellProps, index) =>
-                    this.showColumn(cellProps) && (
-                      <TableCell key={cellProps.id ?? index} {...cellProps} />
-                    ),
-                )}
-                <TableCell className="menu">
-                  {isConfigurable && this.renderColumnVisibilityMenu()}
-                </TableCell>
-              </>
-            );
-          }}
-        </Observer>
+        )}
+        {renderTableHeader.map(
+          (cellProps, index) =>
+            this.showColumn(cellProps) && (
+              <TableCell key={cellProps.id ?? index} {...cellProps} />
+            ),
+        )}
+        <TableCell className="menu">
+          {isConfigurable && this.renderColumnVisibilityMenu()}
+        </TableCell>
       </TableHead>
     );
   }