From b781fc4ce0928cc0d0cb2bbafaf2d02fede09d42 Mon Sep 17 00:00:00 2001
From: Janne Savolainen <janne.savolainen@live.fi>
Date: Wed, 2 Feb 2022 08:27:32 +0200
Subject: [PATCH] Fix scrolling to top when selecting all items in item list
 layout

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

diff --git a/src/renderer/components/item-object-list/content.tsx b/src/renderer/components/item-object-list/content.tsx
index af64731d40..08392359ec 100644
--- a/src/renderer/components/item-object-list/content.tsx
+++ b/src/renderer/components/item-object-list/content.tsx
@@ -203,31 +203,43 @@ export class ItemListLayoutContent<I extends ItemObject> extends React.Component
   }
 
   renderTableHeader() {
-    const { customizeTableRowProps, renderTableHeader, isSelectable, isConfigurable, store } = this.props;
+    const { renderTableHeader } = this.props;
 
     if (!renderTableHeader) {
       return null;
     }
 
-    const enabledItems = this.props.getItems().filter(item => !customizeTableRowProps(item).disabled);
-
     return (
       <TableHead showTopLine nowrap>
-        {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>
+          {() => {
+            const { store, isConfigurable, isSelectable, customizeTableRowProps } = this.props;
+            const enabledItems = this.props.getItems().filter(item => !customizeTableRowProps(item).disabled);
+
+            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>
       </TableHead>
     );
   }