Merge branch 'master' into 3.x

Author: afc163

.circleci/config.yml

@@ -0,0 +1,37 @@
+version: 2
+jobs:
+  lint:
+    docker:
+      - image: circleci/node:latest
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v1-dependencies-{{ checksum "package.json" }}
+      - run: npm install
+      - save_cache:
+          paths:
+            - node_modules
+          key: v1-dependencies-{{ checksum "package.json" }}
+      - run: npm run lint
+  test:
+    docker:
+      - image: circleci/node:latest
+    working_directory: ~/repo
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v1-dependencies-{{ checksum "package.json" }}
+      - run: npm install
+      - save_cache:
+          paths:
+            - node_modules
+          key: v1-dependencies-{{ checksum "package.json" }}
+      - run: npm test -- --coverage
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+      - lint
+      - test

.eslintrc.js

@@ -0,0 +1 @@
+module.exports= require('@umijs/fabric/dist/eslint');

.fatherrc.js

@@ -0,0 +1,8 @@
+export default {
+  cjs: 'babel',
+  esm: { type: 'babel', importLibToEs: true },
+  preCommit: {
+    eslint: true,
+    prettier: true,
+  },
+};

.gitignore

@@ -21,11 +21,18 @@ Thumbs.db
 node_modules
 .cache
 dist
-*.css
+assets/**/*.css
 build
 lib
-es
 coverage
-npm-debug.log.*
+.vscode
 yarn.lock
+es/
 package-lock.json
+src/*.map
+.prettierrc
+tslint.json
+tsconfig.test.json
+.prettierignore
+.storybook
+storybook/index.js

README.md

@@ -1,20 +1,24 @@
 # TimePicker
 
-React TimePicker
+React Time Picker Control.
 
 [![NPM version][npm-image]][npm-url]
-[![build status][travis-image]][travis-url]
-[![Test coverage][codecov-image]][codecov-url]
+[![build status][circleci-image]][circleci-url]
+[![Test coverage][coveralls-image]][coveralls-url]
 [![Dependencies](https://img.shields.io/david/react-component/time-picker.svg?style=flat-square)](https://david-dm.org/react-component/time-picker)
 [![DevDependencies](https://img.shields.io/david/dev/react-component/time-picker.svg?style=flat-square)](https://david-dm.org/react-component/time-picker?type=dev)
 [![npm download][download-image]][download-url]
+[![Storybook](https://gw.alipayobjects.com/mdn/ob_info/afts/img/A*CQXNTZfK1vwAAAAAAAAAAABjAQAAAQ/original)](https://github.com/react-component/time-picker)
 
+[Storybook]: https://github.com/storybooks/press/blob/master/badges/storybook.svg
 [npm-image]: http://img.shields.io/npm/v/rc-time-picker.svg?style=flat-square
 [npm-url]: http://npmjs.org/package/rc-time-picker
-[travis-image]: https://img.shields.io/travis/react-component/time-picker.svg?style=flat-square
-[travis-url]: https://travis-ci.org/react-component/time-picker
-[codecov-image]: https://codecov.io/gh/react-component/time-picker/branch/master/graph/badge.svg
-[codecov-url]: https://codecov.io/gh/react-component/time-picker
+[circleci-image]: https://img.shields.io/circleci/react-component/time-picker.svg?style=flat-square
+[circleci-url]: https://circleci.com/gh/react-component/time-picker
+[coveralls-image]: https://img.shields.io/coveralls/react-component/time-picker.svg?style=flat-square
+[coveralls-url]: https://coveralls.io/r/react-component/time-picker?branch=maste
+[node-image]: https://img.shields.io/badge/node.js-%3E=_0.10-green.svg?style=flat-square
+[node-url]: http://nodejs.org/download/
 [download-image]: https://img.shields.io/npm/dm/rc-time-picker.svg?style=flat-square
 [download-url]: https://npmjs.org/package/rc-time-picker
 
@@ -57,6 +61,7 @@ API
 | value                   | moment                            | null | current value |
 | placeholder             | String                            | '' | time input's placeholder |
 | className               | String                            | '' | time picker className |
+| inputClassName          | String                            | '' | time picker input element className |
 | id                      | String                            | '' | time picker id |
 | popupClassName          | String                            | '' | time panel className |
 | popupStyle              | object                            | {} | customize popup style
@@ -69,8 +74,8 @@ API
 | disabledSeconds         | Function                          | - | disabled second options |
 | use12Hours              | Boolean                           | false | 12 hours display mode |
 | hideDisabledOptions     | Boolean                           | false | whether hide disabled options |
-| onChange                | Function                          | null | called when select a different value |
-| onAmPmChange            | Function                          | null | called when select an am/pm value |
+| onChange                | Function                          | null | called when time-picker a different value |
+| onAmPmChange            | Function                          | null | called when time-picker an am/pm value |
 | addon                   | Function                          | - | called from timepicker panel to render some addon to its bottom, like an OK button. Receives panel instance as parameter, to be able to close it like `panel.close()`.|
 | placement               | String                            | bottomLeft | one of ['topLeft', 'topRight', 'bottomLeft', 'bottomRight'] |
 | transitionName          | String                            | ''  |  |
@@ -82,14 +87,13 @@ API
 | secondStep              | Number                            | 1 | interval between seconds in picker  |
 | focusOnOpen             | Boolean                           | false | automatically focus the input when the picker opens |
 | inputReadOnly             | Boolean                           | false | set input to read only |
-| inputIcon             | ReactNode                           |  | specific the select icon. |
+| inputIcon             | ReactNode                           |  | specific the time-picker icon. |
 | clearIcon             | ReactNode                           |  | specific the clear icon. |
 
 ## Test Case
 
 ```
 npm test
-npm run chrome-test
 ```
 
 ## Coverage

examples/12hours.html

@@ -1,22 +1,20 @@
 /* eslint no-console:0 */
 
