@taocompany/magic-grid 0.11.3 → 0.11.5

package/dist/index.es.js

@@ -7392,41 +7392,17 @@ var rh = {
 function ih(e, t) {
 	return e.key ?? e.prop ?? `col_${t}`;
 }
-function ah(e, t, n) {
-	let r = new Map(t.map((e) => [e.colId, e])), i = [], a = /* @__PURE__ */ new Set();
+function ah(e, t) {
+	let n = new Map(t.map((e) => [e.colId, e])), r = [], i = /* @__PURE__ */ new Set();
 	for (let t of e) {
-		let e = r.get(t);
-		e && (i.push(e), a.add(t));
-	}
-	for (let e = 0; e < t.length; e++) {
-		let r = t[e];
-		if (a.has(r.colId)) continue;
-		let o = n.get(r.colId), s;
-		if (o !== void 0) s = Math.min(o, i.length), n.delete(r.colId);
-		else {
-			s = i.length;
-			for (let n = e - 1; n >= 0; n--) {
-				let e = t[n].colId, r = i.findIndex((t) => t.colId === e);
-				if (r >= 0) {
-					s = r + 1;
-					break;
-				}
-			}
-			if (s === i.length) for (let n = e + 1; n < t.length; n++) {
-				let e = t[n].colId, r = i.findIndex((t) => t.colId === e);
-				if (r >= 0) {
-					s = r;
-					break;
-				}
-			}
-		}
-		i.splice(s, 0, r), a.add(r.colId);
+		let e = n.get(t);
+		e && (r.push(e), i.add(t));
 	}
-	return i;
+	for (let e of t) i.has(e.colId) || (r.push(e), i.add(e.colId));
+	return r;
 }
 var oh = class {
 	columns = [];
-	unavailableColumnOrder = /* @__PURE__ */ new Map();
 	totalWidth = 0;
 	fixedGroups = rh;
 	leftFixedWidth = 0;
@@ -7451,16 +7427,11 @@ var oh = class {
 			this.columnMovableDefault = e.columnMovable, this.allowCrossLaneColumnMove = e.allowCrossLaneColumnMove;
 		}
 		a !== void 0 && (this.gridResizableDefault = $m(a).resizable), o !== void 0 && (this.gridSortableDefault = Da(o).sortable), s !== void 0 && (this.gridFilterableDefault = La(s).filterable);
-		let c = It(e), l = this.columns.map((e) => e.colId), u = new Map(this.columns.map((e) => [e.colId, e])), d = new Set(c.map((e, t) => ih(e, t)));
-		for (let e = 0; e < l.length; e++) {
-			let t = l[e];
-			d.has(t) || this.unavailableColumnOrder.set(t, e);
-		}
-		let f = c.map((e, r) => {
+		let c = It(e), l = this.columns.map((e) => e.colId), u = new Map(this.columns.map((e) => [e.colId, e])), d = new Set(c.map((e, t) => ih(e, t))), f = c.map((e, r) => {
 			let i = this.parseColumn(e, r, t, n), a = u.get(i.colId);
 			return a && (a.defHidden === i.defHidden && (i.hidden = a.hidden), a.defWidth === i.defWidth && a.defFlex === i.defFlex && (i.width = a.width, i.flex = a.flex), a.defFixed === i.defFixed && (i.fixed = a.fixed)), i;
-		});
-		this.columns = l.length === 0 ? f : ah(l, f, this.unavailableColumnOrder), this.rebuildDisplayedLayout();
+		}), p = l.length > 0 && (d.size !== l.length || l.some((e) => !d.has(e)));
+		this.columns = l.length === 0 || p ? f : ah(l, f), this.rebuildDisplayedLayout();
 	}
 	setColumnsHidden(e, t) {
 		let n = [];