From 470e631d5657c9eb50ba0e13fadf3452e77ff499 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Fri, 5 Apr 2019 11:36:04 +0200 Subject: Add asterisk if input is required --- packages/forms/src/input/index.tsx | 2 ++ packages/forms/src/label/index.tsx | 4 +++- packages/forms/src/select/index.tsx | 2 ++ packages/forms/src/typings/generic.ts | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) (limited to 'packages/forms') diff --git a/packages/forms/src/input/index.tsx b/packages/forms/src/input/index.tsx index ab1c33315..5178904d3 100644 --- a/packages/forms/src/input/index.tsx +++ b/packages/forms/src/input/index.tsx @@ -105,6 +105,7 @@ class InputComponent extends Component { min, max, step, + required, } = this.props; const { @@ -123,6 +124,7 @@ class InputComponent extends Component { title={label} showLabel={showLabel} htmlFor={id} + isRequired={required} >
{ classes: Classes; + isRequired: boolean; } class LabelComponent extends Component { @@ -24,6 +25,7 @@ class LabelComponent extends Component { className, children, htmlFor, + isRequired, } = this.props; if (!showLabel) return children; @@ -36,7 +38,7 @@ class LabelComponent extends Component { htmlFor={htmlFor} > {showLabel && ( - {title} + {title}{isRequired && ' *'} )}
{children} diff --git a/packages/forms/src/select/index.tsx b/packages/forms/src/select/index.tsx index 4a9e3c56e..f419d0351 100644 --- a/packages/forms/src/select/index.tsx +++ b/packages/forms/src/select/index.tsx @@ -306,6 +306,7 @@ class SelectComponent extends Component { showLabel, showSearch, onChange, + required, } = this.props; const { @@ -334,6 +335,7 @@ class SelectComponent extends Component { title={label} showLabel={showLabel} htmlFor={id} + isRequired={required} >
Date: Fri, 5 Apr 2019 11:36:15 +0200 Subject: fix line height on input pre/suffix --- packages/forms/src/input/styles.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/forms') diff --git a/packages/forms/src/input/styles.ts b/packages/forms/src/input/styles.ts index a64d2c340..c038295cd 100644 --- a/packages/forms/src/input/styles.ts +++ b/packages/forms/src/input/styles.ts @@ -4,7 +4,7 @@ import CSS from 'csstype'; const prefixStyles = (theme: Theme) => ({ background: theme.inputPrefixBackground, color: theme.inputPrefixColor, - lineHeight: theme.inputHeight, + lineHeight: `${theme.inputHeight}px`, padding: '0 10px', fontSize: theme.uiFontSize, }); -- cgit v1.2.3-70-g09d2 From cdcf151269373de29ef777be661824b659a92aaa Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Fri, 5 Apr 2019 11:37:48 +0200 Subject: bump versions --- packages/forms/package.json | 6 +++--- packages/theme/package.json | 4 ++-- packages/typings/package.json | 4 ++-- packages/ui/package.json | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'packages/forms') diff --git a/packages/forms/package.json b/packages/forms/package.json index 8c21303f4..0ac9a846f 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -1,6 +1,6 @@ { "name": "@meetfranz/forms", - "version": "1.0.14", + "version": "1.0.15", "description": "React form components for Franz", "main": "lib/index.js", "scripts": { @@ -25,7 +25,7 @@ "dependencies": { "@mdi/js": "^3.3.92", "@mdi/react": "^1.1.0", - "@meetfranz/theme": "^1.0.12", + "@meetfranz/theme": "^1.0.13", "react-html-attributes": "^1.4.3", "react-loader": "^2.4.5" }, @@ -35,5 +35,5 @@ "react-dom": "16.7.0", "react-jss": "^8.6.1" }, - "gitHead": "795eb685f4f57c66a2989993f0478e94baf3ca77" + "gitHead": "e9b9079dc921e85961954727a7b2a8eabe5b9798" } diff --git a/packages/theme/package.json b/packages/theme/package.json index e3d1e7af1..642904089 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json @@ -1,6 +1,6 @@ { "name": "@meetfranz/theme", - "version": "1.0.12", + "version": "1.0.13", "description": "Theme configuration for Franz", "author": "Stefan Malzner ", "homepage": "https://github.com/meetfranz/franz", @@ -25,5 +25,5 @@ "dependencies": { "color": "^3.1.0" }, - "gitHead": "795eb685f4f57c66a2989993f0478e94baf3ca77" + "gitHead": "e9b9079dc921e85961954727a7b2a8eabe5b9798" } diff --git a/packages/typings/package.json b/packages/typings/package.json index d0f7ffc43..5da8389d6 100644 --- a/packages/typings/package.json +++ b/packages/typings/package.json @@ -1,6 +1,6 @@ { "name": "@meetfranz/typings", - "version": "0.0.10", + "version": "0.0.11", "description": "TypeScript typings for internal and external projects", "author": "Stefan Malzner ", "homepage": "https://github.com/meetfranz/franz", @@ -18,5 +18,5 @@ "bugs": { "url": "https://github.com/meetfranz/franz/issues" }, - "gitHead": "795eb685f4f57c66a2989993f0478e94baf3ca77" + "gitHead": "e9b9079dc921e85961954727a7b2a8eabe5b9798" } diff --git a/packages/ui/package.json b/packages/ui/package.json index d6c72f31f..514b2cc7c 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,6 +1,6 @@ { "name": "@meetfranz/ui", - "version": "0.0.7", + "version": "0.0.8", "description": "React UI components for Franz", "main": "lib/index.js", "scripts": { @@ -25,7 +25,7 @@ "dependencies": { "@mdi/js": "^3.3.92", "@mdi/react": "^1.1.0", - "@meetfranz/theme": "^1.0.12", + "@meetfranz/theme": "^1.0.13", "react-loader": "^2.4.5" }, "peerDependencies": { @@ -34,5 +34,5 @@ "react-dom": "16.7.0", "react-jss": "^8.6.1" }, - "gitHead": "795eb685f4f57c66a2989993f0478e94baf3ca77" + "gitHead": "e9b9079dc921e85961954727a7b2a8eabe5b9798" } -- cgit v1.2.3-70-g09d2