[Cleanup] Remove redundant code (#663)

Removes:

- Unused option from public API `getWidgetAtCursor` - use without params
- Unused workaround impl. for WebGL
- Invalid code (incorrect `tabIndex` casing)
This commit is contained in:
filtered
2025-03-02 04:54:35 +11:00
committed by GitHub
parent ecb69a4f1d
commit ab25d1fc6e

View File

@@ -453,7 +453,7 @@ export class LGraphCanvas implements ConnectionColorContext {
/** @deprecated See {@link LGraphCanvas.selectedItems} */ /** @deprecated See {@link LGraphCanvas.selectedItems} */
selected_group: LGraphGroup | null = null selected_group: LGraphGroup | null = null
visible_nodes: LGraphNode[] = [] visible_nodes: LGraphNode[] = []
node_over?: LGraphNode | null node_over?: LGraphNode
node_capturing_input?: LGraphNode | null node_capturing_input?: LGraphNode | null
highlighted_links: Dictionary<boolean> = {} highlighted_links: Dictionary<boolean> = {}
link_over_widget?: IWidget link_over_widget?: IWidget
@@ -1572,7 +1572,7 @@ export class LGraphCanvas implements ConnectionColorContext {
this.onSelectionChange?.(this.selected_nodes) this.onSelectionChange?.(this.selected_nodes)
this.visible_nodes = [] this.visible_nodes = []
this.node_over = null this.node_over = undefined
this.node_capturing_input = null this.node_capturing_input = null
this.connecting_links = null this.connecting_links = null
this.highlighted_links = {} this.highlighted_links = {}
@@ -1657,9 +1657,6 @@ export class LGraphCanvas implements ConnectionColorContext {
// TODO: classList.add // TODO: classList.add
element.className += " lgraphcanvas" element.className += " lgraphcanvas"
element.data = this element.data = this
// @ts-expect-error Likely safe to remove. A decent default, but expectation is to be configured by calling app.
// to allow key events
element.tabindex = "1"
// Background canvas: To render objects behind nodes (background, links, groups) // Background canvas: To render objects behind nodes (background, links, groups)
this.bgcanvas = document.createElement("canvas") this.bgcanvas = document.createElement("canvas")
@@ -1866,7 +1863,7 @@ export class LGraphCanvas implements ConnectionColorContext {
getWidgetAtCursor(node?: LGraphNode): IWidget | null { getWidgetAtCursor(node?: LGraphNode): IWidget | null {
node ??= this.node_over node ??= this.node_over
if (!node.widgets) return null if (!node?.widgets) return null
const graphPos = this.graph_mouse const graphPos = this.graph_mouse
const x = graphPos[0] - node.pos[0] const x = graphPos[0] - node.pos[0]
@@ -1925,7 +1922,7 @@ export class LGraphCanvas implements ConnectionColorContext {
otherNode.lostFocusAt = LiteGraph.getTime() otherNode.lostFocusAt = LiteGraph.getTime()
this.node_over?.onMouseLeave?.(e) this.node_over?.onMouseLeave?.(e)
this.node_over = null this.node_over = undefined
this.dirty_canvas = true this.dirty_canvas = true
} }
} }
@@ -2012,6 +2009,8 @@ export class LGraphCanvas implements ConnectionColorContext {
#processPrimaryButton(e: CanvasPointerEvent, node: LGraphNode) { #processPrimaryButton(e: CanvasPointerEvent, node: LGraphNode) {
const { pointer, graph } = this const { pointer, graph } = this
if (!graph) throw new NullGraphError()
const x = e.canvasX const x = e.canvasX
const y = e.canvasY const y = e.canvasY
@@ -2027,8 +2026,6 @@ export class LGraphCanvas implements ConnectionColorContext {
dragRect[3] = 1 dragRect[3] = 1
pointer.onClick = (eUp) => { pointer.onClick = (eUp) => {
if (!graph) throw new NullGraphError()
// Click, not drag // Click, not drag
const clickedItem = node ?? const clickedItem = node ??
(this.reroutesEnabled ? graph.getRerouteOnPos(eUp.canvasX, eUp.canvasY) : null) ?? (this.reroutesEnabled ? graph.getRerouteOnPos(eUp.canvasX, eUp.canvasY) : null) ??
@@ -4079,9 +4076,6 @@ export class LGraphCanvas implements ConnectionColorContext {
drawFrontCanvas(): void { drawFrontCanvas(): void {
this.dirty_canvas = false this.dirty_canvas = false
if (!this.ctx) {
this.ctx = this.bgcanvas.getContext("2d")
}
const ctx = this.ctx const ctx = this.ctx
if (!ctx) return if (!ctx) return