Merge branch 'master' into DocCreatorMenu-work

2 files changed, 7 insertions, 4 deletions

diff --git a/src/client/views/nodes/trails/PresBox.tsx b/src/client/views/nodes/trails/PresBox.tsx
index 9ab5fb1bd..f818c6e20 100644
--- a/src/client/views/nodes/trails/PresBox.tsx
+++ b/src/client/views/nodes/trails/PresBox.tsx
@@ -210,6 +210,7 @@ export class PresBox extends ViewBoxBaseComponent<FieldViewProps>() {
     }
 
     componentDidMount() {
+        this._props.setContentViewBox?.(this);
         this._disposers.pause = reaction(
             () => SnappingManager.UserPanned,
             () => this.pauseAutoPres()
diff --git a/src/client/views/nodes/trails/PresElementBox.tsx b/src/client/views/nodes/trails/PresElementBox.tsx
index b0732c281..31cd1603f 100644
--- a/src/client/views/nodes/trails/PresElementBox.tsx
+++ b/src/client/views/nodes/trails/PresElementBox.tsx
@@ -52,7 +52,11 @@ export class PresElementBox extends ViewBoxBaseComponent<FieldViewProps>() {
 
     // the presentation view that renders this slide
     @computed get presBoxView() {
-        return this.DocumentView?.().containerViewPath?.().lastElement()?.ComponentView as PresBox;
+        return this.DocumentView?.()
+            .containerViewPath?.()
+            .slice()
+            .reverse()
+            .find(dv => dv?.ComponentView instanceof PresBox)?.ComponentView as PresBox;
     }
 
     // the presentation view document that renders this slide
@@ -235,9 +239,7 @@ export class PresElementBox extends ViewBoxBaseComponent<FieldViewProps>() {
                 e.clientY,
                 undefined,
                 action(() => {
-                    Array.from(classesToRestore).forEach(pair => {
-                        pair[0].className = pair[1];
-                    });
+                    Array.from(classesToRestore).forEach(pair => (pair[0].className = pair[1]));
                     this._dragging = false;
                 })
             );