diff options
| author | Sam Wilkins <samwilkins333@gmail.com> | 2019-08-01 02:31:07 -0400 |
|---|---|---|
| committer | Sam Wilkins <samwilkins333@gmail.com> | 2019-08-01 02:31:07 -0400 |
| commit | cd02f494975ad44b85c08d3108f185edbea43258 (patch) | |
| tree | 1c4f30004385d5ffc711032f51cb8cfc5be00898 /src/client/views/nodes/ImageBox.tsx | |
| parent | ec224416fc454c7fdbb62943408226c973d8c751 (diff) | |
| parent | d4accdd22cabdd78fc7bd76dd7ce3cb59e4b102f (diff) | |
Merge branch 'master' into speech-to-text
Diffstat (limited to 'src/client/views/nodes/ImageBox.tsx')
| -rw-r--r-- | src/client/views/nodes/ImageBox.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/views/nodes/ImageBox.tsx b/src/client/views/nodes/ImageBox.tsx index b60ef41fd..9a0615d68 100644 --- a/src/client/views/nodes/ImageBox.tsx +++ b/src/client/views/nodes/ImageBox.tsx @@ -68,7 +68,7 @@ export class ImageBox extends DocComponent<FieldViewProps, ImageDocument>(ImageD private dropDisposer?: DragManager.DragDropDisposer; - @computed get dataDoc() { return BoolCast(this.props.Document.isTemplate) && this.props.DataDoc ? this.props.DataDoc : this.props.Document; } + @computed get dataDoc() { return this.props.DataDoc && (BoolCast(this.props.Document.isTemplate) || BoolCast(this.props.DataDoc.isTemplate) || this.props.DataDoc.layout === this.props.Document) ? this.props.DataDoc : this.props.Document; } protected createDropTarget = (ele: HTMLDivElement) => { |