fix(editor): SVG editor UX — AbortController cleanup, icons, labels
AbortController on all addEventListener calls fixes React StrictMode double-mount causing duplicate listeners, stale "Upload SVG first" alerts, and double file dialogs. Mode buttons get icons (☝●▬), file button shows context-aware label, polygon validate/cancel get green/red styling. Inline SVG style overrides removed (CSS-only now). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
ce29457d8b
commit
ce84caea04
1 file changed
+64
-46
@@ -6,7 +6,6 @@ export default function SvgEditorRoute() {
|
|||||||
const canvasRef = useRef<HTMLDivElement>(null)
|
const canvasRef = useRef<HTMLDivElement>(null)
|
||||||
const canvasInnerRef = useRef<HTMLDivElement>(null)
|
const canvasInnerRef = useRef<HTMLDivElement>(null)
|
||||||
const sidebarRef = useRef<HTMLDivElement>(null)
|
const sidebarRef = useRef<HTMLDivElement>(null)
|
||||||
const cleanupRef = useRef<(() => void) | null>(null)
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const meta = document.createElement('meta')
|
const meta = document.createElement('meta')
|
||||||
@@ -24,11 +23,9 @@ export default function SvgEditorRoute() {
|
|||||||
const sidebar = sidebarRef.current
|
const sidebar = sidebarRef.current
|
||||||
if (!canvas || !canvasInner || !sidebar) return
|
if (!canvas || !canvasInner || !sidebar) return
|
||||||
|
|
||||||
initSvgEditor(canvas, canvasInner, sidebar)
|
const cleanup = initSvgEditor(canvas, canvasInner, sidebar)
|
||||||
|
|
||||||
return () => {
|
return cleanup
|
||||||
if (cleanupRef.current) cleanupRef.current()
|
|
||||||
}
|
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -58,7 +55,10 @@ export default function SvgEditorRoute() {
|
|||||||
<div className="svg-editor-sidebar-content">
|
<div className="svg-editor-sidebar-content">
|
||||||
<div className="section">
|
<div className="section">
|
||||||
<h3>File</h3>
|
<h3>File</h3>
|
||||||
<input type="file" id="svg-editor-file-import" accept=".svg" />
|
<input type="file" id="svg-editor-file-import" accept=".svg" style={{ display: 'none' }} />
|
||||||
|
<button className="primary" id="svg-editor-file-btn">
|
||||||
|
Choose an SVG file
|
||||||
|
</button>
|
||||||
<button className="primary" id="svg-editor-export-btn">
|
<button className="primary" id="svg-editor-export-btn">
|
||||||
Export SVG
|
Export SVG
|
||||||
</button>
|
</button>
|
||||||
@@ -67,17 +67,21 @@ export default function SvgEditorRoute() {
|
|||||||
<div className="section">
|
<div className="section">
|
||||||
<h3>Mode</h3>
|
<h3>Mode</h3>
|
||||||
<button data-mode="select" className="active" id="svg-editor-mode-select">
|
<button data-mode="select" className="active" id="svg-editor-mode-select">
|
||||||
Select / move
|
☝ Select / move
|
||||||
</button>
|
</button>
|
||||||
<button data-mode="point" id="svg-editor-mode-point">
|
<button data-mode="point" id="svg-editor-mode-point">
|
||||||
Add point
|
● Add point
|
||||||
</button>
|
</button>
|
||||||
<button data-mode="polygon" id="svg-editor-mode-polygon">
|
<button data-mode="polygon" id="svg-editor-mode-polygon">
|
||||||
Add polygon
|
▬ Add polygon
|
||||||
</button>
|
</button>
|
||||||
<div id="svg-editor-polygon-controls" style={{ display: 'none' }}>
|
<div id="svg-editor-polygon-controls" style={{ display: 'none' }}>
|
||||||
<button id="svg-editor-finalize-polygon">Close polygon (Enter)</button>
|
<button className="primary" id="svg-editor-finalize-polygon">
|
||||||
<button id="svg-editor-cancel-polygon">Cancel (Esc)</button>
|
Validate polygon (Enter)
|
||||||
|
</button>
|
||||||
|
<button className="danger" id="svg-editor-cancel-polygon">
|
||||||
|
Cancel (Esc)
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<label>Category for new elements</label>
|
<label>Category for new elements</label>
|
||||||
<select id="svg-editor-default-category" />
|
<select id="svg-editor-default-category" />
|
||||||
@@ -203,7 +207,10 @@ function initSvgEditor(
|
|||||||
canvas: HTMLDivElement,
|
canvas: HTMLDivElement,
|
||||||
canvasInner: HTMLDivElement,
|
canvasInner: HTMLDivElement,
|
||||||
_sidebar: HTMLDivElement,
|
_sidebar: HTMLDivElement,
|
||||||
) {
|
): () => void {
|
||||||
|
const ac = new AbortController()
|
||||||
|
const sig = { signal: ac.signal }
|
||||||
|
|
||||||
let mode = 'select'
|
let mode = 'select'
|
||||||
let selected: SVGElement | null = null
|
let selected: SVGElement | null = null
|
||||||
let polygonPoints: number[][] = []
|
let polygonPoints: number[][] = []
|
||||||
@@ -256,19 +263,19 @@ function initSvgEditor(
|
|||||||
btnIn.addEventListener('click', () => {
|
btnIn.addEventListener('click', () => {
|
||||||
zoom *= 1.2
|
zoom *= 1.2
|
||||||
applyZoom()
|
applyZoom()
|
||||||
})
|
}, sig)
|
||||||
const btnOut = document.createElement('button')
|
const btnOut = document.createElement('button')
|
||||||
btnOut.textContent = '−'
|
btnOut.textContent = '−'
|
||||||
btnOut.addEventListener('click', () => {
|
btnOut.addEventListener('click', () => {
|
||||||
zoom /= 1.2
|
zoom /= 1.2
|
||||||
applyZoom()
|
applyZoom()
|
||||||
})
|
}, sig)
|
||||||
const btnReset = document.createElement('button')
|
const btnReset = document.createElement('button')
|
||||||
btnReset.textContent = '⌂'
|
btnReset.textContent = '⌂'
|
||||||
btnReset.addEventListener('click', () => {
|
btnReset.addEventListener('click', () => {
|
||||||
zoom = 1
|
zoom = 1
|
||||||
applyZoom()
|
applyZoom()
|
||||||
})
|
}, sig)
|
||||||
zoomContainer.append(btnIn, btnOut, btnReset)
|
zoomContainer.append(btnIn, btnOut, btnReset)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -325,28 +332,32 @@ function initSvgEditor(
|
|||||||
getEl('svg-editor-count').textContent = '0'
|
getEl('svg-editor-count').textContent = '0'
|
||||||
getEl('svg-editor-element-list').textContent = ''
|
getEl('svg-editor-element-list').textContent = ''
|
||||||
getEl('svg-editor-edit-section').style.display = 'none'
|
getEl('svg-editor-edit-section').style.display = 'none'
|
||||||
|
getEl('svg-editor-file-btn').textContent = 'Choose an SVG file'
|
||||||
}
|
}
|
||||||
|
|
||||||
function setupGlobalDragDrop() {
|
function setupGlobalDragDrop() {
|
||||||
canvas.addEventListener('dragover', (e) => {
|
canvas.addEventListener('dragover', (e) => {
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
canvas.classList.add('dragging-over')
|
canvas.classList.add('dragging-over')
|
||||||
})
|
}, sig)
|
||||||
canvas.addEventListener('dragleave', (e) => {
|
canvas.addEventListener('dragleave', (e) => {
|
||||||
if (e.target === canvas) canvas.classList.remove('dragging-over')
|
if (e.target === canvas) canvas.classList.remove('dragging-over')
|
||||||
})
|
}, sig)
|
||||||
canvas.addEventListener('drop', (e) => {
|
canvas.addEventListener('drop', (e) => {
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
canvas.classList.remove('dragging-over')
|
canvas.classList.remove('dragging-over')
|
||||||
const file = e.dataTransfer?.files[0]
|
const file = e.dataTransfer?.files[0]
|
||||||
if (file && (file.name.endsWith('.svg') || file.type === 'image/svg+xml')) {
|
if (file && (file.name.endsWith('.svg') || file.type === 'image/svg+xml')) {
|
||||||
const reader = new FileReader()
|
const reader = new FileReader()
|
||||||
reader.onload = (ev) => loadSVG(ev.target?.result as string)
|
reader.onload = (ev) => {
|
||||||
|
loadSVG(ev.target?.result as string)
|
||||||
|
getEl('svg-editor-file-btn').textContent = 'Change SVG file'
|
||||||
|
}
|
||||||
reader.readAsText(file, 'UTF-8')
|
reader.readAsText(file, 'UTF-8')
|
||||||
} else {
|
} else {
|
||||||
alert('Drop an SVG file.')
|
alert('Drop an SVG file.')
|
||||||
}
|
}
|
||||||
})
|
}, sig)
|
||||||
}
|
}
|
||||||
|
|
||||||
function loadSVG(svgText: string) {
|
function loadSVG(svgText: string) {
|
||||||
@@ -378,9 +389,6 @@ function initSvgEditor(
|
|||||||
|
|
||||||
svgRoot.removeAttribute('width')
|
svgRoot.removeAttribute('width')
|
||||||
svgRoot.removeAttribute('height')
|
svgRoot.removeAttribute('height')
|
||||||
svgRoot.style.width = '100%'
|
|
||||||
svgRoot.style.height = 'auto'
|
|
||||||
svgRoot.style.maxWidth = '100%'
|
|
||||||
|
|
||||||
CATEGORIES = {}
|
CATEGORIES = {}
|
||||||
selected = null
|
selected = null
|
||||||
@@ -509,9 +517,9 @@ function initSvgEditor(
|
|||||||
|
|
||||||
function setupSVGListeners() {
|
function setupSVGListeners() {
|
||||||
if (!svgRoot) return
|
if (!svgRoot) return
|
||||||
svgRoot.addEventListener('click', svgClickHandler)
|
svgRoot.addEventListener('click', svgClickHandler, sig)
|
||||||
svgRoot.addEventListener('mousedown', svgMousedownHandler)
|
svgRoot.addEventListener('mousedown', svgMousedownHandler, sig)
|
||||||
svgRoot.addEventListener('contextmenu', svgContextMenuHandler)
|
svgRoot.addEventListener('contextmenu', svgContextMenuHandler, sig)
|
||||||
}
|
}
|
||||||
|
|
||||||
function svgClickHandler(e: MouseEvent) {
|
function svgClickHandler(e: MouseEvent) {
|
||||||
@@ -675,15 +683,15 @@ function initSvgEditor(
|
|||||||
}
|
}
|
||||||
|
|
||||||
function setupGlobalListeners() {
|
function setupGlobalListeners() {
|
||||||
document.addEventListener('mousemove', onMouseMove)
|
document.addEventListener('mousemove', onMouseMove, sig)
|
||||||
document.addEventListener('mouseup', onMouseUp)
|
document.addEventListener('mouseup', onMouseUp, sig)
|
||||||
document.addEventListener('keydown', onKeyDown)
|
document.addEventListener('keydown', onKeyDown, sig)
|
||||||
|
|
||||||
getEl('svg-editor-filter-input').addEventListener('input', refreshElementList)
|
getEl('svg-editor-filter-input').addEventListener('input', refreshElementList, sig)
|
||||||
|
|
||||||
;['svg-editor-edit-fr', 'svg-editor-edit-en', 'svg-editor-edit-category'].forEach(
|
;['svg-editor-edit-fr', 'svg-editor-edit-en', 'svg-editor-edit-category'].forEach(
|
||||||
(id) => {
|
(id) => {
|
||||||
getEl(id).addEventListener('change', applyEdit)
|
getEl(id).addEventListener('change', applyEdit, sig)
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -693,7 +701,7 @@ function initSvgEditor(
|
|||||||
range.addEventListener('input', () => {
|
range.addEventListener('input', () => {
|
||||||
num.value = range.value
|
num.value = range.value
|
||||||
if (selected) applyEdit()
|
if (selected) applyEdit()
|
||||||
})
|
}, sig)
|
||||||
num.addEventListener('input', () => {
|
num.addEventListener('input', () => {
|
||||||
const v = parseFloat(num.value)
|
const v = parseFloat(num.value)
|
||||||
if (!isNaN(v)) {
|
if (!isNaN(v)) {
|
||||||
@@ -702,7 +710,7 @@ function initSvgEditor(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
if (selected) applyEdit()
|
if (selected) applyEdit()
|
||||||
})
|
}, sig)
|
||||||
}
|
}
|
||||||
syncSliderNum('svg-editor-edit-radius', 'svg-editor-edit-radius-num')
|
syncSliderNum('svg-editor-edit-radius', 'svg-editor-edit-radius-num')
|
||||||
syncSliderNum('svg-editor-edit-opacity', 'svg-editor-edit-opacity-num')
|
syncSliderNum('svg-editor-edit-opacity', 'svg-editor-edit-opacity-num')
|
||||||
@@ -715,31 +723,39 @@ function initSvgEditor(
|
|||||||
getEl('svg-editor-osteo-fields').style.display = checked ? 'none' : 'block'
|
getEl('svg-editor-osteo-fields').style.display = checked ? 'none' : 'block'
|
||||||
applyEdit()
|
applyEdit()
|
||||||
},
|
},
|
||||||
|
sig,
|
||||||
)
|
)
|
||||||
getEl('svg-editor-edit-detail-target').addEventListener('change', applyEdit)
|
getEl('svg-editor-edit-detail-target').addEventListener('change', applyEdit, sig)
|
||||||
getEl('svg-editor-edit-detail-target').addEventListener('input', () => {
|
getEl('svg-editor-edit-detail-target').addEventListener('input', () => {
|
||||||
if (selected) applyEdit()
|
if (selected) applyEdit()
|
||||||
})
|
}, sig)
|
||||||
|
|
||||||
;(getEl('svg-editor-file-import') as HTMLInputElement).addEventListener('change', (e) => {
|
;(getEl('svg-editor-file-import') as HTMLInputElement).addEventListener('change', (e) => {
|
||||||
const file = (e.target as HTMLInputElement).files?.[0]
|
const file = (e.target as HTMLInputElement).files?.[0]
|
||||||
if (!file) return
|
if (!file) return
|
||||||
const reader = new FileReader()
|
const reader = new FileReader()
|
||||||
reader.onload = (ev) => loadSVG(ev.target?.result as string)
|
reader.onload = (ev) => {
|
||||||
|
loadSVG(ev.target?.result as string)
|
||||||
|
getEl('svg-editor-file-btn').textContent = 'Change SVG file'
|
||||||
|
}
|
||||||
reader.readAsText(file, 'UTF-8')
|
reader.readAsText(file, 'UTF-8')
|
||||||
;(e.target as HTMLInputElement).value = ''
|
;(e.target as HTMLInputElement).value = ''
|
||||||
})
|
}, sig)
|
||||||
|
|
||||||
getEl('svg-editor-export-btn').addEventListener('click', exportSVG)
|
getEl('svg-editor-file-btn').addEventListener('click', () => {
|
||||||
|
;(getEl('svg-editor-file-import') as HTMLInputElement).click()
|
||||||
|
}, sig)
|
||||||
|
|
||||||
getEl('svg-editor-mode-select').addEventListener('click', () => setMode('select'))
|
getEl('svg-editor-export-btn').addEventListener('click', exportSVG, sig)
|
||||||
getEl('svg-editor-mode-point').addEventListener('click', () => setMode('point'))
|
|
||||||
getEl('svg-editor-mode-polygon').addEventListener('click', () => setMode('polygon'))
|
getEl('svg-editor-mode-select').addEventListener('click', () => setMode('select'), sig)
|
||||||
getEl('svg-editor-finalize-polygon').addEventListener('click', finalizePolygon)
|
getEl('svg-editor-mode-point').addEventListener('click', () => setMode('point'), sig)
|
||||||
getEl('svg-editor-cancel-polygon').addEventListener('click', cancelPolygon)
|
getEl('svg-editor-mode-polygon').addEventListener('click', () => setMode('polygon'), sig)
|
||||||
getEl('svg-editor-add-cat-btn').addEventListener('click', addCategory)
|
getEl('svg-editor-finalize-polygon').addEventListener('click', finalizePolygon, sig)
|
||||||
getEl('svg-editor-delete-btn').addEventListener('click', deleteSelected)
|
getEl('svg-editor-cancel-polygon').addEventListener('click', cancelPolygon, sig)
|
||||||
getEl('svg-editor-restart-polygon').addEventListener('click', restartCurrentPolygon)
|
getEl('svg-editor-add-cat-btn').addEventListener('click', addCategory, sig)
|
||||||
|
getEl('svg-editor-delete-btn').addEventListener('click', deleteSelected, sig)
|
||||||
|
getEl('svg-editor-restart-polygon').addEventListener('click', restartCurrentPolygon, sig)
|
||||||
}
|
}
|
||||||
|
|
||||||
function getEl(id: string): HTMLElement {
|
function getEl(id: string): HTMLElement {
|
||||||
@@ -754,7 +770,7 @@ function initSvgEditor(
|
|||||||
}
|
}
|
||||||
|
|
||||||
function setMode(m: string) {
|
function setMode(m: string) {
|
||||||
if (!svgRoot && (m === 'point' || m === 'polygon')) {
|
if (!svgRoot && m !== 'select') {
|
||||||
alert('Upload an SVG first.')
|
alert('Upload an SVG first.')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -1661,4 +1677,6 @@ Current: ${current || '(none)'}`
|
|||||||
svgRoot.style.transform = `scale(${zoom})`
|
svgRoot.style.transform = `scale(${zoom})`
|
||||||
svgRoot.style.transformOrigin = 'top left'
|
svgRoot.style.transformOrigin = 'top left'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return () => { ac.abort() }
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user