From 9f048fee0c44264f8eac8326b9e0945d1426c1f5 Mon Sep 17 00:00:00 2001 From: bobzel Date: Sat, 22 Aug 2020 00:15:04 -0400 Subject: selecting a tab doc in a tree view makes the tab active in the Dashboard. fixed stacking view's maxHeight to be _maxHeight --- src/client/views/collections/CollectionStackingView.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/client/views/collections/CollectionStackingView.tsx') diff --git a/src/client/views/collections/CollectionStackingView.tsx b/src/client/views/collections/CollectionStackingView.tsx index fdb843e60..a9437c11f 100644 --- a/src/client/views/collections/CollectionStackingView.tsx +++ b/src/client/views/collections/CollectionStackingView.tsx @@ -354,7 +354,7 @@ export class CollectionStackingView extends CollectionSubView(StackingDocument) const doc = this.props.DataDoc && this.props.DataDoc.layout === this.layoutDoc ? this.props.DataDoc : this.layoutDoc; this.observer = new _global.ResizeObserver(action((entries: any) => { if (this.layoutDoc._autoHeight && ref && this.refList.length && !SnappingManager.GetIsDragging()) { - Doc.Layout(doc)._height = Math.min(1200, Math.max(...this.refList.map(r => Number(getComputedStyle(r).height.replace("px", ""))))); + Doc.Layout(doc)._height = Math.min(NumCast(this.layoutDoc._maxHeight, Number.MAX_SAFE_INTEGER), Math.max(...this.refList.map(r => Number(getComputedStyle(r).height.replace("px", ""))))); } })); this.observer.observe(ref); @@ -484,7 +484,7 @@ export class CollectionStackingView extends CollectionSubView(StackingDocument) style={{ overflowY: this.props.active() ? "auto" : "hidden", transform: `scale(${this.scaling}`, - height: this.layoutDoc._autoHeight ? "auto" : `${1 / this.scaling * 100}%`, + height: `${1 / this.scaling * 100}%`, width: `${1 / this.scaling * 100}%`, transformOrigin: "top left", }} -- cgit v1.2.3-70-g09d2