Merge pull request #50 from ustczy/master

fix bug of disabledDate and disabledTime
uxcore · Feb 18, 2019 · 081c2e4 · 081c2e4
2 parents 10a040d + 8f777a0
commit 081c2e4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/demo/CalendarDemo.jsx b/demo/CalendarDemo.jsx
@@ -124,7 +124,7 @@ class Demo extends React.Component {
           </p>
           <Calendar
             showToday
-            showTime={false}
+            showTime={true}
             allowClear={false}
             showSecond={false}
             locale="en-us"

diff --git a/src/Calendar.jsx b/src/Calendar.jsx
@@ -125,6 +125,10 @@ class Calendar extends React.Component {
         return current.date();
       },
       disabledDate: (current) => {
+        if (!current) {
+          current = this.getDate(p.defaultOpenValue || new Date().getTime());
+        }
+
         if (typeof p.disabledDate === 'function' && current) {
           const date = current.clone();
           date.getTime = current.valueOf;
@@ -133,6 +137,9 @@ class Calendar extends React.Component {
         return false;
       },
       disabledTime: (current) => {
+        if (!current) {
+          current = this.getDate(p.defaultOpenValue || new Date().getTime());
+        }
         if (typeof p.disabledTime === 'function' && current) {
           const date = current.clone();
           date.getTime = current.valueOf;