Fix stuff

This commit is contained in:
Nathan Bierema 2020-09-19 18:10:49 -04:00
parent 725a94de1c
commit 4f0abaccb7
4 changed files with 9 additions and 4 deletions

View File

@ -38,6 +38,11 @@ export class Select extends (PureComponent || Component)<SelectProps> {
neutral60: this.props.theme.base06, neutral60: this.props.theme.base06,
neutral80: this.props.theme.base07, neutral80: this.props.theme.base07,
}, },
spacing: {
...theme.spacing,
baseUnit: 2,
controlHeight: this.props.theme.inputHeight,
},
})} })}
/> />
); );

View File

@ -14,7 +14,7 @@ export default <C extends React.ComponentType<any>>(
) : ( ) : (
<UnthemedComponent <UnthemedComponent
{...props} {...props}
theme={getDefaultTheme({} as Base16Theme)} theme={getDefaultTheme((props.theme ?? {}) as Base16Theme)}
/> />
); );
}); });

View File

@ -133,9 +133,9 @@ export default class TestTab<S, A extends Action<unknown>> extends Component<
<div style={{ flexGrow: 1, zIndex: 100 }}> <div style={{ flexGrow: 1, zIndex: 100 }}>
<Select <Select
options={templates} options={templates}
getValueLabel={(template: Template) => template.name} getOptionValue={(template: Template) => template.name}
getOptionLabel={(template: Template) => template.name} getOptionLabel={(template: Template) => template.name}
value={templates.filter((template) => template.name == name)} value={templates.filter((template) => template.name === name)}
onChange={this.handleSelectTemplate} onChange={this.handleSelectTemplate}
/> />
</div> </div>

View File

@ -9357,7 +9357,7 @@ hmac-drbg@^1.0.0:
minimalistic-assert "^1.0.0" minimalistic-assert "^1.0.0"
minimalistic-crypto-utils "^1.0.1" minimalistic-crypto-utils "^1.0.1"
hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2: hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0:
version "3.3.2" version "3.3.2"
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==