Merge pull request #25 from pouriaMaleki/master

Fix not showing initial value - fixes #24

Author: mohebifar

examples/src/components/App.js

@@ -14,7 +14,8 @@ const generateRandomMoment = () => {
 
 export default class App extends Component {
   state = {
-    value: moment()
+    value: moment(),
+    someValue: new moment()
   };
 
   render() {
@@ -47,6 +48,22 @@ export default class App extends Component {
               <DatePicker />
             </Example>
           </div>
+          <div>
+            <Example
+              title="ورود تاریخ کنترل شده"
+              code={clearDatePickerCode}
+            >
+              <DatePicker
+                value={this.state.someValue}
+                onChange={value => this.setState({ someValue: value })}
+              />
+              <div style={{ paddingTop: 15 }}>
+                <button onClick={() => this.setState({ someValue: null }) }>
+                  حذف مقدار
+                </button>
+              </div>
+            </Example>
+          </div>
           <div>
             <Example
               title="ورودی تاریخ و کنترل مقدار"
@@ -102,6 +119,21 @@ const basicDatePickerCode = `render() {
   return <DatePicker />;
 }`;
 
+
+const clearDatePickerCode = `render() {
+  return (
+    <div>
+      <DatePicker
+        value={this.state.value}
+        onChange={value => this.setState({ value })}
+      />
+      <button onClick={() => this.setState({ value: null }) }>
+        حذف مقدار
+      </button>
+    </div>
+  );
+}`;
+
 const controlledDatePickerCode = `render() {
   return (
     <div>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-persian-datepicker",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Persian calendar and date picker components for React",
   "main": "lib/index.js",
   "scripts": {

src/components/DatePicker.js

@@ -54,7 +54,9 @@ export default class DatePicker extends Component {
       this.props.onChange(momentValue);
     }
 
-    const inputValue = momentValue.format(inputFormat);
+    let inputValue = "";
+    if (momentValue)
+      inputValue = momentValue.format(inputFormat);
     this.setState({ momentValue, inputValue });
   }
 
@@ -117,7 +119,13 @@ export default class DatePicker extends Component {
   }
 
   renderInput() {
-    const { isOpen, inputValue } = this.state;
+    let { isOpen, inputValue } = this.state;
+
+    if (this.props.value) {
+      let value = this.props.value;
+      let inputFormat = this.props.inputFormat;
+      inputValue = value.format(inputFormat);
+    }
 
     const className = classnames(this.props.className, {
       [outsideClickIgnoreClass]: isOpen