From 8757b03bfd6f3d33335f8e126163b1daa2376589 Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Mon, 25 Jul 2022 10:55:07 -0400
Subject: made formatttedtextbox annotation handle work the same as pdf/web. 
 prevent header from hiding annotation button handle.  fixed resizing text
 boxes.

---
 src/client/views/nodes/MapBox/MapBox.tsx | 38 +++++++++-----------------------
 1 file changed, 11 insertions(+), 27 deletions(-)

(limited to 'src/client/views/nodes/MapBox')

diff --git a/src/client/views/nodes/MapBox/MapBox.tsx b/src/client/views/nodes/MapBox/MapBox.tsx
index e9ed594d3..abd64908f 100644
--- a/src/client/views/nodes/MapBox/MapBox.tsx
+++ b/src/client/views/nodes/MapBox/MapBox.tsx
@@ -7,7 +7,6 @@ import { Doc, DocListCast, Opt, WidthSym } from '../../../../fields/Doc';
 import { Id } from '../../../../fields/FieldSymbols';
 import { InkTool } from '../../../../fields/InkField';
 import { NumCast, StrCast } from '../../../../fields/Types';
-import { TraceMobx } from '../../../../fields/util';
 import { emptyFunction, OmitKeys, returnFalse, returnOne, setupMoveUpEvents, Utils } from '../../../../Utils';
 import { Docs } from '../../../documents/Documents';
 import { DragManager } from '../../../util/DragManager';
@@ -20,7 +19,6 @@ import { MarqueeAnnotator } from '../../MarqueeAnnotator';
 import { AnchorMenu } from '../../pdf/AnchorMenu';
 import { Annotation } from '../../pdf/Annotation';
 import { SidebarAnnos } from '../../SidebarAnnos';
-import { StyleProp } from '../../StyleProvider';
 import { FieldView, FieldViewProps } from '../FieldView';
 import './MapBox.scss';
 import { MapBoxInfoWindow } from './MapBoxInfoWindow';
@@ -453,21 +451,18 @@ export class MapBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProps
      * Handles toggle of sidebar on click the little comment button
      */
     @computed get sidebarHandle() {
-        TraceMobx();
-        const annotated = DocListCast(this.dataDoc[this.SidebarKey]).filter(d => d?.author).length;
-        const color = !annotated ? Colors.WHITE : Colors.BLACK;
-        const backgroundColor = !annotated ? (this.sidebarWidth() ? Colors.MEDIUM_BLUE : Colors.BLACK) : this.props.styleProvider?.(this.rootDoc, this.props as any, StyleProp.WidgetColor + (annotated ? ':annotated' : ''));
-        return !annotated ? null : (
+        return (
             <div
-                className="formattedTextBox-sidebar-handle"
-                onPointerDown={this.sidebarDown}
+                className="mapBox-overlayButton-sidebar"
+                key="sidebar"
+                title="Toggle Sidebar"
                 style={{
-                    left: `max(0px, calc(100% - ${this.sidebarWidthPercent} - 17px))`,
-                    backgroundColor: backgroundColor,
-                    color: color,
-                    opacity: annotated ? 1 : undefined,
-                }}>
-                <FontAwesomeIcon icon={'comment-alt'} />
+                    display: !this.props.isContentActive() ? 'none' : undefined,
+                    top: StrCast(this.rootDoc._showTitle) === 'title' ? 20 : 5,
+                    backgroundColor: this.SidebarShown ? Colors.MEDIUM_BLUE : Colors.BLACK,
+                }}
+                onPointerDown={this.sidebarBtnDown}>
+                <FontAwesomeIcon style={{ color: Colors.WHITE }} icon={'comment-alt'} size="sm" />
             </div>
         );
     }
@@ -665,18 +660,7 @@ export class MapBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProps
                         removeDocument={this.sidebarRemoveDocument}
                     />
                 </div>
-                <div
-                    className="mapBox-overlayButton-sidebar"
-                    key="sidebar"
-                    title="Toggle Sidebar"
-                    style={{
-                        display: !this.props.isContentActive() ? 'none' : undefined,
-                        top: StrCast(this.rootDoc._showTitle) === 'title' ? 20 : 5,
-                        backgroundColor: this.SidebarShown ? Colors.MEDIUM_BLUE : Colors.BLACK,
-                    }}
-                    onPointerDown={this.sidebarBtnDown}>
-                    <FontAwesomeIcon style={{ color: Colors.WHITE }} icon={'comment-alt'} size="sm" />
-                </div>
+                {this.sidebarHandle}
             </div>
         );
     }
-- 
cgit v1.2.3-70-g09d2