@taylorwong/ichartjs 2.0.18 → 2.0.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/README.md +2 -2
- package/docs/agent/charting-scenario.md +2 -0
- package/docs/agent/coding-agent-integration.md +1 -1
- package/docs/agent/development/2.0-release-readiness.md +1 -1
- package/docs/agent/development/iteration-15.md +48 -0
- package/docs/agent/development/roadmap.md +2 -1
- package/docs/agent/diagram-scenario.md +3 -1
- package/docs/agent/frontend-integration.md +1 -1
- package/docs/agent/usage-scenarios.md +1 -1
- package/docs/agent/zh-CN/charting-scenario.md +2 -0
- package/docs/agent/zh-CN/coding-agent-integration.md +1 -1
- package/docs/agent/zh-CN/diagram-scenario.md +3 -1
- package/docs/agent/zh-CN/frontend-integration.md +1 -1
- package/docs/agent/zh-CN/usage-scenarios.md +1 -1
- package/docs/manifests/capabilities.json +2 -2
- package/package.json +1 -1
- package/skills/ichartjs/SKILL.md +3 -2
- package/src/charts.mjs +17 -5
- package/src/index.mjs +1 -1
- package/src/layout.mjs +68 -0
- package/src/project.mjs +99 -10
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2.0.19 - 2026-09-29
|
|
4
|
+
|
|
5
|
+
- Added Iteration 15 adaptive text fitting for Flow, Architecture, Mindmap, and Swimlane nodes, with inline-first edge labels, diagram-only contrast plates, unified diagnostics, and shared SVG/Canvas behavior.
|
|
6
|
+
- Improved diagram readability with vertically centered node labels, bounded compact labels, centered Swimlane nodes, safer edge-label placement, and enlarged-preview re-rendering.
|
|
7
|
+
- Added sector-aware Pie/Donut labels and radius-aware Gauge metrics, including bounded font reduction, explicit `POLAR_LABEL_OVERFLOW` diagnostics, and machine-readable polar layout state.
|
|
8
|
+
|
|
3
9
|
## 2.0.18 - 2026-09-28
|
|
4
10
|
|
|
5
11
|
- Added lightweight Flow semantics for start/end, process, decision, input/output, and connector nodes, including explicit decision branches and loop edges with shared SVG/Canvas geometry.
|
package/README.md
CHANGED
|
@@ -44,7 +44,7 @@ getCapabilities
|
|
|
44
44
|
npm install @taylorwong/ichartjs@^2
|
|
45
45
|
```
|
|
46
46
|
|
|
47
|
-
As a fallback for environments without npm access, install directly from GitHub: `npm install github:wanghetommy/ichartjs#v2.0.
|
|
47
|
+
As a fallback for environments without npm access, install directly from GitHub: `npm install github:wanghetommy/ichartjs#v2.0.19`.
|
|
48
48
|
|
|
49
49
|
### Optional Agent Skill
|
|
50
50
|
|
|
@@ -66,7 +66,7 @@ For a non-interactive global Codex installation:
|
|
|
66
66
|
npx skills add wanghetommy/ichartjs --skill ichartjs --agent codex --global --yes
|
|
67
67
|
```
|
|
68
68
|
|
|
69
|
-
For a release-pinned installation, use `npx skills add https://github.com/wanghetommy/ichartjs/tree/v2.0.
|
|
69
|
+
For a release-pinned installation, use `npx skills add https://github.com/wanghetommy/ichartjs/tree/v2.0.19/skills/ichartjs --agent codex --global --yes`. WorkBuddy users can import the same tagged `skills/ichartjs` URL through the host's Skill interface; do not assume a `--agent workbuddy` adapter unless the installed CLI declares it. Package consumers can still copy `node_modules/@taylorwong/ichartjs/skills/ichartjs` as a manual fallback. After installation, invoke `$ichartjs` when named Skill invocation is supported, or select `ichartjs` in the host UI.
|
|
70
70
|
|
|
71
71
|
### Agent workflow
|
|
72
72
|
|
|
@@ -28,6 +28,8 @@ Agent usage and development guide for generic data analysis and metric visualiza
|
|
|
28
28
|
|
|
29
29
|
- Use `stack: "stacked"` or `stack: "percent"` with Bar, Column, or Area rather than a separate stacked type.
|
|
30
30
|
- Use `type: "pie"` with `innerRadius` for Donut charts.
|
|
31
|
+
- Pie and Donut labels are positioned on each sector centerline and scale down before allowing overflow on very small sectors. Check `getState().layout.labels.polar` and the `POLAR_LABEL_OVERFLOW` warning when labels are required to be fully readable.
|
|
32
|
+
- Gauge keeps its primary value inside the gauge body and adapts its metric font to the available radius; it does not create per-segment labels.
|
|
31
33
|
- Use per-series `mark: "column"` or `mark: "line"` and optional `axis: "right"` for Combo charts.
|
|
32
34
|
- Use `transform: { type: "bin", field, thresholds | step, extent }` for Histogram workflows.
|
|
33
35
|
- Heatmap treats missing values separately from numeric zero through `colorScale.missing`.
|
|
@@ -33,7 +33,7 @@ Install the official Skill with the standard Agent Skills CLI:
|
|
|
33
33
|
npx skills add wanghetommy/ichartjs --skill ichartjs
|
|
34
34
|
```
|
|
35
35
|
|
|
36
|
-
For global non-interactive Codex setup, append `--agent codex --global --yes`. To pin the released workflow, install `https://github.com/wanghetommy/ichartjs/tree/v2.0.
|
|
36
|
+
For global non-interactive Codex setup, append `--agent codex --global --yes`. To pin the released workflow, install `https://github.com/wanghetommy/ichartjs/tree/v2.0.19/skills/ichartjs`. WorkBuddy can import that tagged directory through its Skill interface; only use a host-specific `--agent` value when the installed CLI declares it.
|
|
37
37
|
|
|
38
38
|
Verify discovery with `npx skills add wanghetommy/ichartjs --list`; the result should include `ichartjs`.
|
|
39
39
|
|
|
@@ -40,7 +40,7 @@ iChart.js 2.0 is a new Agent-first product line. Compatibility with 1.x and a 1.
|
|
|
40
40
|
|
|
41
41
|
## Iteration 13 Addendum — 2026-09-23
|
|
42
42
|
|
|
43
|
-
The historical 2.0.0 release decision remains unchanged. Release `v2.0.
|
|
43
|
+
The historical 2.0.0 release decision remains unchanged. Release `v2.0.19` includes Iteration 13 contract hardening, Iteration 14 lightweight Flow semantics, and Iteration 15 text-readability hardening without adding a chart type: 18 chart profiles, 25 commands, 11 schemas, contract version `1.1`, atomic mutation validation, Mindmap edge discovery, strict TypeScript consumer compilation, no active source cycles, Node tests, Chromium browser acceptance, package dry-run verification, the 13F axis-free layout strategy, Timeline/Milestone layout hardening, renderer-parity Flow semantic shapes, adaptive diagram labels, diagram-only edge-label plates, and polar label layout diagnostics for Pie, Donut, and Gauge.
|
|
44
44
|
|
|
45
45
|
## Deferred npm Publication
|
|
46
46
|
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
# Iteration 15 — Text Readability Hardening
|
|
2
|
+
|
|
3
|
+
Iteration 15 improves text readability without adding a new chart type or a new runtime dependency. The policy is semantic: node labels stay inside nodes, while edge labels remain inline when there is enough space and move only when they collide.
|
|
4
|
+
|
|
5
|
+
## 15A — Adaptive node labels
|
|
6
|
+
|
|
7
|
+
Flow, Architecture, Mindmap, and Swimlane node labels use one shared layout policy:
|
|
8
|
+
|
|
9
|
+
1. Keep the configured theme size when a single line fits.
|
|
10
|
+
2. Wrap to at most two lines when the node can support it.
|
|
11
|
+
3. Reduce the font size to a bounded minimum of `10px`.
|
|
12
|
+
4. Truncate only the final visible line when the label still cannot fit.
|
|
13
|
+
5. Suppress labels in physically tiny nodes such as compact connectors.
|
|
14
|
+
|
|
15
|
+
The raw label remains available through node data, tooltips, accessibility output, and the Agent state. Nodes use shape-specific inner padding so labels do not touch decision or I/O edges.
|
|
16
|
+
|
|
17
|
+
## 15B — Semantic edge-label placement
|
|
18
|
+
|
|
19
|
+
Edge labels use this priority:
|
|
20
|
+
|
|
21
|
+
1. Place the label inline near the edge midpoint.
|
|
22
|
+
2. Add a small background plate when the edge passes behind the label.
|
|
23
|
+
3. Move the label to one side when it collides with a node or another label.
|
|
24
|
+
4. Suppress only non-core labels when no readable placement exists.
|
|
25
|
+
|
|
26
|
+
Node labels never move onto edges. Edge routing remains responsible for stopping at node boundaries. The same scene graph is used by SVG and Canvas.
|
|
27
|
+
|
|
28
|
+
Radar indicator labels use collision-aware placement without background plates. Background plates are reserved for diagram edge labels in Flow, Architecture, Mindmap, and Swimlane; ordinary chart labels retain direct, contrast-aware rendering.
|
|
29
|
+
|
|
30
|
+
## 15C — Unified label diagnostics
|
|
31
|
+
|
|
32
|
+
`Chart#getState().layout.labels` exposes family-specific label results, including visible, wrapped, scaled, truncated, suppressed, collision, edge-inline, edge-offset, and backgrounded counts where applicable.
|
|
33
|
+
|
|
34
|
+
Warnings are emitted for information loss or suppression, including `LABEL_TRUNCATED` and `LABELS_SUPPRESSED`. Agent workflows should inspect `getState()` or `explain()` before assuming that a visible chart contains every original label.
|
|
35
|
+
|
|
36
|
+
## 15D — Documentation and acceptance
|
|
37
|
+
|
|
38
|
+
- Shared measurement and fitting helpers live in `src/layout.mjs`.
|
|
39
|
+
- Diagram behavior is implemented in `src/project.mjs`.
|
|
40
|
+
- Generic mark and Radar labels use plate-free collision-aware placement in `src/charts.mjs`.
|
|
41
|
+
- SVG and Canvas use the same scene nodes and label geometry.
|
|
42
|
+
- Acceptance covers CJK and Latin labels, compact nodes, inline edge labels, plate-free Pie/line/Radar labels, and Architecture/Mindmap/Swimlane parity.
|
|
43
|
+
|
|
44
|
+
Preview pages:
|
|
45
|
+
|
|
46
|
+
- `playground/project-gallery.html?case=flow`
|
|
47
|
+
- `playground/project-gallery.html?case=architecture`
|
|
48
|
+
- `playground/project-gallery.html?case=radar`
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# iChart.js 2.0 Roadmap
|
|
2
2
|
|
|
3
|
-
> Roadmap baseline: 2026-09-14. Current release status: `v2.0.
|
|
3
|
+
> Roadmap baseline: 2026-09-14. Current release status: `v2.0.19` includes the completed Iteration 12 structured-diagram work, Iteration 13 contract hardening, Iteration 14 lightweight Flow semantics, Iteration 15 text-readability hardening, sector-aware Pie/Donut labels, radius-aware Gauge metrics, and the preceding layout and diagnostic improvements. Geographic charts and 3D rendering remain out of scope until explicitly reintroduced.
|
|
4
4
|
|
|
5
5
|
## Current Status
|
|
6
6
|
|
|
@@ -17,6 +17,7 @@
|
|
|
17
17
|
- Iteration 12A–12G is included in `v2.0.7`: shared structured-diagram contracts, Architecture layers/boundaries, Mindmap parent-child tree/radial layouts with true cubic-Bezier edges, Agent schemas/capabilities, renderer-parity edge hit testing and selection, waypoint/segment handles, persistent manual routing, and Gallery/documentation coverage. Navigation and editing remain disabled by default and require explicit host activation.
|
|
18
18
|
- Iteration 13A–13F is complete and included in `v2.0.18`: canonical contract registry and generated capability projection, atomic Spec/data/style mutations, row-complete project validation, explicit Mindmap edge metadata, complete public TypeScript declarations and consumer fixture, module-cycle and documentation/example gates, browser acceptance, package dry-run evidence, an axis-free layout strategy for Pie, Funnel, Gauge, and Radar, Timeline/Milestone layout hardening, and runtime diagnostics for constrained Funnel labels and Swimlane label aliases. No chart type was added.
|
|
19
19
|
- Iteration 14A–14D is complete and included in `v2.0.18`: lightweight Flow semantics for start/end, process, decision, input/output, and connector nodes, explicit decision branches and loops, shared SVG/Canvas geometry, capability discovery, validation, and Gallery coverage. No new chart type was added.
|
|
20
|
+
- Iteration 15A–15D is complete and included in `v2.0.19`: adaptive diagram node labels, semantic inline-first edge labels, diagram edge-label background plates, plate-free generic chart labels, shared SVG/Canvas fitting, unified label diagnostics, Agent/diagram documentation, and polar label layout hardening for Pie, Donut, and Gauge.
|
|
20
21
|
- The original `2.0.0` readiness record is historical and superseded by the published `2.0.x` releases. Current release checks are defined by `docs/agent/development/release-sop.md`.
|
|
21
22
|
|
|
22
23
|
## Iteration 4 — Agent Data Contract and Business Editing
|
|
@@ -45,7 +45,7 @@ For a mindmap, prefer the compact parent contract:
|
|
|
45
45
|
|
|
46
46
|
### Lightweight Flow Semantics
|
|
47
47
|
|
|
48
|
-
`flow` supports a small, unambiguous set of semantic node kinds.
|
|
48
|
+
`flow` supports a small, unambiguous set of semantic node kinds. Nodes without `kind` use `process` as a convenience default; non-process semantics should be explicit.
|
|
49
49
|
|
|
50
50
|
```js
|
|
51
51
|
{
|
|
@@ -71,6 +71,8 @@ For a mindmap, prefer the compact parent contract:
|
|
|
71
71
|
|
|
72
72
|
Supported kinds are `start`, `end`, `process`, `decision`, `io`, and `connector`. A decision should have at least two outgoing labeled edges. Loops are ordinary explicit `from`/`to` edges and are allowed. Connectors are circular hand-off points; they do not use implicit matching, so every connection remains visible in `edges`.
|
|
73
73
|
|
|
74
|
+
Node labels are centered on the node and use adaptive fitting: they wrap to at most two lines, reduce to a bounded minimum font size, and truncate only as a last resort. Compact nodes such as small connectors suppress their internal label rather than rendering unreadable text; the full label remains in the node data and accessibility surface. Edge labels stay inline when space permits, use a high-opacity background plate when the line would reduce contrast, and move aside only when they collide with nodes or other labels. `getState().layout.labels` and `explain().warnings` expose any wrapping, scaling, truncation, or suppression.
|
|
75
|
+
|
|
74
76
|
## Current Capabilities
|
|
75
77
|
|
|
76
78
|
Supported:
|
|
@@ -10,7 +10,7 @@ This is the production component path. For one-off files or Agent-led repository
|
|
|
10
10
|
npm install @taylorwong/ichartjs@^2
|
|
11
11
|
```
|
|
12
12
|
|
|
13
|
-
For environments without npm registry access, install from GitHub as a fallback: `npm install github:wanghetommy/ichartjs#v2.0.
|
|
13
|
+
For environments without npm registry access, install from GitHub as a fallback: `npm install github:wanghetommy/ichartjs#v2.0.19`.
|
|
14
14
|
|
|
15
15
|
Use the package through a bundler or another environment that resolves npm ESM imports:
|
|
16
16
|
|
|
@@ -121,7 +121,7 @@ npx skills add wanghetommy/ichartjs --skill ichartjs --agent codex --global --ye
|
|
|
121
121
|
For reproducible installation, pin the released Skill directory:
|
|
122
122
|
|
|
123
123
|
```bash
|
|
124
|
-
npx skills add https://github.com/wanghetommy/ichartjs/tree/v2.0.
|
|
124
|
+
npx skills add https://github.com/wanghetommy/ichartjs/tree/v2.0.19/skills/ichartjs \
|
|
125
125
|
--agent codex --global --yes
|
|
126
126
|
```
|
|
127
127
|
|
|
@@ -28,6 +28,8 @@
|
|
|
28
28
|
|
|
29
29
|
- Bar、Column、Area 使用 `stack: "stacked"` 或 `stack: "percent"`,不新增堆叠类型。
|
|
30
30
|
- Donut 使用 `type: "pie"` 配合 `innerRadius`。
|
|
31
|
+
- Pie 和 Donut 标签会沿扇区中线布局,并在扇区过小时先缩小字号,再允许自然溢出。需要检查完整可读性时,读取 `getState().layout.labels.polar` 和 `POLAR_LABEL_OVERFLOW` 告警。
|
|
32
|
+
- Gauge 的主数值会保持在仪表主体内,并根据半径自适应字号;Gauge 不生成每个分段的标签。
|
|
31
33
|
- Combo 使用每个系列的 `mark: "column"` 或 `mark: "line"`,并可设置 `axis: "right"`。
|
|
32
34
|
- Histogram 使用 `transform: { type: "bin", field, thresholds | step, extent }`。
|
|
33
35
|
- Heatmap 通过 `colorScale.missing` 区分缺失值和数值零。
|
|
@@ -22,7 +22,7 @@ npm Registry 中无作用域的 `ichartjs` 是安全占位包,并非本项目
|
|
|
22
22
|
npx skills add wanghetommy/ichartjs --skill ichartjs
|
|
23
23
|
```
|
|
24
24
|
|
|
25
|
-
Codex 全局无交互安装可追加 `--agent codex --global --yes`。需要固定发布版本时,安装 `https://github.com/wanghetommy/ichartjs/tree/v2.0.
|
|
25
|
+
Codex 全局无交互安装可追加 `--agent codex --global --yes`。需要固定发布版本时,安装 `https://github.com/wanghetommy/ichartjs/tree/v2.0.19/skills/ichartjs`。WorkBuddy 可通过自身 Skill 界面导入该带 Tag 的目录;只有当前 CLI 明确声明对应适配器时才使用宿主专用 `--agent` 参数。
|
|
26
26
|
|
|
27
27
|
使用 `npx skills add wanghetommy/ichartjs --list` 验证发现结果,其中应包含 `ichartjs`。
|
|
28
28
|
|
|
@@ -44,7 +44,7 @@ Architecture 的 `layers` 是从上到下排列的水平分层。同层自动布
|
|
|
44
44
|
|
|
45
45
|
## 轻量级流程语义
|
|
46
46
|
|
|
47
|
-
`flow` 支持一组小而明确的节点语义。没有设置 `kind`
|
|
47
|
+
`flow` 支持一组小而明确的节点语义。没有设置 `kind` 的节点默认使用 `process`,这是便捷默认值;其他语义应显式设置 `kind`。
|
|
48
48
|
|
|
49
49
|
```js
|
|
50
50
|
{
|
|
@@ -70,6 +70,8 @@ Architecture 的 `layers` 是从上到下排列的水平分层。同层自动布
|
|
|
70
70
|
|
|
71
71
|
支持的 `kind` 为 `start`、`end`、`process`、`decision`、`io` 和 `connector`。判断节点建议至少有两条带标签的出边;循环就是普通的显式 `from` / `to` 回边。Connector 是圆形的断开连接点,不使用隐式同名匹配,所有连接都必须明确写在 `edges` 中。
|
|
72
72
|
|
|
73
|
+
节点文字默认在节点内居中,并按自适应规则处理:优先保持字号,必要时最多换成两行,再缩小到有限的最小字号,最后才截断。尺寸过小的节点(例如小型 Connector)会隐藏内部文字,避免显示不全;完整文字仍保留在节点数据和无障碍语义中。连线文字在空间足够时优先贴近连线显示;线条影响对比度时使用高不透明度背景底板,只有与节点或其他文字冲突时才移到连线旁边。`getState().layout.labels` 和 `explain().warnings` 会暴露换行、缩放、截断和隐藏结果。
|
|
74
|
+
|
|
73
75
|
## 当前能力
|
|
74
76
|
|
|
75
77
|
已支持节点、边、泳道、Group、Port、Flow 语义图形、四种布局、三种路由、Mindmap 三次贝塞尔曲线、节点拖动、多选、对齐、网格吸附、键盘移动、Copy/Paste、Group 折叠展开、Port 键盘连线、边选择、折点/正交线段手柄、持久化 `waypoints`、边删除和 Undo/Redo。
|
|
@@ -6,7 +6,7 @@ iChart.js 应作为普通 JavaScript UI 组件运行在浏览器应用中。数
|
|
|
6
6
|
npm install @taylorwong/ichartjs@^2
|
|
7
7
|
```
|
|
8
8
|
|
|
9
|
-
无法访问 npm Registry 的环境请用 GitHub 源作为后备:`npm install github:wanghetommy/ichartjs#v2.0.
|
|
9
|
+
无法访问 npm Registry 的环境请用 GitHub 源作为后备:`npm install github:wanghetommy/ichartjs#v2.0.19`。
|
|
10
10
|
|
|
11
11
|
```js
|
|
12
12
|
import { createChart } from '@taylorwong/ichartjs';
|
|
@@ -116,7 +116,7 @@ npx skills add wanghetommy/ichartjs --skill ichartjs --agent codex --global --ye
|
|
|
116
116
|
需要固定发布版本时,直接安装已发布的 Skill 目录:
|
|
117
117
|
|
|
118
118
|
```bash
|
|
119
|
-
npx skills add https://github.com/wanghetommy/ichartjs/tree/v2.0.
|
|
119
|
+
npx skills add https://github.com/wanghetommy/ichartjs/tree/v2.0.19/skills/ichartjs \
|
|
120
120
|
--agent codex --global --yes
|
|
121
121
|
```
|
|
122
122
|
|
|
@@ -282,8 +282,8 @@
|
|
|
282
282
|
"Short form `branding: false` and object form `branding: { enabled: false }` are both supported. Custom text, link, position, or font are intentionally NOT exposed in the current iteration."
|
|
283
283
|
]
|
|
284
284
|
},
|
|
285
|
-
"packageVersion": "2.0.
|
|
286
|
-
"runtimeVersion": "2.0.
|
|
285
|
+
"packageVersion": "2.0.19",
|
|
286
|
+
"runtimeVersion": "2.0.19",
|
|
287
287
|
"chartTypes": [
|
|
288
288
|
"line",
|
|
289
289
|
"area",
|
package/package.json
CHANGED
package/skills/ichartjs/SKILL.md
CHANGED
|
@@ -21,7 +21,7 @@ Recommended installation:
|
|
|
21
21
|
npx skills add wanghetommy/ichartjs --skill ichartjs
|
|
22
22
|
```
|
|
23
23
|
|
|
24
|
-
Use `--agent codex --global --yes` for global non-interactive Codex installation. Use the tagged directory `https://github.com/wanghetommy/ichartjs/tree/v2.0.
|
|
24
|
+
Use `--agent codex --global --yes` for global non-interactive Codex installation. Use the tagged directory `https://github.com/wanghetommy/ichartjs/tree/v2.0.19/skills/ichartjs` when reproducibility matters. WorkBuddy can import the same directory through its Skill interface; do not assume a `--agent workbuddy` adapter unless the installed CLI declares it.
|
|
25
25
|
|
|
26
26
|
The Skill is a workflow adapter, not the chart runtime. If the current JavaScript or TypeScript project does not already depend on iChart.js, install the matching runtime from npm:
|
|
27
27
|
|
|
@@ -42,7 +42,7 @@ Do not install the unscoped npm registry package named `ichartjs`; it is current
|
|
|
42
42
|
7. Build a JSON-serializable Spec using `suggestedEncodings`, the selected capability, and an applicable recipe.
|
|
43
43
|
8. Use chart-specific channels: Cartesian `x`/`y`, Pie/Funnel `category`/`value`, Gauge `value`, Heatmap `x`/`y`/`color`, and Radar `indicators[].field`. Funnel stage text comes from `encoding.category` (default `name`) and `labels.enabled` additionally renders values; narrow stages may report `FUNNEL_LABEL_TRUNCATED`, so increase width or shorten the stage name. For Flow, use top-level `nodes` and `edges`, `nodes[].kind` from `getCapabilities().diagram.flowNodeKinds`, and edge `label` for decision branches. `connector` uses explicit `from`/`to` edges and loops are allowed. To load a recipe, use `import catalog from '@taylorwong/ichartjs/recipes/minimal-specs' with { type: 'json' }` and select `catalog.examples[type]`; `recipes/` is the public export path backed by the package's `agent-recipes/` directory.
|
|
44
44
|
9. Keep titles/formats under `xAxis`/`yAxis`, labels under `labels`, and legend under `legend`; do not place them inside `encoding`.
|
|
45
|
-
10. Call `validateSpec()` before rendering and repair its preflight errors, warnings, and normalizations. After `createChart()`, inspect `chart.getState()` or `chart.explain()` for render-time diagnostics such as `FUNNEL_LABEL_TRUNCATED`, `VALUE_CLAMPED`, `LABELS_SUPPRESSED`, `NEGATIVE_VALUE_DROPPED`, and `ZERO_TOTAL`; do not assume every layout warning is available during preflight.
|
|
45
|
+
10. Call `validateSpec()` before rendering and repair its preflight errors, warnings, and normalizations. After `createChart()`, inspect `chart.getState()` or `chart.explain()` for render-time diagnostics such as `FUNNEL_LABEL_TRUNCATED`, `VALUE_CLAMPED`, `LABELS_SUPPRESSED`, `LABEL_TRUNCATED`, `NEGATIVE_VALUE_DROPPED`, and `ZERO_TOTAL`; also inspect `getState().layout.labels` for wrapped, scaled, inline-edge, offset-edge, and diagram edge-label background counts. Ordinary chart labels do not use background plates. Do not assume every layout warning is available during preflight.
|
|
46
46
|
11. Call `createChart()` only after validation succeeds. Gauge Specs must declare a meaningful `domain`.
|
|
47
47
|
12. Self-check with `chart.explain()`, `chart.getState()`, `health.renderable`, and JSON export. Treat `VALUE_CLAMPED`, `LABELS_SUPPRESSED`, `NEGATIVE_VALUE_DROPPED`, `FUNNEL_LABEL_TRUNCATED`, and `ZERO_TOTAL` as material diagnostics to report.
|
|
48
48
|
13. Provide an exact preview URL or artifact path and report assumptions, warnings, and deferred checks.
|
|
@@ -64,6 +64,7 @@ Route by requested output:
|
|
|
64
64
|
- For standard data analysis, read `references/chart-selection.md` and use foundational recipes.
|
|
65
65
|
- For Gantt, Timeline, Milestone, Burndown, capacity, release, risk, or aging, use project capabilities and `agent-recipes/project-management.json`.
|
|
66
66
|
- For Flow or Swimlane, preserve node, edge, lane, group, and port IDs; use diagram recipes and validated edit commands.
|
|
67
|
+
- For diagram readability, keep node labels inside their shapes; edge labels stay inline when space permits and move aside only after a collision. Use `getState().layout.labels.diagram` to detect wrapping, scaling, truncation, suppression, and edge-label offsets instead of shortening source labels in the Agent.
|
|
67
68
|
- For business edits, preview first, preserve the preview ID and revision, require confirmation when declared, then commit or reject atomically.
|
|
68
69
|
- For browser deliverables, start `npm run playground` and return the exact maintained Playground URL.
|
|
69
70
|
- Release workflow (npm publish + develop→master merge) is **AUTHOR ONLY**. Read the [release SOP](https://github.com/wanghetommy/ichartjs/blob/master/docs/agent/development/release-sop.md). Never initiate any release step unless the author explicitly instructs.
|
package/src/charts.mjs
CHANGED
|
@@ -8,10 +8,11 @@ import { applyTransforms } from './transforms.mjs';
|
|
|
8
8
|
import { buildProjectScene } from './project.mjs';
|
|
9
9
|
import { formatValue } from './format.mjs';
|
|
10
10
|
import { contrastRatio, resolveTheme } from './theme.mjs';
|
|
11
|
-
import { axisLabelLayout, boxesOverlap, estimateTextWidth, fontSize, titleLayout, truncateText } from './layout.mjs';
|
|
11
|
+
import { axisLabelLayout, boxesOverlap, estimateTextWidth, fontSize, polarLabelLayout, titleLayout, truncateText } from './layout.mjs';
|
|
12
12
|
|
|
13
13
|
const pick = (row, encoding, fallback) => row?.[encoding?.field || fallback];
|
|
14
14
|
const font = (spec, role, fallback = '12px system-ui') => spec.theme?.typography?.[role]?.font || fallback;
|
|
15
|
+
function fontAtSize(value, size) { const raw = String(value || '12px system-ui'); return /\d+(?:\.\d+)?px/i.test(raw) ? raw.replace(/\d+(?:\.\d+)?px/i, `${size}px`) : `${size}px ${raw}`; }
|
|
15
16
|
const niceMantissas = [1, 1.2, 1.5, 1.8, 2, 2.5, 3, 4, 5, 6, 7.5, 8, 10];
|
|
16
17
|
|
|
17
18
|
function nearestNiceMantissa(value) {
|
|
@@ -192,7 +193,7 @@ function layout(spec, data, legendEntries = [], layoutOptions = {}) {
|
|
|
192
193
|
return { plot, chrome, layoutFamily: axisFree ? spec.type : 'cartesian', xLabels, axisTitles, axisTitleWarnings, axisLayout: { size: axisSize, leftLabelWidth, rightLabelWidth }, compact: width < 360 || height < 240, recommendedSize: { minWidth: 280, minHeight: 220 }, xField, xEncoding, temporal, quantitativeX, xMin, xMax, yField, yEncodings, categories, rawMin, rawMax, min, max, rawRightMin, rawRightMax, rightMin, rightMax, yTicks, rightTicks, axes: { y: axisInfo([rawMin, rawMax], [min, max], yTicks, spec.yAxis || {}), right: axisInfo([rawRightMin, rawRightMax], [rightMin, rightMax], rightTicks, spec.yAxis?.right || {}) }, x, y, yRight, axisType, rightType };
|
|
193
194
|
}
|
|
194
195
|
|
|
195
|
-
function addText(scene, id, text, x, y, style = {}, dataRef = null) { scene.add(new SceneNode({ id, type: 'text', geometry: { text: String(text), x, y }, style, dataRef })); }
|
|
196
|
+
function addText(scene, id, text, x, y, style = {}, dataRef = null) { scene.add(new SceneNode({ id, type: 'text', geometry: { text: String(text), x, y }, style, dataRef, zIndex: 4 })); }
|
|
196
197
|
|
|
197
198
|
function addAxes(scene, spec, state) {
|
|
198
199
|
const { plot, categories, min, max, x, y, yRight } = state;
|
|
@@ -248,6 +249,7 @@ function readableLabelColor(spec, background) {
|
|
|
248
249
|
|
|
249
250
|
function addMarkLabel(scene, spec, id, value, x, y, dataRef, bounds = null, anchor = null, formatOverride = null, labelBackground = null) {
|
|
250
251
|
if (!spec.labels?.enabled) return;
|
|
252
|
+
const labelState = scene._labelLayout || (scene._labelLayout = { visible: 0, wrapped: 0, scaled: 0, truncated: 0, suppressed: 0, collisions: 0, backgrounded: 0 });
|
|
251
253
|
const text = formatValue(value, formatOverride || spec.labels.format, spec.locale), size = fontSize(spec, 'label', 12), width = estimateTextWidth(text, size), height = size * 1.25;
|
|
252
254
|
const baseArea = bounds || scene._labelArea || { x: 0, y: 0, width: spec.width, height: spec.height };
|
|
253
255
|
const area = spec.type === 'column' && !anchor ? { ...baseArea, y: baseArea.y - height - 4, height: baseArea.height + height + 4 } : baseArea;
|
|
@@ -262,8 +264,9 @@ function addMarkLabel(scene, spec, id, value, x, y, dataRef, bounds = null, anch
|
|
|
262
264
|
const shifts = anchor ? [preferred, alternate, preferred - height - 3, alternate + height + 3] : [safeY, safeY - height - 3, safeY + height + 3, safeY - 2 * (height + 3), safeY + 2 * (height + 3)];
|
|
263
265
|
const occupied = scene._labelBoxes || (scene._labelBoxes = []);
|
|
264
266
|
const placement = shifts.map(candidateY => Math.max(area.y + height / 2, Math.min(area.y + area.height - height / 2, candidateY))).map(candidateY => ({ x: safeX, y: candidateY, box: { x: safeX - width / 2, y: candidateY - height / 2, width, height } })).find(candidate => !occupied.some(box => boxesOverlap(candidate.box, box, 2)) && (!anchorBox || !boxesOverlap(candidate.box, anchorBox, 0)));
|
|
265
|
-
if (!placement) return;
|
|
267
|
+
if (!placement) { labelState.suppressed += 1; labelState.collisions += 1; return; }
|
|
266
268
|
occupied.push(placement.box);
|
|
269
|
+
labelState.visible += 1;
|
|
267
270
|
addText(scene, `${id}-label`, text, placement.x, placement.y, { fill: labelBackground || markBackground ? readableLabelColor(spec, labelBackground || markBackground) : spec.labels.color || spec.theme.text, font: spec.labels.font || font(spec, 'label'), textAnchor: 'middle', textBaseline: 'middle', baseline: 'middle' }, dataRef);
|
|
268
271
|
}
|
|
269
272
|
|
|
@@ -400,6 +403,7 @@ export function buildScene(spec) {
|
|
|
400
403
|
data.viewOffset = start;
|
|
401
404
|
}
|
|
402
405
|
const scene = new Scene(spec.width, spec.height);
|
|
406
|
+
scene._labelLayout = { visible: 0, wrapped: 0, scaled: 0, truncated: 0, suppressed: 0, collisions: 0, backgrounded: 0 };
|
|
403
407
|
const colors = spec.colors;
|
|
404
408
|
const series = Array.isArray(spec.encoding.y) ? spec.encoding.y : [{ ...spec.encoding.y, name: spec.encoding.y?.name || spec.encoding.y?.field }];
|
|
405
409
|
const entries = legendEntries(spec, data, series, colors);
|
|
@@ -425,9 +429,12 @@ export function buildScene(spec) {
|
|
|
425
429
|
data.rows.forEach((row, index) => { const xValue = Number(row[state.xField]), yValue = Number(row[state.yField]); if (!Number.isFinite(xValue) || !Number.isFinite(yValue)) return; const geometry = { cx: state.x(xValue), cy: state.y(yValue), r: 5 }, dataRef = { seriesIndex: 0, dataIndex: index, field: state.yField }; scene.add(new SceneNode({ id: `series-0-item-${index}`, type: 'circle', geometry, bounds: { x: geometry.cx - 8, y: geometry.cy - 8, width: 16, height: 16 }, style: { fill: colors[0] }, dataRef, interactive: true })); addMarkLabel(scene, spec, `series-0-item-${index}`, yValue, geometry.cx, geometry.cy - 8, dataRef, state.plot, { x: geometry.cx, y: geometry.cy, radius: 5 }); });
|
|
426
430
|
} else if (spec.type === 'pie') {
|
|
427
431
|
const categoryField = spec.encoding.category?.field || 'name', valueField = spec.encoding.value?.field || 'value', values = data.rows.map(row => Number(row[valueField])), total = values.reduce((sum, value) => sum + (Number.isFinite(value) && value > 0 ? value : 0), 0), negativeCount = values.filter(value => Number.isFinite(value) && value < 0).length, cx = state.plot.x + state.plot.width / 2, cy = state.plot.y + state.plot.height / 2, radius = Math.min(state.plot.width, state.plot.height) * 0.46, innerR = radius * Number(spec.innerRadius || 0); let angle = -Math.PI / 2;
|
|
432
|
+
const polarLabels = { visible: 0, scaled: 0, overflowed: 0, suppressed: 0 };
|
|
428
433
|
if (negativeCount) data.warnings.push({ code: 'NEGATIVE_VALUE_DROPPED', path: 'encoding.value', count: negativeCount, message: `Pie ignores ${negativeCount} negative value${negativeCount === 1 ? '' : 's'} when calculating shares.`, suggestion: 'Use non-negative part-to-whole values or choose a Cartesian chart for signed measures.' });
|
|
429
434
|
if (!(total > 0)) { data.warnings.push({ code: 'ZERO_TOTAL', path: 'encoding.value', message: 'Pie requires a positive total.', suggestion: 'Provide at least one positive value or render an explicit empty state.' }); addText(scene, 'pie-zero-total', spec.emptyText || 'No positive values', cx, cy, { fill: spec.theme.muted, font: font(spec, 'subtitle'), textAnchor: 'middle' }); }
|
|
430
|
-
else data.rows.forEach((row, index) => { const rawValue = values[index], value = Number.isFinite(rawValue) ? Math.max(0, rawValue) : 0, end = angle + value / total * Math.PI * 2,
|
|
435
|
+
else data.rows.forEach((row, index) => { const rawValue = values[index], value = Number.isFinite(rawValue) ? Math.max(0, rawValue) : 0, end = angle + value / total * Math.PI * 2, fill = colors[index % colors.length], dataRef = { seriesIndex: 0, dataIndex: index, category: row[categoryField], value, rawValue }; scene.add(new SceneNode({ id: `series-0-item-${index}`, type: 'arc', geometry: { cx, cy, r: radius, innerR, start: angle, end }, bounds: { x: cx - radius, y: cy - radius, width: radius * 2, height: radius * 2 }, style: { fill, stroke: spec.theme.background, strokeWidth: 1 }, dataRef, interactive: true })); if (spec.labels?.enabled) { const label = formatValue(value / total, spec.labels.format || { style: 'percent' }, spec.locale), placement = polarLabelLayout(label, { cx, cy, outerRadius: radius, innerRadius: innerR, startAngle: angle, endAngle: end, size: fontSize(spec, 'label', 12), minSize: 10, padding: 4 }); addText(scene, `series-0-item-${index}-label`, label, placement.x, placement.y, { fill: readableLabelColor(spec, fill), font: fontAtSize(spec.labels.font || font(spec, 'label'), placement.size), textAnchor: 'middle', textBaseline: 'middle', baseline: 'middle' }, dataRef); polarLabels.visible += 1; if (placement.scaled) polarLabels.scaled += 1; if (placement.overflowed) polarLabels.overflowed += 1; } angle = end; });
|
|
436
|
+
state.labelLayout = { ...(state.labelLayout || {}), polar: polarLabels };
|
|
437
|
+
if (polarLabels.overflowed) data.warnings.push({ code: 'POLAR_LABEL_OVERFLOW', path: 'labels', count: polarLabels.overflowed, message: `${polarLabels.overflowed} pie label${polarLabels.overflowed === 1 ? '' : 's'} exceeded the available sector space and may overflow its sector.`, suggestion: 'Increase chart size, reduce the number of slices, or rely on the legend for small sectors.' });
|
|
431
438
|
} else if (spec.type === 'funnel') {
|
|
432
439
|
const categoryField = spec.encoding.category?.field || 'name', valueField = spec.encoding.value?.field || 'value'; const maxValue = Math.max(...data.rows.map(row => Number(row[valueField]) || 0), 1); const segmentHeight = state.plot.height / data.rows.length;
|
|
433
440
|
data.rows.forEach((row, index) => { const value = Number(row[valueField]) || 0, category = String(row[categoryField] ?? row.name ?? row.id ?? `Stage ${index + 1}`), ratio = Math.max(0.1, value / maxValue), fill = colors[index % colors.length]; const width = state.plot.width * ratio; const geometry = { x: state.plot.x + (state.plot.width - width) / 2, y: state.plot.y + index * segmentHeight, width, height: Math.max(2, segmentHeight - 3) }, dataRef = { seriesIndex: 0, dataIndex: index, field: valueField, category, value }; scene.add(new SceneNode({ id: `series-0-item-${index}`, type: 'rect', geometry, bounds: geometry, style: { fill }, dataRef, interactive: true })); const labelSize = fontSize(spec, 'label', 12), textColor = readableLabelColor(spec, fill), availableWidth = Math.max(labelSize * 2, width - 12), label = truncateText(category, availableWidth, labelSize); if (label !== category) data.warnings.push({ code: 'FUNNEL_LABEL_TRUNCATED', path: `data.values[${index}].${categoryField}`, index, rawLabel: category, renderedLabel: label, availableWidth, message: `Funnel stage label "${category}" was truncated to "${label}" because the stage is too narrow.`, suggestion: 'Increase chart width, shorten the stage label, or use a wider stage/value distribution.' }); addText(scene, `funnel-category-${index}`, label, geometry.x + geometry.width / 2, geometry.y + geometry.height / 2 - (spec.labels?.enabled ? labelSize * 0.6 : 0), { fill: textColor, font: spec.labels?.font || font(spec, 'label'), textAnchor: 'middle', textBaseline: 'middle', baseline: 'middle' }, dataRef); if (spec.labels?.enabled) addText(scene, `funnel-value-${index}`, formatValue(value, spec.labels.format, spec.locale), geometry.x + geometry.width / 2, geometry.y + geometry.height / 2 + labelSize * 0.65, { fill: textColor, font: spec.labels?.font || font(spec, 'label'), textAnchor: 'middle', textBaseline: 'middle', baseline: 'middle' }, dataRef); });
|
|
@@ -435,9 +442,14 @@ export function buildScene(spec) {
|
|
|
435
442
|
const valueField = spec.encoding.value?.field || 'value', domain = Array.isArray(spec.domain) ? spec.domain : [0, 100], rawValue = Number(data.rows[0]?.[valueField]), numericValue = Number.isFinite(rawValue) ? rawValue : 0, value = Math.max(Number(domain[0]), Math.min(Number(domain[1]), numericValue)), ratio = (value - Number(domain[0])) / (Number(domain[1]) - Number(domain[0]) || 1), cx = state.plot.x + state.plot.width / 2, cy = state.plot.y + state.plot.height * 0.68, radius = Math.min(state.plot.width * 0.42, state.plot.height * 0.62), start = Math.PI, end = start + Math.PI * ratio;
|
|
436
443
|
if (!Array.isArray(spec.domain)) data.warnings.push({ code: 'MISSING_GAUGE_DOMAIN', path: 'domain', message: 'Gauge rendered with a compatibility fallback; provide an explicit domain to make the value meaningful.' });
|
|
437
444
|
if (numericValue < Number(domain[0]) || numericValue > Number(domain[1])) data.warnings.push({ code: 'VALUE_CLAMPED', path: `data.values[0].${valueField}`, count: 1, rawValue: numericValue, domain: [...domain], message: `Gauge value ${numericValue} is outside domain [${domain[0]}, ${domain[1]}] and was clamped for the arc.`, suggestion: 'Choose a domain that covers the value or review the source unit.' });
|
|
438
|
-
|
|
445
|
+
const label = formatValue(numericValue, spec.labels?.format || spec.encoding.value?.format || { maximumFractionDigits: 2 }, spec.locale), placement = polarLabelLayout(label, { position: 'center', cx, cy, outerRadius: radius, size: fontSize(spec, 'metric', 24), minSize: 12, maxWidth: radius * 1.25, padding: 4, offsetRatio: 0.36 });
|
|
446
|
+
scene.add(new SceneNode({ id: 'gauge-background', type: 'arc', geometry: { cx, cy, r: radius, start: Math.PI, end: Math.PI * 2 }, style: { fill: spec.theme.grid } })); scene.add(new SceneNode({ id: 'gauge-value', type: 'arc', geometry: { cx, cy, r: radius, start, end }, style: { fill: colors[0] }, dataRef: { seriesIndex: 0, dataIndex: 0, value, rawValue: numericValue }, interactive: true })); addText(scene, 'gauge-label', label, placement.x, placement.y, { fill: spec.theme.text, font: fontAtSize(font(spec, 'metric'), placement.size), textAnchor: 'middle', textBaseline: 'middle', baseline: 'middle' });
|
|
447
|
+
state.labelLayout = { ...(state.labelLayout || {}), polar: { visible: 1, scaled: placement.scaled ? 1 : 0, overflowed: placement.overflowed ? 1 : 0, suppressed: 0 } };
|
|
448
|
+
if (placement.overflowed) data.warnings.push({ code: 'POLAR_LABEL_OVERFLOW', path: 'labels', count: 1, message: 'The Gauge value label exceeds the available body width.', suggestion: 'Increase chart size or reduce the metric font size.' });
|
|
439
449
|
}
|
|
440
450
|
addLegend(scene, spec, state.chrome.legend);
|
|
451
|
+
state.labelLayout = { ...(state.labelLayout || {}), marks: scene._labelLayout };
|
|
452
|
+
if (scene._labelLayout.suppressed) data.warnings.push({ code: 'LABELS_SUPPRESSED', path: 'labels', count: scene._labelLayout.suppressed, message: `${scene._labelLayout.suppressed} data labels were suppressed because there was no collision-free placement.`, suggestion: 'Increase chart size, reduce label density, or disable labels.' });
|
|
441
453
|
addBranding(scene, spec);
|
|
442
454
|
return { scene, data, state };
|
|
443
455
|
}
|
package/src/index.mjs
CHANGED
|
@@ -771,4 +771,4 @@ export { normalizeLinkedFilters, normalizeLinkedSelection, filterProjectRows, cr
|
|
|
771
771
|
|
|
772
772
|
export { contrastRatio, planStyle, resolveTheme, styleCapabilities, themeModes, themePalettes, themePresets, validateThemeContrast, annotationPlugin, dataZoomPlugin, dataLabelsPlugin, accessibilityPlugin };
|
|
773
773
|
export { applyPreferencesToSpec, createPreferencesStore, defaultPreferences, mergePreferences, mergeThemePreference, mountChartSettings, normalizePreferences, validatePreferences };
|
|
774
|
-
export const iChart = { version: '2.0.
|
|
774
|
+
export const iChart = { version: '2.0.19', createChart, ChartValidationError, inspectData, normalizeData, binData, applyTransforms, data, getCapabilities, getChartCapability, getPreferenceCapabilities, planChart, recommend, explainChart, contrastRatio, planStyle, resolveTheme, styleCapabilities, themeModes, themePalettes, themePresets, validateThemeContrast, createPreferencesStore, defaultPreferences, normalizePreferences, mergePreferences, validatePreferences, applyPreferencesToSpec, mountChartSettings, annotationPlugin, dataZoomPlugin, dataLabelsPlugin, accessibilityPlugin, getBusinessSchema, inspectDataSchema, validateData, getEditCapabilities, validateEdit, previewEdit, commitPreview, validateRecipe, normalizeProjectCalendar, applyWorkingCalendar, normalizeDependencies, analyzeSchedule, analyzeBurndownSeries, analyzeCapacity, buildCapacityView, buildCumulativeFlowSeries, buildVelocitySeries, buildReleaseForecast, buildRiskMatrixSeries, buildIssueAgingSeries, normalizeLinkedFilters, normalizeLinkedSelection, filterProjectRows, createLinkedProjectState, linkedRecordId };
|
package/src/layout.mjs
CHANGED
|
@@ -48,6 +48,74 @@ export function truncateText(text, maxWidth, size = 12) {
|
|
|
48
48
|
return `${characters.slice(0, low).join('')}${suffix}`;
|
|
49
49
|
}
|
|
50
50
|
|
|
51
|
+
function wrapText(text, maxWidth, size) {
|
|
52
|
+
const characters = Array.from(String(text ?? ''));
|
|
53
|
+
if (!characters.length) return [''];
|
|
54
|
+
const lines = [];
|
|
55
|
+
let line = '';
|
|
56
|
+
characters.forEach(character => {
|
|
57
|
+
const candidate = `${line}${character}`;
|
|
58
|
+
if (line && estimateTextWidth(candidate, size) > maxWidth) {
|
|
59
|
+
lines.push(line.trimEnd());
|
|
60
|
+
line = character.trimStart();
|
|
61
|
+
} else line = candidate;
|
|
62
|
+
});
|
|
63
|
+
if (line || !lines.length) lines.push(line.trimEnd());
|
|
64
|
+
return lines;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
export function fitTextBlock(text, options = {}) {
|
|
68
|
+
const value = String(text ?? ''), maxWidth = Math.max(1, Number(options.maxWidth) || 1), maxHeight = Math.max(1, Number(options.maxHeight) || 1);
|
|
69
|
+
const baseSize = Math.max(1, Number(options.size) || 12), minSize = Math.max(1, Math.min(baseSize, Number(options.minSize) || 10));
|
|
70
|
+
const maxLines = Math.max(1, Math.floor(Number(options.maxLines) || 2)), lineHeightRatio = Math.max(1, Number(options.lineHeight) || 1.2);
|
|
71
|
+
for (let size = baseSize; size >= minSize; size -= 1) {
|
|
72
|
+
const lines = wrapText(value, maxWidth, size);
|
|
73
|
+
if (lines.length <= maxLines && lines.every(line => estimateTextWidth(line, size) <= maxWidth) && lines.length * size * lineHeightRatio <= maxHeight) {
|
|
74
|
+
return { lines, size, lineHeight: size * lineHeightRatio, width: Math.max(size, ...lines.map(line => estimateTextWidth(line, size))), height: lines.length * size * lineHeightRatio, wrapped: lines.length > 1, scaled: size < baseSize, truncated: false };
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
const lines = wrapText(value, maxWidth, minSize).slice(0, maxLines);
|
|
78
|
+
const visibleHeight = maxLines * minSize * lineHeightRatio;
|
|
79
|
+
if (visibleHeight > maxHeight) lines.splice(1);
|
|
80
|
+
const last = lines.length - 1;
|
|
81
|
+
lines[last] = truncateText(lines[last], maxWidth, minSize);
|
|
82
|
+
return { lines, size: minSize, lineHeight: minSize * lineHeightRatio, width: Math.max(minSize, ...lines.map(line => estimateTextWidth(line, minSize))), height: Math.min(maxHeight, Math.max(minSize, lines.length * minSize * lineHeightRatio)), wrapped: lines.length > 1, scaled: minSize < baseSize, truncated: lines.join('') !== value };
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
export function polarLabelLayout(text, options = {}) {
|
|
86
|
+
const value = String(text ?? ''), baseSize = Math.max(1, Number(options.size) || 12), minSize = Math.max(1, Math.min(baseSize, Number(options.minSize) || 10));
|
|
87
|
+
const padding = Math.max(0, Number(options.padding) || 4), lineHeight = Math.max(1, Number(options.lineHeight) || 1.2), cx = Number(options.cx) || 0, cy = Number(options.cy) || 0;
|
|
88
|
+
const outerRadius = Math.max(1, Number(options.outerRadius) || 1), innerRadius = Math.max(0, Math.min(outerRadius, Number(options.innerRadius) || 0));
|
|
89
|
+
let size = baseSize, width = estimateTextWidth(value, size), maxWidth = Infinity, maxHeight = Infinity, x = cx, y = cy, angle = 0, radius = 0;
|
|
90
|
+
if (options.position === 'center') {
|
|
91
|
+
maxWidth = Math.max(1, Number(options.maxWidth) || outerRadius * 1.25);
|
|
92
|
+
maxHeight = Math.max(1, outerRadius * 0.68);
|
|
93
|
+
while (size > minSize && (width > maxWidth || size * lineHeight > maxHeight)) {
|
|
94
|
+
size -= 1;
|
|
95
|
+
width = estimateTextWidth(value, size);
|
|
96
|
+
}
|
|
97
|
+
const height = size * lineHeight;
|
|
98
|
+
const desiredY = cy - outerRadius * Number(options.offsetRatio ?? 0.36);
|
|
99
|
+
y = Math.max(cy - outerRadius + height / 2 + padding, Math.min(cy - height / 2 - padding, desiredY));
|
|
100
|
+
return { x, y, angle: -Math.PI / 2, radius: Math.abs(cy - y), size, width, height, scaled: size < baseSize, overflowed: width > maxWidth || height > maxHeight };
|
|
101
|
+
}
|
|
102
|
+
const startAngle = Number(options.startAngle) || 0, endAngle = Number(options.endAngle) || startAngle, sweep = Math.max(0, endAngle - startAngle), halfSweep = Math.min(Math.PI / 2, sweep / 2), centerAngle = startAngle + sweep / 2;
|
|
103
|
+
const preferredRadius = Number(options.preferredRadius) || (innerRadius > 0 ? (innerRadius + outerRadius) / 2 : outerRadius * 0.68);
|
|
104
|
+
radius = Math.max(innerRadius + padding + baseSize / 2, Math.min(outerRadius - padding - baseSize / 2, preferredRadius));
|
|
105
|
+
maxWidth = Math.max(1, 2 * radius * Math.sin(halfSweep) - padding * 2);
|
|
106
|
+
maxHeight = Math.max(1, outerRadius - innerRadius - padding * 2);
|
|
107
|
+
while (size > minSize && (width > maxWidth || size * lineHeight > maxHeight)) {
|
|
108
|
+
size -= 1;
|
|
109
|
+
width = estimateTextWidth(value, size);
|
|
110
|
+
}
|
|
111
|
+
const height = size * lineHeight;
|
|
112
|
+
radius = Math.max(innerRadius + padding + height / 2, Math.min(outerRadius - padding - height / 2, radius));
|
|
113
|
+
angle = centerAngle;
|
|
114
|
+
x = cx + Math.cos(angle) * radius;
|
|
115
|
+
y = cy + Math.sin(angle) * radius;
|
|
116
|
+
return { x, y, angle, radius, size, width, height, scaled: size < baseSize, overflowed: width > maxWidth || height > maxHeight };
|
|
117
|
+
}
|
|
118
|
+
|
|
51
119
|
export function axisLabelLayout(spec, labels = [], availableWidth = 0) {
|
|
52
120
|
const size = fontSize(spec, 'axis', 12), count = Math.max(1, labels.length);
|
|
53
121
|
const slot = Math.max(1, availableWidth / count), maxWidth = Math.max(size, ...labels.map(label => estimateTextWidth(label, size)));
|
package/src/project.mjs
CHANGED
|
@@ -8,7 +8,7 @@ import { layoutArchitectureNodes, layoutDiagram, normalizeDiagramData, routeEdge
|
|
|
8
8
|
import { analyzeBurndownSeries, analyzeSchedule } from './project-analytics.mjs';
|
|
9
9
|
import { createLinkedProjectState, filterProjectRows, linkedRecordId } from './project-linking.mjs';
|
|
10
10
|
import { contrastRatio, resolveTheme } from './theme.mjs';
|
|
11
|
-
import { axisLabelLayout, estimateTextWidth, fontSize, titleLayout, truncateText } from './layout.mjs';
|
|
11
|
+
import { axisLabelLayout, boxesOverlap, estimateTextWidth, fitTextBlock, fontSize, titleLayout, truncateText } from './layout.mjs';
|
|
12
12
|
|
|
13
13
|
export const projectTypes = ['gantt', 'timeline', 'milestone', 'burndown', 'flow', 'swimlane', 'architecture', 'mindmap'];
|
|
14
14
|
const day = 86400000;
|
|
@@ -57,6 +57,15 @@ const dependencyType = dependency => typeof dependency === 'object' && dependenc
|
|
|
57
57
|
const markText = (theme, background) => (contrastRatio(theme.text, background) || 0) >= (contrastRatio(theme.background, background) || 0) ? theme.text : theme.background;
|
|
58
58
|
const flowNodeKind = node => node?.kind || 'process';
|
|
59
59
|
|
|
60
|
+
function diagramNodeLabelLayout(row, kind, geometry, spec, font = null) {
|
|
61
|
+
const size = font ? Number(String(font).match(/(\d+(?:\.\d+)?)px/)?.[1]) || fontSize(spec, 'label', 12) : fontSize(spec, 'label', 12);
|
|
62
|
+
const minDimension = Math.min(geometry.width, geometry.height);
|
|
63
|
+
const horizontalPadding = kind === 'decision' ? size * 1.8 : size * 1.25;
|
|
64
|
+
const maxWidth = Math.max(0, geometry.width - horizontalPadding * 2);
|
|
65
|
+
if (minDimension < Math.max(24, size * 2) || maxWidth < size * 2.4) return null;
|
|
66
|
+
return fitTextBlock(row.label || row.id, { maxWidth, maxHeight: Math.max(size, geometry.height - size * 0.45), size, minSize: Math.max(10, Math.min(size, size - 2)), maxLines: 2 });
|
|
67
|
+
}
|
|
68
|
+
|
|
60
69
|
function flowNodeVisual(kind, box) {
|
|
61
70
|
const cx = box.x + box.width / 2, cy = box.y + box.height / 2;
|
|
62
71
|
if (kind === 'start' || kind === 'end') return { type: 'path', geometry: { points: Array.from({ length: 16 }, (_, index) => { const angle = index / 16 * Math.PI * 2; return { x: cx + box.width / 2 * Math.cos(angle), y: cy + box.height / 2 * Math.sin(angle) }; }), closed: true } };
|
|
@@ -103,8 +112,56 @@ function routeGanttDependency(dependency, from, to, positions, barOffset, plot)
|
|
|
103
112
|
return compactRoute([source, { x: sourceStubX, y: source.y }, { x: sourceStubX, y: corridorY }, { x: targetStubX, y: corridorY }, { x: targetStubX, y: target.y }, target]);
|
|
104
113
|
}
|
|
105
114
|
|
|
106
|
-
function text(scene, id, content, x, y, style = {}) {
|
|
107
|
-
scene.add({ id, type: 'text', geometry: { text: String(content), x, y }, style: { fill: scene.theme?.text || '#334155', font: scene.theme?.typography?.label?.font || '12px system-ui', ...style }, zIndex: 4 });
|
|
115
|
+
function text(scene, id, content, x, y, style = {}, dataRef = null) {
|
|
116
|
+
scene.add({ id, type: 'text', geometry: { text: String(content), x, y }, style: { fill: scene.theme?.text || '#334155', font: scene.theme?.typography?.label?.font || '12px system-ui', ...style }, dataRef, zIndex: 4 });
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
function textBlock(scene, id, block, x, y, style = {}, dataRef = null) {
|
|
120
|
+
if (!block) return;
|
|
121
|
+
const start = y - (block.lines.length - 1) * block.lineHeight / 2;
|
|
122
|
+
block.lines.forEach((line, index) => text(scene, index ? `${id}-${index}` : id, line, x, start + index * block.lineHeight, { textAnchor: 'middle', textBaseline: 'middle', baseline: 'middle', ...style }, dataRef));
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
function labelPlate(scene, id, box, fill, opacity = 0.94) {
|
|
126
|
+
scene.add({ id: `${id}-background`, type: 'rect', geometry: { x: box.x - 3, y: box.y - 2, width: box.width + 6, height: box.height + 4 }, style: { fill, opacity, stroke: 'none' }, zIndex: 3 });
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
function polylineMidpoint(points) {
|
|
130
|
+
if (!points?.length) return null;
|
|
131
|
+
if (points.length === 1) return { point: points[0], start: points[0], end: points[0] };
|
|
132
|
+
const lengths = points.slice(1).map((point, index) => Math.hypot(point.x - points[index].x, point.y - points[index].y));
|
|
133
|
+
const target = lengths.reduce((sum, value) => sum + value, 0) / 2;
|
|
134
|
+
let traversed = 0;
|
|
135
|
+
for (let index = 1; index < points.length; index += 1) {
|
|
136
|
+
const length = lengths[index - 1];
|
|
137
|
+
if (traversed + length >= target) {
|
|
138
|
+
const ratio = length ? (target - traversed) / length : 0;
|
|
139
|
+
return { point: { x: points[index - 1].x + (points[index].x - points[index - 1].x) * ratio, y: points[index - 1].y + (points[index].y - points[index - 1].y) * ratio }, start: points[index - 1], end: points[index] };
|
|
140
|
+
}
|
|
141
|
+
traversed += length;
|
|
142
|
+
}
|
|
143
|
+
return { point: points.at(-1), start: points.at(-2), end: points.at(-1) };
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
function edgeLabelLayout(edge, spec, positions, occupied = []) {
|
|
147
|
+
const points = edge.points, midpoint = edge.curve === 'cubic' ? { point: cubicBezierPoint(points, 0.5), start: cubicBezierPoint(points, 0.45), end: cubicBezierPoint(points, 0.55) } : polylineMidpoint(points);
|
|
148
|
+
if (!midpoint) return null;
|
|
149
|
+
const length = Math.max(1, edge.curve === 'cubic' ? Math.hypot(points.at(-1).x - points[0].x, points.at(-1).y - points[0].y) : Math.hypot(midpoint.end.x - midpoint.start.x, midpoint.end.y - midpoint.start.y));
|
|
150
|
+
const angle = Math.atan2(midpoint.end.y - midpoint.start.y, midpoint.end.x - midpoint.start.x), normal = { x: -Math.sin(angle), y: Math.cos(angle) }, size = fontSize(spec, 'axis', 12);
|
|
151
|
+
const block = fitTextBlock(edge.label, { maxWidth: Math.max(size * 3, Math.min(180, length - 10)), maxHeight: size * 2.6, size, minSize: 10, maxLines: 2 });
|
|
152
|
+
const inlineOffset = 8, candidates = [
|
|
153
|
+
{ x: midpoint.point.x, y: midpoint.point.y - inlineOffset, onLine: true },
|
|
154
|
+
{ x: midpoint.point.x + normal.x * (inlineOffset + block.height + 6), y: midpoint.point.y + normal.y * (inlineOffset + block.height + 6), onLine: false },
|
|
155
|
+
{ x: midpoint.point.x - normal.x * (inlineOffset + block.height + 6), y: midpoint.point.y - normal.y * (inlineOffset + block.height + 6), onLine: false },
|
|
156
|
+
{ x: midpoint.point.x + normal.x * (inlineOffset + 2 * (block.height + 6)), y: midpoint.point.y + normal.y * (inlineOffset + 2 * (block.height + 6)), onLine: false },
|
|
157
|
+
{ x: midpoint.point.x - normal.x * (inlineOffset + 2 * (block.height + 6)), y: midpoint.point.y - normal.y * (inlineOffset + 2 * (block.height + 6)), onLine: false }
|
|
158
|
+
];
|
|
159
|
+
const nodeBoxes = [...positions.values()];
|
|
160
|
+
for (const candidate of candidates) {
|
|
161
|
+
const box = { x: candidate.x - block.width / 2, y: candidate.y - block.height / 2, width: block.width, height: block.height };
|
|
162
|
+
if (!nodeBoxes.some(node => boxesOverlap(box, node, 2)) && !occupied.some(item => boxesOverlap(box, item, 3))) return { ...candidate, anchor: midpoint.point, box, block };
|
|
163
|
+
}
|
|
164
|
+
return { ...candidates[0], anchor: midpoint.point, box: { x: candidates[0].x - block.width / 2, y: candidates[0].y - block.height / 2, width: block.width, height: block.height }, block, suppressed: false };
|
|
108
165
|
}
|
|
109
166
|
|
|
110
167
|
function arrow(scene, id, points, reference, critical = false, curve = null) {
|
|
@@ -344,6 +401,9 @@ function diagramScene(scene, spec, rows, state) {
|
|
|
344
401
|
const columns = Math.max(1, ...[...ranks.values()].map(rank => rank + 1));
|
|
345
402
|
const gapX = Math.max(144, plot.width / columns), laneHeight = Math.max(80, plot.height / Math.max(1, lanes.length));
|
|
346
403
|
const positions = new Map(), slots = new Map();
|
|
404
|
+
const edgeLabelBoxes = [], labelLayout = { visible: 0, wrapped: 0, scaled: 0, truncated: 0, suppressed: 0, edgeOnLine: 0, edgeOffset: 0, backgrounded: 0 };
|
|
405
|
+
state.labelLayout = { ...(state.labelLayout || {}), diagram: labelLayout };
|
|
406
|
+
state.labelWarnings = [];
|
|
347
407
|
lanes.forEach((lane, index) => {
|
|
348
408
|
scene.add({ id: `lane-${index}`, type: 'rect', geometry: { x: plot.x, y: plot.y + index * laneHeight, width: Math.max(plot.width, columns * gapX), height: laneHeight }, style: { fill: index % 2 ? spec.theme.surface : spec.theme.background, stroke: spec.theme.border }, zIndex: -1 });
|
|
349
409
|
text(scene, `lane-label-${index}`, lane.label || lane.id, plot.x - 12, plot.y + index * laneHeight + 20, { textAnchor: 'end' });
|
|
@@ -364,7 +424,7 @@ function diagramScene(scene, spec, rows, state) {
|
|
|
364
424
|
const architectureBox = architectureLayout[row.id];
|
|
365
425
|
const geometry = architectureBox
|
|
366
426
|
? { ...architectureBox, x: row.position?.x ?? architectureBox.x, y: row.position?.y ?? architectureBox.y }
|
|
367
|
-
: flowNodeBox(row, generated, { x: plot.x + rank * gapX + 12, y: plot.y + (lanes.length ? lane * laneHeight : 0) + (slot + 0.5) * (lanes.length ? laneHeight : Math.max(plot.height, sameCell * 64)) / sameCell - (flowNodeKind(row) === 'connector' ? 14 : 18) });
|
|
427
|
+
: flowNodeBox(row, lanes.length ? { ...generated, y: undefined } : generated, { x: plot.x + rank * gapX + 12, y: plot.y + (lanes.length ? lane * laneHeight : 0) + (slot + 0.5) * (lanes.length ? laneHeight : Math.max(plot.height, sameCell * 64)) / sameCell - (flowNodeKind(row) === 'connector' ? 14 : 18) });
|
|
368
428
|
positions.set(row.id, geometry);
|
|
369
429
|
if (collapsedGroups.has(row.groupId)) return;
|
|
370
430
|
const depth = row.parentId ? (ranks.get(row.id) || 0) : 0;
|
|
@@ -375,7 +435,18 @@ function diagramScene(scene, spec, rows, state) {
|
|
|
375
435
|
const point = port.side === 'left' ? { x: geometry.x, y: geometry.y + geometry.height * (port.offset ?? 0.5) } : port.side === 'top' ? { x: geometry.x + geometry.width * (port.offset ?? 0.5), y: geometry.y } : port.side === 'bottom' ? { x: geometry.x + geometry.width * (port.offset ?? 0.5), y: geometry.y + geometry.height } : { x: geometry.x + geometry.width, y: geometry.y + geometry.height * (port.offset ?? 0.5) };
|
|
376
436
|
scene.add({ id: `port-${row.id}-${port.id}`, type: 'circle', geometry: { cx: point.x, cy: point.y, r: 4 }, bounds: { x: point.x - 6, y: point.y - 6, width: 12, height: 12 }, style: { fill: spec.theme.background, stroke: spec.theme.text, strokeWidth: 1.5 }, dataRef: { nodeId: row.id, portId: port.id, groupId: row.groupId || null }, interactive: true, zIndex: 4 });
|
|
377
437
|
});
|
|
378
|
-
|
|
438
|
+
const label = diagramNodeLabelLayout(row, kind, geometry, spec, nodeFont);
|
|
439
|
+
if (label) {
|
|
440
|
+
const rawLabel = String(row.label || row.id), labelFont = nodeFont ? nodeFont.replace(/\d+(?:\.\d+)?px/, `${label.size}px`) : `${label.size}px system-ui`;
|
|
441
|
+
textBlock(scene, `node-label-${row.id}`, label, geometry.x + geometry.width / 2, geometry.y + geometry.height / 2, { fill: markText(spec.theme, spec.colors[lane % spec.colors.length]), font: labelFont }, { nodeId: row.id, rawLabel, renderedLabel: label.lines.join('\n'), truncated: label.truncated });
|
|
442
|
+
labelLayout.visible += 1;
|
|
443
|
+
if (label.wrapped) labelLayout.wrapped += 1;
|
|
444
|
+
if (label.scaled) labelLayout.scaled += 1;
|
|
445
|
+
if (label.truncated) { labelLayout.truncated += 1; state.labelWarnings.push({ code: 'LABEL_TRUNCATED', path: `nodes.${index}.label`, nodeId: row.id, rawLabel, renderedLabel: label.lines.join('\n'), message: `Node label "${rawLabel}" was truncated to fit its shape.`, suggestion: 'Increase node size or shorten the label.' }); }
|
|
446
|
+
} else if (kind !== 'connector') {
|
|
447
|
+
labelLayout.suppressed += 1;
|
|
448
|
+
state.labelWarnings.push({ code: 'LABELS_SUPPRESSED', path: `nodes.${index}.label`, count: 1, nodeId: row.id, message: `Node label for "${row.label || row.id}" was hidden because the node is too small.`, suggestion: 'Increase node size or use the node tooltip/accessibility text.' });
|
|
449
|
+
}
|
|
379
450
|
});
|
|
380
451
|
const groupBoxes = new Map();
|
|
381
452
|
groups.forEach(group => {
|
|
@@ -414,8 +485,17 @@ function diagramScene(scene, spec, rows, state) {
|
|
|
414
485
|
const points = path.points;
|
|
415
486
|
arrow(scene, `edge-${index}`, points, { from: edge.from, to: edge.to, edgeId: edge.id || `edge-${index}`, status: edge.status, routing, curveTension: edge.curveTension ?? diagramSpec.diagram.curveTension, waypoints: edge.waypoints || [], fromPortDefinition, toPortDefinition, fromGroupId: fromNode.groupId || null, toGroupId: toNode.groupId || null }, edge.critical === true, path.curve);
|
|
416
487
|
if (edge.label) {
|
|
417
|
-
const
|
|
418
|
-
|
|
488
|
+
const placement = edgeLabelLayout({ ...edge, points, curve: path.curve }, spec, positions, edgeLabelBoxes);
|
|
489
|
+
if (placement) {
|
|
490
|
+
edgeLabelBoxes.push(placement.box);
|
|
491
|
+
const rawLabel = String(edge.label), labelFont = `${placement.block.size}px system-ui`;
|
|
492
|
+
if (placement.onLine) labelLayout.edgeOnLine += 1; else labelLayout.edgeOffset += 1;
|
|
493
|
+
if (placement.block.wrapped) labelLayout.wrapped += 1;
|
|
494
|
+
if (placement.block.scaled) labelLayout.scaled += 1;
|
|
495
|
+
if (placement.block.truncated) { labelLayout.truncated += 1; state.labelWarnings.push({ code: 'LABEL_TRUNCATED', path: `edges.${index}.label`, edgeId: edge.id || `edge-${index}`, rawLabel, renderedLabel: placement.block.lines.join('\n'), message: `Edge label "${rawLabel}" was truncated to fit the available line space.`, suggestion: 'Increase the edge length or shorten the label.' }); }
|
|
496
|
+
if (placement.onLine) { labelPlate(scene, `edge-label-${index}`, placement.box, spec.theme.background); labelLayout.backgrounded += 1; }
|
|
497
|
+
textBlock(scene, `edge-label-${index}`, placement.block, placement.x, placement.y, { fill: spec.theme.text, font: labelFont }, { edgeId: edge.id || `edge-${index}`, rawLabel, renderedLabel: placement.block.lines.join('\n'), onLine: placement.onLine, offsetX: placement.x - placement.anchor.x, offsetY: placement.y - placement.anchor.y });
|
|
498
|
+
}
|
|
419
499
|
}
|
|
420
500
|
});
|
|
421
501
|
state.nodePositions = Object.fromEntries(positions);
|
|
@@ -461,7 +541,10 @@ export function buildProjectScene(spec) {
|
|
|
461
541
|
state.projectAnalytics.warnings = state.schedule.warnings;
|
|
462
542
|
}
|
|
463
543
|
if (!data.rows.length) text(scene, 'empty', sourceRows.length && linked.visibleCount === 0 ? 'No matching data' : spec.emptyText || 'No data', spec.width / 2, spec.height / 2, { textAnchor: 'middle' });
|
|
464
|
-
else if (diagram)
|
|
544
|
+
else if (diagram) {
|
|
545
|
+
diagramScene(scene, spec, data.rows, state);
|
|
546
|
+
if (state.labelWarnings?.length) data.warnings.push(...state.labelWarnings);
|
|
547
|
+
}
|
|
465
548
|
else if (spec.type === 'burndown') burndownScene(scene, spec, data.rows, state);
|
|
466
549
|
else tasksScene(scene, spec, data.rows, state);
|
|
467
550
|
if (state.eventLayout?.collisionsUnresolved) data.warnings.push({
|
|
@@ -515,7 +598,7 @@ export function projectTooltip(type, row, locale = 'en-US') {
|
|
|
515
598
|
|
|
516
599
|
export function rerouteDiagramScene(scene) {
|
|
517
600
|
const nodeGeometries = new Map();
|
|
518
|
-
scene.walk(item => { if (item.id.startsWith('node-') && item.dataRef?.nodeId && item.geometry) nodeGeometries.set(item.dataRef.nodeId, item.geometry); });
|
|
601
|
+
scene.walk(item => { if (item.id.startsWith('node-') && !item.id.startsWith('node-label-') && item.dataRef?.nodeId && item.geometry) nodeGeometries.set(item.dataRef.nodeId, item.geometry); });
|
|
519
602
|
scene.walk(node => {
|
|
520
603
|
if (!node.id.startsWith('edge-') || !node.dataRef?.from || !node.dataRef?.to) return;
|
|
521
604
|
const source = nodeGeometries.get(node.dataRef.from), destination = nodeGeometries.get(node.dataRef.to);
|
|
@@ -529,7 +612,13 @@ export function rerouteDiagramScene(scene) {
|
|
|
529
612
|
const arrowNode = scene.find(`${node.id}-arrow`), beforeTip = node.geometry.points.at(-2);
|
|
530
613
|
if (arrowNode) arrowNode.geometry.points = [end, { x: end.x - 7 * Math.cos(Math.atan2(end.y - beforeTip.y, end.x - beforeTip.x) - Math.PI / 6), y: end.y - 7 * Math.sin(Math.atan2(end.y - beforeTip.y, end.x - beforeTip.x) - Math.PI / 6) }, { x: end.x - 7 * Math.cos(Math.atan2(end.y - beforeTip.y, end.x - beforeTip.x) + Math.PI / 6), y: end.y - 7 * Math.sin(Math.atan2(end.y - beforeTip.y, end.x - beforeTip.x) + Math.PI / 6) }, end];
|
|
531
614
|
const edgeIndex = Number(node.id.slice(5)), label = scene.find(`edge-label-${edgeIndex}`), labelPoint = node.geometry.curve === 'cubic' ? cubicBezierPoint(node.geometry.points, 0.5) : node.geometry.points[Math.floor(node.geometry.points.length / 2)];
|
|
532
|
-
if (label && labelPoint) {
|
|
615
|
+
if (label && labelPoint) {
|
|
616
|
+
const old = { x: label.geometry.x, y: label.geometry.y }, offsetX = Number(label.dataRef?.offsetX) || 0, offsetY = Number(label.dataRef?.offsetY) || 0;
|
|
617
|
+
label.geometry.x = labelPoint.x + offsetX; label.geometry.y = labelPoint.y + offsetY;
|
|
618
|
+
const background = scene.find(`edge-label-${edgeIndex}-background`), dx = label.geometry.x - old.x, dy = label.geometry.y - old.y;
|
|
619
|
+
if (background) { background.geometry.x += dx; background.geometry.y += dy; }
|
|
620
|
+
for (let lineIndex = 1; ; lineIndex += 1) { const line = scene.find(`edge-label-${edgeIndex}-${lineIndex}`); if (!line) break; line.geometry.x += dx; line.geometry.y += dy; }
|
|
621
|
+
}
|
|
533
622
|
});
|
|
534
623
|
return scene;
|
|
535
624
|
}
|