fix(SearchBar): cancel should blur. close #1721 (#1756)

ant-design · Aug 29, 2017 · 99c9c32 · 99c9c32
1 parent 36b82ce
commit 99c9c32
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/components/search-bar/index.web.tsx b/components/search-bar/index.web.tsx
@@ -148,9 +148,11 @@ export default class SearchBar extends React.Component<SearchBarProps, SearchBar
       this.props.onBlur();
     }
   }
-
   onClear = () => {
-    this.blurFromOnClear = true;
+    this.doClear();
+  }
+  doClear = (blurFromOnClear = true) => {
+    this.blurFromOnClear = blurFromOnClear;
 
     if (!('value' in this.props)) {
       this.setState({ value: '' });
@@ -161,14 +163,16 @@ export default class SearchBar extends React.Component<SearchBarProps, SearchBar
     if (this.props.onChange) {
       this.props.onChange('');
     }
-    this.refs.searchInput.focus();
+    if (blurFromOnClear) {
+      this.refs.searchInput.focus();
+    }
   }
 
   onCancel = () => {
     if (this.props.onCancel) {
       this.props.onCancel(this.state.value);
     } else {
-      this.onClear();
+      this.doClear(false);
     }
   }