@pallasoft/ps-mobile-components 1.11.0 → 1.13.0

package/dist/services/ps-sortable-grid-service.js

@@ -16,34 +16,38 @@ export class PsSortableGridService {
     static isSameOrder(first, second) {
         return first.length === second.length && first.every((id, index) => id === second[index]);
     }
-    static rows(spans) {
-        return spans.reduce((rows, span, index) => {
+    static units(span) {
+        return span === PsSortableGridSpan.half ? 1 : PsSortableGridConfig.fullUnits;
+    }
+    static rows(spans, capacity = PsSortableGridConfig.compactUnits) {
+        const rows = [];
+        let used = 0;
+        spans.forEach((span, index) => {
+            const units = PsSortableGridService.units(span);
             const last = rows[rows.length - 1];
-            const canJoin = span === PsSortableGridSpan.half &&
-                last !== undefined &&
-                last.length === 1 &&
-                spans[last[0]] === PsSortableGridSpan.half;
-            if (canJoin)
+            if (last !== undefined && used + units <= capacity) {
                 last.push(index);
-            else
-                rows.push([index]);
-            return rows;
-        }, []);
+                used += units;
+                return;
+            }
+            rows.push([index]);
+            used = units;
+        });
+        return rows;
     }
-    static layout(spans, heights, width) {
-        const half = PsSortableGridService.halfWidth(width);
+    static layout(spans, heights, width, capacity = PsSortableGridConfig.compactUnits) {
+        const gap = PsSortableGridConfig.columnGap;
         const rects = [];
         let top = 0;
-        PsSortableGridService.rows(spans).forEach((row) => {
+        PsSortableGridService.rows(spans, capacity).forEach((row) => {
             const rowHeight = Math.max(...row.map((index) => heights[index]));
-            row.forEach((index, column) => {
-                const isHalf = spans[index] === PsSortableGridSpan.half && row.length === 2;
-                rects[index] = {
-                    height: rowHeight,
-                    width: isHalf ? half : width,
-                    x: column === 0 ? 0 : half + PsSortableGridConfig.columnGap,
-                    y: top,
-                };
+            const units = row.reduce((sum, index) => sum + PsSortableGridService.units(spans[index]), 0);
+            const unitWidth = Math.max(width - gap * (row.length - 1), 0) / units;
+            let left = 0;
+            row.forEach((index) => {
+                const itemWidth = unitWidth * PsSortableGridService.units(spans[index]);
+                rects[index] = { height: rowHeight, width: itemWidth, x: left, y: top };
+                left += itemWidth + gap;
             });
             top += rowHeight + PsSortableGridConfig.rowGap;
         });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@pallasoft/ps-mobile-components",
-	"version": "1.11.0",
+	"version": "1.13.0",
 	"private": false,
 	"description": "Native iOS (SwiftUI) and Android (Jetpack Compose) Ps components for Pallasoft mobile apps",
 	"main": "./dist/index.js",
@@ -36,7 +36,7 @@
 	"dependencies": {
 		"@pallasoft/ps-design-system": "^1.19.0",
 		"@pallasoft/ps-icons": "^1.12.0",
-		"@pallasoft/ps-utilities": "^2.29.0"
+		"@pallasoft/ps-utilities": "^2.30.0"
 	},
 	"peerDependencies": {
 		"@expo/ui": "~58.0.0",