refactor: move out status count closer to where it is used

shalanah · Mar 27, 2024 · 0d49345 · 0d49345
1 parent 8fc1838
commit 0d49345
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/public/fallback-7DXoc7Qr5wMFmyUSbW8-f.js → public/fallback-nNGagMvPbhVT9W3vYr8C2.js b/public/fallback-7DXoc7Qr5wMFmyUSbW8-f.js → public/fallback-nNGagMvPbhVT9W3vYr8C2.js
diff --git a/src/components/filterModalContentSpecs.tsx b/src/components/filterModalContentSpecs.tsx
@@ -1,8 +1,15 @@
 import React from 'react';
 import { Checkbox } from './checkbox';
-import useCanIUseContext, { SpecTypes } from '../hooks/useCanIUseContext';
+import useCanIUseContext from '../hooks/useCanIUseContext';
 import { Badge } from './badge';
 import styled from 'styled-components';
+import { FiltersType } from '../hooks/useFilters';
+
+export type SpecTypes = keyof FiltersType['statuses'];
+
+type StatusCounts = {
+  [K in SpecTypes]: number;
+};
 
 const Submit = styled.button`
   display: block;
@@ -27,8 +34,15 @@ export const FilterModalContentSpecs = ({
 }: {
   onClose?: () => void;
 }) => {
-  const { statusCounts, statuses, filters, setFilters, filteredData } =
+  const { filteredByBrowserOnly, statuses, filters, setFilters, filteredData } =
     useCanIUseContext();
+  const statusCounts: StatusCounts = filteredByBrowserOnly.reduce(
+    (acc: { [k: string]: number }, v: { status: 'string' } & any) => {
+      acc[v.status] += 1;
+      return acc;
+    },
+    Object.fromEntries(Object.keys(statuses || {}).map((k) => [k, 0]))
+  );
   const nonEmptyStatusFilters = Object.fromEntries(
     Object.entries(filters.statuses).filter(([k, _]) => {
       return statusCounts[k as SpecTypes] > 0;

diff --git a/src/hooks/useCanIUseContext.tsx b/src/hooks/useCanIUseContext.tsx
@@ -16,19 +16,12 @@ import { useCanIUseData } from './useCanIUseData';
 import { useFilters, type FiltersType } from './useFilters';
 // import { parseMdnData } from '../utils/parseMdnData';
 
-export type SpecTypes = keyof FiltersType['statuses'];
-
-type StatusCounts = {
-  [K in SpecTypes]: number;
-};
-
 interface CanIUseContextInterface {
   loading: boolean;
   hasError: boolean;
   iOSMissingFeatures: any;
   activeIndex: number;
   updateHash: (newHash: string) => void;
-  statusCounts: StatusCounts;
   statuses: { [k: string]: string } | undefined;
   filters: FiltersType;
   setFilters: Dispatch<SetStateAction<FiltersType>>;
@@ -134,11 +127,6 @@ export const CanIUseContextProvider = ({
     }
   };
 
-  const statusCounts: StatusCounts = filteredByBrowserOnly.reduce((acc, v) => {
-    acc[v.status] += 1;
-    return acc;
-  }, Object.fromEntries(Object.entries(canIUseData?.statuses || {}).map(([k, v]) => [k, 0])));
-
   // MDN DATA: TODO: Later
   // If Safari brings up that caniuse data isn't up-to-date...
   // Maybe they should work on that --- who do they really have to blame? That's part of their job, right? Right?
@@ -163,7 +151,6 @@ export const CanIUseContextProvider = ({
       value={{
         search,
         setSearch,
-        statusCounts,
         loading,
         hasError,
         iOSMissingFeatures,