cx 24.3.6 → 24.3.7

package/dist/widgets.js

@@ -16921,44 +16921,32 @@ var GridComponent = /*#__PURE__*/ (function (_VDOM$Component) {
 				},
 				"dropzone",
 			);
+			var isDataRecord = widget.buffered
+				? function (item) {
+						var _item$props;
+						return (
+							((_item$props = item.props) == null ||
+							(_item$props = _item$props.instance) == null ||
+							(_item$props = _item$props.data) == null
+								? void 0
+								: _item$props["class"]) == "cxe-grid-data"
+						);
+					}
+				: function (item) {
+						var _item$props2;
+						return (_item$props2 = item.props) == null || (_item$props2 = _item$props2.record) == null
+							? void 0
+							: _item$props2.type;
+					};
 			var index = 0;
-			while (
-				index < children.length &&
-				((_children$index = children[index]) == null ||
-				(_children$index = _children$index.props) == null ||
-				(_children$index = _children$index.record) == null
-					? void 0
-					: _children$index.type) != "data"
-			) {
-				var _children$index;
-				index++;
-			}
+			while (index < children.length && !isDataRecord(children[index])) index++;
 			var count = 0;
 			while (index < children.length && count < this.state.dropInsertionIndex) {
-				var _children$index2;
-				if (
-					((_children$index2 = children[index]) == null ||
-					(_children$index2 = _children$index2.props) == null ||
-					(_children$index2 = _children$index2.record) == null
-						? void 0
-						: _children$index2.type) == "data"
-				)
-					count++;
+				if (isDataRecord(children[index])) count++;
 				index++;
 			}
 			var savedIndexPos = index;
-			if (!this.state.dropNextToTheRowAbove)
-				while (
-					index < children.length &&
-					((_children$index3 = children[index]) == null ||
-					(_children$index3 = _children$index3.props) == null ||
-					(_children$index3 = _children$index3.record) == null
-						? void 0
-						: _children$index3.type) != "data"
-				) {
-					var _children$index3;
-					index++;
-				}
+			if (!this.state.dropNextToTheRowAbove) while (index < children.length && !isDataRecord(children[index])) index++;
 
 			// do not allow insertion after the last group footer
 			if (savedIndexPos < index && index == children.length) index = savedIndexPos;
@@ -17353,15 +17341,15 @@ var GridComponent = /*#__PURE__*/ (function (_VDOM$Component) {
 			if (dropTarget == "grid" && widget.onDrop && dropInsertionIndex != null) {
 				e.target = {
 					insertionIndex: start + dropInsertionIndex,
-					recordBefore: this.getRecordAt(start + dropInsertionIndex - 1),
-					recordAfter: this.getRecordAt(start + dropInsertionIndex),
+					recordBefore: this.getDataRecordAt(start + dropInsertionIndex - 1),
+					recordAfter: this.getDataRecordAt(start + dropInsertionIndex),
 					dropNextToTheRowAbove: dropNextToTheRowAbove,
 				};
 				instance.invoke("onDrop", e, instance);
 			} else if (dropTarget == "row") {
 				e.target = {
 					index: start + dropInsertionIndex,
-					record: this.getRecordAt(start + dropInsertionIndex),
+					record: this.getDataRecordAt(start + dropInsertionIndex),
 				};
 				instance.invoke("onRowDrop", e, instance);
 			} else if (dropTarget == "column" && widget.onColumnDrop) {
@@ -18034,6 +18022,14 @@ var GridComponent = /*#__PURE__*/ (function (_VDOM$Component) {
 		}
 		widget.selection.selectMultiple(instance.store, selection, indexes, options);
 	};
+	_proto2.getDataRecordAt = function getDataRecordAt(index) {
+		var records = this.props.instance.records;
+		if (!records) return this.getRecordAt(index);
+		var dataRecords = records.filter(function (r) {
+			return r.type == "data";
+		});
+		return dataRecords[index];
+	};
 	_proto2.getRecordAt = function getRecordAt(cursor) {
 		var _this$props7 = this.props,
 			instance = _this$props7.instance,

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "cx",
-   "version": "24.3.6",
+   "version": "24.3.7",
    "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/grid/Grid.js

@@ -1594,19 +1594,23 @@ class GridComponent extends VDOM.Component {
             </tbody>
          );
 
+         let isDataRecord = widget.buffered
+            ? (item) => item.props?.instance?.data?.class == "cxe-grid-data"
+            : (item) => item.props?.record?.type;
+
          let index = 0;
-         while (index < children.length && children[index]?.props?.record?.type != "data") index++;
+         while (index < children.length && !isDataRecord(children[index])) index++;
 
          let count = 0;
          while (index < children.length && count < this.state.dropInsertionIndex) {
-            if (children[index]?.props?.record?.type == "data") count++;
+            if (isDataRecord(children[index])) count++;
             index++;
          }
 
          let savedIndexPos = index;
 
          if (!this.state.dropNextToTheRowAbove)
-            while (index < children.length && children[index]?.props?.record?.type != "data") index++;
+            while (index < children.length && !isDataRecord(children[index])) index++;
 
          // do not allow insertion after the last group footer
          if (savedIndexPos < index && index == children.length) index = savedIndexPos;
@@ -2002,15 +2006,15 @@ class GridComponent extends VDOM.Component {
          if (dropTarget == "grid" && widget.onDrop && dropInsertionIndex != null) {
             e.target = {
                insertionIndex: start + dropInsertionIndex,
-               recordBefore: this.getRecordAt(start + dropInsertionIndex - 1),
-               recordAfter: this.getRecordAt(start + dropInsertionIndex),
+               recordBefore: this.getDataRecordAt(start + dropInsertionIndex - 1),
+               recordAfter: this.getDataRecordAt(start + dropInsertionIndex),
                dropNextToTheRowAbove,
             };
             instance.invoke("onDrop", e, instance);
          } else if (dropTarget == "row") {
             e.target = {
                index: start + dropInsertionIndex,
-               record: this.getRecordAt(start + dropInsertionIndex),
+               record: this.getDataRecordAt(start + dropInsertionIndex),
             };
             instance.invoke("onRowDrop", e, instance);
          } else if (dropTarget == "column" && widget.onColumnDrop) {
@@ -2730,6 +2734,13 @@ class GridComponent extends VDOM.Component {
       widget.selection.selectMultiple(instance.store, selection, indexes, options);
    }
 
+   getDataRecordAt(index) {
+      let { records } = this.props.instance;
+      if (!records) return this.getRecordAt(index);
+      let dataRecords = records.filter((r) => r.type == "data");
+      return dataRecords[index];
+   }
+
    getRecordAt(cursor) {
       let { instance, data } = this.props;
       let { records, widget } = instance;