Merge pull request #768 from myronliu347/master

Fix DatePicker & CascaderSelect Bug
alibaba-fusion · Jun 5, 2019 · 26f73a3 · 26f73a3
2 parents 40de21d + 2ea6cf6
commit 26f73a3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/calendar/range-calendar.jsx b/src/calendar/range-calendar.jsx
@@ -134,7 +134,10 @@ class RangeCalendar extends React.Component {
                 startValue,
             });
 
-            if (startValue) {
+            if (
+                startValue &&
+                !startValue.isSame(this.state.startValue, 'day')
+            ) {
                 this.setState({
                     startVisibleMonth: startValue,
                 });
@@ -156,7 +159,7 @@ class RangeCalendar extends React.Component {
     }
 
     onSelectCell = (date, nextMode) => {
-        this.changeVisibleMonth(date, 'cellClick');
+        // this.changeVisibleMonth(date, 'cellClick');
 
         if (this.state.mode === CALENDAR_MODE_DATE) {
             this.props.onSelect(date);

diff --git a/src/cascader-select/cascader-select.jsx b/src/cascader-select/cascader-select.jsx
@@ -587,6 +587,10 @@ export default class CascaderSelect extends Component {
         if (onChange) {
             onChange(value, data, extra);
         }
+
+        if (searchValue && this.select) {
+            this.select.handleSearchClear();
+        }
     }
 
     handleClear() {
@@ -826,7 +830,7 @@ export default class CascaderSelect extends Component {
             visible,
             onVisibleChange: this.handleVisibleChange,
             showSearch,
-            searchValue,
+            // searchValue,
             onSearch: this.handleSearch,
             onKeyDown: this.handleKeyDown,
             popupContent,

diff --git a/src/select/index.jsx b/src/select/index.jsx
@@ -79,5 +79,5 @@ Select.Combobox = ConfigProvider.config(Select, {
 
 export default ConfigProvider.config(Select, {
     transform,
-    exportNames: ['focusInput'],
+    exportNames: ['focusInput', 'handleSearchClear'],
 });