Use fields without margins when displayed in InlinePopover

This commit is contained in:
Florian Rival
2019-11-21 15:26:01 +00:00
parent 3af0cd862f
commit 4d229f32fa
20 changed files with 24 additions and 8 deletions

View File

@@ -34,9 +34,7 @@ export default class InlinePopover extends Component {
> >
<Background> <Background>
<Column expand> <Column expand>
<Line> <Line>{this.props.children}</Line>
{this.props.children}
</Line>
</Column> </Column>
</Background> </Background>
</Popper> </Popper>

View File

@@ -31,6 +31,7 @@ export default class AudioResourceField extends Component<
return ( return (
<ResourceSelector <ResourceSelector
margin={this.props.isInline ? 'none' : 'dense'}
project={this.props.project} project={this.props.project}
resourceSources={this.props.resourceSources} resourceSources={this.props.resourceSources}
onChooseResource={this.props.onChooseResource} onChooseResource={this.props.onChooseResource}

View File

@@ -127,6 +127,7 @@ export default class BehaviorField extends React.Component<
return ( return (
<SemiControlledAutoComplete <SemiControlledAutoComplete
margin={this.props.isInline ? 'none' : 'dense'}
floatingLabelText={this._description} floatingLabelText={this._description}
fullWidth fullWidth
errorText={ errorText={

View File

@@ -21,6 +21,7 @@ export default class DefaultField extends React.Component<
return ( return (
<SemiControlledTextField <SemiControlledTextField
margin={this.props.isInline ? 'none' : 'dense'}
commitOnBlur commitOnBlur
value={this.props.value} value={this.props.value}
floatingLabelText={description} floatingLabelText={description}

View File

@@ -48,6 +48,7 @@ export default class ExternalEventsField extends React.Component<
return ( return (
<SemiControlledAutoComplete <SemiControlledAutoComplete
margin={this.props.isInline ? 'none' : 'dense'}
floatingLabelText={ floatingLabelText={
parameterMetadata ? parameterMetadata.getDescription() : undefined parameterMetadata ? parameterMetadata.getDescription() : undefined
} }

View File

@@ -27,7 +27,7 @@ export default class GlobalVariableField extends React.Component<
const { project, scope } = this.props; const { project, scope } = this.props;
return ( return (
<div> <React.Fragment>
<VariableField <VariableField
variablesContainer={project ? project.getVariables() : null} variablesContainer={project ? project.getVariables() : null}
parameterMetadata={this.props.parameterMetadata} parameterMetadata={this.props.parameterMetadata}
@@ -56,7 +56,7 @@ export default class GlobalVariableField extends React.Component<
} }
/> />
)} )}
</div> </React.Fragment>
); );
} }
} }

View File

@@ -31,6 +31,7 @@ export default class JsonResourceField extends Component<
return ( return (
<ResourceSelector <ResourceSelector
margin={this.props.isInline ? 'none' : 'dense'}
project={this.props.project} project={this.props.project}
resourceSources={this.props.resourceSources} resourceSources={this.props.resourceSources}
onChooseResource={this.props.onChooseResource} onChooseResource={this.props.onChooseResource}

View File

@@ -109,6 +109,7 @@ export default class KeyField extends Component<ParameterFieldProps, {||}> {
return ( return (
<SemiControlledAutoComplete <SemiControlledAutoComplete
margin={this.props.isInline ? 'none' : 'dense'}
floatingLabelText={ floatingLabelText={
parameterMetadata ? parameterMetadata.getDescription() : undefined parameterMetadata ? parameterMetadata.getDescription() : undefined
} }

View File

@@ -23,6 +23,7 @@ export default class LayerField extends Component<ParameterFieldProps, {||}> {
return ( return (
<SemiControlledAutoComplete <SemiControlledAutoComplete
margin={this.props.isInline ? 'none' : 'dense'}
floatingLabelText={ floatingLabelText={
parameterMetadata ? parameterMetadata.getDescription() : undefined parameterMetadata ? parameterMetadata.getDescription() : undefined
} }

View File

@@ -16,6 +16,7 @@ export default class MouseField extends Component {
return ( return (
<SelectField <SelectField
margin={this.props.isInline ? 'none' : 'dense'}
fullWidth fullWidth
floatingLabelText={description} floatingLabelText={description}
value={value} value={value}

View File

@@ -34,6 +34,7 @@ export default class ObjectField extends React.Component<
render() { render() {
return ( return (
<ObjectSelector <ObjectSelector
margin={this.props.isInline ? 'none' : 'dense'}
project={this.props.project} project={this.props.project}
value={this.props.value} value={this.props.value}
onChange={this.props.onChange} onChange={this.props.onChange}

View File

@@ -53,7 +53,7 @@ export default class ObjectVariableField extends React.Component<
} }
return ( return (
<div> <React.Fragment>
<VariableField <VariableField
variablesContainer={variablesContainer} variablesContainer={variablesContainer}
parameterMetadata={this.props.parameterMetadata} parameterMetadata={this.props.parameterMetadata}
@@ -76,7 +76,7 @@ export default class ObjectVariableField extends React.Component<
}} }}
/> />
)} )}
</div> </React.Fragment>
); );
} }
} }

View File

@@ -21,6 +21,7 @@ export default class OperatorField extends Component<ParameterFieldProps> {
return ( return (
<SelectField <SelectField
margin={this.props.isInline ? 'none' : 'dense'}
fullWidth fullWidth
floatingLabelText={description} floatingLabelText={description}
value={this.props.value} value={this.props.value}

View File

@@ -21,6 +21,7 @@ export default class RelationalOperatorField extends Component<ParameterFieldPro
return ( return (
<SelectField <SelectField
margin={this.props.isInline ? 'none' : 'dense'}
fullWidth fullWidth
floatingLabelText={description} floatingLabelText={description}
value={this.props.value} value={this.props.value}

View File

@@ -28,6 +28,7 @@ export default class SceneNameField extends Component<
return ( return (
<SemiControlledAutoComplete <SemiControlledAutoComplete
margin={this.props.isInline ? 'none' : 'dense'}
floatingLabelText={ floatingLabelText={
parameterMetadata ? parameterMetadata.getDescription() : undefined parameterMetadata ? parameterMetadata.getDescription() : undefined
} }

View File

@@ -35,6 +35,7 @@ export default class StringWithSelectorField extends Component<
return ( return (
<SemiControlledAutoComplete <SemiControlledAutoComplete
margin={this.props.isInline ? 'none' : 'dense'}
floatingLabelText={ floatingLabelText={
parameterMetadata ? parameterMetadata.getDescription() : undefined parameterMetadata ? parameterMetadata.getDescription() : undefined
} }

View File

@@ -40,6 +40,7 @@ export default class VariableField extends Component<Props, {||}> {
<TextFieldWithButtonLayout <TextFieldWithButtonLayout
renderTextField={() => ( renderTextField={() => (
<SemiControlledAutoComplete <SemiControlledAutoComplete
margin={this.props.isInline ? 'none' : 'dense'}
floatingLabelText={description} floatingLabelText={description}
fullWidth fullWidth
value={value} value={value}

View File

@@ -31,6 +31,7 @@ export default class VideoResourceField extends Component<
return ( return (
<ResourceSelector <ResourceSelector
margin={this.props.isInline ? 'none' : 'dense'}
project={this.props.project} project={this.props.project}
resourceSources={this.props.resourceSources} resourceSources={this.props.resourceSources}
onChooseResource={this.props.onChooseResource} onChooseResource={this.props.onChooseResource}

View File

@@ -24,6 +24,7 @@ type Props = {|
floatingLabelText?: ?string, floatingLabelText?: ?string,
openOnFocus?: boolean, openOnFocus?: boolean,
hintText?: ?React.Node, hintText?: ?React.Node,
margin?: 'none' | 'dense',
|}; |};
const iconSize = 24; const iconSize = 24;
@@ -94,6 +95,7 @@ export default class ObjectSelector extends React.Component<Props, {||}> {
allowedObjectType, allowedObjectType,
noGroups, noGroups,
errorTextIfInvalid, errorTextIfInvalid,
margin,
...rest ...rest
} = this.props; } = this.props;
@@ -111,6 +113,7 @@ export default class ObjectSelector extends React.Component<Props, {||}> {
return ( return (
<SemiControlledAutoComplete <SemiControlledAutoComplete
margin={margin}
hintText={t`Choose an object`} hintText={t`Choose an object`}
value={value} value={value}
onChange={onChange} onChange={onChange}

View File

@@ -27,7 +27,7 @@ type Props = {|
flex?: 1, flex?: 1,
width?: 'auto', width?: 'auto',
}, },
margin?: 'none', margin?: 'none' | 'dense',
floatingLabelText?: React.Node, floatingLabelText?: React.Node,