Merge branch 'master' of github.com:tabler/tabler-react into form-aut…

…ocomplete
tabler · Nov 30, 2018 · dd06981 · dd06981
2 parents cb9d5b6 + 788e80b
commit dd06981
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/example/src/SiteWrapper.react.js b/example/src/SiteWrapper.react.js
@@ -17,7 +17,7 @@ type Props = {|
 |};
 
 type State = {|
-  +unreadCount: number,
+  unreadCount: number,
 |};
 
 type subNavItem = {|

diff --git a/src/components/Form/Form.react.js b/src/components/Form/Form.react.js
@@ -37,7 +37,7 @@ export type Props = {|
   +className?: string,
   +action?: string,
   +method?: string,
-  +autocomplete?: "on" | "off",
+  +autocomplete: "on" | "off",
 |};
 
 function Form({
@@ -48,10 +48,6 @@ function Form({
   onSubmit,
   autocomplete,
 }: Props): React.Node {
-  // default for autocomplete is "off" if not passed in explicitly
-  if (!autocomplete) {
-    autocomplete = "off";
-  }
   const classes = cn(className);
   return (
     <form
@@ -66,6 +62,10 @@ function Form({
   );
 }
 
+Form.defaultProps = {
+  autocomplete: 'off',
+};
+
 Form.Group = FormGroup;
 Form.Label = FormLabel;
 Form.Input = FormInput;

diff --git a/src/components/Form/FormInput.react.js b/src/components/Form/FormInput.react.js
@@ -30,6 +30,7 @@ type FormStyle = {|
   +value?: string | number,
   +disabled?: boolean,
   +readOnly?: boolean,
+  +autoFocus?: boolean,
   +checked?: boolean,
 |};
 
@@ -82,6 +83,7 @@ function FormInput(props: Props): React.Node {
     onPaste,
     disabled,
     readOnly,
+    autoFocus,
     label,
   } = props;
   const type = props.type || "text";
@@ -108,6 +110,7 @@ function FormInput(props: Props): React.Node {
     value,
     disabled,
     readOnly,
+    autoFocus,
     onChange,
     onMouseEnter,
     onMouseLeave,