From f027832dd2e3267b70e94c1e60d1703ff86d7fe2 Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Fri, 17 Nov 2023 12:22:32 -0500
Subject: cleaned up captions/title code

---
 src/client/views/nodes/DocumentView.scss                   | 4 ++++
 src/client/views/nodes/DocumentView.tsx                    | 7 +++----
 src/client/views/nodes/formattedText/FormattedTextBox.scss | 1 +
 src/client/views/nodes/formattedText/FormattedTextBox.tsx  | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/client/views/nodes/DocumentView.scss b/src/client/views/nodes/DocumentView.scss
index 931594568..3344dfae4 100644
--- a/src/client/views/nodes/DocumentView.scss
+++ b/src/client/views/nodes/DocumentView.scss
@@ -120,6 +120,10 @@
         display: flex;
         justify-content: center;
         align-items: center;
+        position: relative; // allows contents to be positioned relative/below title
+        > .formattedTextBox {
+            position: absolute; // position a child text box
+        }
 
         .sharingIndicator {
             height: 30px;
diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx
index 991aaa75e..c577a9e3c 100644
--- a/src/client/views/nodes/DocumentView.tsx
+++ b/src/client/views/nodes/DocumentView.tsx
@@ -1176,6 +1176,7 @@ export class DocumentViewInternal extends DocComponent<DocumentViewInternalProps
                 className={`documentView-titleWrapper${showTitleHover ? '-hover' : ''}`}
                 key="title"
                 style={{
+                    zIndex: 1,
                     position: this.headerMargin ? 'relative' : 'absolute',
                     height: this.titleHeight,
                     width: 100 - sidebarWidthPercent + '%',
@@ -1236,10 +1237,8 @@ export class DocumentViewInternal extends DocComponent<DocumentViewInternalProps
             this.contents
         ) : (
             <div className="documentView-styleWrapper">
-                {' '}
-                {!this.headerMargin ? this.contents : titleView}
-                {!this.headerMargin ? titleView : this.contents}
-                {' ' /* */}
+                {titleView}
+                {this.contents}
                 {captionView}
             </div>
         );
diff --git a/src/client/views/nodes/formattedText/FormattedTextBox.scss b/src/client/views/nodes/formattedText/FormattedTextBox.scss
index e6f24d99f..717efd5a9 100644
--- a/src/client/views/nodes/formattedText/FormattedTextBox.scss
+++ b/src/client/views/nodes/formattedText/FormattedTextBox.scss
@@ -49,6 +49,7 @@ audiotag:hover {
     transition: opacity 1s;
     width: 100%;
     position: relative;
+    transform-origin: left top;
     top: 0;
     left: 0;
 }
diff --git a/src/client/views/nodes/formattedText/FormattedTextBox.tsx b/src/client/views/nodes/formattedText/FormattedTextBox.tsx
index 977039a1d..9ab3189a6 100644
--- a/src/client/views/nodes/formattedText/FormattedTextBox.tsx
+++ b/src/client/views/nodes/formattedText/FormattedTextBox.tsx
@@ -2064,7 +2064,7 @@ export class FormattedTextBox extends ViewBoxAnnotatableComponent<FieldViewProps
         if (this.props.isContentActive()) {
             // prevent default if selected || child is active  but this doc isn't scrollable
             if (
-                (this._scrollRef.current?.scrollHeight ?? 0) <= Math.ceil(this.props.PanelHeight()) && //
+                (this._scrollRef.current?.scrollHeight ?? 0) <= Math.ceil(this.props.PanelHeight() / (this.props.NativeDimScaling?.() || 1)) && //
                 (this.props.isSelected() || this.isAnyChildContentActive())
             ) {
                 e.preventDefault();
-- 
cgit v1.2.3-70-g09d2