diff options
| author | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-09-21 21:21:13 +0530 |
|---|---|---|
| committer | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-09-21 21:21:13 +0530 |
| commit | 8fad5a8e842aaed6540d37f6a3a4ba3a3c2abe9b (patch) | |
| tree | e07f9665a5ee959575febbbc60102d90e8e42d07 /src | |
| parent | 93670ebde5de9c602aa45d0e06f377e8d3f89ce8 (diff) | |
| parent | a15ba9360bdb23e593ecc3985954549811cdd852 (diff) | |
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into acls_uv
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/views/DocumentDecorations.tsx | 2 | ||||
| -rw-r--r-- | src/client/views/nodes/formattedText/FormattedTextBox.tsx | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/client/views/DocumentDecorations.tsx b/src/client/views/DocumentDecorations.tsx index 96eba1869..795208c91 100644 --- a/src/client/views/DocumentDecorations.tsx +++ b/src/client/views/DocumentDecorations.tsx @@ -139,7 +139,7 @@ export class DocumentDecorations extends React.Component<{}, { value: string }> dragData.offset = dragDocView.props.ScreenToLocalTransform().scale(dragDocView.props.ContentScaling()).transformDirection(e.x - left, e.y - top); dragData.moveDocument = dragDocView.props.moveDocument; dragData.isSelectionMove = true; - dragData.dropAction = dragDocView.props.Document.dropAction as dropActionType; + dragData.dropAction = dragDocView.props.dropAction as dropActionType; this.Interacting = true; this._hidden = true; DragManager.StartDocumentDrag(SelectionManager.SelectedDocuments().map(dv => dv.ContentDiv!), dragData, e.x, e.y, { diff --git a/src/client/views/nodes/formattedText/FormattedTextBox.tsx b/src/client/views/nodes/formattedText/FormattedTextBox.tsx index db4bf1086..ff2ce90b7 100644 --- a/src/client/views/nodes/formattedText/FormattedTextBox.tsx +++ b/src/client/views/nodes/formattedText/FormattedTextBox.tsx @@ -1189,6 +1189,7 @@ export class FormattedTextBox extends ViewBoxAnnotatableComponent<(FieldViewProp this.endUndoTypingBatch(); Object.values(this._disposers).forEach(disposer => disposer?.()); this._editorView?.destroy(); + FormattedTextBoxComment.Hide(); } _downEvent: any; |