eslint cleanup

8 files changed, 14 insertions, 14 deletions

diff --git a/src/client/views/collections/CollectionCarousel3DView.tsx b/src/client/views/collections/CollectionCarousel3DView.tsx
index 7617f2a52..27c85533f 100644
--- a/src/client/views/collections/CollectionCarousel3DView.tsx
+++ b/src/client/views/collections/CollectionCarousel3DView.tsx
@@ -78,7 +78,7 @@ export class CollectionCarousel3DView extends CollectionSubView() {
                 // suppressSetHeight={true}
                 NativeWidth={returnZero}
                 NativeHeight={returnZero}
-                layout_fitWidth={undefined}
+                fitWidth={undefined}
                 onDoubleClickScript={this.onChildDoubleClick}
                 renderDepth={this._props.renderDepth + 1}
                 LayoutTemplate={this._props.childLayoutTemplate}
diff --git a/src/client/views/collections/CollectionCarouselView.tsx b/src/client/views/collections/CollectionCarouselView.tsx
index 9d3657995..45b64d3e6 100644
--- a/src/client/views/collections/CollectionCarouselView.tsx
+++ b/src/client/views/collections/CollectionCarouselView.tsx
@@ -74,7 +74,7 @@ export class CollectionCarouselView extends CollectionSubView() {
                         {...this._props}
                         NativeWidth={returnZero}
                         NativeHeight={returnZero}
-                        layout_fitWidth={undefined}
+                        fitWidth={undefined}
                         setContentViewBox={undefined}
                         onDoubleClickScript={this.onContentDoubleClick}
                         onClickScript={this.onContentClick}
diff --git a/src/client/views/collections/CollectionNoteTakingView.tsx b/src/client/views/collections/CollectionNoteTakingView.tsx
index 3f9eed1d6..53211be77 100644
--- a/src/client/views/collections/CollectionNoteTakingView.tsx
+++ b/src/client/views/collections/CollectionNoteTakingView.tsx
@@ -269,7 +269,7 @@ export class CollectionNoteTakingView extends CollectionSubView() {
                 PanelHeight={height}
                 styleProvider={this.styleProvider}
                 containerViewPath={this.childContainerViewPath}
-                layout_fitWidth={this._props.childLayoutFitWidth}
+                fitWidth={this._props.childLayoutFitWidth}
                 isContentActive={emptyFunction}
                 onKey={this.onKeyDown}
                 // TODO: change this from a prop to a parameter passed into a function
@@ -282,7 +282,7 @@ export class CollectionNoteTakingView extends CollectionSubView() {
                 dontCenter={this._props.childIgnoreNativeSize ? 'xy' : undefined}
                 dontRegisterView={dataDoc ? true : BoolCast(this.layoutDoc.childDontRegisterViews, this._props.dontRegisterView)}
                 rootSelected={this.rootSelected}
-                layout_showTitle={this._props.childlayout_showTitle}
+                showTitle={this._props.childlayout_showTitle}
                 dragAction={StrCast(this.layoutDoc.childDragAction) as dropActionType}
                 onClickScript={this.onChildClickHandler}
                 onDoubleClickScript={this.onChildDoubleClickHandler}
@@ -528,7 +528,7 @@ export class CollectionNoteTakingView extends CollectionSubView() {
     });
 
     refList = () => this._refList;
-    backgroundColor = () => this._props.DocumentView?.().backgroundColor();
+    backgroundColor = () => this.DocumentView?.()?.backgroundColor();
 
     // sectionNoteTaking returns a CollectionNoteTakingViewColumn (which is an individual column)
     sectionNoteTaking = (heading: SchemaHeaderField | undefined, docList: Doc[]) => (
diff --git a/src/client/views/collections/CollectionStackedTimeline.tsx b/src/client/views/collections/CollectionStackedTimeline.tsx
index f9b123bb6..1604920f6 100644
--- a/src/client/views/collections/CollectionStackedTimeline.tsx
+++ b/src/client/views/collections/CollectionStackedTimeline.tsx
@@ -855,7 +855,7 @@ class StackedTimelineAnchor extends ObservableReactComponent<StackedTimelineAnch
                     isDocumentActive={this._props.isDocumentActive}
                     PanelWidth={width}
                     PanelHeight={height}
-                    layout_fitWidth={returnTrue}
+                    fitWidth={returnTrue}
                     ScreenToLocalTransform={screenXf}
                     pinToPres={emptyFunction}
                     focus={focusFunc}
@@ -882,7 +882,7 @@ class StackedTimelineAnchor extends ObservableReactComponent<StackedTimelineAnch
         return (
             <div style={{ pointerEvents: this.noEvents ? 'none' : undefined }}>
                 {inner.view}
-                {!inner.anchor.view || !inner.anchor.view.IsSelected ? null : (
+                {!inner.anchor.view?.IsSelected ? null : (
                     <>
                         <div key="left" className="collectionStackedTimeline-left-resizer" style={{ pointerEvents: this.noEvents ? 'none' : undefined }} onPointerDown={e => this.onAnchorDown(e, this._props.mark, true)} />
                         <div key="right" className="collectionStackedTimeline-resizer" style={{ pointerEvents: this.noEvents ? 'none' : undefined }} onPointerDown={e => this.onAnchorDown(e, this._props.mark, false)} />
diff --git a/src/client/views/collections/CollectionStackingView.tsx b/src/client/views/collections/CollectionStackingView.tsx
index 3f12a281e..07aa0f4f0 100644
--- a/src/client/views/collections/CollectionStackingView.tsx
+++ b/src/client/views/collections/CollectionStackingView.tsx
@@ -336,7 +336,7 @@ export class CollectionStackingView extends CollectionSubView<Partial<collection
                 pointerEvents={this.DocumentView?.()._props.onClickScript?.() ? returnNone : undefined} // if the stack has an onClick, then we don't want the contents to be interactive (see CollectionPileView)
                 styleProvider={this.styleProvider}
                 containerViewPath={this.childContainerViewPath}
-                layout_fitWidth={this.childFitWidth}
+                fitWidth={this.childFitWidth}
                 isContentActive={doc.onClick ? this.isChildButtonContentActive : this.isChildContentActive}
                 onKey={this.onKeyDown}
                 DataTransition={trans}
@@ -348,7 +348,7 @@ export class CollectionStackingView extends CollectionSubView<Partial<collection
                 dontCenter={this._props.childIgnoreNativeSize ? 'xy' : (StrCast(this.layoutDoc.layout_dontCenter) as any)}
                 dontRegisterView={BoolCast(this.layoutDoc.childDontRegisterViews, this._props.dontRegisterView)} // used to be true if DataDoc existed, but template textboxes won't layout_autoHeight resize if dontRegisterView is set, but they need to.
                 rootSelected={this.rootSelected}
-                layout_showTitle={this._props.childlayout_showTitle}
+                showTitle={this._props.childlayout_showTitle}
                 dragAction={(this.layoutDoc.childDragAction ?? this._props.childDragAction) as dropActionType}
                 onClickScript={this.onChildClickHandler}
                 onDoubleClickScript={this.onChildDoubleClickHandler}
diff --git a/src/client/views/collections/TreeView.tsx b/src/client/views/collections/TreeView.tsx
index 6ea6bbfbd..3a187171a 100644
--- a/src/client/views/collections/TreeView.tsx
+++ b/src/client/views/collections/TreeView.tsx
@@ -1015,7 +1015,7 @@ export class TreeView extends ObservableReactComponent<TreeViewProps> {
                     }
                 })}
                 Document={this.Document}
-                layout_fitWidth={returnTrue}
+                fitWidth={returnTrue}
                 scriptContext={this}
                 hideDecorations
                 hideClickBehaviors
@@ -1122,7 +1122,7 @@ export class TreeView extends ObservableReactComponent<TreeViewProps> {
                     this._dref = r;
                 })}
                 Document={this.Document}
-                layout_fitWidth={this.fitWidthFilter}
+                fitWidth={this.fitWidthFilter}
                 PanelWidth={this.embeddedPanelWidth}
                 PanelHeight={this.embeddedPanelHeight}
                 LayoutTemplateString={asText ? FormattedTextBox.LayoutString('text') : undefined}
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
index 21a069bd8..74de6524b 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
@@ -183,7 +183,7 @@ export class CollectionFreeFormView extends CollectionSubView<Partial<collection
         return this._props.styleProvider?.(this.Document, this._props, StyleProp.BackgroundColor);
     }
     @computed get fitWidth() {
-        return this._props.layout_fitWidth?.(this.Document) ?? this.layoutDoc.layout_fitWidth;
+        return this._props.fitWidth?.(this.Document) ?? this.layoutDoc.layout_fitWidth;
     }
     @computed get nativeDimScaling() {
         if (this._firstRender || (this._props.isAnnotationOverlay && !this._props.annotationLayerHostsContent)) return 1;
@@ -1055,7 +1055,7 @@ export class CollectionFreeFormView extends CollectionSubView<Partial<collection
                 pinToPres={this._props.pinToPres}
                 whenChildContentsActiveChanged={this._props.whenChildContentsActiveChanged}
                 dragAction={(this.Document.childDragAction ?? this._props.childDragAction) as dropActionType}
-                layout_showTitle={this._props.childlayout_showTitle}
+                showTitle={this._props.childlayout_showTitle}
                 dontRegisterView={this._props.dontRegisterView}
                 pointerEvents={this.childPointerEventsFunc}
             />
diff --git a/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx b/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
index b684b65e5..fd57f3d13 100644
--- a/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
+++ b/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
@@ -1234,7 +1234,7 @@ class CollectionSchemaViewDoc extends ObservableReactComponent<CollectionSchemaV
                 hideTitle
                 hideDocumentButtonBar
                 hideLinkAnchors
-                layout_fitWidth={returnTrue}
+                fitWidth={returnTrue}
             />
         );
     }