aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/collections/CollectionView.tsx
diff options
context:
space:
mode:
authorTyler Schicke <tyler_schicke@brown.edu>2019-04-03 01:38:29 -0400
committerTyler Schicke <tyler_schicke@brown.edu>2019-04-03 01:38:29 -0400
commit5889bf159ee0a0f6567683b2bb8c2475feccf9ec (patch)
tree0b420df1f73c65e24789638814ea8ab6777c6588 /src/client/views/collections/CollectionView.tsx
parentadecb4a47cac3c2f92d11d8f500d4decf70a06d1 (diff)
Almost compiles
Diffstat (limited to 'src/client/views/collections/CollectionView.tsx')
-rw-r--r--src/client/views/collections/CollectionView.tsx4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/views/collections/CollectionView.tsx b/src/client/views/collections/CollectionView.tsx
index 51cc99595..d440dcff9 100644
--- a/src/client/views/collections/CollectionView.tsx
+++ b/src/client/views/collections/CollectionView.tsx
@@ -12,7 +12,7 @@ export class CollectionView extends React.Component<FieldViewProps> {
public static LayoutString(fieldStr: string = "DataKey") { return FieldView.LayoutString(CollectionView, fieldStr) }
private SubView = (type: CollectionViewType, renderProps: CollectionRenderProps) => {
- let props = { ...renderProps, ...this.props };
+ let props = { ...this.props, ...renderProps };
switch (type) {
case CollectionViewType.Freeform: return (<CollectionFreeFormView {...props} />)
case CollectionViewType.Schema: return (<CollectionSchemaView {...props} />)
@@ -34,7 +34,7 @@ export class CollectionView extends React.Component<FieldViewProps> {
return (
<CollectionBaseView {...this.props} onContextMenu={this.onContextMenu}>
{this.SubView}
- </CollectionBaseView> >
+ </CollectionBaseView>
)
}
} \ No newline at end of file