Comfy-Org/ComfyUI_frontend
1
0
Fork 0
mirror of https://github.com/Comfy-Org/ComfyUI_frontend.git synced 2026-02-06 08:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #157 from ilyabesk/typedef_updates_and_fixes

Browse Source 
Typedef updates and fixes
This commit is contained in:
Javi Agenjo
2020-07-15 21:04:28 +02:00
committed by GitHub
parent e64363d928 5fdce48481
commit 66b8e3a09b
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/litegraph.d.ts vendored
View File

@@ -16,6 +16,7 @@ export type SlotShape =
| typeof LiteGraph.CIRCLE_SHAPE
| typeof LiteGraph.ARROW_SHAPE
| typeof LiteGraph.SQUARE_SHAPE
| number; // For custom shapes
/** https://github.com/jagenjo/litegraph.js/tree/master/guides#node-slots */
export interface INodeSlot {
@@ -238,6 +239,8 @@ export const LiteGraph: {
registerNodeType(type: string, base: { new (): LGraphNode }): void;
/** removes a node type from the system */
unregisterNodeType(type: string): void;
/** Removes all previously registered node's types. */
clearRegisteredTypes(): void;
/**
* Create a new node type by passing a function, it wraps it with a proper class and generates inputs according to the parameters of the function.
* Useful to wrap simple methods that do not require properties, and that only process some input to generate an output.
@@ -1308,6 +1311,8 @@ export declare class LGraphCanvas {
drawBackCanvas(): void;
/** draws the given node inside the canvas */
drawNode(node: LGraphNode, ctx: CanvasRenderingContext2D): void;
/** draws graphic for node's slot */
drawSlotGraphic(ctx: CanvasRenderingContext2D, pos: number[], shape: SlotShape, horizontal: boolean): void;
/** draws the shape of the given node in the canvas */
drawNodeShape(
node: LGraphNode,

13
src/litegraph.js
View File

@@ -3603,10 +3603,14 @@
return null;
}
var output = this.outputs[slot];
var input = target_node.inputs[target_slot];
if (LiteGraph.isValidConnection(output.type, input.type)) {
if (target_node.onBeforeConnectInput) {
// This way node can choose another slot (if selected is occupied)
target_slot = target_node.onBeforeConnectInput(target_slot);
input = target_node.inputs[target_slot];
}
//if there is something already plugged there, disconnect
@@ -3618,8 +3622,6 @@
//this.setDirtyCanvas(false,true);
//this.graph.connectionChange( this );
var output = this.outputs[slot];
//allows nodes to block connection
if (target_node.onConnectInput) {
if ( target_node.onConnectInput(target_slot, output.type, output, this, slot) === false ) {
@@ -3627,7 +3629,6 @@
}
}
var input = target_node.inputs[target_slot];
var link_info = null;
link_info = new LLink(
@@ -6978,7 +6979,7 @@ LGraphNode.prototype.executeAction = function(action)
var temp_vec2 = new Float32Array(2);
function drawSlotGraphic(ctx, pos, shape, horizontal) {
LGraphCanvas.prototype.drawSlotGraphic = function(ctx, pos, shape, horizontal) {
ctx.beginPath();
switch (shape) {
@@ -7173,7 +7174,7 @@ LGraphNode.prototype.executeAction = function(action)
var shape = slot.shape || (slot.type === LiteGraph.EVENT && LiteGraph.BOX_SHAPE)
|| (low_quality && LiteGraph.SQUARE_SHAPE) || LiteGraph.CIRCLE_SHAPE;
drawSlotGraphic(ctx, pos, shape, horizontal);
this.drawSlotGraphic(ctx, pos, shape, horizontal);
//render name
if (render_text) {
@@ -7217,7 +7218,7 @@ LGraphNode.prototype.executeAction = function(action)
var shape = slot.shape || (slot.type === LiteGraph.EVENT && LiteGraph.BOX_SHAPE)
|| (low_quality && LiteGraph.SQUARE_SHAPE) || LiteGraph.CIRCLE_SHAPE;
drawSlotGraphic(ctx, pos, shape, horizontal);
this.drawSlotGraphic(ctx, pos, shape, horizontal);
if(!low_quality)
ctx.stroke();