update placement handle

diff --git a/HISTORY.md b/HISTORY.md
index 5be49afb05462d978ca73389461dddb33824f192..15c1e02c80f946e3ef4fc9cb7768292e8a72ee03 100644 (file)
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,8 +1,17 @@
-History
-=======
+# History
 
 ---
 
+0.5.4 / 2015-11-19
+------------------
+
+`update` change value prop to defaultValue.
+
+0.5.2 / 2015-11-19
+------------------
+
+`update` renew placements config.
+
 0.5.1 / 2015-11-19
 ------------------
 

diff --git a/README.md b/README.md
index c6e8e1c98d401887e1e426c79654e16c09789745..1ab1239a9f1717e835a31c7f66a89e115072cc1f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
-TimePicker
-==========
+# TimePicker
 
 React TimePicker
 
@@ -25,21 +24,24 @@ API
 
 ### TimePicker
 
-| Name          | Type                       | Default                                       | Description                                   |
-|---------------|----------------------------|-----------------------------------------------|-----------------------------------------------|
-| prefixCls     | String                     |                                               | prefixCls of this component                   |
-| locale        | Object                     | import from 'rc-time-picker/lib/locale/en_US' |                                               |
-| disabled      | Boolean                    | false                                         | whether picker is disabled                    |
-| open          | Boolean                    | false                                         | current open state of picker. controlled prop |
-| value         | GregorianCalendar          | null                                          | current value like input's value              |
-| placeholder   | String                     | ''                                            | time input's placeholder                      |
-| formatter     | GregorianCalendarFormatter | HH:mm:ss or HH:mm or mm:ss                    |                                               |
-| hourOptions   | Array<String>              | hour options                                  |                                               |
-| minuteOptions | Array<String>              | minute options                                |                                               |
-| secondOptions | Array<String>              | second options                                |                                               |
-| onChange      | Function                   | null                                          | called when select a different value          |
-| onOpen        | Function                   | null                                          | called when open picker                       |
-| onClose       | Function                   | null                                          | called when close picker                      |
+| Name           | Type                       | Default                                       | Description                                                                                |
+|----------------|----------------------------|-----------------------------------------------|--------------------------------------------------------------------------------------------|
+| prefixCls      | String                     |                                               | prefixCls of this component                                                                |
+| locale         | Object                     | import from 'rc-time-picker/lib/locale/en_US' |                                                                                            |
+| disabled       | Boolean                    | false                                         | whether picker is disabled                                                                 |
+| open           | Boolean                    | false                                         | current open state of picker. controlled prop                                              |
+| defaultValue   | GregorianCalendar          | null                                          | current value like input's value                                                           |
+| placeholder    | String                     | ''                                            | time input's placeholder                                                                   |
+| formatter      | GregorianCalendarFormatter | HH:mm:ss or HH:mm or mm:ss                    |                                                                                            |
+| hourOptions    | Array<String>              | hour options                                  |                                                                                            |
+| minuteOptions  | Array<String>              | minute options                                |                                                                                            |
+| secondOptions  | Array<String>              | second options                                |                                                                                            |
+| onChange       | Function                   | null                                          | called when select a different value                                                       |
+| onOpen         | Function                   | null                                          | called when open picker                                                                    |
+| onClose        | Function                   | null                                          | called when close picker                                                                   |
+| inputClassName | String                     | ''                                            |                                                                                            |
+| placement      | String                     | bottomLeft                                    | one of ['left','right','top','bottom', 'topLeft', 'topRight', 'bottomLeft', 'bottomRight'] |
+| transitionName | String                     | ''                                            |                                                                                            |
 
 License
 -------

diff --git a/assets/index/Picker.less b/assets/index/Picker.less
index 769c4b7fa33978ac6aa9d3b9540bc11f3be49f33..507121f121137415b3ce297bde9d4e3d476ac830 100644 (file)
--- a/assets/index/Picker.less
+++ b/assets/index/Picker.less
@@ -1,3 +1,32 @@
+.@{prefixClass}-picker-container {
+  z-index: 1070;
+  position: absolute;
+
+  &.slide-up-enter.slide-up-enter-active&-placement-topLeft,
+  &.slide-up-enter.slide-up-enter-active&-placement-topRight,
+  &.slide-up-appear.slide-up-appear-active&-placement-topLeft,
+  &.slide-up-appear.slide-up-appear-active&-placement-topRight {
+    animation-name: antSlideDownIn;
+  }
+
+  &.slide-up-enter.slide-up-enter-active&-placement-bottomLeft,
+  &.slide-up-enter.slide-up-enter-active&-placement-bottomRight,
+  &.slide-up-appear.slide-up-appear-active&-placement-bottomLeft,
+  &.slide-up-appear.slide-up-appear-active&-placement-bottomRight {
+    animation-name: antSlideUpIn;
+  }
+
+  &.slide-up-leave.slide-up-leave-active&-placement-topLeft,
+  &.slide-up-leave.slide-up-leave-active&-placement-topRight {
+    animation-name: antSlideDownOut;
+  }
+
+  &.slide-up-leave.slide-up-leave-active&-placement-bottomLeft,
+  &.slide-up-leave.slide-up-leave-active&-placement-bottomRight {
+    animation-name: antSlideUpOut;
+  }
+}
+
 .@{prefixClass} {
   &-picker {
   }

diff --git a/package.json b/package.json
index 437d9b1f8ed940a7e9f4e3dda9c864cc6db4788b..563eb5dbb28391753b33a98bb40b4f86eb302d8c 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rc-time-picker",
-  "version": "0.5.1",
+  "version": "0.5.4",
   "description": "React TimePicker",
   "keywords": [
     "react",

diff --git a/src/TimePicker.jsx b/src/TimePicker.jsx
index a6ea7a9f4a28ba3aac1a3e5e0d151a322a5edd51..98a175480feb2c4850eeeb3f22329185a5a32fcc 100644 (file)
--- a/src/TimePicker.jsx
+++ b/src/TimePicker.jsx
@@ -50,8 +50,11 @@ const Picker = React.createClass({
 
   getInitialState() {
     this.savePanelRef = refFn.bind(this, 'panelInstance');
-    const { open, value } = this.props;
-    return { open, value };
+    const { open, defaultValue } = this.props;
+    return {
+      open: open,
+      value: defaultValue,
+    };
   },
 
   componentWillReceiveProps(nextProps) {

diff --git a/src/util/placements.js b/src/util/placements.js
index 2574da12b534a3ab85da58de5cfcfd278629decf..676028676aaa08b29c777fc1cc3595e1a1cf64cf 100644 (file)
--- a/src/util/placements.js
+++ b/src/util/placements.js
@@ -6,25 +6,25 @@ const autoAdjustOverflow = {
 const targetOffset = [0, 0];
 
 const placements = {
-  topLeft: {
+  bottomLeft: {
     points: ['tl', 'tl'],
     overflow: autoAdjustOverflow,
     offset: [0, -3],
     targetOffset,
   },
-  topRight: {
+  bottomRight: {
     points: ['tr', 'tr'],
     overflow: autoAdjustOverflow,
     offset: [0, -3],
     targetOffset,
   },
-  bottomRight: {
+  topRight: {
     points: ['br', 'br'],
     overflow: autoAdjustOverflow,
     offset: [0, 3],
     targetOffset,
   },
-  bottomLeft: {
+  topLeft: {
     points: ['bl', 'bl'],
     overflow: autoAdjustOverflow,
     offset: [0, 3],