Make Tabs supply number instead of Number

packages/core/src/layout/HeaderTabs/index.tsx

@@ -42,16 +42,17 @@ export type Tab = {
   id: string;
   label: string;
 };
+
 export const HeaderTabs: React.FC<{
   tabs: Tab[];
-  onChange?: (index: Number) => void;
+  onChange?: (index: number) => void;
 }> = ({ tabs, onChange }) => {
   const [selectedTab, setSelectedTab] = useState<Number>(0);
   const styles = useStyles();
 
   const handleChange = (_: React.ChangeEvent<{}>, index: Number) => {
     setSelectedTab(index);
-    if (onChange) onChange(index);
+    if (onChange) onChange(index.valueOf());
   };
 
   return (

plugins/catalog/src/components/CatalogPage/CatalogTabs.tsx

@@ -70,10 +70,10 @@ export const CatalogTabs = ({ tabs, onChange }: Props) => {
   }, [tabs, currentTabIndex]);
 
   const switchTab = useCallback(
-    (index: Number) => {
-      const tab = tabs[index as number];
+    (index: number) => {
+      const tab = tabs[index];
       setSelectedFilters([tab.id]);
-      setCurrentTabIndex(index as number);
+      setCurrentTabIndex(index);
       onChangeRef.current?.(tab);
     },
     [tabs, setSelectedFilters],