diff options
| author | bobzel <zzzman@gmail.com> | 2025-01-15 13:07:06 -0500 |
|---|---|---|
| committer | bobzel <zzzman@gmail.com> | 2025-01-15 13:07:06 -0500 |
| commit | 53dfafd330013eab20d93ac87dd82c59c8b17cce (patch) | |
| tree | bb0b34e78f6d425746719266060d4be980cc7b64 /src/client/views/collections/collectionGrid | |
| parent | 85f60319ba7020b2976ed1063915a145a09ab381 (diff) | |
| parent | 205fdacf9807be2691e13e1d9d04d6b98620391a (diff) | |
Merge branch 'eleanor-gptdraw' into eleanor-gptdraw-tester
Diffstat (limited to 'src/client/views/collections/collectionGrid')
| -rw-r--r-- | src/client/views/collections/collectionGrid/CollectionGridView.tsx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/client/views/collections/collectionGrid/CollectionGridView.tsx b/src/client/views/collections/collectionGrid/CollectionGridView.tsx index 5c41fee37..6dffb80f1 100644 --- a/src/client/views/collections/collectionGrid/CollectionGridView.tsx +++ b/src/client/views/collections/collectionGrid/CollectionGridView.tsx @@ -186,21 +186,23 @@ export class CollectionGridView extends CollectionSubView() { getDisplayDoc(layout: Doc, dxf: () => Transform, width: () => number, height: () => number) { return ( <DocumentView - // eslint-disable-next-line react/jsx-props-no-spreading {...this._props} - NativeWidth={returnZero} - NativeHeight={returnZero} - setContentViewBox={emptyFunction} Document={layout} TemplateDataDocument={layout.resolvedDataDoc as Doc} + NativeWidth={returnZero} + NativeHeight={returnZero} + fitWidth={this._props.childLayoutFitWidth} + containerViewPath={this.childContainerViewPath} + renderDepth={this._props.renderDepth + 1} isContentActive={this.isChildContentActive} PanelWidth={width} PanelHeight={height} ScreenToLocalTransform={dxf} + setContentViewBox={emptyFunction} whenChildContentsActiveChanged={this._props.whenChildContentsActiveChanged} onClickScript={this.onChildClickHandler} - renderDepth={this._props.renderDepth + 1} dontCenter={StrCast(this.layoutDoc.layout_dontCenter) as 'x' | 'y' | 'xy'} + showTags={BoolCast(this.layoutDoc.showChildTags) || BoolCast(this.Document._layout_showTags)} /> ); } |
