aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusodhi <61431818+usodhi@users.noreply.github.com>2020-05-15 22:40:18 +0530
committerusodhi <61431818+usodhi@users.noreply.github.com>2020-05-15 22:40:18 +0530
commit9c0b8ab5820232292e02fbf453e50261137a533c (patch)
treef9e4a370cc4c18874f177aa055919c844ce3a60a
parent95ec58135f3534640afc0a38d8c4bbbb84bc3434 (diff)
pulling
-rw-r--r--src/client/views/collections/collectionGrid/CollectionGridView.tsx11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/client/views/collections/collectionGrid/CollectionGridView.tsx b/src/client/views/collections/collectionGrid/CollectionGridView.tsx
index f7d6f481a..cd1e0f7f0 100644
--- a/src/client/views/collections/collectionGrid/CollectionGridView.tsx
+++ b/src/client/views/collections/collectionGrid/CollectionGridView.tsx
@@ -67,20 +67,21 @@ export class CollectionGridView extends CollectionSubView(GridSchema) {
return <ContentFittingDocumentView
{...this.props}
Document={layout}
- DataDocument={layout.resolvedDataDoc as Doc}
+ DataDoc={layout.resolvedDataDoc as Doc}
NativeHeight={returnZero}
NativeWidth={returnZero}
addDocTab={this.addDocTab}
fitToBox={BoolCast(this.props.Document._freezeChildDimensions)}
FreezeDimensions={BoolCast(this.props.Document._freezeChildDimensions)}
backgroundColor={this.props.backgroundColor}
- CollectionDoc={this.props.Document}
+ ContainingCollectionDoc={this.props.Document}
PanelWidth={width}
PanelHeight={height}
- getTransform={dxf}
+ ScreenToLocalTransform={dxf}
onClick={this.onChildClickHandler}
renderDepth={this.props.renderDepth + 1}
- Display={"contents"}
+ parentActive={this.props.active}
+ //Display={"contents"}
/>;
}
@@ -145,6 +146,7 @@ export class CollectionGridView extends CollectionSubView(GridSchema) {
layoutDoc.h = 2;
this.layoutDocs.push(layoutDoc);
+ this.props.Document.highest = i;
}
this.props.Document.gridLayouts = new List<Doc>(this.layoutDocs);
}
@@ -156,7 +158,6 @@ export class CollectionGridView extends CollectionSubView(GridSchema) {
@computed
private get contents(): [JSX.Element[], Layout[]] {
const { childLayoutPairs } = this;
- const { Document } = this.props;
const collector: JSX.Element[] = [];
const layoutArray: Layout[] = [];