aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSam Wilkins <samwilkins333@gmail.com>2020-01-17 11:45:56 -0500
committerSam Wilkins <samwilkins333@gmail.com>2020-01-17 11:45:56 -0500
commitc0de8569d4d4dea83174a9d79e780d9d9f5692d7 (patch)
treec4b5a2cc5334bdd71ad2efc26e3ce4befea654e9 /src
parentf783e6cd66d4a7e303bd327d028076e3d76815bc (diff)
parent9af3c5967e45b98186a2862a1f23e2494630ddb3 (diff)
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web
Diffstat (limited to 'src')
-rw-r--r--src/client/views/collections/CollectionMulticolumnView.tsx5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/client/views/collections/CollectionMulticolumnView.tsx b/src/client/views/collections/CollectionMulticolumnView.tsx
index 4744de34c..51064d5c3 100644
--- a/src/client/views/collections/CollectionMulticolumnView.tsx
+++ b/src/client/views/collections/CollectionMulticolumnView.tsx
@@ -126,8 +126,10 @@ export class CollectionMulticolumnView extends CollectionSubView(MulticolumnDocu
resolved.push({ pixels: width, ...remaining });
});
const collector: JSX.Element[] = [];
+ let offset = 0;
for (let i = 0; i < resolved.length; i++) {
const { target, pixels } = resolved[i];
+ const shiftX = offset;
collector.push(
<div className={"fish"}>
<ContentFittingDocumentView
@@ -136,7 +138,7 @@ export class CollectionMulticolumnView extends CollectionSubView(MulticolumnDocu
Document={target}
DataDocument={target.resolvedDataDoc as Doc}
PanelWidth={() => pixels}
- getTransform={this.props.ScreenToLocalTransform}
+ getTransform={() => this.props.ScreenToLocalTransform().translate(-shiftX, 0)}
/>
<span className={"display"}>{NumCast(target.widthMagnitude).toFixed(3)} {StrCast(target.widthUnit)}</span>
</div>,
@@ -148,6 +150,7 @@ export class CollectionMulticolumnView extends CollectionSubView(MulticolumnDocu
toRight={resolved[i + 1]?.target}
/>
);
+ offset += pixels + resizerWidth;
}
collector.pop(); // removes the final extraneous resize bar
return collector;