From a6ce36b1d4ec550a4e16992d6e9f8c2ccfdacaf5 Mon Sep 17 00:00:00 2001
From: Stephen Haberman <shaberman@homebound.com>
Date: Tue, 1 Jun 2021 07:30:29 -0500
Subject: [PATCH] Bump back to react-virtuoso which was itemSize merged.

---
 package.json                 |  2 +-
 src/components/GridTable.tsx |  5 ++++-
 yarn.lock                    | 20 ++++++++++----------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 8aa849517..9be76bf21 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "react-aria": "^3.6.0",
     "react-day-picker": "^7.4.10",
     "react-stately": "^3.5.0",
-    "@homebound/react-virtuoso": "^1.8.6",
+    "react-virtuoso": "^1.9.0",
     "tributejs": "^5.1.3",
     "trix": "^1.3.1"
   },
diff --git a/src/components/GridTable.tsx b/src/components/GridTable.tsx
index 09e475213..4cfbf59f7 100644
--- a/src/components/GridTable.tsx
+++ b/src/components/GridTable.tsx
@@ -1,4 +1,3 @@
-import { Components, Virtuoso } from "@homebound/react-virtuoso";
 import memoizeOne from "memoize-one";
 import { Observer } from "mobx-react";
 import React, {
@@ -12,6 +11,7 @@ import React, {
   useState,
 } from "react";
 import { Link } from "react-router-dom";
+import { Components, Virtuoso } from "react-virtuoso";
 import { navLink } from "src/components/CssReset";
 import { Icon } from "src/components/Icon";
 import { Css, Margin, Only, Palette, Properties, px, Xss } from "src/Css";
@@ -458,6 +458,9 @@ function renderVirtual<R extends Kinded>(
     <Virtuoso
       components={{ List: VirtualRoot(style, columns, id, xss) }}
       topItemCount={stickyHeader ? headerRows.length : 0}
+      // Both the `Item` and `itemContent` use `display: contents`, so their height is 0,
+      // so instead drill into the 1st real content cell.
+      itemSize={(el) => (el.firstElementChild!.firstElementChild! as HTMLElement).offsetHeight}
       itemContent={(index) => {
         // We keep header and filter rows separate, but react-virtuoso is a flat list,
         // so we pick the right header / first row message / actual row.
diff --git a/yarn.lock b/yarn.lock
index 1662b4e38..d422f5ea8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1382,16 +1382,6 @@
   resolved "https://registry.yarnpkg.com/@homebound/form-state/-/form-state-1.0.2.tgz#da581bf9951a7d6ce9036133246d17a367488a99"
   integrity sha512-1PfejczCNuENqAaM6m60k9CspmdXqXyhErakuSPPMUJi751++ss9V0ZTIhZ1faSrL/I7LUVvOSG36CMLb0lv2w==
 
-"@homebound/react-virtuoso@^1.8.6":
-  version "1.8.6"
-  resolved "https://registry.yarnpkg.com/@homebound/react-virtuoso/-/react-virtuoso-1.8.6.tgz#6281518dd5d6496200312375e96b38b58108c949"
-  integrity sha512-DYFFmC+WMraFi9d6DiG90kp0eJt/57UCtxyl6FgIrO3tF665o0UUguL24/r5X9a7bFs6BJDZwlXnFjFK/utFWQ==
-  dependencies:
-    "@virtuoso.dev/react-urx" "^0.2.5"
-    "@virtuoso.dev/urx" "^0.2.5"
-    react-app-polyfill "^1.0.6"
-    resize-observer-polyfill "^1.5.1"
-
 "@homebound/rtl-utils@^1.39.0":
   version "1.39.0"
   resolved "https://registry.yarnpkg.com/@homebound/rtl-utils/-/rtl-utils-1.39.0.tgz#5774d941cc2830dc474641167995e90f8c83f43c"
@@ -13078,6 +13068,16 @@ react-textarea-autosize@^8.3.0:
     use-composed-ref "^1.0.0"
     use-latest "^1.0.0"
 
+react-virtuoso@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/react-virtuoso/-/react-virtuoso-1.9.0.tgz#5223d82b4b88021e73cd7cb671824e65537ce3ed"
+  integrity sha512-7ugCTy+zuKIplhhRLvOVHjyluLeB/BNBF2XwwJyKifsQNY/H565BV4yJYzejbmusdFGI7Dt8iJi1Zb9Nfj/pew==
+  dependencies:
+    "@virtuoso.dev/react-urx" "^0.2.5"
+    "@virtuoso.dev/urx" "^0.2.5"
+    react-app-polyfill "^1.0.6"
+    resize-observer-polyfill "^1.5.1"
+
 react@^16.11.0, react@^16.12.0, react@^16.14.0, react@^16.8.3:
   version "16.14.0"
   resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"