From 36f7b31d98a561f6c4c71934ea46e43aa3afe317 Mon Sep 17 00:00:00 2001
From: Bob Zeleznik <zzzman@gmail.com>
Date: Sun, 3 May 2020 00:00:41 -0400
Subject: got rid of div from CollectionView.

---
 package-lock.json                               | 16 ++++++++++++++++
 package.json                                    |  2 +-
 src/client/views/collections/CollectionView.tsx |  6 +++---
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 959fc41ef..9ac02f404 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2868,12 +2868,22 @@
                 "upath": "^1.1.1"
             },
             "dependencies": {
+                "bindings": {
+                    "version": "1.5.0",
+                    "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+                    "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+                    "optional": true,
+                    "requires": {
+                        "file-uri-to-path": "1.0.0"
+                    }
+                },
                 "fsevents": {
                     "version": "1.2.12",
                     "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.12.tgz",
                     "integrity": "sha512-Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q==",
                     "optional": true,
                     "requires": {
+                        "bindings": "^1.5.0",
                         "nan": "^2.12.1",
                         "node-pre-gyp": "*"
                     },
@@ -5663,6 +5673,12 @@
             "resolved": "https://registry.npmjs.org/file-type/-/file-type-7.7.1.tgz",
             "integrity": "sha512-bTrKkzzZI6wH+NXhyD3SOXtb2zXTw2SbwI2RxUlRcXVsnN7jNL5hJzVQLYv7FOQhxFkK4XWdAflEaWFpaLLWpQ=="
         },
+        "file-uri-to-path": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+            "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+            "optional": true
+        },
         "filewatcher": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/filewatcher/-/filewatcher-3.0.1.tgz",
diff --git a/package.json b/package.json
index 84c23147a..ef30a3385 100644
--- a/package.json
+++ b/package.json
@@ -164,7 +164,7 @@
         "formidable": "^1.2.1",
         "golden-layout": "^1.5.9",
         "google-auth-library": "^4.2.4",
-        "google-maps-react": "^2.0.2",
+        "google-maps-react": "^2.0.6",
         "googleapis": "^40.0.0",
         "googlephotos": "^0.2.5",
         "howler": "^2.1.3",
diff --git a/src/client/views/collections/CollectionView.tsx b/src/client/views/collections/CollectionView.tsx
index cb7d86e00..43da1c44f 100644
--- a/src/client/views/collections/CollectionView.tsx
+++ b/src/client/views/collections/CollectionView.tsx
@@ -201,8 +201,8 @@ export class CollectionView extends Touchable<FieldViewProps & CollectionViewCus
     private SubView = (type: CollectionViewType, renderProps: CollectionRenderProps) => {
         // currently cant think of a reason for collection docking view to have a chrome. mind may change if we ever have nested docking views -syip
         const chrome = this.props.Document._chromeStatus === "disabled" || this.props.Document._chromeStatus === "replaced" || type === CollectionViewType.Docking ? (null) :
-            <CollectionViewBaseChrome CollectionView={this} key="chrome" PanelWidth={this.bodyPanelWidth} type={type} collapse={this.collapse} />;
-        return [chrome, this.SubViewHelper(type, renderProps)];
+            <CollectionViewBaseChrome key="chrome" CollectionView={this} PanelWidth={this.bodyPanelWidth} type={type} collapse={this.collapse} />;
+        return <>{chrome} {this.SubViewHelper(type, renderProps)}</>;
     }
 
 
@@ -501,7 +501,7 @@ export class CollectionView extends Touchable<FieldViewProps & CollectionViewCus
             }}
             onContextMenu={this.onContextMenu}>
             {this.showIsTagged()}
-            <div style={{ width: `calc(100% - ${this.facetWidth()}px)` }}>
+            <div className="collectionView-facetCont" style={{ width: `calc(100% - ${this.facetWidth()}px)` }}>
                 {this.collectionViewType !== undefined ? this.SubView(this.collectionViewType, props) : (null)}
             </div>
             {this.lightbox(DocListCast(this.props.Document[this.props.fieldKey]).filter(d => d.type === DocumentType.IMG).map(d =>
-- 
cgit v1.2.3-70-g09d2