Merge pull request #831 from metasfresh/dev-829

Filter criteria not shown when typing error #829
metasfresh · Jun 2, 2017 · 1283ce4 · 1283ce4
2 parents 20b5da6 + 96b3924
commit 1283ce4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/src/components/widget/Lookup/Lookup.js b/src/components/widget/Lookup/Lookup.js
@@ -150,6 +150,7 @@ class Lookup extends Component {
                                 }
                                 initialFocus={index===0 ? initialFocus : false}
                                 setNextProperty={this.setNextProperty}
+                                lookupEmpty={isInputEmpty}
                                 {...{placeholder, readonly, tabIndex,
                                 windowType, parameterName, entity, dataId,
                                 isModal, recent, rank, updated, filterWidget,

diff --git a/src/components/widget/Lookup/RawLookup.js b/src/components/widget/Lookup/RawLookup.js
@@ -50,7 +50,7 @@ class RawLookup extends Component {
 
         const {
             autoFocus, defaultValue, fireClickOutside, handleInputEmptyStatus,
-            filterWidget, initialFocus
+            filterWidget, initialFocus, lookupEmpty
         } = this.props;
 
         const {shouldBeFocused} = this.state;
@@ -79,7 +79,7 @@ class RawLookup extends Component {
             }
         }
 
-        if(filterWidget && defaultValue === null){
+        if(filterWidget && defaultValue === null && lookupEmpty){
             this.inputSearch.value = defaultValue;
         }
     }
@@ -132,20 +132,17 @@ class RawLookup extends Component {
         });
     }
 
-    handleFocus = () => {
-        this.setState({
-            isOpen: true
-        })
-    }
-
     handleChange = (handleChangeOnFocus) => {
         const {
             recent, windowType, dataId, filterWidget, parameterName,
-            tabId, rowId, entity, subentity, subentityId, viewId, mainProperty
+            tabId, rowId, entity, subentity, subentityId, viewId, mainProperty,
+            handleInputEmptyStatus
         } = this.props;
 
         if(this.inputSearch.value != ''){
 
+            handleInputEmptyStatus(false);
+
             this.setState({
                 isInputEmpty: false,
                 loading: true,
@@ -316,7 +313,6 @@ class RawLookup extends Component {
                                 type="text"
                                 className="input-field js-input-field font-weight-semibold"
                                 onChange={this.handleChange}
-                                onFocus={this.handleFocus}
                                 ref={(c) => this.inputSearch = c}
                                 placeholder={placeholder}
                                 disabled={readonly && !disabled}