diff options
| author | bob <bcz@cs.brown.edu> | 2019-04-16 11:00:55 -0400 |
|---|---|---|
| committer | bob <bcz@cs.brown.edu> | 2019-04-16 11:00:55 -0400 |
| commit | bb935a1af68c3684640cf93e04b55324142b05ea (patch) | |
| tree | 571369e8b17af15e231e1c22f08d05597ae2e815 /src/client/views/MainOverlayTextBox.tsx | |
| parent | b7a766aa5d53686e032b34d7213ad543108f12c3 (diff) | |
| parent | 5acba4487b3cb66d194e7e3c4c06c5ed8e2c04b4 (diff) | |
Merge branch 'master' into richTextEditor
Diffstat (limited to 'src/client/views/MainOverlayTextBox.tsx')
| -rw-r--r-- | src/client/views/MainOverlayTextBox.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/views/MainOverlayTextBox.tsx b/src/client/views/MainOverlayTextBox.tsx index 6d43d88f0..422a45d59 100644 --- a/src/client/views/MainOverlayTextBox.tsx +++ b/src/client/views/MainOverlayTextBox.tsx @@ -101,7 +101,7 @@ export class MainOverlayTextBox extends React.Component<MainOverlayTextBoxProps> s[0] = Math.sqrt((s[0] - t[0]) * (s[0] - t[0]) + (s[1] - t[1]) * (s[1] - t[1])); return <div className="mainOverlayTextBox-textInput" style={{ pointerEvents: "none", transform: `translate(${x}px, ${y}px) scale(${1 / s[0]},${1 / s[0]})`, width: "auto", height: "auto" }} > <div className="mainOverlayTextBox-textInput" onPointerDown={this.textBoxDown} ref={this._textProxyDiv} onScroll={this.textScroll} style={{ pointerEvents: "none", transform: `scale(${1}, ${1})`, width: `${w * s[0]}px`, height: `${h * s[0]}px` }}> - <FormattedTextBox fieldKey={this._textFieldKey!} isOverlay={true} Document={this.TextDoc} isSelected={returnTrue} select={emptyFunction} isTopMost={true} + <FormattedTextBox fieldKey={this._textFieldKey} isOverlay={true} Document={this.TextDoc} isSelected={returnTrue} select={emptyFunction} isTopMost={true} selectOnLoad={true} ContainingCollectionView={undefined} onActiveChanged={emptyFunction} active={returnTrue} ScreenToLocalTransform={() => this._textXf} focus={emptyDocFunction} /> </div> </ div>; |