Fix more random tsc errors

Author: doombubbles

spellsource-web/src/components/collection/collection.tsx

@@ -3,7 +3,8 @@ import React, { FunctionComponent, useContext, useEffect, useState } from "react
 import { CardType } from "../../__generated__/spellsource-game";
 import { CollectionCardFragment, CollectionCardsOrderBy, useGetCollectionCardsQuery } from "../../__generated__/client";
 import { CardDef } from "./card-display";
-import { Button as RBButton, Dropdown, Form, Table } from "react-bootstrap";
+import { Dropdown, Form, Table } from "react-bootstrap";
+import { Button } from "../typed-bootstrap";
 import { toTitleCaseCorrected } from "../../lib/blockly-spellsource-utils";
 import { clamp } from "lodash";
 import DropdownToggle from "react-bootstrap/DropdownToggle";
@@ -16,8 +17,6 @@ import Link from "next/link";
 import { useDrag, useDrop } from "react-dnd";
 import { CardCache } from "../../pages/collection";
 
-const Button = RBButton as React.ComponentType<any>;
-
 const ShowCardTypes: CardType[] = ["MINION", "SPELL", "WEAPON", "HERO", "HERO_POWER", "CLASS"];
 const DefaultShowCardTypes: CardType[] = ["MINION", "SPELL", "WEAPON"];
 const defaultLimit = 25;

spellsource-web/src/components/collection/deck.tsx

@@ -1,9 +1,7 @@
 import React, { FunctionComponent, useContext } from "react";
 import _, { isEqual } from "lodash";
 import { textDecorationStyle } from "./collection";
-import { Button as RBButton } from "react-bootstrap";
-
-const Button = RBButton as React.ComponentType<any>;
+import { Button } from "../typed-bootstrap";
 import { useDrag, useDrop } from "react-dnd";
 import { GetDeckQuery, GetDeckQueryVariables, GetDecksQuery, GetDecksQueryVariables, useCreateDeckMutation, useDeleteDeckMutation, useRenameDeckMutation, useSetCardsInDeckMutation } from "../../__generated__/client";
 import { ListActions } from "react-use/lib/useList";

spellsource-web/src/components/typed-bootstrap.ts

@@ -0,0 +1,4 @@
+import { Button as RBButton } from "react-bootstrap";
+import React from "react";
+
+export const Button = RBButton as React.ComponentType<any>;

spellsource-web/src/pages/collection.tsx

@@ -10,7 +10,8 @@ import React, { createContext, FunctionComponent, useEffect, useMemo, useRef, us
 import { getSession, useSession } from "next-auth/react";
 import Collection, { textDecorationStyle } from "../components/collection/collection";
 import Head from "next/head";
-import { Button, Col, Container, Dropdown, Offcanvas, OffcanvasBody, Row } from "react-bootstrap";
+import { Col, Container, Dropdown, Offcanvas, OffcanvasBody, Row } from "react-bootstrap";
+import { Button } from "../components/typed-bootstrap";
 import _ from "lodash";
 import { useRouter } from "next/router";
 import { CardDef, toRgbaString } from "../components/collection/card-display";

spellsource-web/src/pages/rogue-test.tsx

@@ -2,7 +2,8 @@ import { GetServerSideProps } from "next";
 import { getSession } from "next-auth/react";
 import Layout from "../components/creative-layout";
 import { useGetClassesQuery, useGetUserIdTestQuery, useStartRogueRunMutation } from "../__generated__/client";
-import { Button, Container } from "react-bootstrap";
+import { Container } from "react-bootstrap";
+import { Button } from "../components/typed-bootstrap";
 
 export const getServerSideProps: GetServerSideProps = async (context) => ({
   props: { session: await getSession(context) },