@grafloria/element 0.4.31 → 0.4.32

package/src/lib/dashboard-kit/tabs.js

@@ -61,7 +61,7 @@ onDrag) {
         var _a;
         if ((_a = e.target) === null || _a === void 0 ? void 0 : _a.closest('.axdb-tab'))
             return;
-        onSelectContainer === null || onSelectContainer === void 0 ? void 0 : onSelectContainer();
+        onSelectContainer === null || onSelectContainer === void 0 ? void 0 : onSelectContainer(e);
     };
     for (const p of pages) {
         const b = doc.createElement('button');

package/src/lib/load.js

@@ -151,7 +151,15 @@ export function fromDocument(document, options = {}) {
                 // the group's slab `gridItem`, its children in its own membership.
                 const meta = ((_b = childGroup.getMetadata('containerWidget')) !== null && _b !== void 0 ? _b : {});
                 const cell = cellFromGridItem(childGroup.getMetadata('gridItem'));
-                const ws = Object.assign(Object.assign(Object.assign({ id: childGroup.id }, meta), (cell ? { x: cell.x, y: cell.y, span: cell.w, rows: cell.h } : {})), { widgets: rebuildBoard(childGroup, viewId) });
+                const inner = rebuildBoard(childGroup, viewId);
+                // A tab container's pages keep the order they were REORDERED into
+                // (`order` on the container), not the order they joined the group.
+                const order = meta.order;
+                if (Array.isArray(order)) {
+                    const rank = (id) => (order.indexOf(id) < 0 ? Number.MAX_SAFE_INTEGER : order.indexOf(id));
+                    inner.sort((p, q) => rank(p.id) - rank(q.id));
+                }
+                const ws = Object.assign(Object.assign(Object.assign({ id: childGroup.id }, meta), (cell ? { x: cell.x, y: cell.y, span: cell.w, rows: cell.h } : {})), { widgets: inner });
                 specById.set(ws.id, ws);
                 viewOfWidget.set(ws.id, g.id);
                 boardWidgets.set(ws.id, ws.widgets);