lots of api cleanup and cycle removal

1 files changed, 2 insertions, 3 deletions

diff --git a/src/client/views/DocumentDecorations.tsx b/src/client/views/DocumentDecorations.tsx
index 4262c2d57..fd44909c0 100644
--- a/src/client/views/DocumentDecorations.tsx
+++ b/src/client/views/DocumentDecorations.tsx
@@ -25,7 +25,6 @@ import { DocumentButtonBar } from './DocumentButtonBar';
 import './DocumentDecorations.scss';
 import { InkStrokeProperties } from './InkStrokeProperties';
 import { InkingStroke } from './InkingStroke';
-import { LightboxView } from './LightboxView';
 import { ObservableReactComponent } from './ObservableReactComponent';
 import { CollectionDockingView } from './collections/CollectionDockingView';
 import { CollectionFreeFormView } from './collections/collectionFreeForm';
@@ -95,7 +94,7 @@ export class DocumentDecorations extends ObservableReactComponent<DocumentDecora
     @computed get ClippedBounds() {
         const bounds = { ...this.Bounds };
         const leftBounds = this._props.boundsLeft;
-        const topBounds = LightboxView.LightboxDoc ? 0 : this._props.boundsTop;
+        const topBounds = DocumentView.LightboxDoc() ? 0 : this._props.boundsTop;
         bounds.x = Math.max(leftBounds, bounds.x - this._resizeBorderWidth / 2) + this._resizeBorderWidth / 2;
         bounds.y = Math.max(topBounds, bounds.y - this._resizeBorderWidth / 2 - this._titleHeight) + this._resizeBorderWidth / 2 + this._titleHeight;
         const borderRadiusDraggerWidth = 15;
@@ -277,7 +276,7 @@ export class DocumentDecorations extends ObservableReactComponent<DocumentDecora
                     openDoc = Doc.GetEmbeddings(openDoc).find(embedding => !embedding.embedContainer) ?? Doc.MakeEmbedding(openDoc);
                     Doc.deiconifyView(openDoc);
                 }
-                LightboxView.Instance.SetLightboxDoc(openDoc, undefined, selectedDocs.slice(1));
+                DocumentView.SetLightboxDoc(openDoc, undefined, selectedDocs.slice(1));
             }
         }
         DocumentView.DeselectAll();