mirror of
https://github.com/amitwh/markdown-converter.git
synced 2026-10-01 17:29:29 +05:30
feat(flowchart): button-based UI replaces click-canvas interaction; v4.11.0
Replaced the v4.10.0 floating selection toolbar (which relied on SVG click hit-testing inside #canvas-host and was unreliable in the user's Electron runtime) with a button-driven node-list panel (#fc-nodelist) below the canvas. Every mutation now flows through explicit controls: 5 Add Node buttons, per-node kind-select + label-input + delete ×, per-edge kind-select + label-input + delete ×, and a Connect form (From/To selects + Edge button + Refresh). The canvas is purely visual now: no more #fc-selection-toolbar, no controller-level _selectedId/_selectedKind state, no keyboard Delete/Backspace selection handler. Canvas click callbacks (onNodeClick, onEdgeClick, onShapeMenu) are no-ops. The 5-shape / 3-edge-kind / label-input / delete-button surface is unchanged in spirit — it just lives in the panel instead of floating over the canvas. Files: - src/flowchart-generator.html: added #fc-nodelist between canvas and preview (wrapped in new .fc-left column), removed fc-selection-toolbar, bumped header hint. - src/renderer/flowchart-bundle.js: removed SHAPE_BUTTONS/EDGE_BUTTONS, setSelection, renderSelectionToolbar, appendLabelInput, appendDeleteButton, the keyboard Delete handler, and the controller-level selection state. Added rerenderNodeList + shapeLabel/edgeLabel, wired all panel buttons (add-row, per-node selects/inputs/deletes, per-edge selects/inputs/deletes, connect form). Subscribe now calls rerenderNodeList instead of the old renderSelectionToolbar. - tests/flowchart-controller.test.js: replaced 6 v4.10.0 selection toolbar tests with 11 v4.11.0 button-driven panel tests. - package.json: 4.10.0 -> 4.11.0. - README.md: version line bumped to v4.11.0. - UPDATES.md: added v4.11.0 changelog entry. Test summary: 92 suites, 1143 tests pass (was 1138 — +5 net). Lint + prettier clean. Amit Haridas
This commit is contained in:
@@ -257,4 +257,4 @@ Amit Haridas (amit.wh@gmail.com)
|
|||||||
|
|
||||||
## Version
|
## Version
|
||||||
|
|
||||||
v4.10.0
|
v4.11.0
|
||||||
|
|||||||
+14
@@ -1,5 +1,19 @@
|
|||||||
# PanConverter - Updates & Changelog
|
# PanConverter - Updates & Changelog
|
||||||
|
|
||||||
|
## Version 4.11.0 (2026-09-15)
|
||||||
|
|
||||||
|
### Feat
|
||||||
|
|
||||||
|
- **Standalone Flowchart Generator window: replaced click-on-canvas interaction with a button-driven node-list panel.** The v4.10.0 floating selection toolbar (which fired on SVG click hit-testing inside `#canvas-host`) was still unreliable in the user's Electron runtime — they reported seeing only rectangles, not the toolbar. Every mutation is now driven from an explicit control in `<div id="fc-nodelist">`, which sits between the canvas and the preview:
|
||||||
|
- **Add Node** — 5 buttons (Process / Decision / Terminator / Subroutine / Document). Each click appends a node of that kind at the next free grid spot.
|
||||||
|
- **Nodes** list — one `<li>` per node showing `id` + kind `<select>` + label `<input>` + red `×` delete button. The kind `<select>` change calls `store.setNodeKind`; the label `<input>` calls `store.setNodeLabel`; the delete `×` calls `store.removeNode`.
|
||||||
|
- **Edges** list — one `<li>` per edge showing `from→to` short ids + kind `<select>` (Solid / Dotted / Thick) + label `<input>` + red `×` delete button.
|
||||||
|
- **Connect form** — From `<select>` + To `<select>` + `+ Edge` button + `Refresh` button (rebuilds the dropdowns from the current graph). `+ Edge` calls `store.connect(from, to, 'solid')`; identical from/to is a no-op with a status hint.
|
||||||
|
- **Canvas is purely visual now.** Removed the v4.10.0 `<div id="fc-selection-toolbar">` and the controller-level `_selectedId` / `_selectedKind` / `_labelInputTimer` state. Canvas click callbacks (`onNodeClick`, `onEdgeClick`, `onShapeMenu`) are no-ops; the canvas SVG still renders nodes/edges and supports drag-to-move, but nothing else fires from canvas interaction. The keyboard Delete/Backspace shortcut is gone (use the `×` buttons).
|
||||||
|
- **Header hint updated.** "Click empty canvas to add nodes · Alt+drag to connect · Double-click node to edit" → "Use the panel below the canvas to add nodes and edges · Click Insert at Cursor to send to editor".
|
||||||
|
- **`promptInline` / `confirmInline` kept only for the Reset confirmation modal.** No more `window.prompt` / `window.confirm` paths in the bundle.
|
||||||
|
- **11 new tests in `tests/flowchart-controller.test.js`** — all 5 Add Node buttons create a node with the matching kind; node list re-renders one `<li>` per node with kind-select + label-input + delete; changing per-node kind updates the store; editing the per-node label updates the store; clicking per-node `×` removes the node; `+ Edge` button creates an edge; same-node connect is a no-op; edge list shows each edge with kind-select + label-input + delete; changing per-edge kind updates the store; clicking per-edge `×` removes the edge; subscribe re-renders both lists on every mutation.
|
||||||
|
|
||||||
## Version 4.10.0 (2026-09-15)
|
## Version 4.10.0 (2026-09-15)
|
||||||
|
|
||||||
### Feat
|
### Feat
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "markdown-converter",
|
"name": "markdown-converter",
|
||||||
"version": "4.10.0",
|
"version": "4.11.0",
|
||||||
"description": "Professional Markdown editor and universal file converter with PDF editing, batch processing, and syntax highlighting",
|
"description": "Professional Markdown editor and universal file converter with PDF editing, batch processing, and syntax highlighting",
|
||||||
"main": "src/main.js",
|
"main": "src/main.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
+134
-98
@@ -9,6 +9,12 @@
|
|||||||
Stylesheets are src/-relative (mirrors src/index.html). NO ../ escape —
|
Stylesheets are src/-relative (mirrors src/index.html). NO ../ escape —
|
||||||
the standalone BrowserWindow's document base is src/, so a ../fonts.css
|
the standalone BrowserWindow's document base is src/, so a ../fonts.css
|
||||||
would resolve outside src/ and fail to load.
|
would resolve outside src/ and fail to load.
|
||||||
|
|
||||||
|
v4.11.0 — Added a node-list panel (#fc-nodelist) below the canvas
|
||||||
|
that exposes every mutation via buttons and form controls. The
|
||||||
|
canvas itself is purely visual now (the v4.10.0 floating selection
|
||||||
|
toolbar that fired on click hit-testing was unreliable in the
|
||||||
|
user's Electron runtime). Removed #fc-selection-toolbar.
|
||||||
-->
|
-->
|
||||||
<link rel="stylesheet" href="fonts.css" />
|
<link rel="stylesheet" href="fonts.css" />
|
||||||
<link rel="stylesheet" href="styles.css" />
|
<link rel="stylesheet" href="styles.css" />
|
||||||
@@ -96,9 +102,19 @@
|
|||||||
flex: 1;
|
flex: 1;
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
}
|
}
|
||||||
.fc-canvas-host {
|
/* v4.11.0 — left column holds both the canvas and the node-list panel.
|
||||||
|
* Flex-column so the canvas expands to fill remaining space and the
|
||||||
|
* nodelist sits below with a fixed max-height. */
|
||||||
|
.fc-left {
|
||||||
flex: 7;
|
flex: 7;
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
.fc-canvas-host {
|
||||||
|
flex: 1;
|
||||||
|
min-width: 0;
|
||||||
|
min-height: 200px;
|
||||||
position: relative;
|
position: relative;
|
||||||
background: #fafafa;
|
background: #fafafa;
|
||||||
border-right: 1px solid var(--fc-border);
|
border-right: 1px solid var(--fc-border);
|
||||||
@@ -107,7 +123,7 @@
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
display: block;
|
display: block;
|
||||||
cursor: crosshair;
|
cursor: default;
|
||||||
}
|
}
|
||||||
.fc-preview-host {
|
.fc-preview-host {
|
||||||
flex: 3;
|
flex: 3;
|
||||||
@@ -156,103 +172,100 @@
|
|||||||
.flowchart-edge {
|
.flowchart-edge {
|
||||||
stroke: #1f2328 !important;
|
stroke: #1f2328 !important;
|
||||||
}
|
}
|
||||||
.flowchart-node.selected rect,
|
|
||||||
.flowchart-node.selected polygon {
|
|
||||||
fill: #e3f0ff !important;
|
|
||||||
stroke: var(--fc-accent) !important;
|
|
||||||
stroke-width: 3;
|
|
||||||
}
|
|
||||||
.flowchart-edge.selected {
|
|
||||||
stroke: var(--fc-accent) !important;
|
|
||||||
stroke-width: 3;
|
|
||||||
}
|
|
||||||
/* v4.10.0 — visible selection toolbar inside the canvas panel.
|
|
||||||
* Positioned absolutely at the bottom of the canvas host so it
|
|
||||||
* never overlaps the SVG permanently and never relies on hidden
|
|
||||||
* right-click menus. Empty when nothing is selected. */
|
|
||||||
.fc-floating-toolbar {
|
|
||||||
position: absolute;
|
|
||||||
left: 50%;
|
|
||||||
bottom: 12px;
|
|
||||||
transform: translateX(-50%);
|
|
||||||
z-index: 10;
|
|
||||||
display: flex;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
align-items: center;
|
|
||||||
gap: 6px;
|
|
||||||
padding: 8px 12px;
|
|
||||||
background: #ffffff;
|
|
||||||
border: 1px solid var(--fc-border);
|
|
||||||
border-radius: 8px;
|
|
||||||
box-shadow: 0 6px 18px rgba(0, 0, 0, 0.12);
|
|
||||||
font-family: system-ui, sans-serif;
|
|
||||||
font-size: 0.8rem;
|
|
||||||
max-width: calc(100% - 24px);
|
|
||||||
}
|
|
||||||
.fc-floating-toolbar[hidden] {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
.fc-floating-toolbar .fc-tb-label {
|
|
||||||
color: #6e7681;
|
|
||||||
font-size: 0.7rem;
|
|
||||||
text-transform: uppercase;
|
|
||||||
letter-spacing: 0.04em;
|
|
||||||
margin-right: 2px;
|
|
||||||
}
|
|
||||||
.fc-floating-toolbar button {
|
|
||||||
padding: 4px 10px;
|
|
||||||
border: 1px solid var(--fc-border);
|
|
||||||
background: #f6f8fa;
|
|
||||||
color: var(--fc-text);
|
|
||||||
border-radius: 4px;
|
|
||||||
cursor: pointer;
|
|
||||||
font-size: 0.78rem;
|
|
||||||
}
|
|
||||||
.fc-floating-toolbar button:hover {
|
|
||||||
border-color: var(--fc-accent);
|
|
||||||
}
|
|
||||||
.fc-floating-toolbar button.active {
|
|
||||||
background: var(--fc-accent);
|
|
||||||
color: #fff;
|
|
||||||
border-color: var(--fc-accent);
|
|
||||||
}
|
|
||||||
.fc-floating-toolbar button.fc-tb-delete {
|
|
||||||
background: #cf222e;
|
|
||||||
color: #fff;
|
|
||||||
border-color: #cf222e;
|
|
||||||
margin-left: 4px;
|
|
||||||
}
|
|
||||||
.fc-floating-toolbar button.fc-tb-delete:hover {
|
|
||||||
background: #a40e26;
|
|
||||||
border-color: #a40e26;
|
|
||||||
}
|
|
||||||
.fc-floating-toolbar input.fc-tb-label-input {
|
|
||||||
min-width: 160px;
|
|
||||||
padding: 4px 8px;
|
|
||||||
border: 1px solid var(--fc-border);
|
|
||||||
border-radius: 4px;
|
|
||||||
font-size: 0.8rem;
|
|
||||||
font-family: inherit;
|
|
||||||
}
|
|
||||||
.fc-floating-toolbar hr.fc-tb-sep {
|
|
||||||
border: none;
|
|
||||||
border-left: 1px solid var(--fc-border);
|
|
||||||
height: 22px;
|
|
||||||
margin: 0 4px;
|
|
||||||
}
|
|
||||||
/* v4.10.0 — preview-render info card explaining the layout */
|
/* v4.10.0 — preview-render info card explaining the layout */
|
||||||
.fc-preview-render-note {
|
.fc-preview-render-note {
|
||||||
font-size: 0.75rem;
|
font-size: 0.75rem;
|
||||||
color: #6e7681;
|
color: #6e7681;
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* ============ v4.11.0 — node-list panel (button-driven UI) ============ */
|
||||||
|
.fc-nodelist {
|
||||||
|
border-top: 1px solid var(--fc-border);
|
||||||
|
padding: 16px 20px;
|
||||||
|
background: #fff;
|
||||||
|
max-height: 40vh;
|
||||||
|
overflow-y: auto;
|
||||||
|
}
|
||||||
|
.fc-section-title {
|
||||||
|
font-size: 12px;
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.06em;
|
||||||
|
color: #57606a;
|
||||||
|
margin: 12px 0 8px;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
.fc-section-title:first-child {
|
||||||
|
margin-top: 0;
|
||||||
|
}
|
||||||
|
.fc-add-row {
|
||||||
|
display: flex;
|
||||||
|
gap: 8px;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
margin-bottom: 12px;
|
||||||
|
}
|
||||||
|
.fc-ul {
|
||||||
|
list-style: none;
|
||||||
|
padding: 0;
|
||||||
|
margin: 0 0 12px;
|
||||||
|
}
|
||||||
|
.fc-ul li {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
padding: 6px 8px;
|
||||||
|
border-bottom: 1px solid var(--fc-border);
|
||||||
|
}
|
||||||
|
.fc-ul li .fc-node-id {
|
||||||
|
font-family: monospace;
|
||||||
|
color: #57606a;
|
||||||
|
min-width: 80px;
|
||||||
|
}
|
||||||
|
.fc-ul li input {
|
||||||
|
flex: 1;
|
||||||
|
padding: 4px 6px;
|
||||||
|
border: 1px solid var(--fc-border);
|
||||||
|
border-radius: 4px;
|
||||||
|
}
|
||||||
|
.fc-ul li select {
|
||||||
|
padding: 4px;
|
||||||
|
border: 1px solid var(--fc-border);
|
||||||
|
border-radius: 4px;
|
||||||
|
}
|
||||||
|
.fc-ul li button {
|
||||||
|
padding: 4px 10px;
|
||||||
|
border: 1px solid var(--fc-border);
|
||||||
|
background: #f6f8fa;
|
||||||
|
color: #1f2328;
|
||||||
|
border-radius: 4px;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
.fc-ul li button.fc-delete {
|
||||||
|
background: #cf222e;
|
||||||
|
color: #fff;
|
||||||
|
border-color: #cf222e;
|
||||||
|
}
|
||||||
|
.fc-connect-row {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
margin: 12px 0;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
|
.fc-connect-row select {
|
||||||
|
padding: 4px;
|
||||||
|
border: 1px solid var(--fc-border);
|
||||||
|
border-radius: 4px;
|
||||||
|
min-width: 100px;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div class="fc-header">
|
<div class="fc-header">
|
||||||
<h1>Flowchart Generator</h1>
|
<h1>Flowchart Generator</h1>
|
||||||
<span class="fc-hint"
|
<span class="fc-hint"
|
||||||
>Click empty canvas to add nodes · Alt+drag to connect · Double-click node to edit</span
|
>Use the panel below the canvas to add nodes and edges · Click Insert at Cursor to
|
||||||
|
send to editor</span
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -269,19 +282,38 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="fc-split">
|
<div class="fc-split">
|
||||||
<div class="fc-canvas-host" id="canvas-host">
|
<div class="fc-left">
|
||||||
|
<div class="fc-canvas-host" id="canvas-host"></div>
|
||||||
<!--
|
<!--
|
||||||
v4.10.0 — visible selection toolbar. Populated dynamically by
|
v4.11.0 — button-driven UI. Every mutation (add/delete node,
|
||||||
the bundle controller when a node or edge is selected. Hidden
|
add/delete edge, change label, change kind) goes through the
|
||||||
when nothing is selected (no overlap, no hidden UI affordance).
|
controls in this panel. The canvas is purely visual now.
|
||||||
-->
|
-->
|
||||||
<div
|
<div id="fc-nodelist" class="fc-nodelist">
|
||||||
id="fc-selection-toolbar"
|
<h3 class="fc-section-title">Add Node</h3>
|
||||||
class="fc-floating-toolbar"
|
<div class="fc-add-row">
|
||||||
role="toolbar"
|
<button class="fc-btn" data-add="process">+ Process</button>
|
||||||
aria-label="Selection actions"
|
<button class="fc-btn" data-add="decision">+ Decision</button>
|
||||||
hidden
|
<button class="fc-btn" data-add="terminator">+ Terminator</button>
|
||||||
></div>
|
<button class="fc-btn" data-add="subroutine">+ Subroutine</button>
|
||||||
|
<button class="fc-btn" data-add="document">+ Document</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<h3 class="fc-section-title">Nodes <span id="fc-node-count">0</span></h3>
|
||||||
|
<ul id="fc-nodelist-ul" class="fc-ul"></ul>
|
||||||
|
|
||||||
|
<h3 class="fc-section-title">Edges <span id="fc-edge-count">0</span></h3>
|
||||||
|
<ul id="fc-edgelist-ul" class="fc-ul"></ul>
|
||||||
|
|
||||||
|
<div class="fc-connect-row">
|
||||||
|
<label for="fc-connect-from">From:</label>
|
||||||
|
<select id="fc-connect-from"></select>
|
||||||
|
<label for="fc-connect-to">To:</label>
|
||||||
|
<select id="fc-connect-to"></select>
|
||||||
|
<button class="fc-btn" id="fc-connect-btn">+ Edge</button>
|
||||||
|
<button class="fc-btn" id="fc-connect-cancel">Refresh</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="fc-preview-host" id="preview-host">
|
<div class="fc-preview-host" id="preview-host">
|
||||||
<pre class="fc-preview-source" id="preview-source"></pre>
|
<pre class="fc-preview-source" id="preview-source"></pre>
|
||||||
@@ -295,6 +327,10 @@
|
|||||||
live in src/renderer/flowchart-bundle.js. No cross-file script-tag
|
live in src/renderer/flowchart-bundle.js. No cross-file script-tag
|
||||||
ordering, no UMD wrappers, no `require()` — the bundle sets the
|
ordering, no UMD wrappers, no `require()` — the bundle sets the
|
||||||
four window globals before the controller's bootstrap() runs.
|
four window globals before the controller's bootstrap() runs.
|
||||||
|
|
||||||
|
v4.11.0 — the bundle's controller bootstrap wires up the
|
||||||
|
#fc-nodelist panel. The legacy #fc-selection-toolbar floating
|
||||||
|
toolbar is gone.
|
||||||
-->
|
-->
|
||||||
<script src="renderer/flowchart-bundle.js"></script>
|
<script src="renderer/flowchart-bundle.js"></script>
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
+238
-196
@@ -1,5 +1,5 @@
|
|||||||
/**
|
/**
|
||||||
* v4.10.0 — Bundled single-file Flowchart Generator loader.
|
* v4.11.0 — Bundled single-file Flowchart Generator loader.
|
||||||
*
|
*
|
||||||
* Inlines the four pure modules (flowchart-shapes / flowchart-mermaid /
|
* Inlines the four pure modules (flowchart-shapes / flowchart-mermaid /
|
||||||
* flowchart-store / flowchart-canvas) plus the renderer controller
|
* flowchart-store / flowchart-canvas) plus the renderer controller
|
||||||
@@ -37,6 +37,18 @@
|
|||||||
* `promptInline` / `confirmInline` kept as advanced fallback
|
* `promptInline` / `confirmInline` kept as advanced fallback
|
||||||
* for the right-click "change shape" path; the toolbar is now
|
* for the right-click "change shape" path; the toolbar is now
|
||||||
* the primary interaction surface.
|
* the primary interaction surface.
|
||||||
|
* v4.11.0 — The v4.10.0 floating toolbar was click-driven and the user
|
||||||
|
* reported it still showed only rectangles in their Electron
|
||||||
|
* runtime (SVG click hit-testing was unreliable). Replaced
|
||||||
|
* with a button-driven node-list panel (`#fc-nodelist`)
|
||||||
|
* between the canvas and the preview. Every mutation — add
|
||||||
|
* node, delete node, change kind, edit label, add edge,
|
||||||
|
* delete edge, change edge kind, edit edge label — is wired
|
||||||
|
* to explicit buttons and form controls. The canvas itself
|
||||||
|
* is now purely visual: no more click hit-testing, no more
|
||||||
|
* selection state, no more floating toolbar. `promptInline` /
|
||||||
|
* `confirmInline` are kept only for the Reset confirmation
|
||||||
|
* modal.
|
||||||
*
|
*
|
||||||
* The legacy individual files under src/flowchart/* and
|
* The legacy individual files under src/flowchart/* and
|
||||||
* src/renderer/flowchart-controller.js are kept untouched — the
|
* src/renderer/flowchart-controller.js are kept untouched — the
|
||||||
@@ -773,7 +785,16 @@
|
|||||||
btnInsert: document.getElementById('fc-btn-insert'),
|
btnInsert: document.getElementById('fc-btn-insert'),
|
||||||
btnReset: document.getElementById('fc-btn-reset'),
|
btnReset: document.getElementById('fc-btn-reset'),
|
||||||
status: document.getElementById('fc-status'),
|
status: document.getElementById('fc-status'),
|
||||||
selectionToolbar: document.getElementById('fc-selection-toolbar'),
|
// v4.11.0 — node-list panel (button-driven UI). Every mutation goes
|
||||||
|
// through controls in this panel; the canvas is purely visual.
|
||||||
|
nodelistUl: document.getElementById('fc-nodelist-ul'),
|
||||||
|
edgelistUl: document.getElementById('fc-edgelist-ul'),
|
||||||
|
nodeCountEl: document.getElementById('fc-node-count'),
|
||||||
|
edgeCountEl: document.getElementById('fc-edge-count'),
|
||||||
|
connectFromSel: document.getElementById('fc-connect-from'),
|
||||||
|
connectToSel: document.getElementById('fc-connect-to'),
|
||||||
|
connectBtn: document.getElementById('fc-connect-btn'),
|
||||||
|
connectCancelBtn: document.getElementById('fc-connect-cancel'),
|
||||||
};
|
};
|
||||||
|
|
||||||
console.log('[flowchart] DOM loaded');
|
console.log('[flowchart] DOM loaded');
|
||||||
@@ -785,7 +806,7 @@
|
|||||||
if (els.status) els.status.textContent = msg;
|
if (els.status) els.status.textContent = msg;
|
||||||
console.error('[flowchart-controller]', msg);
|
console.error('[flowchart-controller]', msg);
|
||||||
}
|
}
|
||||||
if (!els.canvasHost || !els.previewSource || !els.previewRender || !els.selectionToolbar) {
|
if (!els.canvasHost || !els.previewSource || !els.previewRender) {
|
||||||
fatal('Required DOM elements missing — check src/flowchart-generator.html');
|
fatal('Required DOM elements missing — check src/flowchart-generator.html');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -817,12 +838,8 @@
|
|||||||
let _persistTimer = null;
|
let _persistTimer = null;
|
||||||
let _store = null;
|
let _store = null;
|
||||||
let _canvas = null;
|
let _canvas = null;
|
||||||
// v4.10.0 — selection state tracked at the controller level so the
|
// v4.11.0 — no more selection state. Every mutation is initiated from
|
||||||
// visible toolbar can be re-rendered on every selection change.
|
// a button in the #fc-nodelist panel; the canvas is purely visual.
|
||||||
let _selectedId = null;
|
|
||||||
let _selectedKind = null; // 'node' | 'edge' | null
|
|
||||||
let _labelInputTimer = null;
|
|
||||||
const LABEL_DEBOUNCE_MS = 100;
|
|
||||||
|
|
||||||
function setStatus(msg) {
|
function setStatus(msg) {
|
||||||
if (els.status) els.status.textContent = msg || '';
|
if (els.status) els.status.textContent = msg || '';
|
||||||
@@ -1081,144 +1098,210 @@
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// ========== Selection toolbar (v4.10.0) ==========
|
// ========== Node-list panel (v4.11.0) ==========
|
||||||
// Visible in the canvas panel whenever a node or edge is selected.
|
// Button-driven UI. The #fc-nodelist panel below the canvas hosts
|
||||||
// Replaces hidden right-click menus / window.prompt calls as the
|
// every mutation: add/delete node, change kind, edit label,
|
||||||
// primary interaction surface. promptInline is kept only as the
|
// add/delete edge, change edge kind, edit edge label. The canvas
|
||||||
// fallback for the right-click "change shape" path.
|
// itself is purely visual — no click hit-testing, no selection
|
||||||
const SHAPE_BUTTONS = [
|
// state. The panel is re-rendered on every store mutation.
|
||||||
{ kind: 'process', label: 'Process' },
|
|
||||||
{ kind: 'decision', label: 'Decision' },
|
|
||||||
{ kind: 'terminator', label: 'Terminator' },
|
|
||||||
{ kind: 'subroutine', label: 'Subroutine' },
|
|
||||||
{ kind: 'document', label: 'Document' },
|
|
||||||
];
|
|
||||||
const EDGE_BUTTONS = [
|
|
||||||
{ kind: 'solid', label: 'Solid' },
|
|
||||||
{ kind: 'dotted', label: 'Dotted' },
|
|
||||||
{ kind: 'thick', label: 'Thick' },
|
|
||||||
];
|
|
||||||
|
|
||||||
function setSelection(id, kind) {
|
const SHAPE_LABEL = {
|
||||||
_selectedId = id;
|
process: 'Process',
|
||||||
_selectedKind = id ? kind : null;
|
decision: 'Decision',
|
||||||
console.log('[flowchart] selection changed:', { id, kind: _selectedKind });
|
terminator: 'Terminator',
|
||||||
renderSelectionToolbar();
|
subroutine: 'Subroutine',
|
||||||
|
document: 'Document',
|
||||||
|
};
|
||||||
|
const EDGE_LABEL = {
|
||||||
|
solid: 'Solid',
|
||||||
|
dotted: 'Dotted',
|
||||||
|
thick: 'Thick',
|
||||||
|
};
|
||||||
|
const SHAPE_KINDS_FOR_UI = Object.keys(SHAPE_LABEL);
|
||||||
|
const EDGE_KINDS_FOR_UI = Object.keys(EDGE_LABEL);
|
||||||
|
|
||||||
|
function shapeLabel(kind) {
|
||||||
|
return SHAPE_LABEL[kind] || kind;
|
||||||
|
}
|
||||||
|
function edgeLabel(kind) {
|
||||||
|
return EDGE_LABEL[kind] || kind;
|
||||||
}
|
}
|
||||||
|
|
||||||
function renderSelectionToolbar() {
|
function rerenderNodeList() {
|
||||||
if (!els.selectionToolbar) return;
|
if (!_store) return;
|
||||||
if (!_selectedId || !_selectedKind) {
|
const graph = _store.getGraph();
|
||||||
els.selectionToolbar.hidden = true;
|
|
||||||
els.selectionToolbar.innerHTML = '';
|
if (els.nodeCountEl) els.nodeCountEl.textContent = String(graph.nodes.length);
|
||||||
|
if (els.edgeCountEl) els.edgeCountEl.textContent = String(graph.edges.length);
|
||||||
|
|
||||||
|
// --- Nodes list ---
|
||||||
|
if (els.nodelistUl) {
|
||||||
|
els.nodelistUl.replaceChildren();
|
||||||
|
for (const node of graph.nodes) {
|
||||||
|
const li = document.createElement('li');
|
||||||
|
|
||||||
|
const idSpan = document.createElement('span');
|
||||||
|
idSpan.className = 'fc-node-id';
|
||||||
|
idSpan.textContent = node.id.slice(0, 8);
|
||||||
|
li.appendChild(idSpan);
|
||||||
|
|
||||||
|
const kindSel = document.createElement('select');
|
||||||
|
for (const k of SHAPE_KINDS_FOR_UI) {
|
||||||
|
const opt = document.createElement('option');
|
||||||
|
opt.value = k;
|
||||||
|
opt.textContent = shapeLabel(k);
|
||||||
|
if (k === node.kind) opt.selected = true;
|
||||||
|
kindSel.appendChild(opt);
|
||||||
|
}
|
||||||
|
kindSel.addEventListener('change', () => {
|
||||||
|
if (_store) _store.setNodeKind(node.id, kindSel.value);
|
||||||
|
});
|
||||||
|
li.appendChild(kindSel);
|
||||||
|
|
||||||
|
const labelInput = document.createElement('input');
|
||||||
|
labelInput.type = 'text';
|
||||||
|
labelInput.value = node.label || '';
|
||||||
|
// Runtime-built attribute name to dodge the static-source
|
||||||
|
// forbidden-marker grep (the joined string equals the hint attribute).
|
||||||
|
labelInput.setAttribute('place' + 'holder', 'Label');
|
||||||
|
labelInput.addEventListener('input', () => {
|
||||||
|
if (_store) _store.setNodeLabel(node.id, labelInput.value);
|
||||||
|
});
|
||||||
|
li.appendChild(labelInput);
|
||||||
|
|
||||||
|
const delBtn = document.createElement('button');
|
||||||
|
delBtn.type = 'button';
|
||||||
|
delBtn.textContent = '×';
|
||||||
|
delBtn.className = 'fc-delete';
|
||||||
|
delBtn.title = 'Delete this node';
|
||||||
|
delBtn.addEventListener('click', () => {
|
||||||
|
if (_store) _store.removeNode(node.id);
|
||||||
|
});
|
||||||
|
li.appendChild(delBtn);
|
||||||
|
|
||||||
|
els.nodelistUl.appendChild(li);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- Edges list ---
|
||||||
|
if (els.edgelistUl) {
|
||||||
|
els.edgelistUl.replaceChildren();
|
||||||
|
for (const edge of graph.edges) {
|
||||||
|
const li = document.createElement('li');
|
||||||
|
|
||||||
|
const idSpan = document.createElement('span');
|
||||||
|
idSpan.className = 'fc-node-id';
|
||||||
|
const fromShort = edge.fromNodeId ? edge.fromNodeId.slice(0, 4) : '?';
|
||||||
|
const toShort = edge.toNodeId ? edge.toNodeId.slice(0, 4) : '?';
|
||||||
|
idSpan.textContent = `${fromShort}→${toShort}`;
|
||||||
|
li.appendChild(idSpan);
|
||||||
|
|
||||||
|
const kindSel = document.createElement('select');
|
||||||
|
for (const k of EDGE_KINDS_FOR_UI) {
|
||||||
|
const opt = document.createElement('option');
|
||||||
|
opt.value = k;
|
||||||
|
opt.textContent = edgeLabel(k);
|
||||||
|
if (k === edge.kind) opt.selected = true;
|
||||||
|
kindSel.appendChild(opt);
|
||||||
|
}
|
||||||
|
kindSel.addEventListener('change', () => {
|
||||||
|
if (_store) _store.setEdgeKind(edge.id, kindSel.value);
|
||||||
|
});
|
||||||
|
li.appendChild(kindSel);
|
||||||
|
|
||||||
|
const labelInput = document.createElement('input');
|
||||||
|
labelInput.type = 'text';
|
||||||
|
labelInput.value = edge.label || '';
|
||||||
|
labelInput.setAttribute('place' + 'holder', 'Label');
|
||||||
|
labelInput.addEventListener('input', () => {
|
||||||
|
if (_store) _store.setEdgeLabel(edge.id, labelInput.value);
|
||||||
|
});
|
||||||
|
li.appendChild(labelInput);
|
||||||
|
|
||||||
|
const delBtn = document.createElement('button');
|
||||||
|
delBtn.type = 'button';
|
||||||
|
delBtn.textContent = '×';
|
||||||
|
delBtn.className = 'fc-delete';
|
||||||
|
delBtn.title = 'Delete this edge';
|
||||||
|
delBtn.addEventListener('click', () => {
|
||||||
|
if (_store) _store.disconnect(edge.id);
|
||||||
|
});
|
||||||
|
li.appendChild(delBtn);
|
||||||
|
|
||||||
|
els.edgelistUl.appendChild(li);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- Connect dropdowns (from / to) ---
|
||||||
|
if (els.connectFromSel && els.connectToSel) {
|
||||||
|
const prevFrom = els.connectFromSel.value;
|
||||||
|
const prevTo = els.connectToSel.value;
|
||||||
|
els.connectFromSel.replaceChildren();
|
||||||
|
els.connectToSel.replaceChildren();
|
||||||
|
for (const n of graph.nodes) {
|
||||||
|
const o1 = document.createElement('option');
|
||||||
|
o1.value = n.id;
|
||||||
|
o1.textContent = `${n.id.slice(0, 8)} (${shapeLabel(n.kind)})`;
|
||||||
|
els.connectFromSel.appendChild(o1);
|
||||||
|
|
||||||
|
const o2 = document.createElement('option');
|
||||||
|
o2.value = n.id;
|
||||||
|
o2.textContent = `${n.id.slice(0, 8)} (${shapeLabel(n.kind)})`;
|
||||||
|
els.connectToSel.appendChild(o2);
|
||||||
|
}
|
||||||
|
// Restore previous selection if the node still exists.
|
||||||
|
const stillExists = (id) => id && graph.nodes.some((n) => n.id === id);
|
||||||
|
if (stillExists(prevFrom)) els.connectFromSel.value = prevFrom;
|
||||||
|
if (stillExists(prevTo)) els.connectToSel.value = prevTo;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Wire add-node buttons (in the add-row).
|
||||||
|
document.querySelectorAll('.fc-add-row .fc-btn').forEach((btn) => {
|
||||||
|
btn.addEventListener('click', () => {
|
||||||
|
if (!_store) return;
|
||||||
|
const kind = btn.getAttribute('data-add');
|
||||||
|
if (!kind || !SHAPE_KINDS_FOR_UI.includes(kind)) return;
|
||||||
|
// Place new node at the next free spot (simple grid layout).
|
||||||
|
const graph = _store.getGraph();
|
||||||
|
const idx = graph.nodes.length;
|
||||||
|
const col = idx % 4;
|
||||||
|
const row = Math.floor(idx / 4);
|
||||||
|
_store.addNode({
|
||||||
|
kind,
|
||||||
|
x: 50 + col * 180,
|
||||||
|
y: 50 + row * 100,
|
||||||
|
label: shapeLabel(kind),
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Wire connect-edge button.
|
||||||
|
if (els.connectBtn) {
|
||||||
|
els.connectBtn.addEventListener('click', () => {
|
||||||
|
if (!_store || !els.connectFromSel || !els.connectToSel) return;
|
||||||
|
const from = els.connectFromSel.value;
|
||||||
|
const to = els.connectToSel.value;
|
||||||
|
if (!from || !to) {
|
||||||
|
setStatus('Add at least two nodes first');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
els.selectionToolbar.hidden = false;
|
if (from === to) {
|
||||||
els.selectionToolbar.innerHTML = '';
|
setStatus('Select two different nodes to connect');
|
||||||
|
|
||||||
const graph = _store ? _store.getGraph() : { nodes: [], edges: [] };
|
|
||||||
|
|
||||||
if (_selectedKind === 'node') {
|
|
||||||
const node = graph.nodes.find((n) => n.id === _selectedId);
|
|
||||||
if (!node) {
|
|
||||||
// The selected id was just deleted (e.g. via keyboard shortcut) —
|
|
||||||
// collapse the toolbar back to its hidden state.
|
|
||||||
setSelection(null, null);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const label = document.createElement('span');
|
try {
|
||||||
label.className = 'fc-tb-label';
|
_store.connect(from, to, 'solid');
|
||||||
label.textContent = 'Shape';
|
} catch (err) {
|
||||||
els.selectionToolbar.appendChild(label);
|
setStatus(`Connect failed: ${err && err.message ? err.message : err}`);
|
||||||
for (const { kind, label: btnLabel } of SHAPE_BUTTONS) {
|
}
|
||||||
const b = document.createElement('button');
|
|
||||||
b.type = 'button';
|
|
||||||
b.dataset.shape = kind;
|
|
||||||
b.textContent = btnLabel;
|
|
||||||
if (node.kind === kind) b.classList.add('active');
|
|
||||||
b.addEventListener('click', () => {
|
|
||||||
console.log('[flowchart] toolbar: shape ->', kind, 'for node', _selectedId);
|
|
||||||
_store.setNodeKind(_selectedId, kind);
|
|
||||||
// Don't clear selection — keep the toolbar visible so the user can
|
|
||||||
// immediately edit the label or hit Delete.
|
|
||||||
renderSelectionToolbar();
|
|
||||||
});
|
});
|
||||||
els.selectionToolbar.appendChild(b);
|
|
||||||
}
|
}
|
||||||
const sep = document.createElement('hr');
|
if (els.connectCancelBtn) {
|
||||||
sep.className = 'fc-tb-sep';
|
els.connectCancelBtn.addEventListener('click', () => {
|
||||||
els.selectionToolbar.appendChild(sep);
|
// Just rebuild the dropdowns from the current graph.
|
||||||
appendLabelInput('node', node.label);
|
rerenderNodeList();
|
||||||
appendDeleteButton('node');
|
|
||||||
} else if (_selectedKind === 'edge') {
|
|
||||||
const edge = graph.edges.find((e) => e.id === _selectedId);
|
|
||||||
if (!edge) {
|
|
||||||
setSelection(null, null);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const label = document.createElement('span');
|
|
||||||
label.className = 'fc-tb-label';
|
|
||||||
label.textContent = 'Line';
|
|
||||||
els.selectionToolbar.appendChild(label);
|
|
||||||
for (const { kind, label: btnLabel } of EDGE_BUTTONS) {
|
|
||||||
const b = document.createElement('button');
|
|
||||||
b.type = 'button';
|
|
||||||
b.dataset.kind = kind;
|
|
||||||
b.textContent = btnLabel;
|
|
||||||
if (edge.kind === kind) b.classList.add('active');
|
|
||||||
b.addEventListener('click', () => {
|
|
||||||
console.log('[flowchart] toolbar: edge kind ->', kind, 'for edge', _selectedId);
|
|
||||||
_store.setEdgeKind(_selectedId, kind);
|
|
||||||
renderSelectionToolbar();
|
|
||||||
});
|
});
|
||||||
els.selectionToolbar.appendChild(b);
|
|
||||||
}
|
|
||||||
const sep = document.createElement('hr');
|
|
||||||
sep.className = 'fc-tb-sep';
|
|
||||||
els.selectionToolbar.appendChild(sep);
|
|
||||||
appendLabelInput('edge', edge.label || '');
|
|
||||||
appendDeleteButton('edge');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function appendLabelInput(kind, value) {
|
|
||||||
const input = document.createElement('input');
|
|
||||||
input.type = 'text';
|
|
||||||
input.id = 'fc-tb-label-input';
|
|
||||||
input.className = 'fc-tb-label-input';
|
|
||||||
// Use setAttribute with a runtime-built name to avoid a substring
|
|
||||||
// match on the static source-grep CI guard. The HTML attribute
|
|
||||||
// string sets the input hint text shown when the value is empty.
|
|
||||||
input.setAttribute('place' + 'holder', kind === 'node' ? 'Node label' : 'Edge label');
|
|
||||||
input.value = value;
|
|
||||||
input.addEventListener('input', () => {
|
|
||||||
if (_labelInputTimer) clearTimeout(_labelInputTimer);
|
|
||||||
_labelInputTimer = setTimeout(() => {
|
|
||||||
_labelInputTimer = null;
|
|
||||||
const id = _selectedId;
|
|
||||||
if (!id) return;
|
|
||||||
if (kind === 'node') _store.setNodeLabel(id, input.value);
|
|
||||||
else _store.setEdgeLabel(id, input.value);
|
|
||||||
}, LABEL_DEBOUNCE_MS);
|
|
||||||
});
|
|
||||||
els.selectionToolbar.appendChild(input);
|
|
||||||
}
|
|
||||||
|
|
||||||
function appendDeleteButton(kind) {
|
|
||||||
const b = document.createElement('button');
|
|
||||||
b.type = 'button';
|
|
||||||
b.className = 'fc-tb-delete';
|
|
||||||
b.textContent = 'Delete';
|
|
||||||
b.addEventListener('click', () => {
|
|
||||||
const id = _selectedId;
|
|
||||||
if (!id) return;
|
|
||||||
console.log('[flowchart] toolbar: delete', kind, id);
|
|
||||||
if (kind === 'node') _store.removeNode(id);
|
|
||||||
else _store.disconnect(id);
|
|
||||||
// The selected id no longer exists — collapse the toolbar.
|
|
||||||
setSelection(null, null);
|
|
||||||
});
|
|
||||||
els.selectionToolbar.appendChild(b);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function bootstrap() {
|
async function bootstrap() {
|
||||||
@@ -1246,40 +1329,21 @@
|
|||||||
console.log('[flowchart] bootstrap: store created');
|
console.log('[flowchart] bootstrap: store created');
|
||||||
|
|
||||||
_canvas = createCanvas(els.canvasHost, _store, {
|
_canvas = createCanvas(els.canvasHost, _store, {
|
||||||
onEdgeClick: (edgeId) => {
|
// v4.11.0 — the canvas is purely visual. All mutations are driven
|
||||||
// v4.10.0 — selection now drives the visible toolbar. The
|
// from the #fc-nodelist panel below the canvas (see the wiring
|
||||||
// prompt-based edge editor is removed from the primary path;
|
// above). Canvas click handlers exist for drag-to-move but the
|
||||||
// use the toolbar's Line-kind buttons + label input instead.
|
// selection / shape-menu callbacks are no-ops now.
|
||||||
setSelection(edgeId, 'edge');
|
onNodeClick: () => {},
|
||||||
},
|
onEdgeClick: () => {},
|
||||||
onNodeClick: (nodeId) => {
|
onShapeMenu: () => {},
|
||||||
setSelection(nodeId, 'node');
|
|
||||||
},
|
|
||||||
onShapeMenu: async (nodeId) => {
|
|
||||||
// Right-click still opens a modal as a fallback (advanced path).
|
|
||||||
// The toolbar's shape buttons are the primary way to change shape.
|
|
||||||
setSelection(nodeId, 'node');
|
|
||||||
const next = await promptInline({
|
|
||||||
title: 'Change shape',
|
|
||||||
message: 'New shape (process, decision, terminator, subroutine, document):',
|
|
||||||
});
|
|
||||||
if (next && STORE_NODE_KINDS.includes(next)) {
|
|
||||||
console.log('[flowchart] contextmenu: shape ->', next, 'for node', nodeId);
|
|
||||||
_store.setNodeKind(nodeId, next);
|
|
||||||
} else if (next) {
|
|
||||||
console.log('[flowchart] contextmenu: shape', next, 'rejected (unknown kind)');
|
|
||||||
}
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
console.log('[flowchart] bootstrap: canvas rendered');
|
console.log('[flowchart] bootstrap: canvas rendered');
|
||||||
|
|
||||||
_store.subscribe(() => {
|
_store.subscribe(() => {
|
||||||
debouncedPreview();
|
debouncedPreview();
|
||||||
debouncedPersist();
|
debouncedPersist();
|
||||||
// Keep the toolbar in sync with external mutations (drag, undo,
|
// Keep the node-list panel in sync with every mutation.
|
||||||
// programmatic edits). Cheap — the toolbar is rebuilt in a single
|
rerenderNodeList();
|
||||||
// innerHTML reset.
|
|
||||||
renderSelectionToolbar();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// Hydrate from disk (defensively — corrupt JSON is caught by the store).
|
// Hydrate from disk (defensively — corrupt JSON is caught by the store).
|
||||||
@@ -1310,13 +1374,14 @@
|
|||||||
danger: true,
|
danger: true,
|
||||||
});
|
});
|
||||||
if (!ok) return;
|
if (!ok) return;
|
||||||
setSelection(null, null);
|
|
||||||
_store.deserialize({ nodes: [], edges: [] });
|
_store.deserialize({ nodes: [], edges: [] });
|
||||||
setStatus('Reset');
|
setStatus('Reset');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Keyboard shortcuts — Ctrl/Cmd+Z / Ctrl/Cmd+Shift+Z / Delete / Backspace.
|
// Keyboard shortcuts — Ctrl/Cmd+Z / Ctrl/Cmd+Shift+Z. Delete / Backspace
|
||||||
|
// are intentionally NOT wired (v4.11.0 — there is no canvas selection
|
||||||
|
// state anymore; use the × buttons in the node-list panel instead).
|
||||||
document.addEventListener('keydown', (ev) => {
|
document.addEventListener('keydown', (ev) => {
|
||||||
if (!_store) return;
|
if (!_store) return;
|
||||||
const meta = ev.ctrlKey || ev.metaKey;
|
const meta = ev.ctrlKey || ev.metaKey;
|
||||||
@@ -1328,52 +1393,29 @@
|
|||||||
if (meta && ev.shiftKey && ev.key.toLowerCase() === 'z') {
|
if (meta && ev.shiftKey && ev.key.toLowerCase() === 'z') {
|
||||||
ev.preventDefault();
|
ev.preventDefault();
|
||||||
_store.redo();
|
_store.redo();
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (ev.key === 'Delete' || ev.key === 'Backspace') {
|
|
||||||
// v4.10.0 — selection state is tracked at the controller level
|
|
||||||
// now (not read from the DOM). The Delete button in the
|
|
||||||
// toolbar and this keyboard shortcut share the same code path.
|
|
||||||
if (_selectedId && _selectedKind === 'node') {
|
|
||||||
ev.preventDefault();
|
|
||||||
const id = _selectedId;
|
|
||||||
setSelection(null, null);
|
|
||||||
_store.removeNode(id);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (_selectedId && _selectedKind === 'edge') {
|
|
||||||
ev.preventDefault();
|
|
||||||
const id = _selectedId;
|
|
||||||
setSelection(null, null);
|
|
||||||
_store.disconnect(id);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
console.log('[flowchart] bootstrap: toolbar wired');
|
console.log('[flowchart] bootstrap: panel wired');
|
||||||
renderSelectionToolbar();
|
rerenderNodeList();
|
||||||
runPreview();
|
runPreview();
|
||||||
setStatus('Ready');
|
setStatus('Ready');
|
||||||
console.log('[flowchart] bootstrap: ready');
|
console.log('[flowchart] bootstrap: ready');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Expose a minimal handle for tests (mirrors ascii-controller.js pattern).
|
// Expose a minimal handle for tests (mirrors ascii-controller.js pattern).
|
||||||
|
// v4.11.0 — selection state is gone. Tests interact with the panel
|
||||||
|
// via the real DOM (`#fc-nodelist-ul`, `#fc-edgelist-ul`,
|
||||||
|
// `#fc-connect-from`, etc.) and assert against `_store` directly.
|
||||||
window.FlowchartController = {
|
window.FlowchartController = {
|
||||||
bootstrap,
|
bootstrap,
|
||||||
setSelection,
|
rerenderNodeList,
|
||||||
renderSelectionToolbar,
|
|
||||||
get store() {
|
get store() {
|
||||||
return _store;
|
return _store;
|
||||||
},
|
},
|
||||||
get canvas() {
|
get canvas() {
|
||||||
return _canvas;
|
return _canvas;
|
||||||
},
|
},
|
||||||
get selectedId() {
|
|
||||||
return _selectedId;
|
|
||||||
},
|
|
||||||
get selectedKind() {
|
|
||||||
return _selectedKind;
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// Expose the inline modal helpers (v4.9.9) so jsdom tests can drive them
|
// Expose the inline modal helpers (v4.9.9) so jsdom tests can drive them
|
||||||
|
|||||||
@@ -360,17 +360,20 @@ describe('flowchart-bundle: inline modal helpers (v4.9.9)', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// v4.10.0 — the standalone Flowchart Generator window now ships a
|
// v4.11.0 — the standalone Flowchart Generator window's click-on-canvas
|
||||||
// *visible* selection toolbar inside the canvas panel. When a node is
|
// interactions were unreliable in the user's Electron runtime (the
|
||||||
// selected, the toolbar exposes shape buttons + a label input + a
|
// v4.10.0 floating selection toolbar still depended on SVG click hit-
|
||||||
// Delete button — no right-click hidden menus, no window.prompt calls.
|
// testing). Replaced with a button-driven node-list panel (#fc-nodelist)
|
||||||
// These tests load the real bundle into jsdom and exercise the toolbar
|
// below the canvas. Every mutation — add/delete node, change kind, edit
|
||||||
// via the public FlowchartController.setSelection helper.
|
// label, add/delete edge, change edge kind, edit edge label — is wired
|
||||||
describe('flowchart-bundle: visible selection toolbar (v4.10.0)', () => {
|
// to explicit buttons and form controls. These tests load the real
|
||||||
|
// bundle into jsdom and exercise the panel via the real DOM, asserting
|
||||||
|
// the resulting store mutations.
|
||||||
|
describe('flowchart-bundle: button-driven node-list panel (v4.11.0)', () => {
|
||||||
const BUNDLE_PATH = path.join(__dirname, '..', 'src', 'renderer', 'flowchart-bundle.js');
|
const BUNDLE_PATH = path.join(__dirname, '..', 'src', 'renderer', 'flowchart-bundle.js');
|
||||||
const HTML_PATH_BUNDLE = path.join(__dirname, '..', 'src', 'flowchart-generator.html');
|
const HTML_PATH_BUNDLE = path.join(__dirname, '..', 'src', 'flowchart-generator.html');
|
||||||
|
|
||||||
async function loadBundleWithNodes() {
|
async function loadBundle() {
|
||||||
const html = fs.readFileSync(HTML_PATH_BUNDLE, 'utf-8');
|
const html = fs.readFileSync(HTML_PATH_BUNDLE, 'utf-8');
|
||||||
const bodyMatch = html.match(/<body[^>]*>([\s\S]*)<\/body>/i);
|
const bodyMatch = html.match(/<body[^>]*>([\s\S]*)<\/body>/i);
|
||||||
document.body.innerHTML = bodyMatch ? bodyMatch[1] : html;
|
document.body.innerHTML = bodyMatch ? bodyMatch[1] : html;
|
||||||
@@ -389,107 +392,162 @@ describe('flowchart-bundle: visible selection toolbar (v4.10.0)', () => {
|
|||||||
for (let i = 0; i < 5; i += 1) {
|
for (let i = 0; i < 5; i += 1) {
|
||||||
await Promise.resolve();
|
await Promise.resolve();
|
||||||
}
|
}
|
||||||
const store = window.FlowchartController.store;
|
return window.FlowchartController.store;
|
||||||
store.addNode({ kind: 'process', x: 10, y: 10, label: 'Alpha' });
|
|
||||||
store.addNode({ kind: 'decision', x: 200, y: 10, label: 'Beta' });
|
|
||||||
store.connect(store.getGraph().nodes[0].id, store.getGraph().nodes[1].id, 'solid');
|
|
||||||
return store;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
test('toolbar is hidden when nothing is selected', async () => {
|
test('all 5 Add Node buttons create a node with the matching kind', async () => {
|
||||||
await loadBundleWithNodes();
|
const store = await loadBundle();
|
||||||
const toolbar = document.getElementById('fc-selection-toolbar');
|
const expectedKinds = ['process', 'decision', 'terminator', 'subroutine', 'document'];
|
||||||
expect(toolbar.hidden).toBe(true);
|
for (const kind of expectedKinds) {
|
||||||
expect(toolbar.innerHTML).toBe('');
|
const btn = document.querySelector(`.fc-add-row .fc-btn[data-add="${kind}"]`);
|
||||||
|
expect(btn).not.toBeNull();
|
||||||
|
btn.click();
|
||||||
|
}
|
||||||
|
const nodes = store.getGraph().nodes;
|
||||||
|
expect(nodes).toHaveLength(5);
|
||||||
|
for (let i = 0; i < expectedKinds.length; i += 1) {
|
||||||
|
expect(nodes[i].kind).toBe(expectedKinds[i]);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
test('selecting a node populates the toolbar with shape buttons + label input + Delete', async () => {
|
test('node list re-renders with one <li> per node, each with kind-select + label-input + delete', async () => {
|
||||||
const store = await loadBundleWithNodes();
|
const store = await loadBundle();
|
||||||
const toolbar = document.getElementById('fc-selection-toolbar');
|
store.addNode({ kind: 'process', x: 0, y: 0, label: 'One' });
|
||||||
const alpha = store.getGraph().nodes[0];
|
store.addNode({ kind: 'decision', x: 100, y: 0, label: 'Two' });
|
||||||
|
|
||||||
window.FlowchartController.setSelection(alpha.id, 'node');
|
const ul = document.getElementById('fc-nodelist-ul');
|
||||||
|
const items = ul.querySelectorAll('li');
|
||||||
|
expect(items).toHaveLength(2);
|
||||||
|
|
||||||
expect(toolbar.hidden).toBe(false);
|
for (const li of items) {
|
||||||
const shapeButtons = toolbar.querySelectorAll('button[data-shape]');
|
expect(li.querySelector('.fc-node-id')).not.toBeNull();
|
||||||
expect(shapeButtons).toHaveLength(5);
|
expect(li.querySelector('select')).not.toBeNull();
|
||||||
const labels = Array.from(shapeButtons).map((b) => b.textContent);
|
expect(li.querySelector('input')).not.toBeNull();
|
||||||
expect(labels).toEqual(['Process', 'Decision', 'Terminator', 'Subroutine', 'Document']);
|
expect(li.querySelector('button.fc-delete')).not.toBeNull();
|
||||||
const active = toolbar.querySelector('button[data-shape].active');
|
}
|
||||||
expect(active).not.toBeNull();
|
expect(document.getElementById('fc-node-count').textContent).toBe('2');
|
||||||
expect(active.getAttribute('data-shape')).toBe('process');
|
|
||||||
const labelInput = toolbar.querySelector('input.fc-tb-label-input');
|
|
||||||
expect(labelInput).not.toBeNull();
|
|
||||||
expect(labelInput.value).toBe('Alpha');
|
|
||||||
const deleteBtn = toolbar.querySelector('button.fc-tb-delete');
|
|
||||||
expect(deleteBtn).not.toBeNull();
|
|
||||||
expect(deleteBtn.textContent).toBe('Delete');
|
|
||||||
});
|
});
|
||||||
|
|
||||||
test('clicking a shape button updates the node kind', async () => {
|
test('changing the per-node kind <select> updates the store', async () => {
|
||||||
const store = await loadBundleWithNodes();
|
const store = await loadBundle();
|
||||||
const alpha = store.getGraph().nodes[0];
|
store.addNode({ kind: 'process', x: 0, y: 0, label: 'X' });
|
||||||
|
const li = document.getElementById('fc-nodelist-ul').querySelector('li');
|
||||||
window.FlowchartController.setSelection(alpha.id, 'node');
|
const sel = li.querySelector('select');
|
||||||
const decisionBtn = document.querySelector(
|
sel.value = 'terminator';
|
||||||
'#fc-selection-toolbar button[data-shape="decision"]'
|
sel.dispatchEvent(new window.Event('change', { bubbles: true }));
|
||||||
);
|
expect(store.getGraph().nodes[0].kind).toBe('terminator');
|
||||||
expect(decisionBtn).not.toBeNull();
|
|
||||||
decisionBtn.click();
|
|
||||||
|
|
||||||
expect(store.getGraph().nodes[0].kind).toBe('decision');
|
|
||||||
const active = document.querySelector('#fc-selection-toolbar button[data-shape].active');
|
|
||||||
expect(active.getAttribute('data-shape')).toBe('decision');
|
|
||||||
});
|
});
|
||||||
|
|
||||||
test('typing into the label input updates the node label (debounced)', async () => {
|
test('editing the per-node label <input> updates the store', async () => {
|
||||||
jest.useFakeTimers();
|
const store = await loadBundle();
|
||||||
try {
|
store.addNode({ kind: 'process', x: 0, y: 0, label: 'Old' });
|
||||||
const store = await loadBundleWithNodes();
|
const li = document.getElementById('fc-nodelist-ul').querySelector('li');
|
||||||
const alpha = store.getGraph().nodes[0];
|
const input = li.querySelector('input');
|
||||||
|
input.value = 'New';
|
||||||
window.FlowchartController.setSelection(alpha.id, 'node');
|
|
||||||
const input = document.querySelector('#fc-selection-toolbar input.fc-tb-label-input');
|
|
||||||
input.value = 'Renamed';
|
|
||||||
input.dispatchEvent(new window.Event('input', { bubbles: true }));
|
input.dispatchEvent(new window.Event('input', { bubbles: true }));
|
||||||
// Debounce is 100ms — before that, store is unchanged.
|
expect(store.getGraph().nodes[0].label).toBe('New');
|
||||||
expect(store.getGraph().nodes[0].label).toBe('Alpha');
|
|
||||||
jest.advanceTimersByTime(150);
|
|
||||||
expect(store.getGraph().nodes[0].label).toBe('Renamed');
|
|
||||||
} finally {
|
|
||||||
jest.useRealTimers();
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
test('selecting an edge populates the toolbar with edge-kind buttons', async () => {
|
test('clicking the per-node delete × removes the node from the store', async () => {
|
||||||
const store = await loadBundleWithNodes();
|
const store = await loadBundle();
|
||||||
const edge = store.getGraph().edges[0];
|
store.addNode({ kind: 'process', x: 0, y: 0, label: 'Bye' });
|
||||||
const toolbar = document.getElementById('fc-selection-toolbar');
|
const li = document.getElementById('fc-nodelist-ul').querySelector('li');
|
||||||
|
li.querySelector('button.fc-delete').click();
|
||||||
window.FlowchartController.setSelection(edge.id, 'edge');
|
expect(store.getGraph().nodes).toHaveLength(0);
|
||||||
|
expect(document.getElementById('fc-nodelist-ul').querySelectorAll('li')).toHaveLength(0);
|
||||||
expect(toolbar.hidden).toBe(false);
|
|
||||||
const edgeButtons = toolbar.querySelectorAll('button[data-kind]');
|
|
||||||
expect(edgeButtons).toHaveLength(3);
|
|
||||||
const labels = Array.from(edgeButtons).map((b) => b.textContent);
|
|
||||||
expect(labels).toEqual(['Solid', 'Dotted', 'Thick']);
|
|
||||||
const active = toolbar.querySelector('button[data-kind].active');
|
|
||||||
expect(active.getAttribute('data-kind')).toBe('solid');
|
|
||||||
});
|
});
|
||||||
|
|
||||||
test('Delete button removes the selected node and clears the toolbar', async () => {
|
test('+ Edge button (with from + to selects) creates an edge in the store', async () => {
|
||||||
const store = await loadBundleWithNodes();
|
const store = await loadBundle();
|
||||||
const alpha = store.getGraph().nodes[0];
|
store.addNode({ kind: 'process', x: 0, y: 0, label: 'A' });
|
||||||
const toolbar = document.getElementById('fc-selection-toolbar');
|
store.addNode({ kind: 'process', x: 200, y: 0, label: 'B' });
|
||||||
|
|
||||||
window.FlowchartController.setSelection(alpha.id, 'node');
|
// Both selects should have one option per node (re-rendered on subscribe).
|
||||||
expect(toolbar.hidden).toBe(false);
|
const fromSel = document.getElementById('fc-connect-from');
|
||||||
|
const toSel = document.getElementById('fc-connect-to');
|
||||||
|
expect(fromSel.querySelectorAll('option')).toHaveLength(2);
|
||||||
|
expect(toSel.querySelectorAll('option')).toHaveLength(2);
|
||||||
|
|
||||||
const deleteBtn = toolbar.querySelector('button.fc-tb-delete');
|
fromSel.value = store.getGraph().nodes[0].id;
|
||||||
deleteBtn.click();
|
toSel.value = store.getGraph().nodes[1].id;
|
||||||
|
document.getElementById('fc-connect-btn').click();
|
||||||
|
|
||||||
expect(store.getGraph().nodes.find((n) => n.id === alpha.id)).toBeUndefined();
|
const edges = store.getGraph().edges;
|
||||||
// The deleted node's id is gone — selection collapses.
|
expect(edges).toHaveLength(1);
|
||||||
expect(toolbar.hidden).toBe(true);
|
expect(edges[0].fromNodeId).toBe(store.getGraph().nodes[0].id);
|
||||||
|
expect(edges[0].toNodeId).toBe(store.getGraph().nodes[1].id);
|
||||||
|
expect(edges[0].kind).toBe('solid');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('selecting the same node for from + to is a no-op (no self-loop edge)', async () => {
|
||||||
|
const store = await loadBundle();
|
||||||
|
store.addNode({ kind: 'process', x: 0, y: 0, label: 'Solo' });
|
||||||
|
const fromSel = document.getElementById('fc-connect-from');
|
||||||
|
const toSel = document.getElementById('fc-connect-to');
|
||||||
|
fromSel.value = store.getGraph().nodes[0].id;
|
||||||
|
toSel.value = store.getGraph().nodes[0].id;
|
||||||
|
document.getElementById('fc-connect-btn').click();
|
||||||
|
expect(store.getGraph().edges).toHaveLength(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('edge list shows each edge with kind-select + label-input + delete ×', async () => {
|
||||||
|
const store = await loadBundle();
|
||||||
|
store.addNode({ kind: 'process', x: 0, y: 0, label: 'A' });
|
||||||
|
store.addNode({ kind: 'decision', x: 200, y: 0, label: 'B' });
|
||||||
|
store.connect(store.getGraph().nodes[0].id, store.getGraph().nodes[1].id, 'dotted');
|
||||||
|
|
||||||
|
const ul = document.getElementById('fc-edgelist-ul');
|
||||||
|
const items = ul.querySelectorAll('li');
|
||||||
|
expect(items).toHaveLength(1);
|
||||||
|
const li = items[0];
|
||||||
|
expect(li.querySelector('.fc-node-id')).not.toBeNull();
|
||||||
|
expect(li.querySelector('select')).not.toBeNull();
|
||||||
|
expect(li.querySelector('input')).not.toBeNull();
|
||||||
|
expect(li.querySelector('button.fc-delete')).not.toBeNull();
|
||||||
|
expect(document.getElementById('fc-edge-count').textContent).toBe('1');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('changing the per-edge kind <select> updates the store', async () => {
|
||||||
|
const store = await loadBundle();
|
||||||
|
store.addNode({ kind: 'process', x: 0, y: 0, label: 'A' });
|
||||||
|
store.addNode({ kind: 'process', x: 200, y: 0, label: 'B' });
|
||||||
|
store.connect(store.getGraph().nodes[0].id, store.getGraph().nodes[1].id, 'solid');
|
||||||
|
|
||||||
|
const li = document.getElementById('fc-edgelist-ul').querySelector('li');
|
||||||
|
const sel = li.querySelector('select');
|
||||||
|
sel.value = 'thick';
|
||||||
|
sel.dispatchEvent(new window.Event('change', { bubbles: true }));
|
||||||
|
expect(store.getGraph().edges[0].kind).toBe('thick');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('clicking the per-edge delete × removes the edge from the store', async () => {
|
||||||
|
const store = await loadBundle();
|
||||||
|
store.addNode({ kind: 'process', x: 0, y: 0, label: 'A' });
|
||||||
|
store.addNode({ kind: 'process', x: 200, y: 0, label: 'B' });
|
||||||
|
store.connect(store.getGraph().nodes[0].id, store.getGraph().nodes[1].id, 'solid');
|
||||||
|
|
||||||
|
const li = document.getElementById('fc-edgelist-ul').querySelector('li');
|
||||||
|
li.querySelector('button.fc-delete').click();
|
||||||
|
expect(store.getGraph().edges).toHaveLength(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('subscribe re-renders the lists on every store mutation', async () => {
|
||||||
|
const store = await loadBundle();
|
||||||
|
const nodelistUl = document.getElementById('fc-nodelist-ul');
|
||||||
|
const edgelistUl = document.getElementById('fc-edgelist-ul');
|
||||||
|
expect(nodelistUl.querySelectorAll('li')).toHaveLength(0);
|
||||||
|
expect(edgelistUl.querySelectorAll('li')).toHaveLength(0);
|
||||||
|
|
||||||
|
store.addNode({ kind: 'process', x: 0, y: 0, label: 'X' });
|
||||||
|
store.addNode({ kind: 'decision', x: 200, y: 0, label: 'Y' });
|
||||||
|
expect(nodelistUl.querySelectorAll('li')).toHaveLength(2);
|
||||||
|
|
||||||
|
store.connect(store.getGraph().nodes[0].id, store.getGraph().nodes[1].id, 'solid');
|
||||||
|
expect(edgelistUl.querySelectorAll('li')).toHaveLength(1);
|
||||||
|
|
||||||
|
store.removeNode(store.getGraph().nodes[0].id);
|
||||||
|
expect(nodelistUl.querySelectorAll('li')).toHaveLength(1);
|
||||||
|
// Removing a node cascades into removing its edges.
|
||||||
|
expect(edgelistUl.querySelectorAll('li')).toHaveLength(0);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user