cx 21.12.2 → 21.12.3

package/dist/widgets.js

@@ -10616,7 +10616,7 @@ var LookupComponent = /*#__PURE__*/ (function(_VDOM$Component) {
 
 	_proto3.onItemClick = function onItemClick(e, _ref2) {
 		var store = _ref2.store;
-		this.select(e, store.getData());
+		this.select(e, [store.getData()]);
 		if (!this.props.instance.widget.submitOnEnterKey || e.type != "keydown") e.stopPropagation();
 		if (e.keyCode != KeyCode.tab) e.preventDefault();
 	};
@@ -10672,7 +10672,7 @@ var LookupComponent = /*#__PURE__*/ (function(_VDOM$Component) {
 		instance.set("values", []);
 	};
 
-	_proto3.select = function select(e, itemsData) {
+	_proto3.select = function select(e, itemsData, reset) {
 		var _this11 = this;
 
 		var instance = this.props.instance;
@@ -10685,17 +10685,26 @@ var LookupComponent = /*#__PURE__*/ (function(_VDOM$Component) {
 		if (widget.multiple) {
 			var selectedKeys = data.selectedKeys,
 				records = data.records;
-			var newRecords = [].concat(records || []);
-			var selectMultiple = itemsData.length > 1;
+			var newRecords = reset ? [] : [].concat(records || []);
+			var singleSelect = itemsData.length == 1;
 			var optionKey = null;
-			if (!selectMultiple) optionKey = this.getOptionKey(itemsData[0]); // if we receive more than 1 item for selection, it cannot be a deselection
+			if (singleSelect) optionKey = this.getOptionKey(itemsData[0]); // deselect
 
 			if (
-				selectMultiple ||
-				!selectedKeys.find(function(k) {
+				singleSelect &&
+				selectedKeys.find(function(k) {
 					return areKeysEqual(optionKey, k);
 				})
 			) {
+				newRecords = records.filter(function(v) {
+					return !areKeysEqual(
+						optionKey,
+						_this11.getLocalKey({
+							$value: v
+						})
+					);
+				});
+			} else {
 				itemsData.forEach(function(itemData) {
 					var valueData = {
 						$value: {}
@@ -10705,15 +10714,6 @@ var LookupComponent = /*#__PURE__*/ (function(_VDOM$Component) {
 					});
 					newRecords.push(valueData.$value);
 				});
-			} else {
-				newRecords = records.filter(function(v) {
-					return !areKeysEqual(
-						optionKey,
-						_this11.getLocalKey({
-							$value: v
-						})
-					);
-				});
 			}
 
 			instance.set("records", newRecords);
@@ -10749,21 +10749,15 @@ var LookupComponent = /*#__PURE__*/ (function(_VDOM$Component) {
 	};
 
 	_proto3.onDropdownKeyPress = function onDropdownKeyPress(e) {
-		if (e.keyCode == KeyCode.esc) {
-			this.closeDropdown(e);
-			this.dom.input.focus();
-		}
-
-		if (this.listKeyDown) this.listKeyDown(e); // if next focusable element is disabled, recalculate and update the dom before switching focus
-
-		if (e.keyCode == KeyCode.tab) this.props.forceUpdate();
-	};
-
-	_proto3.onKeyDown = function onKeyDown(e) {
 		switch (e.keyCode) {
-			case KeyCode.pageDown:
-			case KeyCode.pageUp:
-				if (this.state.dropdownOpen) e.preventDefault();
+			case KeyCode.esc:
+				this.closeDropdown(e);
+				this.dom.input.focus();
+				break;
+
+			case KeyCode.tab:
+				// if next focusable element is disabled, recalculate and update the dom before switching focus
+				this.props.forceUpdate();
 				break;
 
 			case KeyCode.a:
@@ -10772,16 +10766,28 @@ var LookupComponent = /*#__PURE__*/ (function(_VDOM$Component) {
 					quickSelectAll = _this$props$instance$2.quickSelectAll,
 					multiple = _this$props$instance$2.multiple;
 				if (!quickSelectAll || !multiple) return;
-				var options = this.state.options;
-				var optionsToSelect = options.map(function(o) {
+				var optionsToSelect = this.state.options.map(function(o) {
 					return {
 						$option: o
 					};
 				});
-				this.select(e, optionsToSelect);
+				this.select(e, optionsToSelect, true);
 				e.stopPropagation();
 				e.preventDefault();
 				break;
+
+			default:
+				if (this.listKeyDown) this.listKeyDown(e);
+				break;
+		}
+	};
+
+	_proto3.onKeyDown = function onKeyDown(e) {
+		switch (e.keyCode) {
+			case KeyCode.pageDown:
+			case KeyCode.pageUp:
+				if (this.state.dropdownOpen) e.preventDefault();
+				break;
 		}
 	};
 

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "cx",
-   "version": "21.12.2",
+   "version": "21.12.3",
    "description": "Advanced JavaScript UI framework for admin and dashboard applications with ready to use grid, form and chart components.",
    "main": "index.js",
    "jsnext:main": "src/index.js",

package/src/widgets/form/LookupField.js

@@ -670,7 +670,7 @@ class LookupComponent extends VDOM.Component {
    }
 
    onItemClick(e, { store }) {
-      this.select(e, store.getData());
+      this.select(e, [store.getData()]);
       if (!this.props.instance.widget.submitOnEnterKey || e.type != "keydown") e.stopPropagation();
       if (e.keyCode != KeyCode.tab) e.preventDefault();
    }
@@ -709,7 +709,7 @@ class LookupComponent extends VDOM.Component {
       instance.set("values", []);
    }
 
-   select(e, itemsData) {
+   select(e, itemsData, reset) {
       let { instance } = this.props;
       let { store, data, widget } = instance;
       let { bindings, keyBindings } = widget;
@@ -717,14 +717,17 @@ class LookupComponent extends VDOM.Component {
       if (widget.multiple) {
          let { selectedKeys, records } = data;
 
-         let newRecords = [...(records || [])];
-         let selectMultiple = itemsData.length > 1;
+         let newRecords = reset ? [] : [...(records || [])];
+         let singleSelect = itemsData.length == 1;
          let optionKey = null;
-         if (!selectMultiple)
+         if (singleSelect)
             optionKey = this.getOptionKey(itemsData[0]);
 
-         // if we receive more than 1 item for selection, it cannot be a deselection
-         if (selectMultiple || !selectedKeys.find((k) => areKeysEqual(optionKey, k))) {
+         // deselect
+         if (singleSelect && selectedKeys.find((k) => areKeysEqual(optionKey, k))) {
+            newRecords = records.filter((v) => !areKeysEqual(optionKey, this.getLocalKey({ $value: v })));
+         }
+         else {
             itemsData.forEach(itemData => {
                let valueData = {
                   $value: {},
@@ -734,8 +737,6 @@ class LookupComponent extends VDOM.Component {
                });
                newRecords.push(valueData.$value);
             });
-         } else {
-            newRecords = records.filter((v) => !areKeysEqual(optionKey, this.getLocalKey({ $value: v })));
          }
 
          instance.set("records", newRecords);
@@ -767,21 +768,15 @@ class LookupComponent extends VDOM.Component {
    }
 
    onDropdownKeyPress(e) {
-      if (e.keyCode == KeyCode.esc) {
-         this.closeDropdown(e);
-         this.dom.input.focus();
-      }
-      if (this.listKeyDown) this.listKeyDown(e);
-
-      // if next focusable element is disabled, recalculate and update the dom before switching focus
-      if (e.keyCode == KeyCode.tab) this.props.forceUpdate();
-   }
-
-   onKeyDown(e) {
       switch (e.keyCode) {
-         case KeyCode.pageDown:
-         case KeyCode.pageUp:
-            if (this.state.dropdownOpen) e.preventDefault();
+         case KeyCode.esc:
+            this.closeDropdown(e);
+            this.dom.input.focus();
+            break;
+
+         case KeyCode.tab:
+            // if next focusable element is disabled, recalculate and update the dom before switching focus
+            this.props.forceUpdate();
             break;
 
          case KeyCode.a:
@@ -790,14 +785,27 @@ class LookupComponent extends VDOM.Component {
             let { quickSelectAll, multiple } = this.props.instance.widget;
             if (!quickSelectAll || !multiple) return;
 
-            let options = this.state.options;
-            let optionsToSelect = options.map(o => ({
+            let optionsToSelect = this.state.options.map(o => ({
                $option: o
             }));
-            this.select(e, optionsToSelect);
+            this.select(e, optionsToSelect, true);
             e.stopPropagation();
             e.preventDefault();
             break;
+
+         default:
+            if (this.listKeyDown) this.listKeyDown(e);
+            break;
+
+      }
+   }
+
+   onKeyDown(e) {
+      switch (e.keyCode) {
+         case KeyCode.pageDown:
+         case KeyCode.pageUp:
+            if (this.state.dropdownOpen) e.preventDefault();
+            break;
       }
    }