diff options
| author | bobzel <zzzman@gmail.com> | 2024-09-11 10:49:09 -0400 |
|---|---|---|
| committer | bobzel <zzzman@gmail.com> | 2024-09-11 10:49:09 -0400 |
| commit | 34e2b4d4c098e08d6cfe7d48c3a4b27fcda091b3 (patch) | |
| tree | 7a2eb47266d9a2ccee81dcb39b98564cbc94d172 /src/client/views/nodes/formattedText/FormattedTextBox.tsx | |
| parent | 7f4d53ce9f8cf3932b627ab063855e3323cc3dc2 (diff) | |
| parent | d3817d1c03b68ab2c69ab5ccfb5e8d6943df8f25 (diff) | |
merged with master
Diffstat (limited to 'src/client/views/nodes/formattedText/FormattedTextBox.tsx')
| -rw-r--r-- | src/client/views/nodes/formattedText/FormattedTextBox.tsx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/client/views/nodes/formattedText/FormattedTextBox.tsx b/src/client/views/nodes/formattedText/FormattedTextBox.tsx index 996c6843e..1d3251496 100644 --- a/src/client/views/nodes/formattedText/FormattedTextBox.tsx +++ b/src/client/views/nodes/formattedText/FormattedTextBox.tsx @@ -2043,7 +2043,6 @@ export class FormattedTextBox extends ViewBoxAnnotatableComponent<FormattedTextB style={{ cursor: this._props.isContentActive() ? 'text' : undefined, height: this._props.height ? 'max-content' : undefined, - overflow: this.layout_autoHeight ? 'hidden' : undefined, pointerEvents: Doc.ActiveTool === InkTool.None && !SnappingManager.ExploreMode ? undefined : 'none', }} onContextMenu={this.specificContextMenu} @@ -2062,7 +2061,7 @@ export class FormattedTextBox extends ViewBoxAnnotatableComponent<FormattedTextB }} style={{ width: this.noSidebar ? '100%' : `calc(100% - ${this.layout_sidebarWidthPercent})`, - overflow: this.layoutDoc._createDocOnCR ? 'hidden' : this.layoutDoc._layout_autoHeight ? 'visible' : undefined, + overflow: this.layoutDoc._createDocOnCR || this.layoutDoc._layout_hideScroll ? 'hidden' : this.layout_autoHeight ? 'visible' : undefined, }} onScroll={this.onScroll} onDrop={this.ondrop}> |