@dflat-core/web 1.7.2086 → 1.7.2087

package/fesm2022/dflat-core-web-core-ux.mjs

@@ -19058,25 +19058,42 @@ var DataGridComponent = class DataGridComponent {
 	onRowDragEnd() {
 		const drag = this.pendingRowDrag;
 		if (!drag) return;
-		const moved = !!this.draggedRow;
+		const moved = this.draggedRow;
 		this.pendingRowDrag = void 0;
 		this.draggedRow = void 0;
 		document.body.classList.remove(DataGridComponent.DraggingBodyClass);
 		if (!moved) return;
+		const rows = this.data.Values;
+		const index = rows.findIndex((r) => r.Id === moved.Id);
+		if (index < 0 || drag.initial.findIndex((r) => r.Id === moved.Id) === index) return;
 		const property = this.rowOrderProperty;
-		let values = drag.initial.map((r) => r[property]).sort((a, b) => a - b);
+		const values = drag.initial.map((r) => r[property]);
+		let changed;
 		if (values.some((v) => Utilities.IsNil(v)) || new Set(values).size !== values.length) {
 			const offset = this.facade.filter.filter$.value?.Offset ?? 0;
-			values = drag.initial.map((_, i) => offset + i + 1);
-		}
-		const changed = this.data.Values.map((row, i) => ({
-			row,
-			value: values[i]
-		})).filter((x) => x.row[property] !== x.value).map((x) => ({
-			...x.row,
-			[property]: x.value
-		}));
-		if (changed.length > 0) this.facade.change.emitUpdated(changed);
+			changed = rows.map((row, i) => ({
+				row,
+				value: offset + i + 1
+			})).filter((x) => x.row[property] !== x.value).map((x) => ({
+				...x.row,
+				[property]: x.value
+			}));
+		} else {
+			const previous = rows[index - 1]?.[property];
+			const next = rows[index + 1]?.[property];
+			const value = Utilities.IsNil(previous) ? next - 1 : Utilities.IsNil(next) ? previous + 1 : (previous + next) / 2;
+			changed = [{
+				...moved,
+				[property]: value
+			}];
+		}
+		const rank = this.facade.config.rowRankProperty;
+		if (rank) {
+			const ranks = drag.initial.map((r) => r[rank]);
+			rows.forEach((row, i) => row[rank] = ranks[i]);
+			changed.forEach((c) => c[rank] = ranks[rows.findIndex((r) => r.Id === c.Id)]);
+		}
+		this.facade.change.emitUpdated(changed);
 		this.cd.markForCheck();
 	}
 	static {