diff options
| author | Sam Wilkins <samwilkins333@gmail.com> | 2019-08-14 22:03:20 -0400 |
|---|---|---|
| committer | Sam Wilkins <samwilkins333@gmail.com> | 2019-08-14 22:03:20 -0400 |
| commit | 750a3333392724d10675ac4e2a6e124dc248bbe0 (patch) | |
| tree | 93928b05d3ec9de155e7c07d989093009c6f2ed5 /src/client/views/collections/CollectionBaseView.tsx | |
| parent | 244952ccc52bf66ac34eeea7d5469d0ba6313aff (diff) | |
| parent | 71f27b718d9be29034ba233b5be18ea29f59f30b (diff) | |
resolved merge conflicts
Diffstat (limited to 'src/client/views/collections/CollectionBaseView.tsx')
| -rw-r--r-- | src/client/views/collections/CollectionBaseView.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/views/collections/CollectionBaseView.tsx b/src/client/views/collections/CollectionBaseView.tsx index cad87ebcc..4a296493a 100644 --- a/src/client/views/collections/CollectionBaseView.tsx +++ b/src/client/views/collections/CollectionBaseView.tsx @@ -83,7 +83,7 @@ export class CollectionBaseView extends React.Component<CollectionViewProps> { active = (): boolean => { var isSelected = this.props.isSelected(); - return isSelected || this._isChildActive || this.props.renderDepth === 0 || BoolCast(this.props.Document.excludeFromLibrary); + return isSelected || BoolCast(this.props.Document.forceActive) || this._isChildActive || this.props.renderDepth === 0 || BoolCast(this.props.Document.excludeFromLibrary); } //TODO should this be observable? |