fix: Multiple issues (#60)

RocketChat · Sep 27, 2019 · 62e5620 · 62e5620
1 parent ae00b62
commit 62e5620
Show file tree

Hide file tree

Showing 6 changed files with 840 additions and 1,477 deletions.
diff --git a/packages/fuselage/package.json b/packages/fuselage/package.json
@@ -35,7 +35,8 @@
     "update-storybook": "run-s test:results build-storybook loki:update"
   },
   "peerDependencies": {
-    "react": "^16.8.6"
+    "react": "^16.8.6",
+    "styled-components": "^4.4.0"
   },
   "devDependencies": {
     "@babel/core": "^7.4.5",
@@ -64,7 +65,6 @@
     "eslint": "^6.1.0",
     "eslint-plugin-import": "^2.18.2",
     "eslint-plugin-react": "^7.14.3",
-    "final-form": "^4.16.1",
     "fs-extra": "^8.0.1",
     "gh-pages": "^2.0.1",
     "husky": "^2.3.0",
@@ -77,9 +77,8 @@
     "npm-run-all": "^4.1.5",
     "postcss-loader": "^3.0.0",
     "react": "^16.8.6",
-    "react-final-form-hooks": "^2.0.0",
-    "react-helmet": "^5.2.1",
     "sass-loader": "^7.1.0",
+    "styled-components": "^4.4.0",
     "stylelint": "^10.0.1",
     "stylelint-order": "^3.0.0",
     "webpack-bundle-analyzer": "^3.3.2",
@@ -107,8 +106,7 @@
     }
   },
   "dependencies": {
-    "@rocket.chat/icons": "^0.2.0-alpha.0",
-    "styled-components": "^4.3.2"
+    "@rocket.chat/icons": "^0.2.0-alpha.0"
   },
   "browserslist": {
     "production": [

diff --git a/packages/fuselage/src/components/Field/stories.js b/packages/fuselage/src/components/Field/stories.js
@@ -22,7 +22,7 @@ storiesOf('Elements|Field', module)
       <h1>Field</h1>
     </TextSection>
     <ShowCaseSection>
-      <Field helpText='Help text' style={{ width: '100%' }}>
+      <Field style={{ width: '100%' }}>
         <Label text='Label'>
           <PseudoInput />
         </Label>

diff --git a/packages/fuselage/src/components/Input/index.js b/packages/fuselage/src/components/Input/index.js
@@ -239,10 +239,11 @@ const PlaceholderOption = styled.option`
 const SelectInput = React.forwardRef(function SelectInput({
   children,
   placeholder,
+  value,
   ...props
 }, ref) {
   return <Container>
-    <SelectElement hasPlaceholder={!!placeholder} ref={ref} {...props}>
+    <SelectElement hasPlaceholder={!!placeholder && !value} ref={ref} value={value} {...props}>
       <PlaceholderOption value=''>{placeholder}</PlaceholderOption>
       {children}
     </SelectElement>

diff --git a/packages/fuselage/src/components/Input/stories.js b/packages/fuselage/src/components/Input/stories.js
@@ -124,7 +124,7 @@ storiesOf('Elements|Input', module)
       xAxis={{
         default: {},
         'with placeholder': { placeholder: 'Placeholder' },
-        'with value': { value: 'B' },
+        'with value': { placeholder: 'Placeholder', value: 'B' },
       }}
       yAxis={{
         default: {},

diff --git a/packages/fuselage/src/components/Label/index.js b/packages/fuselage/src/components/Label/index.js
@@ -22,7 +22,7 @@ const Wrapper = styled.div`
 
   display: flex;
 
-  flex: 0 0 auto;
+  flex: 1 0 auto;
 
   flex-flow: row nowrap;
 `;