diff options
| author | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-06-12 18:31:49 +0530 |
|---|---|---|
| committer | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-06-12 18:31:49 +0530 |
| commit | 747ae83d5b70b7e9b2d3755aa9e402dbf1c6ae5e (patch) | |
| tree | c37b501f6ec7f8deb4d1a858972c86cb668c352c | |
| parent | 8e2b01cc8f302d509ce0234abbe36c5d9637ab38 (diff) | |
fixed gridflex bugs
| -rw-r--r-- | src/client/views/collections/CollectionViewChromes.tsx | 5 | ||||
| -rw-r--r-- | src/client/views/collections/collectionGrid/CollectionGridView.tsx | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/client/views/collections/CollectionViewChromes.tsx b/src/client/views/collections/CollectionViewChromes.tsx index 53bff0fe5..64a459aff 100644 --- a/src/client/views/collections/CollectionViewChromes.tsx +++ b/src/client/views/collections/CollectionViewChromes.tsx @@ -622,7 +622,7 @@ export class CollectionGridViewChrome extends React.Component<CollectionViewChro */ @undoBatch toggleFlex = () => { - this.props.CollectionView.props.Document.gridFlex = !this.props.CollectionView.props.Document.gridFlex; + this.props.CollectionView.props.Document.gridFlex = !BoolCast(this.props.CollectionView.props.Document.gridFlex, true); } /** @@ -718,7 +718,6 @@ export class CollectionGridViewChrome extends React.Component<CollectionViewChro onPointerDown={stopPropagation} onChange={this.changeCompactType} value={StrCast(this.props.CollectionView.props.Document.gridCompaction)}> - > {["vertical", "horizontal", "null"].map(type => <option className="collectionGridViewChrome-viewOption" onPointerDown={stopPropagation} @@ -729,7 +728,7 @@ export class CollectionGridViewChrome extends React.Component<CollectionViewChro </select> <span className="grid-control" style={{ width: this.resize ? "12%" : "20%" }}> - <input style={{ marginRight: 5 }} type="checkbox" onClick={this.toggleFlex} defaultChecked={BoolCast(this.props.CollectionView.props.Document.gridFlex)} /> + <input style={{ marginRight: 5 }} type="checkbox" onClick={this.toggleFlex} defaultChecked={BoolCast(this.props.CollectionView.props.Document.gridFlex, true)} /> <label className="flexLabel">{this.resize ? "Flex" : "Flexible"}</label> </span> diff --git a/src/client/views/collections/collectionGrid/CollectionGridView.tsx b/src/client/views/collections/collectionGrid/CollectionGridView.tsx index ec142f7a5..87d7d945a 100644 --- a/src/client/views/collections/collectionGrid/CollectionGridView.tsx +++ b/src/client/views/collections/collectionGrid/CollectionGridView.tsx @@ -65,9 +65,9 @@ export class CollectionGridView extends CollectionSubView(GridSchema) { // for each document that was added, add a corresponding grid layout object newValue.forEach(({ layout }, i) => { if (!layouts.find(gridLayout => gridLayout.i === layout[Id])) { - this.addLayoutItem(layouts, this.makeLayoutItem(layout, this.unflexedPosition(i), !this.flexGrid)) + this.addLayoutItem(layouts, this.makeLayoutItem(layout, this.unflexedPosition(i), !this.flexGrid)); } - }) + }); } else { // for each document that was removed, remove its corresponding grid layout object oldValue.forEach(({ layout }) => { @@ -94,10 +94,12 @@ export class CollectionGridView extends CollectionSubView(GridSchema) { this._resetListenerDisposer?.(); } - unflexedPosition(index: number) { + unflexedPosition(index: number): Omit<Layout, "i"> { return { x: (index % Math.floor(this.numCols / this.defaultW)) * this.defaultW, y: Math.floor(index / Math.floor(this.numCols / this.defaultH)) * this.defaultH, + w: this.defaultW, + h: this.defaultH, static: true }; } |