Merge branch 'master' into geo2

nicolaskruchten · web-flow · commit c1de99962269 · 2018-07-19T16:01:49.000-04:00
diff --git a/src/components/fields/DataSelector.js b/src/components/fields/DataSelector.js
@@ -45,7 +45,8 @@ export class UnconnectedDataSelector extends Component {
             'carpet',
             'contourcarpet',
           ].includes(props.container.type)) ||
-        (props.container.type === 'table' && props.attr !== 'columnorder');
+        (props.container.type === 'table' && props.attr !== 'columnorder') ||
+        Array.isArray(this.fullValue);
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,8 @@ export class UnconnectedDataSelector extends Component {`
`45`	`45`	`'carpet',`
`46`	`46`	`'contourcarpet',`
`47`	`47`	`].includes(props.container.type)) \|\|`
`48`		`- (props.container.type === 'table' && props.attr !== 'columnorder');`
	`48`	`+ (props.container.type === 'table' && props.attr !== 'columnorder') \|\|`
	`49`	`+ Array.isArray(this.fullValue);`
`49`	`50`	`}`
`50`	`51`	`}`
`51`	`52`