From 5603059c6798e2c1276439086512b1cc6dbba748 Mon Sep 17 00:00:00 2001 From: Arthur Denner Date: Thu, 13 Jan 2022 17:32:50 +0100 Subject: [PATCH] fix(datepicker): pass error prop to Form.Field (#708) * chore: revert eslint-plugin-prettier to v3 * chore: add error knob to Storybook * fix(datepicker): pass error prop to Form.Field --- package.json | 2 +- src/components/input.tsx | 4 +++- stories/index.stories.tsx | 44 ++++++++++++++++++++++----------------- yarn.lock | 8 +++---- 4 files changed, 33 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index 2b91a1cf..0dcd08d6 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "babel-jest": "27.4.5", "babel-loader": "8.2.3", "cssnano": "4.1.11", - "eslint-plugin-prettier": "4.0.0", + "eslint-plugin-prettier": "3.4.1", "husky": "7.0.4", "jest-transform-css": "3.0.0", "prettier": "2.5.1", diff --git a/src/components/input.tsx b/src/components/input.tsx index 16826f45..32effd45 100644 --- a/src/components/input.tsx +++ b/src/components/input.tsx @@ -16,6 +16,7 @@ const inputData = { const CustomInput = React.forwardRef((props, ref) => { const { clearIcon, + error, icon, isClearIconVisible, label, @@ -27,11 +28,12 @@ const CustomInput = React.forwardRef((props, ref) => { } = props; return ( - + {label && } { ); }; -export const usageWithForm = () => ( - -
- - - - -
-
-); +export const usageWithForm = () => { + const error = boolean('Error state', false); + + return ( + +
+ + + + +
+
+ ); +}; export const inverted = () => { const type = select('Type', typeMap, typeMap.basic); diff --git a/yarn.lock b/yarn.lock index c0a2fa14..2fa9f335 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5946,10 +5946,10 @@ eslint-plugin-jsx-a11y@^6.2.3: has "^1.0.3" jsx-ast-utils "^2.2.1" -eslint-plugin-prettier@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz#8b99d1e4b8b24a762472b4567992023619cb98e0" - integrity sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ== +eslint-plugin-prettier@3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz#e9ddb200efb6f3d05ffe83b1665a716af4a387e5" + integrity sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g== dependencies: prettier-linter-helpers "^1.0.0"