@almadar/ui 5.114.0 → 5.115.0

package/dist/avl/index.cjs

@@ -37405,7 +37405,7 @@ var init_GraphCanvas = __esm({
         nodesRef.current = simNodes;
         if (layout === "force") {
           let iterations = 0;
-          const maxIterations = 100;
+          const maxIterations = 300;
           const tick = () => {
             const nodes = nodesRef.current;
             const centerX = w / 2;
@@ -37435,9 +37435,9 @@ var init_GraphCanvas = __esm({
               const dx = target.x - source.x;
               const dy = target.y - source.y;
               const dist = Math.sqrt(dx * dx + dy * dy) || 1;
-              const w2 = edge.weight ?? 1;
-              const linkTarget = linkDistance * (1 + (1 - Math.min(1, Math.max(0, w2))) * 1.5);
-              const force = (dist - linkTarget) * 0.05;
+              const w2 = Math.min(1, Math.max(0, edge.weight ?? 1));
+              const linkTarget = linkDistance * (0.5 + (1 - w2) * 1.5);
+              const force = (dist - linkTarget) * (0.04 + 0.1 * w2);
               const fx = dx / dist * force;
               const fy = dy / dist * force;
               source.fx += fx;
@@ -37445,9 +37445,27 @@ var init_GraphCanvas = __esm({
               target.fx -= fx;
               target.fy -= fy;
             }
+            const centroids = /* @__PURE__ */ new Map();
             for (const node of nodes) {
-              node.fx += (centerX - node.x) * 0.01;
-              node.fy += (centerY - node.y) * 0.01;
+              const g = node.group ?? "__none__";
+              let c = centroids.get(g);
+              if (!c) {
+                c = { x: 0, y: 0, n: 0 };
+                centroids.set(g, c);
+              }
+              c.x += node.x;
+              c.y += node.y;
+              c.n += 1;
+            }
+            for (const node of nodes) {
+              const c = centroids.get(node.group ?? "__none__");
+              if (c && c.n > 1) {
+                node.fx += (c.x / c.n - node.x) * 0.04;
+                node.fy += (c.y / c.n - node.y) * 0.04;
+              } else {
+                node.fx += (centerX - node.x) * 0.01;
+                node.fy += (centerY - node.y) * 0.01;
+              }
             }
             const damping = 0.9;
             for (const node of nodes) {

package/dist/avl/index.js

@@ -37359,7 +37359,7 @@ var init_GraphCanvas = __esm({
         nodesRef.current = simNodes;
         if (layout === "force") {
           let iterations = 0;
-          const maxIterations = 100;
+          const maxIterations = 300;
           const tick = () => {
             const nodes = nodesRef.current;
             const centerX = w / 2;
@@ -37389,9 +37389,9 @@ var init_GraphCanvas = __esm({
               const dx = target.x - source.x;
               const dy = target.y - source.y;
               const dist = Math.sqrt(dx * dx + dy * dy) || 1;
-              const w2 = edge.weight ?? 1;
-              const linkTarget = linkDistance * (1 + (1 - Math.min(1, Math.max(0, w2))) * 1.5);
-              const force = (dist - linkTarget) * 0.05;
+              const w2 = Math.min(1, Math.max(0, edge.weight ?? 1));
+              const linkTarget = linkDistance * (0.5 + (1 - w2) * 1.5);
+              const force = (dist - linkTarget) * (0.04 + 0.1 * w2);
               const fx = dx / dist * force;
               const fy = dy / dist * force;
               source.fx += fx;
@@ -37399,9 +37399,27 @@ var init_GraphCanvas = __esm({
               target.fx -= fx;
               target.fy -= fy;
             }
+            const centroids = /* @__PURE__ */ new Map();
             for (const node of nodes) {
-              node.fx += (centerX - node.x) * 0.01;
-              node.fy += (centerY - node.y) * 0.01;
+              const g = node.group ?? "__none__";
+              let c = centroids.get(g);
+              if (!c) {
+                c = { x: 0, y: 0, n: 0 };
+                centroids.set(g, c);
+              }
+              c.x += node.x;
+              c.y += node.y;
+              c.n += 1;
+            }
+            for (const node of nodes) {
+              const c = centroids.get(node.group ?? "__none__");
+              if (c && c.n > 1) {
+                node.fx += (c.x / c.n - node.x) * 0.04;
+                node.fy += (c.y / c.n - node.y) * 0.04;
+              } else {
+                node.fx += (centerX - node.x) * 0.01;
+                node.fy += (centerY - node.y) * 0.01;
+              }
             }
             const damping = 0.9;
             for (const node of nodes) {

package/dist/components/index.cjs

@@ -36794,7 +36794,7 @@ var init_GraphCanvas = __esm({
         nodesRef.current = simNodes;
         if (layout === "force") {
           let iterations = 0;
-          const maxIterations = 100;
+          const maxIterations = 300;
           const tick = () => {
             const nodes = nodesRef.current;
             const centerX = w / 2;
@@ -36824,9 +36824,9 @@ var init_GraphCanvas = __esm({
               const dx = target.x - source.x;
               const dy = target.y - source.y;
               const dist = Math.sqrt(dx * dx + dy * dy) || 1;
-              const w2 = edge.weight ?? 1;
-              const linkTarget = linkDistance * (1 + (1 - Math.min(1, Math.max(0, w2))) * 1.5);
-              const force = (dist - linkTarget) * 0.05;
+              const w2 = Math.min(1, Math.max(0, edge.weight ?? 1));
+              const linkTarget = linkDistance * (0.5 + (1 - w2) * 1.5);
+              const force = (dist - linkTarget) * (0.04 + 0.1 * w2);
               const fx = dx / dist * force;
               const fy = dy / dist * force;
               source.fx += fx;
@@ -36834,9 +36834,27 @@ var init_GraphCanvas = __esm({
               target.fx -= fx;
               target.fy -= fy;
             }
+            const centroids = /* @__PURE__ */ new Map();
             for (const node of nodes) {
-              node.fx += (centerX - node.x) * 0.01;
-              node.fy += (centerY - node.y) * 0.01;
+              const g = node.group ?? "__none__";
+              let c = centroids.get(g);
+              if (!c) {
+                c = { x: 0, y: 0, n: 0 };
+                centroids.set(g, c);
+              }
+              c.x += node.x;
+              c.y += node.y;
+              c.n += 1;
+            }
+            for (const node of nodes) {
+              const c = centroids.get(node.group ?? "__none__");
+              if (c && c.n > 1) {
+                node.fx += (c.x / c.n - node.x) * 0.04;
+                node.fy += (c.y / c.n - node.y) * 0.04;
+              } else {
+                node.fx += (centerX - node.x) * 0.01;
+                node.fy += (centerY - node.y) * 0.01;
+              }
             }
             const damping = 0.9;
             for (const node of nodes) {

package/dist/components/index.js

@@ -36749,7 +36749,7 @@ var init_GraphCanvas = __esm({
         nodesRef.current = simNodes;
         if (layout === "force") {
           let iterations = 0;
-          const maxIterations = 100;
+          const maxIterations = 300;
           const tick = () => {
             const nodes = nodesRef.current;
             const centerX = w / 2;
@@ -36779,9 +36779,9 @@ var init_GraphCanvas = __esm({
               const dx = target.x - source.x;
               const dy = target.y - source.y;
               const dist = Math.sqrt(dx * dx + dy * dy) || 1;
-              const w2 = edge.weight ?? 1;
-              const linkTarget = linkDistance * (1 + (1 - Math.min(1, Math.max(0, w2))) * 1.5);
-              const force = (dist - linkTarget) * 0.05;
+              const w2 = Math.min(1, Math.max(0, edge.weight ?? 1));
+              const linkTarget = linkDistance * (0.5 + (1 - w2) * 1.5);
+              const force = (dist - linkTarget) * (0.04 + 0.1 * w2);
               const fx = dx / dist * force;
               const fy = dy / dist * force;
               source.fx += fx;
@@ -36789,9 +36789,27 @@ var init_GraphCanvas = __esm({
               target.fx -= fx;
               target.fy -= fy;
             }
+            const centroids = /* @__PURE__ */ new Map();
             for (const node of nodes) {
-              node.fx += (centerX - node.x) * 0.01;
-              node.fy += (centerY - node.y) * 0.01;
+              const g = node.group ?? "__none__";
+              let c = centroids.get(g);
+              if (!c) {
+                c = { x: 0, y: 0, n: 0 };
+                centroids.set(g, c);
+              }
+              c.x += node.x;
+              c.y += node.y;
+              c.n += 1;
+            }
+            for (const node of nodes) {
+              const c = centroids.get(node.group ?? "__none__");
+              if (c && c.n > 1) {
+                node.fx += (c.x / c.n - node.x) * 0.04;
+                node.fy += (c.y / c.n - node.y) * 0.04;
+              } else {
+                node.fx += (centerX - node.x) * 0.01;
+                node.fy += (centerY - node.y) * 0.01;
+              }
             }
             const damping = 0.9;
             for (const node of nodes) {

package/dist/lib/drawable/three/index.cjs

@@ -706,6 +706,7 @@ function ModelLoader({
     box.getSize(size);
     const maxDim = Math.max(size.x, size.y, size.z);
     if (!Number.isFinite(maxDim) || maxDim < 0.05) return 1;
+    log3.warn(`TMP-GG1 bounds ${url.split("/").pop() ?? url} size=${JSON.stringify([size.x, size.y, size.z])} scaleProp=${JSON.stringify(scale)}`);
     return 1 / maxDim;
   }, [model]);
   const scaleArray = React3.useMemo(() => {
@@ -913,7 +914,11 @@ function Sprite3D({ node, projector }) {
       node.height * projector.cellSize,
       node.width * projector.cellSize
     ];
-    return /* @__PURE__ */ jsxRuntime.jsx("group", { position: projector.toWorld(node.position), children: /* @__PURE__ */ jsxRuntime.jsx(
+    const world = projector.toWorld(node.position);
+    if (node.position.z !== void 0) {
+      console.warn(`TMP-GG1 sprite3d ${asset.url.split("/").pop() ?? asset.url} posZ=${node.position.z} world=${JSON.stringify(world)} scale=${JSON.stringify(scale)}`);
+    }
+    return /* @__PURE__ */ jsxRuntime.jsx("group", { position: world, children: /* @__PURE__ */ jsxRuntime.jsx(
       ModelLoader,
       {
         url: asset.url,

package/dist/lib/drawable/three/index.js

@@ -682,6 +682,7 @@ function ModelLoader({
     box.getSize(size);
     const maxDim = Math.max(size.x, size.y, size.z);
     if (!Number.isFinite(maxDim) || maxDim < 0.05) return 1;
+    log3.warn(`TMP-GG1 bounds ${url.split("/").pop() ?? url} size=${JSON.stringify([size.x, size.y, size.z])} scaleProp=${JSON.stringify(scale)}`);
     return 1 / maxDim;
   }, [model]);
   const scaleArray = useMemo(() => {
@@ -889,7 +890,11 @@ function Sprite3D({ node, projector }) {
       node.height * projector.cellSize,
       node.width * projector.cellSize
     ];
-    return /* @__PURE__ */ jsx("group", { position: projector.toWorld(node.position), children: /* @__PURE__ */ jsx(
+    const world = projector.toWorld(node.position);
+    if (node.position.z !== void 0) {
+      console.warn(`TMP-GG1 sprite3d ${asset.url.split("/").pop() ?? asset.url} posZ=${node.position.z} world=${JSON.stringify(world)} scale=${JSON.stringify(scale)}`);
+    }
+    return /* @__PURE__ */ jsx("group", { position: world, children: /* @__PURE__ */ jsx(
       ModelLoader,
       {
         url: asset.url,

package/dist/providers/index.cjs

@@ -35535,7 +35535,7 @@ var init_GraphCanvas = __esm({
         nodesRef.current = simNodes;
         if (layout === "force") {
           let iterations = 0;
-          const maxIterations = 100;
+          const maxIterations = 300;
           const tick = () => {
             const nodes = nodesRef.current;
             const centerX = w / 2;
@@ -35565,9 +35565,9 @@ var init_GraphCanvas = __esm({
               const dx = target.x - source.x;
               const dy = target.y - source.y;
               const dist = Math.sqrt(dx * dx + dy * dy) || 1;
-              const w2 = edge.weight ?? 1;
-              const linkTarget = linkDistance * (1 + (1 - Math.min(1, Math.max(0, w2))) * 1.5);
-              const force = (dist - linkTarget) * 0.05;
+              const w2 = Math.min(1, Math.max(0, edge.weight ?? 1));
+              const linkTarget = linkDistance * (0.5 + (1 - w2) * 1.5);
+              const force = (dist - linkTarget) * (0.04 + 0.1 * w2);
               const fx = dx / dist * force;
               const fy = dy / dist * force;
               source.fx += fx;
@@ -35575,9 +35575,27 @@ var init_GraphCanvas = __esm({
               target.fx -= fx;
               target.fy -= fy;
             }
+            const centroids = /* @__PURE__ */ new Map();
             for (const node of nodes) {
-              node.fx += (centerX - node.x) * 0.01;
-              node.fy += (centerY - node.y) * 0.01;
+              const g = node.group ?? "__none__";
+              let c = centroids.get(g);
+              if (!c) {
+                c = { x: 0, y: 0, n: 0 };
+                centroids.set(g, c);
+              }
+              c.x += node.x;
+              c.y += node.y;
+              c.n += 1;
+            }
+            for (const node of nodes) {
+              const c = centroids.get(node.group ?? "__none__");
+              if (c && c.n > 1) {
+                node.fx += (c.x / c.n - node.x) * 0.04;
+                node.fy += (c.y / c.n - node.y) * 0.04;
+              } else {
+                node.fx += (centerX - node.x) * 0.01;
+                node.fy += (centerY - node.y) * 0.01;
+              }
             }
             const damping = 0.9;
             for (const node of nodes) {

package/dist/providers/index.js

@@ -35490,7 +35490,7 @@ var init_GraphCanvas = __esm({
         nodesRef.current = simNodes;
         if (layout === "force") {
           let iterations = 0;
-          const maxIterations = 100;
+          const maxIterations = 300;
           const tick = () => {
             const nodes = nodesRef.current;
             const centerX = w / 2;
@@ -35520,9 +35520,9 @@ var init_GraphCanvas = __esm({
               const dx = target.x - source.x;
               const dy = target.y - source.y;
               const dist = Math.sqrt(dx * dx + dy * dy) || 1;
-              const w2 = edge.weight ?? 1;
-              const linkTarget = linkDistance * (1 + (1 - Math.min(1, Math.max(0, w2))) * 1.5);
-              const force = (dist - linkTarget) * 0.05;
+              const w2 = Math.min(1, Math.max(0, edge.weight ?? 1));
+              const linkTarget = linkDistance * (0.5 + (1 - w2) * 1.5);
+              const force = (dist - linkTarget) * (0.04 + 0.1 * w2);
               const fx = dx / dist * force;
               const fy = dy / dist * force;
               source.fx += fx;
@@ -35530,9 +35530,27 @@ var init_GraphCanvas = __esm({
               target.fx -= fx;
               target.fy -= fy;
             }
+            const centroids = /* @__PURE__ */ new Map();
             for (const node of nodes) {
-              node.fx += (centerX - node.x) * 0.01;
-              node.fy += (centerY - node.y) * 0.01;
+              const g = node.group ?? "__none__";
+              let c = centroids.get(g);
+              if (!c) {
+                c = { x: 0, y: 0, n: 0 };
+                centroids.set(g, c);
+              }
+              c.x += node.x;
+              c.y += node.y;
+              c.n += 1;
+            }
+            for (const node of nodes) {
+              const c = centroids.get(node.group ?? "__none__");
+              if (c && c.n > 1) {
+                node.fx += (c.x / c.n - node.x) * 0.04;
+                node.fy += (c.y / c.n - node.y) * 0.04;
+              } else {
+                node.fx += (centerX - node.x) * 0.01;
+                node.fy += (centerY - node.y) * 0.01;
+              }
             }
             const damping = 0.9;
             for (const node of nodes) {

package/dist/runtime/index.cjs

@@ -34900,7 +34900,7 @@ var init_GraphCanvas = __esm({
         nodesRef.current = simNodes;
         if (layout === "force") {
           let iterations = 0;
-          const maxIterations = 100;
+          const maxIterations = 300;
           const tick = () => {
             const nodes = nodesRef.current;
             const centerX = w / 2;
@@ -34930,9 +34930,9 @@ var init_GraphCanvas = __esm({
               const dx = target.x - source.x;
               const dy = target.y - source.y;
               const dist = Math.sqrt(dx * dx + dy * dy) || 1;
-              const w2 = edge.weight ?? 1;
-              const linkTarget = linkDistance * (1 + (1 - Math.min(1, Math.max(0, w2))) * 1.5);
-              const force = (dist - linkTarget) * 0.05;
+              const w2 = Math.min(1, Math.max(0, edge.weight ?? 1));
+              const linkTarget = linkDistance * (0.5 + (1 - w2) * 1.5);
+              const force = (dist - linkTarget) * (0.04 + 0.1 * w2);
               const fx = dx / dist * force;
               const fy = dy / dist * force;
               source.fx += fx;
@@ -34940,9 +34940,27 @@ var init_GraphCanvas = __esm({
               target.fx -= fx;
               target.fy -= fy;
             }
+            const centroids = /* @__PURE__ */ new Map();
             for (const node of nodes) {
-              node.fx += (centerX - node.x) * 0.01;
-              node.fy += (centerY - node.y) * 0.01;
+              const g = node.group ?? "__none__";
+              let c = centroids.get(g);
+              if (!c) {
+                c = { x: 0, y: 0, n: 0 };
+                centroids.set(g, c);
+              }
+              c.x += node.x;
+              c.y += node.y;
+              c.n += 1;
+            }
+            for (const node of nodes) {
+              const c = centroids.get(node.group ?? "__none__");
+              if (c && c.n > 1) {
+                node.fx += (c.x / c.n - node.x) * 0.04;
+                node.fy += (c.y / c.n - node.y) * 0.04;
+              } else {
+                node.fx += (centerX - node.x) * 0.01;
+                node.fy += (centerY - node.y) * 0.01;
+              }
             }
             const damping = 0.9;
             for (const node of nodes) {

package/dist/runtime/index.js

@@ -34856,7 +34856,7 @@ var init_GraphCanvas = __esm({
         nodesRef.current = simNodes;
         if (layout === "force") {
           let iterations = 0;
-          const maxIterations = 100;
+          const maxIterations = 300;
           const tick = () => {
             const nodes = nodesRef.current;
             const centerX = w / 2;
@@ -34886,9 +34886,9 @@ var init_GraphCanvas = __esm({
               const dx = target.x - source.x;
               const dy = target.y - source.y;
               const dist = Math.sqrt(dx * dx + dy * dy) || 1;
-              const w2 = edge.weight ?? 1;
-              const linkTarget = linkDistance * (1 + (1 - Math.min(1, Math.max(0, w2))) * 1.5);
-              const force = (dist - linkTarget) * 0.05;
+              const w2 = Math.min(1, Math.max(0, edge.weight ?? 1));
+              const linkTarget = linkDistance * (0.5 + (1 - w2) * 1.5);
+              const force = (dist - linkTarget) * (0.04 + 0.1 * w2);
               const fx = dx / dist * force;
               const fy = dy / dist * force;
               source.fx += fx;
@@ -34896,9 +34896,27 @@ var init_GraphCanvas = __esm({
               target.fx -= fx;
               target.fy -= fy;
             }
+            const centroids = /* @__PURE__ */ new Map();
             for (const node of nodes) {
-              node.fx += (centerX - node.x) * 0.01;
-              node.fy += (centerY - node.y) * 0.01;
+              const g = node.group ?? "__none__";
+              let c = centroids.get(g);
+              if (!c) {
+                c = { x: 0, y: 0, n: 0 };
+                centroids.set(g, c);
+              }
+              c.x += node.x;
+              c.y += node.y;
+              c.n += 1;
+            }
+            for (const node of nodes) {
+              const c = centroids.get(node.group ?? "__none__");
+              if (c && c.n > 1) {
+                node.fx += (c.x / c.n - node.x) * 0.04;
+                node.fy += (c.y / c.n - node.y) * 0.04;
+              } else {
+                node.fx += (centerX - node.x) * 0.01;
+                node.fy += (centerY - node.y) * 0.01;
+              }
             }
             const damping = 0.9;
             for (const node of nodes) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@almadar/ui",
-  "version": "5.114.0",
+  "version": "5.115.0",
   "description": "React UI components, hooks, and providers for Almadar",
   "type": "module",
   "sideEffects": [