Fix another "Rendered more hooks than during the previous render"

#154 #90
devhubapp · Jul 4, 2019 · 70bbfd5 · 70bbfd5
1 parent 6373349
commit 70bbfd5
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/packages/components/src/components/layout/Sidebar.tsx b/packages/components/src/components/layout/Sidebar.tsx
@@ -574,6 +574,10 @@ export const Sidebar = React.memo((props: SidebarProps) => {
 
 Sidebar.displayName = 'Sidebar'
 
+const getFilteredItemsOptions: Parameters<typeof getFilteredItems>[3] = {
+  mergeSimilar: false,
+}
+
 const SidebarColumnItem = React.memo(
   (props: {
     activeOpacity?: ColumnHeaderItemProps['activeOpacity']
@@ -607,13 +611,12 @@ const SidebarColumnItem = React.memo(
 
     const { column, columnIndex, headerDetails } = useColumn(columnId)
 
-    if (!(column && columnIndex >= 0 && headerDetails)) return null
-
-    const getFilteredItemsOptions: Parameters<typeof getFilteredItems>[3] = {
-      mergeSimilar: false,
-    }
+    const { allItems } = useColumnData(
+      (column && column.id) || '',
+      getFilteredItemsOptions,
+    )
 
-    const { allItems } = useColumnData(column.id, getFilteredItemsOptions)
+    if (!(column && columnIndex >= 0 && headerDetails)) return null
 
     const filteredItemsMetadata = getItemsFilterMetadata(
       column.type,