diff options
| author | bobzel <zzzman@gmail.com> | 2020-11-30 10:59:52 -0500 |
|---|---|---|
| committer | bobzel <zzzman@gmail.com> | 2020-11-30 10:59:52 -0500 |
| commit | 228ea98b69e848dddf835debb2acf77bbd7ddfbb (patch) | |
| tree | 62e2d3054ab565bc91997db7875d4022e1751564 /src/client/views/nodes/PresBox.tsx | |
| parent | aae3fe10d4f996dfc811977ce457ae33d5fe3bcc (diff) | |
| parent | 5da87a5d161446308031dd4b221f1f7e3a127e72 (diff) | |
Merge branch 'master' into sally-changes
Diffstat (limited to 'src/client/views/nodes/PresBox.tsx')
| -rw-r--r-- | src/client/views/nodes/PresBox.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/views/nodes/PresBox.tsx b/src/client/views/nodes/PresBox.tsx index 683cb938a..455ee87e1 100644 --- a/src/client/views/nodes/PresBox.tsx +++ b/src/client/views/nodes/PresBox.tsx @@ -640,7 +640,7 @@ export class PresBox extends ViewBoxBaseComponent<FieldViewProps, PresBoxSchema> removeDocument = (doc: Doc) => Doc.RemoveDocFromList(this.dataDoc, this.fieldKey, doc); getTransform = () => this.props.ScreenToLocalTransform().translate(-5, -65);// listBox padding-left and pres-box-cont minHeight panelHeight = () => this.props.PanelHeight() - 40; - active = (outsideReaction?: boolean) => ((Doc.GetSelectedTool() === InkTool.None && !this.layoutDoc._isBackground) && + active = (outsideReaction?: boolean) => ((Doc.GetSelectedTool() === InkTool.None && this.props.layerProvider?.(this.layoutDoc) !== false) && (this.layoutDoc.forceActive || this.props.isSelected(outsideReaction) || this._isChildActive || this.props.renderDepth === 0) ? true : false) /** |