diff options
author | Dominik Guzei <dominik.guzei@gmail.com> | 2019-03-21 16:35:38 +0100 |
---|---|---|
committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-03-21 16:36:19 +0100 |
commit | 93137229bf3b04e4589ae315a81ed2de7a171ded (patch) | |
tree | 703432658a50425e2a295f527c9fdb392211bfd3 /packages | |
parent | add workspaces count badge in settings navigation (diff) | |
download | ferdium-app-93137229bf3b04e4589ae315a81ed2de7a171ded.tar.gz ferdium-app-93137229bf3b04e4589ae315a81ed2de7a171ded.tar.zst ferdium-app-93137229bf3b04e4589ae315a81ed2de7a171ded.zip |
fix merge conflicts with latest develop
Diffstat (limited to 'packages')
-rw-r--r-- | packages/forms/package.json | 6 | ||||
-rw-r--r-- | packages/forms/src/button/index.tsx | 1 | ||||
-rw-r--r-- | packages/forms/src/input/index.tsx | 9 | ||||
-rw-r--r-- | packages/forms/src/label/index.tsx | 2 | ||||
-rw-r--r-- | packages/theme/package.json | 4 | ||||
-rw-r--r-- | packages/theme/src/themes/default/index.ts | 4 | ||||
-rw-r--r-- | packages/typings/package.json | 4 | ||||
-rw-r--r-- | packages/ui/package.json | 6 | ||||
-rw-r--r-- | packages/ui/src/infobox/index.tsx | 7 |
9 files changed, 29 insertions, 14 deletions
diff --git a/packages/forms/package.json b/packages/forms/package.json index e78929777..fe161a282 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json | |||
@@ -1,6 +1,6 @@ | |||
1 | { | 1 | { |
2 | "name": "@meetfranz/forms", | 2 | "name": "@meetfranz/forms", |
3 | "version": "1.0.9", | 3 | "version": "1.0.13", |
4 | "description": "React form components for Franz", | 4 | "description": "React form components for Franz", |
5 | "main": "lib/index.js", | 5 | "main": "lib/index.js", |
6 | "scripts": { | 6 | "scripts": { |
@@ -25,7 +25,7 @@ | |||
25 | "dependencies": { | 25 | "dependencies": { |
26 | "@mdi/js": "^3.3.92", | 26 | "@mdi/js": "^3.3.92", |
27 | "@mdi/react": "^1.1.0", | 27 | "@mdi/react": "^1.1.0", |
28 | "@meetfranz/theme": "^1.0.7", | 28 | "@meetfranz/theme": "^1.0.11", |
29 | "react-html-attributes": "^1.4.3", | 29 | "react-html-attributes": "^1.4.3", |
30 | "react-loader": "^2.4.5" | 30 | "react-loader": "^2.4.5" |
31 | }, | 31 | }, |
@@ -35,5 +35,5 @@ | |||
35 | "react-dom": "16.7.0", | 35 | "react-dom": "16.7.0", |
36 | "react-jss": "^8.6.1" | 36 | "react-jss": "^8.6.1" |
37 | }, | 37 | }, |
38 | "gitHead": "14b151cad6a5a849bb476aaa3fc53bf1eead7f4b" | 38 | "gitHead": "27778954921365e4957eae964e28f68690f3825f" |
39 | } | 39 | } |
diff --git a/packages/forms/src/button/index.tsx b/packages/forms/src/button/index.tsx index 7a7f83dab..6959cde73 100644 --- a/packages/forms/src/button/index.tsx +++ b/packages/forms/src/button/index.tsx | |||
@@ -44,6 +44,7 @@ const styles = (theme: Theme) => ({ | |||
44 | width: (props: IProps) => (props.stretch ? '100%' : 'auto') as CSS.WidthProperty<string>, | 44 | width: (props: IProps) => (props.stretch ? '100%' : 'auto') as CSS.WidthProperty<string>, |
45 | fontSize: theme.uiFontSize, | 45 | fontSize: theme.uiFontSize, |
46 | textDecoration: 'none', | 46 | textDecoration: 'none', |
47 | height: theme.buttonHeight, | ||
47 | 48 | ||
48 | '&:hover': { | 49 | '&:hover': { |
49 | opacity: 0.8, | 50 | opacity: 0.8, |
diff --git a/packages/forms/src/input/index.tsx b/packages/forms/src/input/index.tsx index cc3709b1a..f89c91be5 100644 --- a/packages/forms/src/input/index.tsx +++ b/packages/forms/src/input/index.tsx | |||
@@ -34,7 +34,7 @@ interface IState { | |||
34 | } | 34 | } |
35 | 35 | ||
36 | class InputComponent extends Component<IProps, IState> { | 36 | class InputComponent extends Component<IProps, IState> { |
37 | public static defaultProps = { | 37 | static defaultProps = { |
38 | focus: false, | 38 | focus: false, |
39 | onChange: () => {}, | 39 | onChange: () => {}, |
40 | onBlur: () => {}, | 40 | onBlur: () => {}, |
@@ -109,8 +109,10 @@ class InputComponent extends Component<IProps, IState> { | |||
109 | placeholder, | 109 | placeholder, |
110 | spellCheck, | 110 | spellCheck, |
111 | onBlur, | 111 | onBlur, |
112 | onEnterKey, | ||
113 | onFocus, | 112 | onFocus, |
113 | min, | ||
114 | max, | ||
115 | step, | ||
114 | } = this.props; | 116 | } = this.props; |
115 | 117 | ||
116 | const { | 118 | const { |
@@ -157,6 +159,9 @@ class InputComponent extends Component<IProps, IState> { | |||
157 | onBlur={onBlur} | 159 | onBlur={onBlur} |
158 | disabled={disabled} | 160 | disabled={disabled} |
159 | onKeyPress={this.onInputKeyPress.bind(this)} | 161 | onKeyPress={this.onInputKeyPress.bind(this)} |
162 | min={min} | ||
163 | max={max} | ||
164 | step={step} | ||
160 | /> | 165 | /> |
161 | {suffix && ( | 166 | {suffix && ( |
162 | <span className={classes.suffix}> | 167 | <span className={classes.suffix}> |
diff --git a/packages/forms/src/label/index.tsx b/packages/forms/src/label/index.tsx index 36fcfbedf..590270a06 100644 --- a/packages/forms/src/label/index.tsx +++ b/packages/forms/src/label/index.tsx | |||
@@ -26,6 +26,8 @@ class LabelComponent extends Component<ILabel> { | |||
26 | htmlFor, | 26 | htmlFor, |
27 | } = this.props; | 27 | } = this.props; |
28 | 28 | ||
29 | if (!showLabel) return children; | ||
30 | |||
29 | return ( | 31 | return ( |
30 | <label | 32 | <label |
31 | className={classnames({ | 33 | className={classnames({ |
diff --git a/packages/theme/package.json b/packages/theme/package.json index 5c21a787f..3034d6347 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json | |||
@@ -1,6 +1,6 @@ | |||
1 | { | 1 | { |
2 | "name": "@meetfranz/theme", | 2 | "name": "@meetfranz/theme", |
3 | "version": "1.0.9", | 3 | "version": "1.0.11", |
4 | "description": "Theme configuration for Franz", | 4 | "description": "Theme configuration for Franz", |
5 | "author": "Stefan Malzner <stefan@adlk.io>", | 5 | "author": "Stefan Malzner <stefan@adlk.io>", |
6 | "homepage": "https://github.com/meetfranz/franz", | 6 | "homepage": "https://github.com/meetfranz/franz", |
@@ -25,5 +25,5 @@ | |||
25 | "dependencies": { | 25 | "dependencies": { |
26 | "color": "^3.1.0" | 26 | "color": "^3.1.0" |
27 | }, | 27 | }, |
28 | "gitHead": "14b151cad6a5a849bb476aaa3fc53bf1eead7f4b" | 28 | "gitHead": "27778954921365e4957eae964e28f68690f3825f" |
29 | } | 29 | } |
diff --git a/packages/theme/src/themes/default/index.ts b/packages/theme/src/themes/default/index.ts index 2290b18e3..f2632ee20 100644 --- a/packages/theme/src/themes/default/index.ts +++ b/packages/theme/src/themes/default/index.ts | |||
@@ -42,7 +42,7 @@ export const colorWebviewLoaderBackground = color(legacyStyles.themeGrayLighter) | |||
42 | // Input | 42 | // Input |
43 | export const labelColor = legacyStyles.themeGrayLight; | 43 | export const labelColor = legacyStyles.themeGrayLight; |
44 | export const inputColor = legacyStyles.themeGray; | 44 | export const inputColor = legacyStyles.themeGray; |
45 | export const inputHeight = '35px'; | 45 | export const inputHeight = 40; |
46 | export const inputBackground = legacyStyles.themeGrayLightest; | 46 | export const inputBackground = legacyStyles.themeGrayLightest; |
47 | export const inputBorder = `1px solid ${legacyStyles.themeGrayLighter}`; | 47 | export const inputBorder = `1px solid ${legacyStyles.themeGrayLighter}`; |
48 | export const inputModifierColor = legacyStyles.themeGrayLight; | 48 | export const inputModifierColor = legacyStyles.themeGrayLight; |
@@ -108,6 +108,8 @@ export const buttonInvertedBackground = 'none'; | |||
108 | export const buttonInvertedTextColor = brandPrimary; | 108 | export const buttonInvertedTextColor = brandPrimary; |
109 | export const buttonInvertedBorder = `1px solid ${brandPrimary}`; | 109 | export const buttonInvertedBorder = `1px solid ${brandPrimary}`; |
110 | 110 | ||
111 | export const buttonHeight = inputHeight; | ||
112 | |||
111 | export const buttonLoaderColor = { | 113 | export const buttonLoaderColor = { |
112 | primary: '#FFF', | 114 | primary: '#FFF', |
113 | secondary: buttonSecondaryTextColor, | 115 | secondary: buttonSecondaryTextColor, |
diff --git a/packages/typings/package.json b/packages/typings/package.json index 54257c54c..5207cf3c6 100644 --- a/packages/typings/package.json +++ b/packages/typings/package.json | |||
@@ -1,6 +1,6 @@ | |||
1 | { | 1 | { |
2 | "name": "@meetfranz/typings", | 2 | "name": "@meetfranz/typings", |
3 | "version": "0.0.7", | 3 | "version": "0.0.9", |
4 | "description": "TypeScript typings for internal and external projects", | 4 | "description": "TypeScript typings for internal and external projects", |
5 | "author": "Stefan Malzner <stefan@adlk.io>", | 5 | "author": "Stefan Malzner <stefan@adlk.io>", |
6 | "homepage": "https://github.com/meetfranz/franz", | 6 | "homepage": "https://github.com/meetfranz/franz", |
@@ -18,5 +18,5 @@ | |||
18 | "bugs": { | 18 | "bugs": { |
19 | "url": "https://github.com/meetfranz/franz/issues" | 19 | "url": "https://github.com/meetfranz/franz/issues" |
20 | }, | 20 | }, |
21 | "gitHead": "14b151cad6a5a849bb476aaa3fc53bf1eead7f4b" | 21 | "gitHead": "27778954921365e4957eae964e28f68690f3825f" |
22 | } | 22 | } |
diff --git a/packages/ui/package.json b/packages/ui/package.json index 62a1e5a6e..fb36555c4 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json | |||
@@ -1,6 +1,6 @@ | |||
1 | { | 1 | { |
2 | "name": "@meetfranz/ui", | 2 | "name": "@meetfranz/ui", |
3 | "version": "0.0.4", | 3 | "version": "0.0.6", |
4 | "description": "React UI components for Franz", | 4 | "description": "React UI components for Franz", |
5 | "main": "lib/index.js", | 5 | "main": "lib/index.js", |
6 | "scripts": { | 6 | "scripts": { |
@@ -25,7 +25,7 @@ | |||
25 | "dependencies": { | 25 | "dependencies": { |
26 | "@mdi/js": "^3.3.92", | 26 | "@mdi/js": "^3.3.92", |
27 | "@mdi/react": "^1.1.0", | 27 | "@mdi/react": "^1.1.0", |
28 | "@meetfranz/theme": "^1.0.7", | 28 | "@meetfranz/theme": "^1.0.11", |
29 | "react-loader": "^2.4.5" | 29 | "react-loader": "^2.4.5" |
30 | }, | 30 | }, |
31 | "peerDependencies": { | 31 | "peerDependencies": { |
@@ -34,5 +34,5 @@ | |||
34 | "react-dom": "16.7.0", | 34 | "react-dom": "16.7.0", |
35 | "react-jss": "^8.6.1" | 35 | "react-jss": "^8.6.1" |
36 | }, | 36 | }, |
37 | "gitHead": "14b151cad6a5a849bb476aaa3fc53bf1eead7f4b" | 37 | "gitHead": "27778954921365e4957eae964e28f68690f3825f" |
38 | } | 38 | } |
diff --git a/packages/ui/src/infobox/index.tsx b/packages/ui/src/infobox/index.tsx index 53ed16341..1a442a733 100644 --- a/packages/ui/src/infobox/index.tsx +++ b/packages/ui/src/infobox/index.tsx | |||
@@ -15,6 +15,7 @@ interface IProps extends IWithStyle { | |||
15 | ctaLabel?: string; | 15 | ctaLabel?: string; |
16 | ctaLoading?: boolean; | 16 | ctaLoading?: boolean; |
17 | children: React.ReactNode; | 17 | children: React.ReactNode; |
18 | className: string; | ||
18 | } | 19 | } |
19 | 20 | ||
20 | interface IState { | 21 | interface IState { |
@@ -138,6 +139,7 @@ class InfoboxComponent extends Component<IProps, IState> { | |||
138 | ctaLoading, | 139 | ctaLoading, |
139 | ctaOnClick, | 140 | ctaOnClick, |
140 | dismissable, | 141 | dismissable, |
142 | className, | ||
141 | } = this.props; | 143 | } = this.props; |
142 | 144 | ||
143 | const { | 145 | const { |
@@ -150,7 +152,10 @@ class InfoboxComponent extends Component<IProps, IState> { | |||
150 | } | 152 | } |
151 | 153 | ||
152 | return ( | 154 | return ( |
153 | <div className={classes.wrapper}> | 155 | <div className={classnames({ |
156 | [classes.wrapper]: true, | ||
157 | [`${className}`]: className, | ||
158 | })}> | ||
154 | <div | 159 | <div |
155 | className={classnames({ | 160 | className={classnames({ |
156 | [classes.infobox]: true, | 161 | [classes.infobox]: true, |