fix(BTS-152): some fixes at checkbox and input component as well

catho · Mar 27, 2019 · 49fa76c · 49fa76c
1 parent d209ca7
commit 49fa76c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 20 deletions.
diff --git a/components/Checkbox/Checkbox.jsx b/components/Checkbox/Checkbox.jsx
@@ -124,7 +124,7 @@ Checkbox.defaultProps = {
   disabled: false,
   error: '',
   id: '',
-  label: 'Label',
+  label: '',
 };
 
 Checkbox.propTypes = {

diff --git a/components/Input/Input.jsx b/components/Input/Input.jsx
@@ -55,13 +55,7 @@ const InputIcon = styled(Icon)`
   cursor: pointer;
   position: absolute;
   right: 12px;
-  top: 50px;
-
-  ${({ description }) =>
-    description &&
-    `
-    top: 70px;
-  `};
+  bottom: 10px;
 `;
 
 const InputSearchIcon = styled(InputIcon)`
@@ -201,7 +195,11 @@ class Input extends React.Component {
           />
         )}
         {!!value && !error && (
-          <InputIcon name="cancel" description={descriptionLabel} />
+          <InputIcon
+            name="cancel"
+            description={descriptionLabel}
+            hasLabel={Boolean(label)}
+          />
         )}
         {error && <InputErrorMessage>{error}</InputErrorMessage>}
         {helperText && !error && <HelperText>{helperText}</HelperText>}

diff --git a/package.json b/package.json
@@ -97,7 +97,7 @@
     "styled-components": "^4.1.3"
   },
   "dependencies": {
-    "@catho/quantum-storybook-ui": "^1.0.1",
+    "@catho/quantum-storybook-ui": "^1.0.3",
     "@material-ui/core": "^3.8.2",
     "@material-ui/icons": "^3.0.2",
     "babel-polyfill": "^6.26.0",

diff --git a/yarn.lock b/yarn.lock
@@ -857,20 +857,21 @@
     lodash "^4.17.11"
     to-fast-properties "^2.0.0"
 
-"@catho/quantum-storybook-ui@^1.0.0", "@catho/quantum-storybook-ui@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@catho/quantum-storybook-ui/-/quantum-storybook-ui-1.0.1.tgz#aca8f121cad96d1a856ef5eb80af8f198025f73d"
-  integrity sha512-7TcpnBHuqAtC05ist2ZT8UEsX4IbI49vJ7Yw4cHQq1dNdTvlctU4tMM3Tdqx+iST85qr/7t5//89mU72o+Jg8A==
+"@catho/quantum-storybook-ui@^1.0.1", "@catho/quantum-storybook-ui@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@catho/quantum-storybook-ui/-/quantum-storybook-ui-1.0.3.tgz#6698b1810ad67a11de0679cc1f2728c3d624752b"
+  integrity sha512-t+Ac7U+fPaO3mZny9KzTugKxaMTqUUgeSoYIqABa9YaTOHbTocrgZ6+iALfTFjpWkysYOjKkzoAA9RpDm6TOUA==
   dependencies:
-    "@catho/quantum" "^1.2.0"
+    "@catho/quantum" "^1.5.1"
+    commitizen "^3.0.7"
     react-markdown "^4.0.6"
 
-"@catho/quantum@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@catho/quantum/-/quantum-1.2.0.tgz#ea2fdbdf2c117bce11665a75c6ee38afb5d93faa"
-  integrity sha512-rvBlWDjgeu5aLglQyHsXfg7/PTTCe7DCgSnnTf6tUjug28MgHi15UqFZXmm94/NPrf8DjQKU23XHVo9uY3f76g==
+"@catho/quantum@^1.5.1":
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/@catho/quantum/-/quantum-1.7.0.tgz#c8fa6b984a685ef274b6dfe4ca14c266c787485e"
+  integrity sha512-T9NsMxG2GZTMKqV5RKBfIcptHgAK5BsS0kPcxqWGGES0on4njCwZ9XNF7NjUuP03vGuv4vWniOmNTMwMLpI/sw==
   dependencies:
-    "@catho/quantum-storybook-ui" "^1.0.0"
+    "@catho/quantum-storybook-ui" "^1.0.1"
     "@material-ui/core" "^3.8.2"
     "@material-ui/icons" "^3.0.2"
     babel-polyfill "^6.26.0"