fix issue with react-virtual upgrade, and organize some imports

lib/Models/ItemSearchProviders/EnumIndex.ts

@@ -1,5 +1,5 @@
-import joinUrl from "./joinUrl";
 import loadCsv from "../../Core/loadCsv";
+import joinUrl from "./joinUrl";
 import { IndexBase, IndexType } from "./Types";
 
 // IDs of enum to search

lib/Models/ItemSearchProviders/Index.ts

@@ -8,9 +8,9 @@ import NumericIndex from "./NumericIndex";
 import TextIndex from "./TextIndex";
 import { IndexType, indexTypes } from "./Types";
 
-export { IndexType, indexTypes } from "./Types";
 export { default as EnumIndex } from "./EnumIndex";
 export { default as NumericIndex } from "./NumericIndex";
+export { IndexType, indexTypes } from "./Types";
 
 // IndexRoot holds the indexes for each property and top level options
 export type IndexRoot = {

lib/Models/ItemSearchProviders/IndexedItemSearchProvider.ts

@@ -3,11 +3,11 @@ import { action } from "mobx";
 import loadCsv from "../../Core/loadCsv";
 import loadJson5 from "../../Core/loadJson5";
 import { SearchParameterTraits } from "../../Traits/TraitsClasses/SearchableItemTraits";
+import { Index, IndexRoot, IndexType, parseIndexRoot } from "./Index";
 import ItemSearchProvider, {
   ItemSearchParameter,
   ItemSearchResult
 } from "./ItemSearchProvider";
-import { Index, IndexRoot, IndexType, parseIndexRoot } from "./Index";
 import joinUrl from "./joinUrl";
 
 const t = i18next.t.bind(i18next);

lib/Models/ItemSearchProviders/ItemSearchProvider.ts

@@ -1,5 +1,3 @@
-import BoundingSphere from "terriajs-cesium/Source/Core/BoundingSphere";
-import Cartographic from "terriajs-cesium/Source/Core/Cartographic";
 import { SearchParameterTraits } from "../../Traits/TraitsClasses/SearchableItemTraits";
 
 export type ItemSearchParameter =

lib/Models/ItemSearchProviders/ItemSearchProviders.ts

@@ -1,6 +1,6 @@
 import Constructor from "../../Core/Constructor";
-import ItemSearchProvider from "./ItemSearchProvider";
 import IndexedItemSearchProvider from "./IndexedItemSearchProvider";
+import ItemSearchProvider from "./ItemSearchProvider";
 
 export const ItemSearchProviders: Map<
   string,

lib/Models/ItemSearchProviders/NumericIndex.ts

@@ -1,8 +1,8 @@
-import joinUrl from "./joinUrl";
-import loadCsv from "../../Core/loadCsv";
-import { IndexBase, IndexType } from "./Types";
 import sortedIndexBy from "lodash-es/sortedIndexBy";
 import sortedLastIndexBy from "lodash-es/sortedLastIndexBy";
+import loadCsv from "../../Core/loadCsv";
+import joinUrl from "./joinUrl";
+import { IndexBase, IndexType } from "./Types";
 
 // Minimum and maxiumum values in a numeric range
 export type NumericRange = { min: number; max: number };

lib/ReactViews/Tools/ItemSearchTool/BackButton.tsx

@@ -2,8 +2,8 @@ import { FC } from "react";
 import { useTheme } from "styled-components";
 import { BoxSpan } from "../../../Styled/Box";
 import Button from "../../../Styled/Button";
-import { TextSpan } from "../../../Styled/Text";
 import { GLYPHS, StyledIcon } from "../../../Styled/Icon";
+import { TextSpan } from "../../../Styled/Text";
 
 const BackButton: FC<{ onClick: () => void }> = ({ children, onClick }) => {
   const theme = useTheme();

lib/ReactViews/Tools/ItemSearchTool/ErrorComponent.tsx

@@ -1,5 +1,4 @@
 import { FC } from "react";
-
 import Text from "../../../Styled/Text";
 
 const ErrorComponent: FC = ({ children }) => {

lib/ReactViews/Tools/ItemSearchTool/SearchForm.tsx

@@ -1,6 +1,6 @@
 import { WithT } from "i18next";
 import isEmpty from "lodash-es/isEmpty";
-import { FC, FormEvent, ChangeEvent, useEffect, useState } from "react";
+import { ChangeEvent, FC, FormEvent, useEffect, useState } from "react";
 import {
   useTranslation,
   WithTranslation,
@@ -16,12 +16,12 @@ import ItemSearchProvider, {
   NumericItemSearchParameter,
   TextItemSearchParameter
 } from "../../../Models/ItemSearchProviders/ItemSearchProvider";
+import Box from "../../../Styled/Box";
+import Button from "../../../Styled/Button";
+import Text from "../../../Styled/Text";
 import ErrorComponent from "./ErrorComponent";
 import { ItemSearchQuery } from "./ItemSearchTool";
 import Loading from "./Loading";
-import Text from "../../../Styled/Text";
-import Box from "../../../Styled/Box";
-import Button from "../../../Styled/Button";
 
 export interface SearchFormProps extends WithTranslation {
   itemSearchProvider: ItemSearchProvider;

lib/ReactViews/Tools/ItemSearchTool/SearchResults.tsx

@@ -1,6 +1,6 @@
 import { observer } from "mobx-react";
 import Mustache from "mustache";
-import { FC, MouseEventHandler, createRef, useCallback, useState } from "react";
+import { FC, MouseEventHandler, useCallback, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useVirtual } from "react-virtual";
 import styled from "styled-components";
@@ -28,7 +28,7 @@ const SearchResults: FC<SearchResultsProps> = props => {
     currentMapEffect.is === "highlightSingleResult"
       ? currentMapEffect.result
       : undefined;
-  const parentRef = createRef<HTMLDivElement>();
+  const parentRef = useRef<HTMLDivElement>(null);
   const list = useVirtual({
     size: results.length,
     parentRef,

package.json

@@ -130,7 +130,7 @@
     "react-swipeable": "^5.1.0",
     "react-transition-group": "^4.3.0",
     "react-uid": "^2.3.0",
-    "react-virtual": "^2.7.0",
+    "react-virtual": "^2.8.1",
     "resolve-url-loader": "^3.0.1",
     "retry": "^0.12.0",
     "rollbar": "^2.24.0",