From d341129e05dbe422bbfce61fe25dee5dc594ec3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Fri, 26 Jun 2020 23:03:35 +0200
Subject: [PATCH] Made CatalogFilter accept dynamic onChange

---
 .../CatalogFilter/CatalogFilter.tsx           | 26 ++++++++++++++-----
 .../components/CatalogPage/CatalogPage.tsx    | 13 +++-------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/plugins/catalog/src/components/CatalogFilter/CatalogFilter.tsx b/plugins/catalog/src/components/CatalogFilter/CatalogFilter.tsx
index 71956e2e22..2537b7fba0 100644
--- a/plugins/catalog/src/components/CatalogFilter/CatalogFilter.tsx
+++ b/plugins/catalog/src/components/CatalogFilter/CatalogFilter.tsx
@@ -26,7 +26,14 @@ import {
   Theme,
   Typography,
 } from '@material-ui/core';
-import React, { FC, useCallback, useMemo, useState, useEffect } from 'react';
+import React, {
+  FC,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react';
 import {
   EntityFilterOptions,
   entityFilters,
@@ -35,7 +42,7 @@ import {
 import { FilterGroup, useEntityFilterGroup } from '../../filter';
 import { useStarredEntities } from '../../hooks/useStarredEntites';
 
-export type CatalogFilterItem = {
+type CatalogFilterItem = {
   id: EntityGroup;
   label: string;
   icon?: IconComponent;
@@ -73,9 +80,11 @@ const useStyles = makeStyles<Theme>(theme => ({
   },
 }));
 
+type OnChangeCallback = (item: { id: string; label: string }) => void;
+
 type Props = {
   filterGroups: CatalogFilterGroup[];
-  onChange?: (filterItem: CatalogFilterItem) => void;
+  onChange?: OnChangeCallback;
   initiallySelected?: EntityGroup;
 };
 
@@ -87,12 +96,17 @@ export const CatalogFilter = ({
   const classes = useStyles();
   const { currentFilter, setCurrentFilter, getFilterCount } = useFilter();
 
+  const onChangeRef = useRef<OnChangeCallback>();
+  useEffect(() => {
+    onChangeRef.current = onChange;
+  }, [onChange]);
+
   const setCurrent = useCallback(
     (item: CatalogFilterItem) => {
       setCurrentFilter(item.id);
-      onChange?.(item);
+      onChangeRef.current?.(item);
     },
-    [onChange, setCurrentFilter],
+    [setCurrentFilter],
   );
 
   // Make one initial onChange to inform the surroundings about the selected
@@ -101,7 +115,7 @@ export const CatalogFilter = ({
     const items = filterGroups.flatMap(g => g.items);
     const item = items.find(i => i.id === initiallySelected) || items[0];
     if (item) {
-      onChange?.(item);
+      onChangeRef.current?.(item);
     }
     // intentionally only happens on startup
     // eslint-disable-next-line react-hooks/exhaustive-deps
diff --git a/plugins/catalog/src/components/CatalogPage/CatalogPage.tsx b/plugins/catalog/src/components/CatalogPage/CatalogPage.tsx
index b7e97227e8..ecee5cc729 100644
--- a/plugins/catalog/src/components/CatalogPage/CatalogPage.tsx
+++ b/plugins/catalog/src/components/CatalogPage/CatalogPage.tsx
@@ -22,16 +22,13 @@ import Edit from '@material-ui/icons/Edit';
 import GitHub from '@material-ui/icons/GitHub';
 import Star from '@material-ui/icons/Star';
 import StarOutline from '@material-ui/icons/StarBorder';
-import React, { useCallback, useState } from 'react';
+import React, { useState } from 'react';
 import { Link as RouterLink } from 'react-router-dom';
 import { EntityGroup, filterGroups } from '../../data/filters';
 import { findLocationForEntityMeta } from '../../data/utils';
 import { EntityFilterGroupsProvider, useFilteredEntities } from '../../filter';
 import { useStarredEntities } from '../../hooks/useStarredEntites';
-import {
-  CatalogFilter,
-  CatalogFilterItem,
-} from '../CatalogFilter/CatalogFilter';
+import { CatalogFilter } from '../CatalogFilter/CatalogFilter';
 import { CatalogTable } from '../CatalogTable/CatalogTable';
 import CatalogLayout from './CatalogLayout';
 import { CatalogTabs } from './CatalogTabs';
@@ -103,10 +100,6 @@ const CatalogPageContents = () => {
     },
   ];
 
-  const onSidebarChanged = useCallback((filterItem: CatalogFilterItem) => {
-    setSelectedSidebarItem(filterItem.label);
-  }, []);
-
   return (
     <CatalogLayout>
       <CatalogTabs onChange={({ label }) => setSelectedTab(label)} />
@@ -127,7 +120,7 @@ const CatalogPageContents = () => {
           <div>
             <CatalogFilter
               filterGroups={filterGroups}
-              onChange={onSidebarChanged}
+              onChange={({ label }) => setSelectedSidebarItem(label)}
               initiallySelected={EntityGroup.OWNED}
             />
           </div>