Merge pull request #51 from y0c/dev

1.0.2

Author: y0c

package-lock.json

@@ -20,7 +20,9 @@
     "bump:minor": "yarn version --minor",
     "bump:major": "yarn version --major",
     "prepublish": "yarn lint && yarn test",
-    "deploy-storybook": "storybook-to-ghpages"
+    "deploy-storybook": "storybook-to-ghpages",
+    "test:unit:output": "yarn test --json --outputFile=.jest.test.result.json",
+    "start": "yarn test:unit:output && start-storybook -p 6006"
   },
   "lint-staged": {
     "{src}/**/*.ts*": [
@@ -34,7 +36,7 @@
   },
   "dependencies": {
     "classnames": "^2.2.6",
-    "dayjs": "^1.8.12",
+    "dayjs": "^1.8.21",
     "react": "^16.8.4",
     "react-dom": "^16.8.4"
   },

package.json

@@ -1,5 +1,5 @@
 export namespace IDatePicker {
-  export type Locale = string | { name: string; [key: string]: any };
+  export type Locale = any;
   export enum PickerDirection {
     TOP,
     BOTTOM,

src/common/@types.ts

@@ -179,18 +179,19 @@ class DatePicker extends React.Component<Props, State> {
   };
 
   public renderInputComponent = (): JSX.Element => {
-    const { inputComponent, readOnly, disabled, clear, autoFocus, showDefaultIcon } = this.props;
+    const { inputComponent, readOnly, disabled, clear, autoFocus, showDefaultIcon, placeholder } = this.props;
     const { inputValue } = this.state;
     const inputProps = {
       readOnly,
       autoFocus,
       disabled,
       clear,
+      placeholder,
       onChange: this.handleInputChange,
       onClear: this.handleInputClear,
       onBlur: this.handleInputBlur,
       value: inputValue,
-      icon: showDefaultIcon ? <SVGIcon id="calendar" /> : undefined,
+      icon: showDefaultIcon ? <SVGIcon id="calendar" /> : undefined
     };
     return inputComponent ? inputComponent({ ...inputProps }) : <PickerInput {...inputProps} />;
   };

src/components/DatePicker.tsx

@@ -18,15 +18,15 @@ const TimeInput: React.FunctionComponent<Props> = ({ onUp, onDown, onChange, onB
   return (
     <div className="time-input">
       <div className="time-input__up">
-        <button onClick={onUp}>
+        <button onClick={onUp} type="button">
           <SVGIcon id="up" />
         </button>
       </div>
       <div className="time-input__text">
         <input type="text" value={value} onChange={onChange} onBlur={onBlur} />
       </div>
       <div className="time-input__down">
-        <button onClick={onDown}>
+        <button onClick={onDown} type="button">
           <SVGIcon id="down" />
         </button>
       </div>

src/components/TimeInput.tsx

@@ -37,6 +37,9 @@ storiesOf('DatePicker', module)
         <DatePicker {...defaultProps} direction={0} />
       </div>
     );
+  })
+  .add('placeholder', () => {
+    return <DatePicker {...defaultProps} placeholder="Select date" />;
   });
 
 storiesOf('DatePicker - Input Props', module)