aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/collections
diff options
context:
space:
mode:
authorBob Zeleznik <zzzman@gmail.com>2020-05-27 13:53:18 -0400
committerBob Zeleznik <zzzman@gmail.com>2020-05-27 13:53:18 -0400
commitae552bf33e197bf18989a821f726f2d5670f6647 (patch)
tree8e26027d68670f9c82d6ddce12a11b8cb17f7e49 /src/client/views/collections
parentc1e7d638b92c2484f54078866c0bc69ec69c77e4 (diff)
fixed ineracting with documents selected in GridView
Diffstat (limited to 'src/client/views/collections')
-rw-r--r--src/client/views/collections/collectionGrid/CollectionGridView.tsx3
-rw-r--r--src/client/views/collections/collectionGrid/Grid.tsx3
2 files changed, 5 insertions, 1 deletions
diff --git a/src/client/views/collections/collectionGrid/CollectionGridView.tsx b/src/client/views/collections/collectionGrid/CollectionGridView.tsx
index bc554e2c2..a55d5a8ac 100644
--- a/src/client/views/collections/collectionGrid/CollectionGridView.tsx
+++ b/src/client/views/collections/collectionGrid/CollectionGridView.tsx
@@ -240,7 +240,7 @@ export class CollectionGridView extends CollectionSubView(GridSchema) {
style={{
marginLeft: NumCast(this.props.Document._xMargin), marginRight: NumCast(this.props.Document._xMargin),
marginTop: NumCast(this.props.Document._yMargin), marginBottom: NumCast(this.props.Document._yMargin),
- pointerEvents: !this.props.isSelected() && !this.props.ContainingCollectionView?._isChildActive && !SnappingManager.GetIsDragging() ? "none" : undefined
+ pointerEvents: !this.props.isSelected() && this.props.renderDepth !== 0 && !this.props.ContainingCollectionView?._isChildActive && !SnappingManager.GetIsDragging() ? "none" : undefined
}}
ref={this.createDashEventsTarget}
onPointerDown={e => e.stopPropagation()}
@@ -249,6 +249,7 @@ export class CollectionGridView extends CollectionSubView(GridSchema) {
width={this.props.PanelWidth()}
nodeList={contents}
layout={layout}
+ transformScale={this.props.ScreenToLocalTransform().Scale}
numCols={this.props.Document.numCols as number}
rowHeight={this.props.Document.rowHeight as number}
setLayout={(layout: Layout[]) => this.setLayout(layout)}
diff --git a/src/client/views/collections/collectionGrid/Grid.tsx b/src/client/views/collections/collectionGrid/Grid.tsx
index a5f5c724a..9c66d1e33 100644
--- a/src/client/views/collections/collectionGrid/Grid.tsx
+++ b/src/client/views/collections/collectionGrid/Grid.tsx
@@ -18,6 +18,7 @@ interface GridProps {
numCols: number;
rowHeight: number;
setLayout: Function;
+ transformScale: number;
}
/**
@@ -35,6 +36,7 @@ export default class Grid extends React.Component<GridProps> {
this.props.setLayout(layout);
}
+ Scale = 2
render() {
console.log("In grid layout prop received value= " + this.props.layout?.[0]?.w);
return (
@@ -45,6 +47,7 @@ export default class Grid extends React.Component<GridProps> {
width={this.props.width}
compactType={null}
isDroppable={true}
+ useCSSTransforms={true}
margin={[10, 10]}
onLayoutChange={layout => this.onLayoutChange(layout)}
>