@almadar/ui 5.119.0 → 5.120.0

package/dist/runtime/index.cjs

@@ -34895,8 +34895,11 @@ var init_GraphCanvas = __esm({
       React81.useEffect(() => {
         const canvas = canvasRef.current;
         if (!canvas || propNodes.length === 0) return;
-        const w = logicalW;
-        const h = height;
+        const viewW = logicalW;
+        const viewH = height;
+        const layoutScale = Math.max(1, Math.min(3, Math.sqrt(propNodes.length / 12)));
+        const w = viewW * layoutScale;
+        const h = viewH * layoutScale;
         const labelFont = resolveColor3("var(--font-family)", canvas) || "system-ui";
         const prevPos = /* @__PURE__ */ new Map();
         for (const pn of nodesRef.current) if (pn.x != null && pn.y != null) prevPos.set(pn.id, { x: pn.x, y: pn.y });
@@ -34936,93 +34939,122 @@ var init_GraphCanvas = __esm({
           const COLLIDE_PASSES = 6;
           const LABEL_GAP = 12;
           const LABEL_H = 16;
-          const tick = (iter) => {
+          const SIMILARITY_NEIGHBORS = 5;
+          const SIMILARITY_MIN_WEIGHT = 0.25;
+          const drawnPairs = /* @__PURE__ */ new Set();
+          for (const edge of propEdges) drawnPairs.add(edgeKeyOf(edge.source, edge.target));
+          const similarityNeighbors = /* @__PURE__ */ new Map();
+          {
+            const bySource = /* @__PURE__ */ new Map();
+            for (const pair of propSimilarity) {
+              if (pair.weight < SIMILARITY_MIN_WEIGHT) continue;
+              if (drawnPairs.has(edgeKeyOf(pair.source, pair.target))) continue;
+              const arr = bySource.get(pair.source) ?? [];
+              arr.push(pair);
+              bySource.set(pair.source, arr);
+            }
+            for (const [id, arr] of bySource) {
+              arr.sort((a, b) => b.weight - a.weight);
+              const keep = new Set(arr.slice(0, SIMILARITY_NEIGHBORS).map((p) => p.target));
+              similarityNeighbors.set(id, keep);
+            }
+          }
+          const activeSimilarity = propSimilarity.filter((pair) => {
+            if (drawnPairs.has(edgeKeyOf(pair.source, pair.target))) return false;
+            const a = similarityNeighbors.get(pair.source);
+            const b = similarityNeighbors.get(pair.target);
+            return (a?.has(pair.target) ?? false) || (b?.has(pair.source) ?? false);
+          });
+          const tick = (iter, options) => {
+            const skipForces = options?.skipForces ?? false;
             const nodes = nodesRef.current;
             const centerX = w / 2;
             const centerY = h / 2;
-            const temp = Math.max(COOL, 1 - iter / maxIterations);
+            const temp = skipForces ? 0 : Math.max(COOL, 1 - iter / maxIterations);
             for (const node of nodes) {
               node.fx = 0;
               node.fy = 0;
             }
-            for (let i = 0; i < nodes.length; i++) {
-              for (let j = i + 1; j < nodes.length; j++) {
-                const dx = nodes[j].x - nodes[i].x;
-                const dy = nodes[j].y - nodes[i].y;
+            if (!skipForces) {
+              for (let i = 0; i < nodes.length; i++) {
+                for (let j = i + 1; j < nodes.length; j++) {
+                  const dx = nodes[j].x - nodes[i].x;
+                  const dy = nodes[j].y - nodes[i].y;
+                  const dist = Math.sqrt(dx * dx + dy * dy) || 1;
+                  const force = repulsion / (dist * dist) * temp;
+                  const fx = dx / dist * force;
+                  const fy = dy / dist * force;
+                  nodes[i].fx -= fx;
+                  nodes[i].fy -= fy;
+                  nodes[j].fx += fx;
+                  nodes[j].fy += fy;
+                }
+              }
+              const nodeById = new Map(nodes.map((n) => [n.id, n]));
+              const spring = (a, b, rest, k) => {
+                const dx = b.x - a.x;
+                const dy = b.y - a.y;
                 const dist = Math.sqrt(dx * dx + dy * dy) || 1;
-                const force = repulsion / (dist * dist) * temp;
+                const force = (dist - rest) * k * temp;
                 const fx = dx / dist * force;
                 const fy = dy / dist * force;
-                nodes[i].fx -= fx;
-                nodes[i].fy -= fy;
-                nodes[j].fx += fx;
-                nodes[j].fy += fy;
+                a.fx += fx;
+                a.fy += fy;
+                b.fx -= fx;
+                b.fy -= fy;
+              };
+              for (const edge of propEdges) {
+                const source = nodeById.get(edge.source);
+                const target = nodeById.get(edge.target);
+                if (!source || !target) continue;
+                drawnPairs.add(edgeKeyOf(edge.source, edge.target));
+                const w2 = Math.min(1, Math.max(0, edge.weight ?? 1));
+                spring(source, target, linkDistance * (0.35 + (1 - w2) * 0.3), 0.14);
               }
-            }
-            const nodeById = new Map(nodes.map((n) => [n.id, n]));
-            const spring = (a, b, rest, k) => {
-              const dx = b.x - a.x;
-              const dy = b.y - a.y;
-              const dist = Math.sqrt(dx * dx + dy * dy) || 1;
-              const force = (dist - rest) * k * temp;
-              const fx = dx / dist * force;
-              const fy = dy / dist * force;
-              a.fx += fx;
-              a.fy += fy;
-              b.fx -= fx;
-              b.fy -= fy;
-            };
-            const drawnPairs = /* @__PURE__ */ new Set();
-            for (const edge of propEdges) {
-              const source = nodeById.get(edge.source);
-              const target = nodeById.get(edge.target);
-              if (!source || !target) continue;
-              drawnPairs.add(edgeKeyOf(edge.source, edge.target));
-              const w2 = Math.min(1, Math.max(0, edge.weight ?? 1));
-              spring(source, target, linkDistance * (0.35 + (1 - w2) * 0.3), 0.14);
-            }
-            for (const pair of propSimilarity) {
-              if (drawnPairs.has(edgeKeyOf(pair.source, pair.target))) continue;
-              const source = nodeById.get(pair.source);
-              const target = nodeById.get(pair.target);
-              if (!source || !target) continue;
-              const w2 = Math.min(1, Math.max(0, pair.weight));
-              spring(source, target, linkDistance * (1.35 - 0.55 * w2), 0.015);
-            }
-            const centroids = /* @__PURE__ */ new Map();
-            for (const node of nodes) {
-              const g = node.group ?? "__none__";
-              let c = centroids.get(g);
-              if (!c) {
-                c = { x: 0, y: 0, n: 0 };
-                centroids.set(g, c);
+              for (const pair of activeSimilarity) {
+                const source = nodeById.get(pair.source);
+                const target = nodeById.get(pair.target);
+                if (!source || !target) continue;
+                const w2 = Math.min(1, Math.max(0, pair.weight));
+                spring(source, target, linkDistance * (1.35 - 0.55 * w2), 0.015);
               }
-              c.x += node.x;
-              c.y += node.y;
-              c.n += 1;
-            }
-            const multiCluster = centroids.size > 1;
-            for (const node of nodes) {
-              if (multiCluster) {
-                const c = centroids.get(node.group ?? "__none__");
-                if (c && c.n > 1) {
-                  node.fx += (c.x / c.n - node.x) * 0.04 * temp;
-                  node.fy += (c.y / c.n - node.y) * 0.04 * temp;
+              const centroids = /* @__PURE__ */ new Map();
+              for (const node of nodes) {
+                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;
+              }
+              const multiCluster = centroids.size > 1;
+              for (const node of nodes) {
+                if (multiCluster) {
+                  const c = centroids.get(node.group ?? "__none__");
+                  if (c && c.n > 1) {
+                    node.fx += (c.x / c.n - node.x) * 0.06 * temp;
+                    node.fy += (c.y / c.n - node.y) * 0.06 * temp;
+                  } else {
+                    node.fx += (centerX - node.x) * 0.01 * temp;
+                    node.fy += (centerY - node.y) * 0.01 * temp;
+                  }
                 } else {
-                  node.fx += (centerX - node.x) * 0.01 * temp;
-                  node.fy += (centerY - node.y) * 0.01 * temp;
+                  node.fx += (centerX - node.x) * 8e-3 * temp;
+                  node.fy += (centerY - node.y) * 8e-3 * temp;
                 }
-              } else {
-                node.fx += (centerX - node.x) * 8e-3 * temp;
-                node.fy += (centerY - node.y) * 8e-3 * temp;
+              }
+              const damping = 0.9;
+              for (const node of nodes) {
+                node.vx = (node.vx + node.fx) * damping;
+                node.vy = (node.vy + node.fy) * damping;
+                node.x += node.vx;
+                node.y += node.vy;
               }
             }
-            const damping = 0.9;
             for (const node of nodes) {
-              node.vx = (node.vx + node.fx) * damping;
-              node.vy = (node.vy + node.fy) * damping;
-              node.x += node.vx;
-              node.y += node.vy;
               node.x = Math.max(30, Math.min(w - 30, node.x));
               node.y = Math.max(30, Math.min(h - 30, node.y));
             }
@@ -35073,6 +35105,22 @@ var init_GraphCanvas = __esm({
           };
           if (fullRelayout) {
             for (let i = 0; i < maxIterations; i++) tick(i);
+            for (let i = 0; i < 4; i++) tick(maxIterations, { skipForces: true });
+            const fitPad = 40;
+            let minX = Infinity, minY = Infinity, maxX = -Infinity, maxY = -Infinity;
+            for (const node of nodesRef.current) {
+              const r = node.size || 8;
+              const lw = showLabels ? node.labelW ?? (node.labelW = node.label ? measureLabelWidth(node.label, labelFont) : 0) : 0;
+              minX = Math.min(minX, node.x - r, node.x - lw / 2);
+              minY = Math.min(minY, node.y - r);
+              maxX = Math.max(maxX, node.x + r, node.x + lw / 2);
+              maxY = Math.max(maxY, node.y + r + LABEL_GAP + LABEL_H);
+            }
+            const bboxW = Math.max(1, maxX - minX + fitPad * 2);
+            const bboxH = Math.max(1, maxY - minY + fitPad * 2);
+            const nextZoom = Math.min(1, viewW / bboxW, viewH / bboxH);
+            setZoom(nextZoom);
+            setOffset({ x: fitPad - minX * nextZoom, y: fitPad - minY * nextZoom });
             laidOutRef.current = true;
           } else {
             const centroids = /* @__PURE__ */ new Map();

package/dist/runtime/index.js

@@ -34851,8 +34851,11 @@ var init_GraphCanvas = __esm({
       useEffect(() => {
         const canvas = canvasRef.current;
         if (!canvas || propNodes.length === 0) return;
-        const w = logicalW;
-        const h = height;
+        const viewW = logicalW;
+        const viewH = height;
+        const layoutScale = Math.max(1, Math.min(3, Math.sqrt(propNodes.length / 12)));
+        const w = viewW * layoutScale;
+        const h = viewH * layoutScale;
         const labelFont = resolveColor3("var(--font-family)", canvas) || "system-ui";
         const prevPos = /* @__PURE__ */ new Map();
         for (const pn of nodesRef.current) if (pn.x != null && pn.y != null) prevPos.set(pn.id, { x: pn.x, y: pn.y });
@@ -34892,93 +34895,122 @@ var init_GraphCanvas = __esm({
           const COLLIDE_PASSES = 6;
           const LABEL_GAP = 12;
           const LABEL_H = 16;
-          const tick = (iter) => {
+          const SIMILARITY_NEIGHBORS = 5;
+          const SIMILARITY_MIN_WEIGHT = 0.25;
+          const drawnPairs = /* @__PURE__ */ new Set();
+          for (const edge of propEdges) drawnPairs.add(edgeKeyOf(edge.source, edge.target));
+          const similarityNeighbors = /* @__PURE__ */ new Map();
+          {
+            const bySource = /* @__PURE__ */ new Map();
+            for (const pair of propSimilarity) {
+              if (pair.weight < SIMILARITY_MIN_WEIGHT) continue;
+              if (drawnPairs.has(edgeKeyOf(pair.source, pair.target))) continue;
+              const arr = bySource.get(pair.source) ?? [];
+              arr.push(pair);
+              bySource.set(pair.source, arr);
+            }
+            for (const [id, arr] of bySource) {
+              arr.sort((a, b) => b.weight - a.weight);
+              const keep = new Set(arr.slice(0, SIMILARITY_NEIGHBORS).map((p) => p.target));
+              similarityNeighbors.set(id, keep);
+            }
+          }
+          const activeSimilarity = propSimilarity.filter((pair) => {
+            if (drawnPairs.has(edgeKeyOf(pair.source, pair.target))) return false;
+            const a = similarityNeighbors.get(pair.source);
+            const b = similarityNeighbors.get(pair.target);
+            return (a?.has(pair.target) ?? false) || (b?.has(pair.source) ?? false);
+          });
+          const tick = (iter, options) => {
+            const skipForces = options?.skipForces ?? false;
             const nodes = nodesRef.current;
             const centerX = w / 2;
             const centerY = h / 2;
-            const temp = Math.max(COOL, 1 - iter / maxIterations);
+            const temp = skipForces ? 0 : Math.max(COOL, 1 - iter / maxIterations);
             for (const node of nodes) {
               node.fx = 0;
               node.fy = 0;
             }
-            for (let i = 0; i < nodes.length; i++) {
-              for (let j = i + 1; j < nodes.length; j++) {
-                const dx = nodes[j].x - nodes[i].x;
-                const dy = nodes[j].y - nodes[i].y;
+            if (!skipForces) {
+              for (let i = 0; i < nodes.length; i++) {
+                for (let j = i + 1; j < nodes.length; j++) {
+                  const dx = nodes[j].x - nodes[i].x;
+                  const dy = nodes[j].y - nodes[i].y;
+                  const dist = Math.sqrt(dx * dx + dy * dy) || 1;
+                  const force = repulsion / (dist * dist) * temp;
+                  const fx = dx / dist * force;
+                  const fy = dy / dist * force;
+                  nodes[i].fx -= fx;
+                  nodes[i].fy -= fy;
+                  nodes[j].fx += fx;
+                  nodes[j].fy += fy;
+                }
+              }
+              const nodeById = new Map(nodes.map((n) => [n.id, n]));
+              const spring = (a, b, rest, k) => {
+                const dx = b.x - a.x;
+                const dy = b.y - a.y;
                 const dist = Math.sqrt(dx * dx + dy * dy) || 1;
-                const force = repulsion / (dist * dist) * temp;
+                const force = (dist - rest) * k * temp;
                 const fx = dx / dist * force;
                 const fy = dy / dist * force;
-                nodes[i].fx -= fx;
-                nodes[i].fy -= fy;
-                nodes[j].fx += fx;
-                nodes[j].fy += fy;
+                a.fx += fx;
+                a.fy += fy;
+                b.fx -= fx;
+                b.fy -= fy;
+              };
+              for (const edge of propEdges) {
+                const source = nodeById.get(edge.source);
+                const target = nodeById.get(edge.target);
+                if (!source || !target) continue;
+                drawnPairs.add(edgeKeyOf(edge.source, edge.target));
+                const w2 = Math.min(1, Math.max(0, edge.weight ?? 1));
+                spring(source, target, linkDistance * (0.35 + (1 - w2) * 0.3), 0.14);
               }
-            }
-            const nodeById = new Map(nodes.map((n) => [n.id, n]));
-            const spring = (a, b, rest, k) => {
-              const dx = b.x - a.x;
-              const dy = b.y - a.y;
-              const dist = Math.sqrt(dx * dx + dy * dy) || 1;
-              const force = (dist - rest) * k * temp;
-              const fx = dx / dist * force;
-              const fy = dy / dist * force;
-              a.fx += fx;
-              a.fy += fy;
-              b.fx -= fx;
-              b.fy -= fy;
-            };
-            const drawnPairs = /* @__PURE__ */ new Set();
-            for (const edge of propEdges) {
-              const source = nodeById.get(edge.source);
-              const target = nodeById.get(edge.target);
-              if (!source || !target) continue;
-              drawnPairs.add(edgeKeyOf(edge.source, edge.target));
-              const w2 = Math.min(1, Math.max(0, edge.weight ?? 1));
-              spring(source, target, linkDistance * (0.35 + (1 - w2) * 0.3), 0.14);
-            }
-            for (const pair of propSimilarity) {
-              if (drawnPairs.has(edgeKeyOf(pair.source, pair.target))) continue;
-              const source = nodeById.get(pair.source);
-              const target = nodeById.get(pair.target);
-              if (!source || !target) continue;
-              const w2 = Math.min(1, Math.max(0, pair.weight));
-              spring(source, target, linkDistance * (1.35 - 0.55 * w2), 0.015);
-            }
-            const centroids = /* @__PURE__ */ new Map();
-            for (const node of nodes) {
-              const g = node.group ?? "__none__";
-              let c = centroids.get(g);
-              if (!c) {
-                c = { x: 0, y: 0, n: 0 };
-                centroids.set(g, c);
+              for (const pair of activeSimilarity) {
+                const source = nodeById.get(pair.source);
+                const target = nodeById.get(pair.target);
+                if (!source || !target) continue;
+                const w2 = Math.min(1, Math.max(0, pair.weight));
+                spring(source, target, linkDistance * (1.35 - 0.55 * w2), 0.015);
               }
-              c.x += node.x;
-              c.y += node.y;
-              c.n += 1;
-            }
-            const multiCluster = centroids.size > 1;
-            for (const node of nodes) {
-              if (multiCluster) {
-                const c = centroids.get(node.group ?? "__none__");
-                if (c && c.n > 1) {
-                  node.fx += (c.x / c.n - node.x) * 0.04 * temp;
-                  node.fy += (c.y / c.n - node.y) * 0.04 * temp;
+              const centroids = /* @__PURE__ */ new Map();
+              for (const node of nodes) {
+                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;
+              }
+              const multiCluster = centroids.size > 1;
+              for (const node of nodes) {
+                if (multiCluster) {
+                  const c = centroids.get(node.group ?? "__none__");
+                  if (c && c.n > 1) {
+                    node.fx += (c.x / c.n - node.x) * 0.06 * temp;
+                    node.fy += (c.y / c.n - node.y) * 0.06 * temp;
+                  } else {
+                    node.fx += (centerX - node.x) * 0.01 * temp;
+                    node.fy += (centerY - node.y) * 0.01 * temp;
+                  }
                 } else {
-                  node.fx += (centerX - node.x) * 0.01 * temp;
-                  node.fy += (centerY - node.y) * 0.01 * temp;
+                  node.fx += (centerX - node.x) * 8e-3 * temp;
+                  node.fy += (centerY - node.y) * 8e-3 * temp;
                 }
-              } else {
-                node.fx += (centerX - node.x) * 8e-3 * temp;
-                node.fy += (centerY - node.y) * 8e-3 * temp;
+              }
+              const damping = 0.9;
+              for (const node of nodes) {
+                node.vx = (node.vx + node.fx) * damping;
+                node.vy = (node.vy + node.fy) * damping;
+                node.x += node.vx;
+                node.y += node.vy;
               }
             }
-            const damping = 0.9;
             for (const node of nodes) {
-              node.vx = (node.vx + node.fx) * damping;
-              node.vy = (node.vy + node.fy) * damping;
-              node.x += node.vx;
-              node.y += node.vy;
               node.x = Math.max(30, Math.min(w - 30, node.x));
               node.y = Math.max(30, Math.min(h - 30, node.y));
             }
@@ -35029,6 +35061,22 @@ var init_GraphCanvas = __esm({
           };
           if (fullRelayout) {
             for (let i = 0; i < maxIterations; i++) tick(i);
+            for (let i = 0; i < 4; i++) tick(maxIterations, { skipForces: true });
+            const fitPad = 40;
+            let minX = Infinity, minY = Infinity, maxX = -Infinity, maxY = -Infinity;
+            for (const node of nodesRef.current) {
+              const r = node.size || 8;
+              const lw = showLabels ? node.labelW ?? (node.labelW = node.label ? measureLabelWidth(node.label, labelFont) : 0) : 0;
+              minX = Math.min(minX, node.x - r, node.x - lw / 2);
+              minY = Math.min(minY, node.y - r);
+              maxX = Math.max(maxX, node.x + r, node.x + lw / 2);
+              maxY = Math.max(maxY, node.y + r + LABEL_GAP + LABEL_H);
+            }
+            const bboxW = Math.max(1, maxX - minX + fitPad * 2);
+            const bboxH = Math.max(1, maxY - minY + fitPad * 2);
+            const nextZoom = Math.min(1, viewW / bboxW, viewH / bboxH);
+            setZoom(nextZoom);
+            setOffset({ x: fitPad - minX * nextZoom, y: fitPad - minY * nextZoom });
             laidOutRef.current = true;
           } else {
             const centroids = /* @__PURE__ */ new Map();

package/package.json

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