-import 'rc-time-picker/assets/index.less';
-
+import '../assets/index.less';
 import React from 'react';
-import ReactDom from 'react-dom';
-
 import moment from 'moment';
-
-import TimePicker from 'rc-time-picker';
+import TimePicker from '..';
 
 const showSecond = true;
 const str = showSecond ? 'HH:mm:ss' : 'HH:mm';
 
-const now = moment().hour(14).minute(30);
+const now = moment()
+  .hour(14)
+  .minute(30);
 
 function generateOptions(length, excludedOptions) {
   const arr = [];
-  for (let value = 0; value < length; value++) {
+  for (let value = 0; value < length; value += 1) {
     if (excludedOptions.indexOf(value) < 0) {
       arr.push(value);
     }
@@ -44,17 +42,13 @@ function disabledMinutes(h) {
 }
 
 function disabledSeconds(h, m) {
-  return [h + m % 60];
+  return [h + (m % 60)];
 }
 
-ReactDom.render(
-  <div>
+const App = () => (
+  <>
     <h3>Disabled picker</h3>
-    <TimePicker
-      defaultValue={now}
-      disabled
-      onChange={onChange}
-    />
+    <TimePicker defaultValue={now} disabled onChange={onChange} />
     <h3>Disabled options</h3>
     <TimePicker
       showSecond={showSecond}
@@ -65,5 +59,7 @@ ReactDom.render(
       disabledMinutes={disabledMinutes}
       disabledSeconds={disabledSeconds}
     />
-  </div>
-, document.getElementById('__react-content'));
+  </>
+);
+
+export default App;

examples/disabled.html

@@ -1,17 +1,18 @@
-import 'rc-time-picker/assets/index.less';
+import '../assets/index.less';
 import React from 'react';
-import ReactDom from 'react-dom';
 import moment from 'moment';
-import TimePicker from 'rc-time-picker';
+import TimePicker from '..';
 
-ReactDom.render(
-  <div>
+const App = () => (
+  <>
     <TimePicker defaultValue={moment()} showHour={false} />
     <TimePicker defaultValue={moment()} showMinute={false} />
     <TimePicker defaultValue={moment()} showSecond={false} />
 
     <TimePicker defaultValue={moment()} showMinute={false} showSecond={false} />
-    <TimePicker defaultValue={moment()} showHour={false} showSecond={false}/>
+    <TimePicker defaultValue={moment()} showHour={false} showSecond={false} />
     <TimePicker defaultValue={moment()} showHour={false} showMinute={false} />
-  </div>
-, document.getElementById('__react-content'));
+  </>
+);
+
+export default App;