From 0b38b0629496973d6c4571208710096deb91b7d7 Mon Sep 17 00:00:00 2001
From: srichman333 <sarah_n_richman@brown.edu>
Date: Fri, 24 Nov 2023 17:59:13 -0500
Subject: merge

---
 src/client/views/collections/CollectionView.tsx | 38 +++++++++++--------------
 1 file changed, 17 insertions(+), 21 deletions(-)

(limited to 'src/client/views/collections/CollectionView.tsx')

diff --git a/src/client/views/collections/CollectionView.tsx b/src/client/views/collections/CollectionView.tsx
index c2062e8ab..389a9a534 100644
--- a/src/client/views/collections/CollectionView.tsx
+++ b/src/client/views/collections/CollectionView.tsx
@@ -33,7 +33,6 @@ import { SubCollectionViewProps } from './CollectionSubView';
 import { CollectionTimeView } from './CollectionTimeView';
 import { CollectionTreeView } from './CollectionTreeView';
 import './CollectionView.scss';
-export const COLLECTION_BORDER_WIDTH = 2;
 const path = require('path');
 
 interface CollectionViewProps_ extends FieldViewProps {
@@ -81,8 +80,6 @@ export class CollectionView extends ViewBoxAnnotatableComponent<ViewBoxAnnotatab
     private reactionDisposer: IReactionDisposer | undefined;
     @observable _isContentActive: boolean | undefined;
 
-    protected _multiTouchDisposer?: InteractionUtils.MultiTouchEventDisposer;
-
     constructor(props: any) {
         super(props);
         runInAction(() => (this._annotationKeySuffix = returnEmptyString));
@@ -124,23 +121,22 @@ export class CollectionView extends ViewBoxAnnotatableComponent<ViewBoxAnnotatab
         if (type === undefined) return null;
         switch (type) {
             default:
-            case CollectionViewType.Freeform: return <CollectionFreeFormView key="collview" {...props} />;
-            case CollectionViewType.Docking: return <CollectionDockingView key="collview" {...props} />;
-            case CollectionViewType.Schema: return <CollectionSchemaView key="collview" {...props} />;
-            case CollectionViewType.Docking: return <CollectionDockingView key="collview" {...props} />;
-            case CollectionViewType.Tree: return <CollectionTreeView key="collview" {...props} />;
-            case CollectionViewType.Multicolumn: return <CollectionMulticolumnView key="collview" {...props} />;
-            case CollectionViewType.Multirow: return <CollectionMultirowView key="collview" {...props} />;
-            case CollectionViewType.Linear: return <CollectionLinearView key="collview" {...props} />;
-            case CollectionViewType.Pile: return <CollectionPileView key="collview" {...props} />;
-            case CollectionViewType.Carousel: return <CollectionCarouselView key="collview" {...props} />;
-            case CollectionViewType.Carousel3D: return <CollectionCarousel3DView key="collview" {...props} />;
-            case CollectionViewType.Stacking: return <CollectionStackingView key="collview" {...props} />;
-            case CollectionViewType.NoteTaking: return <CollectionNoteTakingView key="collview" {...props} />;
-            case CollectionViewType.Masonry: return <CollectionStackingView key="collview" {...props} />;
-            case CollectionViewType.Time: return <CollectionTimeView key="collview" {...props} />;
-            case CollectionViewType.Grid: return <CollectionGridView key="collview" {...props} />;
-            //case CollectionViewType.Staff: return <CollectionStaffView key="collview" {...props} />;
+            case CollectionViewType.Freeform:     return <CollectionFreeFormView    key="collview" {...props} />;
+            case CollectionViewType.Docking:      return <CollectionDockingView     key="collview" {...props} />;
+            case CollectionViewType.Schema:       return <CollectionSchemaView      key="collview" {...props} />;
+            case CollectionViewType.Docking:      return <CollectionDockingView     key="collview" {...props} />;
+            case CollectionViewType.Tree:         return <CollectionTreeView        key="collview" {...props} />;
+            case CollectionViewType.Multicolumn:  return <CollectionMulticolumnView key="collview" {...props} />;
+            case CollectionViewType.Multirow:     return <CollectionMultirowView    key="collview" {...props} />;
+            case CollectionViewType.Linear:       return <CollectionLinearView      key="collview" {...props} />;
+            case CollectionViewType.Pile:         return <CollectionPileView        key="collview" {...props} />;
+            case CollectionViewType.Carousel:     return <CollectionCarouselView    key="collview" {...props} />;
+            case CollectionViewType.Carousel3D:   return <CollectionCarousel3DView  key="collview" {...props} />;
+            case CollectionViewType.Stacking:     return <CollectionStackingView    key="collview" {...props} />;
+            case CollectionViewType.NoteTaking:   return <CollectionNoteTakingView  key="collview" {...props} />;
+            case CollectionViewType.Masonry:      return <CollectionStackingView    key="collview" {...props} />;
+            case CollectionViewType.Time:         return <CollectionTimeView        key="collview" {...props} />;
+            case CollectionViewType.Grid:         return <CollectionGridView        key="collview" {...props} />;
         }
     };
 
@@ -175,7 +171,7 @@ export class CollectionView extends ViewBoxAnnotatableComponent<ViewBoxAnnotatab
         if (cm && !e.isPropagationStopped()) {
             // need to test this because GoldenLayout causes a parallel hierarchy in the React DOM for its children and the main document view7
             !Doc.noviceMode &&
-                this.setupViewTypes('UI Controls...', vtype => {
+                this.setupViewTypes('Appearance...', vtype => {
                     const newRendition = Doc.MakeEmbedding(this.rootDoc);
                     newRendition._type_collection = vtype;
                     this.props.addDocTab(newRendition, OpenWhere.addRight);
-- 
cgit v1.2.3-70-g09d2