diff options
| author | Sam Wilkins <samwilkins333@gmail.com> | 2019-12-29 15:35:45 -0800 |
|---|---|---|
| committer | Sam Wilkins <samwilkins333@gmail.com> | 2019-12-29 15:35:45 -0800 |
| commit | 6a3167f80e5801763a88add8b3a8cfce2ac7b467 (patch) | |
| tree | 97c1f42adc762f9a47a319d5a1caf974ee775800 | |
| parent | b4bf12dd03cdac8c9930ddf5e19e36c87b3696e6 (diff) | |
| parent | 50e5da90b9b46d4c54af34621cf13dbd81a43ad4 (diff) | |
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web
| -rw-r--r-- | src/client/views/nodes/FormattedTextBox.tsx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/client/views/nodes/FormattedTextBox.tsx b/src/client/views/nodes/FormattedTextBox.tsx index 6d889b495..a08c14436 100644 --- a/src/client/views/nodes/FormattedTextBox.tsx +++ b/src/client/views/nodes/FormattedTextBox.tsx @@ -78,6 +78,7 @@ export class FormattedTextBox extends DocAnnotatableComponent<(FieldViewProps & public static ToolTipTextMenu: TooltipTextMenu | undefined = undefined; public ProseRef?: HTMLDivElement; private _ref: React.RefObject<HTMLDivElement> = React.createRef(); + private _scrollRef: React.RefObject<HTMLDivElement> = React.createRef(); private _editorView: Opt<EditorView>; private _applyingChange: boolean = false; private _searchIndex = 0; @@ -806,7 +807,7 @@ export class FormattedTextBox extends DocAnnotatableComponent<(FieldViewProps & const r1 = refNode && refNode.getBoundingClientRect(); const r3 = self._ref.current!.getBoundingClientRect(); if (r1.top < r3.top || r1.top > r3.bottom) { - r1 && (self._ref.current!.scrollTop += (r1.top - r3.top) * self.props.ScreenToLocalTransform().Scale); + r1 && (self._scrollRef.current!.scrollTop += (r1.top - r3.top) * self.props.ScreenToLocalTransform().Scale); } return true; }, @@ -1149,7 +1150,7 @@ export class FormattedTextBox extends DocAnnotatableComponent<(FieldViewProps & onPointerEnter={action(() => this._entered = true)} onPointerLeave={action(() => this._entered = false)} > - <div className={`formattedTextBox-outer`} style={{ width: `calc(100% - ${this.sidebarWidthPercent})`, }}> + <div className={`formattedTextBox-outer`} style={{ width: `calc(100% - ${this.sidebarWidthPercent})`, }} ref={this._scrollRef}> <div className={`formattedTextBox-inner${rounded}`} style={{ whiteSpace: "pre-wrap", pointerEvents: ((this.Document.isButton || this.props.onClick) && !this.props.isSelected()) ? "none" : undefined }} ref={this.createDropTarget} /> </div> {this.props.Document.hideSidebar ? (null) : this.sidebarWidthPercent === "0%" ? |