cx 22.5.3 → 22.6.0

package/dist/widgets.js

@@ -28,6 +28,7 @@ import {
 	registerKeyboardShortcut,
 	unfocusElement,
 	Culture,
+	bind,
 	enableCultureSensitiveFormatting,
 	Format,
 	ContentResolver,
@@ -129,6 +130,7 @@ import {
 	isSelector,
 	ReadOnlyDataView,
 	StringTemplate,
+	isAccessorChain,
 	getSelector,
 	enableFatArrowExpansion
 } from "cx/data";
@@ -9835,19 +9837,28 @@ var LookupField = /*#__PURE__*/ (function(_Field) {
 
 		if (!this.bindings) {
 			var b = [];
-			if (this.value && this.value.bind)
-				b.push({
-					key: true,
-					local: this.value.bind,
-					remote: "$option." + this.optionIdField,
-					set: this.value.set
-				});
-			if (this.text && this.text.bind)
-				b.push({
-					local: this.text.bind,
-					remote: "$option." + this.optionTextField,
-					set: this.text.set
-				});
+
+			if (this.value) {
+				if (isAccessorChain(this.value)) this.value = bind(this.value);
+				if (this.value.bind)
+					b.push({
+						key: true,
+						local: this.value.bind,
+						remote: "$option." + this.optionIdField,
+						set: this.value.set
+					});
+			}
+
+			if (this.text) {
+				if (isAccessorChain(this.text)) this.value = bind(this.text);
+				if (this.text.bind)
+					b.push({
+						local: this.text.bind,
+						remote: "$option." + this.optionTextField,
+						set: this.text.set
+					});
+			}
+
 			this.bindings = b;
 		}
 
@@ -18853,7 +18864,7 @@ var GridComponent = /*#__PURE__*/ (function(_VDOM$Component) {
 						isDraggedOver: mod.over,
 						cursor: mod.cursor,
 						cursorCellIndex: index == cursor && cursorCellIndex,
-						cellEdit: index == cursor && cursorCellIndex && cellEdit,
+						cellEdit: index == cursor && cursorCellIndex != null && cellEdit,
 						shouldUpdate: row.shouldUpdate,
 						dimensionsVersion: dimensionsVersion,
 						fixed: fixed,
@@ -18939,7 +18950,7 @@ var GridComponent = /*#__PURE__*/ (function(_VDOM$Component) {
 							cursorIndex: index,
 							data: record.data,
 							cursorCellIndex: index == cursor && cursorCellIndex,
-							cellEdit: index == cursor && cursorCellIndex && cellEdit
+							cellEdit: index == cursor && cursorCellIndex != null && cellEdit
 						}
 					)
 				},
@@ -20172,8 +20183,8 @@ var GridComponent = /*#__PURE__*/ (function(_VDOM$Component) {
 				var futureState = _objectSpread2(_objectSpread2({}, _this11.state), newState);
 
 				if (!futureState.cellEdit && wasCellEditing) {
-					//If cell editing is in progress, moving the cursor may cause that the cell editor is unmounted before
-					//the blur event which may cause data loss for components which do not have reactOn=change set, e.g. NumberField.
+					// If cell editing is in progress, moving the cursor may cause that the cell editor to unmount before
+					// the blur event which may cause data loss for components which do not have reactOn=change set, e.g. NumberField.
 					unfocusElement(null, false);
 
 					var record = _this11.getRecordAt(prevState.cursor);
@@ -20183,7 +20194,7 @@ var GridComponent = /*#__PURE__*/ (function(_VDOM$Component) {
 					else {
 						var newData = record.store.get(widget.recordName); //record.data might be stale at this point
 
-						if (widget.onCellEdited && newData != _this11.cellEditUndoData)
+						if (widget.onCellEdited && newData != _this11.cellEditUndoData) {
 							_this11.props.instance.invoke(
 								"onCellEdited",
 								{
@@ -20194,6 +20205,9 @@ var GridComponent = /*#__PURE__*/ (function(_VDOM$Component) {
 								},
 								record
 							);
+
+							_this11.cellEditUndoData = newData;
+						}
 					}
 				}
 

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "cx",
-   "version": "22.5.3",
+   "version": "22.6.0",
    "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

@@ -34,6 +34,8 @@ import { List } from "../List";
 import { Selection } from "../../ui/selection/Selection";
 import { HighlightedSearchText } from "../HighlightedSearchText";
 import { autoFocus } from "../autoFocus";
+import { bind } from "../../ui";
+import { isAccessorChain } from "../../data/createAccessorModelProxy";
 
 export class LookupField extends Field {
    declareData() {
@@ -64,20 +66,27 @@ export class LookupField extends Field {
 
       if (!this.bindings) {
          let b = [];
-         if (this.value && this.value.bind)
-            b.push({
-               key: true,
-               local: this.value.bind,
-               remote: `$option.${this.optionIdField}`,
-               set: this.value.set,
-            });
+         if (this.value) {
+            if (isAccessorChain(this.value)) this.value = bind(this.value);
+            if (this.value.bind)
+               b.push({
+                  key: true,
+                  local: this.value.bind,
+                  remote: `$option.${this.optionIdField}`,
+                  set: this.value.set,
+               });
+         }
+
+         if (this.text) {
+            if (isAccessorChain(this.text)) this.value = bind(this.text);
+            if (this.text.bind)
+               b.push({
+                  local: this.text.bind,
+                  remote: `$option.${this.optionTextField}`,
+                  set: this.text.set,
+               });
+         }
 
-         if (this.text && this.text.bind)
-            b.push({
-               local: this.text.bind,
-               remote: `$option.${this.optionTextField}`,
-               set: this.text.set,
-            });
          this.bindings = b;
       }
 

package/src/widgets/grid/Grid.js

@@ -1315,7 +1315,7 @@ class GridComponent extends VDOM.Component {
                isDraggedOver={mod.over}
                cursor={mod.cursor}
                cursorCellIndex={index == cursor && cursorCellIndex}
-               cellEdit={index == cursor && cursorCellIndex && cellEdit}
+               cellEdit={index == cursor && cursorCellIndex != null && cellEdit}
                shouldUpdate={row.shouldUpdate}
                dimensionsVersion={dimensionsVersion}
                fixed={fixed}
@@ -1382,7 +1382,7 @@ class GridComponent extends VDOM.Component {
                   cursorIndex: index,
                   data: record.data,
                   cursorCellIndex: index == cursor && cursorCellIndex,
-                  cellEdit: index == cursor && cursorCellIndex && cellEdit,
+                  cellEdit: index == cursor && cursorCellIndex != null && cellEdit,
                }}
             />
          );
@@ -2495,15 +2495,15 @@ class GridComponent extends VDOM.Component {
             let futureState = { ...this.state, ...newState };
 
             if (!futureState.cellEdit && wasCellEditing) {
-               //If cell editing is in progress, moving the cursor may cause that the cell editor is unmounted before
-               //the blur event which may cause data loss for components which do not have reactOn=change set, e.g. NumberField.
+               // If cell editing is in progress, moving the cursor may cause that the cell editor to unmount before
+               // the blur event which may cause data loss for components which do not have reactOn=change set, e.g. NumberField.
                unfocusElement(null, false);
                let record = this.getRecordAt(prevState.cursor);
                if ((!this.cellEditorValid || cancelEdit) && this.cellEditUndoData)
                   record.store.set(widget.recordName, this.cellEditUndoData);
                else {
                   let newData = record.store.get(widget.recordName); //record.data might be stale at this point
-                  if (widget.onCellEdited && newData != this.cellEditUndoData)
+                  if (widget.onCellEdited && newData != this.cellEditUndoData) {
                      this.props.instance.invoke(
                         "onCellEdited",
                         {
@@ -2514,6 +2514,8 @@ class GridComponent extends VDOM.Component {
                         },
                         record
                      );
+                     this.cellEditUndoData = newData;
+                  }
                }
             }