clean up of LightboxView

1 files changed, 11 insertions, 25 deletions

diff --git a/src/client/views/nodes/trails/PresBox.tsx b/src/client/views/nodes/trails/PresBox.tsx
index 3d7c68bcd..c4ef07123 100644
--- a/src/client/views/nodes/trails/PresBox.tsx
+++ b/src/client/views/nodes/trails/PresBox.tsx
@@ -204,16 +204,11 @@ export class PresBox extends ViewBoxBaseComponent<FieldViewProps>() {
         );
         this._disposers.editing = reaction(
             () => this.layoutDoc.presentation_status === PresStatus.Edit,
-            editing => {
-                if (editing) {
-                    this.childDocs.forEach(doc => {
-                        if (doc.presentation_indexed !== undefined) {
-                            this.progressivizedItems(doc)?.forEach(indexedDoc => (indexedDoc.opacity = undefined));
-                            doc.presentation_indexed = Math.min(this.progressivizedItems(doc)?.length ?? 0, 1);
-                        }
-                    });
-                }
-            }
+            editing => editing && 
+                this.childDocs.filter(doc => doc.presentation_indexed !== undefined).forEach(doc => {
+                    this.progressivizedItems(doc)?.forEach(indexedDoc => (indexedDoc.opacity = undefined));
+                    doc.presentation_indexed = Math.min(this.progressivizedItems(doc)?.length ?? 0, 1);
+                }) // prettier-ignore
         );
     }
 
@@ -283,19 +278,10 @@ export class PresBox extends ViewBoxBaseComponent<FieldViewProps>() {
     };
 
     // go to documents chain
-    runSubroutines = (childrenToRun: Doc[], normallyNextSlide: Doc) => {
-        console.log(childrenToRun, normallyNextSlide, 'runSUBFUNC');
-        if (childrenToRun === undefined) {
-            console.log('children undefined');
-            return;
+    runSubroutines = (childrenToRun: Opt<Doc[]>, normallyNextSlide: Doc) => {
+        if (childrenToRun && childrenToRun[0] !== normallyNextSlide) {
+            childrenToRun.forEach(child => DocumentManager.Instance.showDocument(child, {}));
         }
-        if (childrenToRun[0] === normallyNextSlide) {
-            return;
-        }
-
-        childrenToRun.forEach(child => {
-            DocumentManager.Instance.showDocument(child, {});
-        });
     };
 
     // Called when the user activates 'next' - to move to the next part of the pres. trail
@@ -806,7 +792,7 @@ export class PresBox extends ViewBoxBaseComponent<FieldViewProps>() {
         if (activeItem.presentation_openInLightbox) {
             const context = DocCast(targetDoc.annotationOn) ?? targetDoc;
             if (!DocumentManager.Instance.getLightboxDocumentView(context)) {
-                LightboxView.SetLightboxDoc(context);
+                LightboxView.Instance.SetLightboxDoc(context);
             }
         }
         if (targetDoc) {
@@ -815,7 +801,7 @@ export class PresBox extends ViewBoxBaseComponent<FieldViewProps>() {
             DocumentManager.Instance.AddViewRenderedCb(LightboxView.LightboxDoc, dv => {
                 // if target or the doc it annotates is not in the lightbox, then close the lightbox
                 if (!DocumentManager.Instance.getLightboxDocumentView(DocCast(targetDoc.annotationOn) ?? targetDoc)) {
-                    LightboxView.SetLightboxDoc(undefined);
+                    LightboxView.Instance.SetLightboxDoc(undefined);
                 }
                 DocumentManager.Instance.showDocument(targetDoc, options, finished);
             });
@@ -909,7 +895,7 @@ export class PresBox extends ViewBoxBaseComponent<FieldViewProps>() {
                             break;
                     }
                 });
-            LightboxView.SetLightboxDoc(undefined);
+            LightboxView.Instance.SetLightboxDoc(undefined);
             Doc.RemFromMyOverlay(this.rootDoc);
             return PresStatus.Edit;
         };