Switch from ReactJSS to styled-components in ui-components

This commit is contained in:
Florian Scholdei
2019-10-08 16:42:08 +02:00
parent 7ec1a8dd01
commit 1b6392defc
19 changed files with 422 additions and 566 deletions

View File

@@ -1,15 +1,13 @@
//@flow
import React from "react";
import injectSheet from "react-jss";
import classNames from "classnames";
import { translate } from "react-i18next";
import styled from "styled-components";
type Props = {
filter: string => void,
value?: string,
// context props
classes: Object,
t: string => string
};
@@ -17,15 +15,9 @@ type State = {
value: string
};
const styles = {
inputField: {
float: "right",
marginTop: "1.25rem"
},
inputHeight: {
height: "2.5rem"
}
};
const FixedHeightInput = styled.input`
height: 2.5rem;
`;
class FilterInput extends React.Component<Props, State> {
constructor(props) {
@@ -43,15 +35,12 @@ class FilterInput extends React.Component<Props, State> {
};
render() {
const { classes, t } = this.props;
const { t } = this.props;
return (
<form
className={classNames(classes.inputField, "input-field")}
onSubmit={this.handleSubmit}
>
<form className="input-field" onSubmit={this.handleSubmit}>
<div className="control has-icons-left">
<input
className={classNames(classes.inputHeight, "input")}
<FixedHeightInput
className="input"
type="search"
placeholder={t("filterEntries")}
value={this.state.value}
@@ -66,4 +55,4 @@ class FilterInput extends React.Component<Props, State> {
}
}
export default injectSheet(styles)(translate("commons")(FilterInput));
export default translate("commons")(FilterInput);

View File

@@ -1,6 +1,5 @@
//@flow
import * as React from "react";
import injectSheet from "react-jss";
import type { DisplayedUser } from "@scm-manager/ui-types";
import { Help, Tag } from "../index";
@@ -8,24 +7,15 @@ type Props = {
items: DisplayedUser[],
label: string,
helpText?: string,
onRemove: (DisplayedUser[]) => void,
// context props
classes: Object
onRemove: (DisplayedUser[]) => void
};
const styles = {
help: {
position: "relative"
}
};
class TagGroup extends React.Component<Props> {
export default class TagGroup extends React.Component<Props> {
render() {
const { items, label, helpText, classes } = this.props;
const { items, label, helpText } = this.props;
let help = null;
if (helpText) {
help = <Help className={classes.help} message={helpText} />;
help = <Help className="is-relative" message={helpText} />;
}
return (
<div className="field is-grouped is-grouped-multiline">
@@ -62,5 +52,3 @@ class TagGroup extends React.Component<Props> {
this.props.onRemove(newItems);
};
}
export default injectSheet(styles)(TagGroup);