The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
Feature/maskeditor context menu (#649)
Dr.Lt.Datad926f65f5621
diff --git a/web/extensions/core/maskeditor.js b/web/extensions/core/maskeditor.jsindex 552059e86..4b0c12747 100644--- a/web/extensions/core/maskeditor.js+++ b/web/extensions/core/maskeditor.js@@ -72,40 +72,50 @@ function prepareRGB(image, backupCanvas, backupCtx) {class MaskEditorDialog extends ComfyDialog {static instance = null;++ static getInstance() {+ if(!MaskEditorDialog.instance) {+ MaskEditorDialog.instance = new MaskEditorDialog(app);+ }++ return MaskEditorDialog.instance;+ }++ is_layout_created = false;+constructor() {super();this.element = $el("div.comfy-modal", { parent: document.body },[ $el("div.comfy-modal-content",[...this.createButtons()]),]);- MaskEditorDialog.instance = this;}createButtons() {return [];}- clearMask(self) {- }-createButton(name, callback) {var button = document.createElement("button");button.innerText = name;button.addEventListener("click", callback);return button;}+createLeftButton(name, callback) {var button = this.createButton(name, callback);button.style.cssFloat = "left";button.style.marginRight = "4px";return button;}+createRightButton(name, callback) {var button = this.createButton(name, callback);button.style.cssFloat = "right";button.style.marginLeft = "4px";return button;}+createLeftSlider(self, name, callback) {const divElement = document.createElement('div');divElement.id = "maskeditor-slider";@@ -164,7 +174,7 @@ class MaskEditorDialog extends ComfyDialog {brush.style.MozBorderRadius = "50%";brush.style.WebkitBorderRadius = "50%";brush.style.position = "absolute";- brush.style.zIndex = 100;+ brush.style.zIndex = 8889;brush.style.pointerEvents = "none";this.brush = brush;this.element.appendChild(imgCanvas);@@ -187,7 +197,8 @@ class MaskEditorDialog extends ComfyDialog {document.removeEventListener("keydown", MaskEditorDialog.handleKeyDown);self.close();});- var saveButton = this.createRightButton("Save", () => {++ this.saveButton = this.createRightButton("Save", () => {document.removeEventListener("mouseup", MaskEditorDialog.handleMouseUp);document.removeEventListener("keydown", MaskEditorDialog.handleKeyDown);self.save();@@ -199,11 +210,10 @@ class MaskEditorDialog extends ComfyDialog {this.element.appendChild(bottom_panel);bottom_panel.appendChild(clearButton);- bottom_panel.appendChild(saveButton);+ bottom_panel.appendChild(this.saveButton);bottom_panel.appendChild(cancelButton);bottom_panel.appendChild(brush_size_slider);- this.element.style.display = "block";imgCanvas.style.position = "relative";imgCanvas.style.top = "200";imgCanvas.style.left = "0";@@ -212,25 +222,63 @@ class MaskEditorDialog extends ComfyDialog {}show() {- // layout- const imgCanvas = document.createElement('canvas');- const maskCanvas = document.createElement('canvas');- const backupCanvas = document.createElement('canvas');+ if(!this.is_layout_created) {+ // layout+ const imgCanvas = document.createElement('canvas');+ const maskCanvas = document.createElement('canvas');+ const backupCanvas = document.createElement('canvas');++ imgCanvas.id = "imageCanvas";+ maskCanvas.id = "maskCanvas";+ backupCanvas.id = "backupCanvas";++ this.setlayout(imgCanvas, maskCanvas);++ // prepare content+ this.imgCanvas = imgCanvas;+ this.maskCanvas = maskCanvas;+ this.backupCanvas = backupCanvas;+ this.maskCtx = maskCanvas.getContext('2d');+ this.backupCtx = backupCanvas.getContext('2d');++ this.setEventHandler(maskCanvas);++ this.is_layout_created = true;++ // replacement of onClose hook since close is not real close+ const self = this;+ const observer = new MutationObserver(function(mutations) {+ mutations.forEach(function(mutation) {+ if (mutation.type === 'attributes' && mutation.attributeName === 'style') {+ if(self.last_display_style && self.last_display_style != 'none' && self.element.style.display == 'none') {+ ComfyApp.onClipspaceEditorClosed();+ }++ self.last_display_style = self.element.style.display;+ }+ });+ });- imgCanvas.id = "imageCanvas";- maskCanvas.id = "maskCanvas";- backupCanvas.id = "backupCanvas";+ const config = { attributes: true };+ observer.observe(this.element, config);+ }- this.setlayout(imgCanvas, maskCanvas);+ this.setImages(this.imgCanvas, this.backupCanvas);- // prepare content- this.maskCanvas = maskCanvas;- this.backupCanvas = backupCanvas;- this.maskCtx = maskCanvas.getContext('2d');- this.backupCtx = backupCanvas.getContext('2d');+ if(ComfyApp.clipspace_return_node) {+ this.saveButton.innerText = "Save to node";+ }+ else {+ this.saveButton.innerText = "Save";+ }+ this.saveButton.disabled = false;- this.setImages(imgCanvas, backupCanvas);- this.setEventHandler(maskCanvas);+ this.element.style.display = "block";+ this.element.style.zIndex = 8888; // NOTE: alert dialog must be high priority.+ }++ isOpened() {+ return this.element.style.display == "block";}setImages(imgCanvas, backupCanvas) {@@ -239,6 +287,10 @@ class MaskEditorDialog extends ComfyDialog {const maskCtx = this.maskCtx;const maskCanvas = this.maskCanvas;+ backupCtx.clearRect(0,0,this.backupCanvas.width,this.backupCanvas.height);+ imgCtx.clearRect(0,0,this.imgCanvas.width,this.imgCanvas.height);+ maskCtx.clearRect(0,0,this.maskCanvas.width,this.maskCanvas.height);+// image loadconst orig_image = new Image();window.addEventListener("resize", () => {@@ -296,8 +348,7 @@ class MaskEditorDialog extends ComfyDialog {rgb_url.searchParams.set('channel', 'rgb');orig_image.src = rgb_url;this.image = orig_image;- }g-+ }setEventHandler(maskCanvas) {maskCanvas.addEventListener("contextmenu", (event) => {@@ -327,6 +378,8 @@ class MaskEditorDialog extends ComfyDialog {self.brush_size = Math.min(self.brush_size+2, 100);} else if (event.key === '[') {self.brush_size = Math.max(self.brush_size-2, 1);+ } else if(event.key === 'Enter') {+ self.save();}self.updateBrushPreview(self);@@ -514,7 +567,7 @@ class MaskEditorDialog extends ComfyDialog {}}- save() {+ async save() {const backupCtx = this.backupCanvas.getContext('2d', {willReadFrequently:true});backupCtx.clearRect(0,0,this.backupCanvas.width,this.backupCanvas.height);@@ -570,7 +623,10 @@ class MaskEditorDialog extends ComfyDialog {formData.append('type', "input");formData.append('subfolder', "clipspace");- uploadMask(item, formData);+ this.saveButton.innerText = "Saving...";+ this.saveButton.disabled = true;+ await uploadMask(item, formData);+ ComfyApp.onClipspaceEditorSave();this.close();}}@@ -578,13 +634,15 @@ class MaskEditorDialog extends ComfyDialog {app.registerExtension({name: "Comfy.MaskEditor",init(app) {- const callback =+ ComfyApp.open_maskeditor =function () {- let dlg = new MaskEditorDialog(app);- dlg.show();+ const dlg = MaskEditorDialog.getInstance();+ if(!dlg.isOpened()) {+ dlg.show();+ }};const context_predicate = () => ComfyApp.clipspace && ComfyApp.clipspace.imgs && ComfyApp.clipspace.imgs.length > 0- ClipspaceDialog.registerButton("MaskEditor", context_predicate, callback);+ ClipspaceDialog.registerButton("MaskEditor", context_predicate, ComfyApp.open_maskeditor);}});\ No newline at end of filediff --git a/web/scripts/app.js b/web/scripts/app.jsindex 00d3c9746..87c5e30ca 100644--- a/web/scripts/app.js+++ b/web/scripts/app.js@@ -26,6 +26,8 @@ export class ComfyApp {*/static clipspace = null;static clipspace_invalidate_handler = null;+ static open_maskeditor = null;+ static clipspace_return_node = null;constructor() {this.ui = new ComfyUI(this);@@ -49,6 +51,114 @@ export class ComfyApp {this.shiftDown = false;}+ static isImageNode(node) {+ return node.imgs || (node && node.widgets && node.widgets.findIndex(obj => obj.name === 'image') >= 0);+ }++ static onClipspaceEditorSave() {+ if(ComfyApp.clipspace_return_node) {+ ComfyApp.pasteFromClipspace(ComfyApp.clipspace_return_node);+ }+ }++ static onClipspaceEditorClosed() {+ ComfyApp.clipspace_return_node = null;+ }++ static copyToClipspace(node) {+ var widgets = null;+ if(node.widgets) {+ widgets = node.widgets.map(({ type, name, value }) => ({ type, name, value }));+ }++ var imgs = undefined;+ var orig_imgs = undefined;+ if(node.imgs != undefined) {+ imgs = [];+ orig_imgs = [];++ for (let i = 0; i < node.imgs.length; i++) {+ imgs[i] = new Image();+ imgs[i].src = node.imgs[i].src;+ orig_imgs[i] = imgs[i];+ }+ }++ var selectedIndex = 0;+ if(node.imageIndex) {+ selectedIndex = node.imageIndex;+ }++ ComfyApp.clipspace = {+ 'widgets': widgets,+ 'imgs': imgs,+ 'original_imgs': orig_imgs,+ 'images': node.images,+ 'selectedIndex': selectedIndex,+ 'img_paste_mode': 'selected' // reset to default im_paste_mode state on copy action+ };++ ComfyApp.clipspace_return_node = null;++ if(ComfyApp.clipspace_invalidate_handler) {+ ComfyApp.clipspace_invalidate_handler();+ }+ }++ static pasteFromClipspace(node) {+ if(ComfyApp.clipspace) {+ // image paste+ if(ComfyApp.clipspace.imgs && node.imgs) {+ if(node.images && ComfyApp.clipspace.images) {+ if(ComfyApp.clipspace['img_paste_mode'] == 'selected') {+ app.nodeOutputs[node.id + ""].images = node.images = [ComfyApp.clipspace.images[ComfyApp.clipspace['selectedIndex']]];+ }+ else+ app.nodeOutputs[node.id + ""].images = node.images = ComfyApp.clipspace.images;+ }++ if(ComfyApp.clipspace.imgs) {+ // deep-copy to cut link with clipspace+ if(ComfyApp.clipspace['img_paste_mode'] == 'selected') {+ const img = new Image();+ img.src = ComfyApp.clipspace.imgs[ComfyApp.clipspace['selectedIndex']].src;+ node.imgs = [img];+ node.imageIndex = 0;+ }+ else {+ const imgs = [];+ for(let i=0; i<ComfyApp.clipspace.imgs.length; i++) {+ imgs[i] = new Image();+ imgs[i].src = ComfyApp.clipspace.imgs[i].src;+ node.imgs = imgs;+ }+ }+ }+ }++ if(node.widgets) {+ if(ComfyApp.clipspace.images) {+ const clip_image = ComfyApp.clipspace.images[ComfyApp.clipspace['selectedIndex']];+ const index = node.widgets.findIndex(obj => obj.name === 'image');+ if(index >= 0) {+ node.widgets[index].value = clip_image;+ }+ }+ if(ComfyApp.clipspace.widgets) {+ ComfyApp.clipspace.widgets.forEach(({ type, name, value }) => {+ const prop = Object.values(node.widgets).find(obj => obj.type === type && obj.name === name);+ if (prop && prop.type != 'button') {+ prop.value = value;+ prop.callback(value);+ }+ });+ }+ }++ app.graph.setDirtyCanvas(true);+ }+ }+/*** Invoke an extension callback* @param {keyof ComfyExtension} method The extension callback to execute@@ -138,102 +248,30 @@ export class ComfyApp {}}- options.push(- {- content: "Copy (Clipspace)",- callback: (obj) => {- var widgets = null;- if(this.widgets) {- widgets = this.widgets.map(({ type, name, value }) => ({ type, name, value }));- }-- var imgs = undefined;- var orig_imgs = undefined;- if(this.imgs != undefined) {- imgs = [];- orig_imgs = [];-- for (let i = 0; i < this.imgs.length; i++) {- imgs[i] = new Image();- imgs[i].src = this.imgs[i].src;- orig_imgs[i] = imgs[i];- }- }-- ComfyApp.clipspace = {- 'widgets': widgets,- 'imgs': imgs,- 'original_imgs': orig_imgs,- 'images': this.images,- 'selectedIndex': 0,- 'img_paste_mode': 'selected' // reset to default im_paste_mode state on copy action- };-- if(ComfyApp.clipspace_invalidate_handler) {- ComfyApp.clipspace_invalidate_handler();- }- }- });-- if(ComfyApp.clipspace != null) {- options.push(- {- content: "Paste (Clipspace)",- callback: () => {- if(ComfyApp.clipspace) {- // image paste- if(ComfyApp.clipspace.imgs && this.imgs) {- if(this.images && ComfyApp.clipspace.images) {- if(ComfyApp.clipspace['img_paste_mode'] == 'selected') {- app.nodeOutputs[this.id + ""].images = this.images = [ComfyApp.clipspace.images[ComfyApp.clipspace['selectedIndex']]];-- }- else- app.nodeOutputs[this.id + ""].images = this.images = ComfyApp.clipspace.images;- }-- if(ComfyApp.clipspace.imgs) {- // deep-copy to cut link with clipspace- if(ComfyApp.clipspace['img_paste_mode'] == 'selected') {- const img = new Image();- img.src = ComfyApp.clipspace.imgs[ComfyApp.clipspace['selectedIndex']].src;- this.imgs = [img];- }- else {- const imgs = [];- for(let i=0; i<ComfyApp.clipspace.imgs.length; i++) {- imgs[i] = new Image();- imgs[i].src = ComfyApp.clipspace.imgs[i].src;- this.imgs = imgs;- }- }- }- }+ // prevent conflict of clipspace content+ if(!ComfyApp.clipspace_return_node) {+ options.push({+ content: "Copy (Clipspace)",+ callback: (obj) => { ComfyApp.copyToClipspace(this); }+ });++ if(ComfyApp.clipspace != null) {+ options.push({+ content: "Paste (Clipspace)",+ callback: () => { ComfyApp.pasteFromClipspace(this); }+ });+ }- if(this.widgets) {- if(ComfyApp.clipspace.images) {- const clip_image = ComfyApp.clipspace.images[ComfyApp.clipspace['selectedIndex']];- const index = this.widgets.findIndex(obj => obj.name === 'image');- if(index >= 0) {- this.widgets[index].value = clip_image;- }- }- if(ComfyApp.clipspace.widgets) {- ComfyApp.clipspace.widgets.forEach(({ type, name, value }) => {- const prop = Object.values(this.widgets).find(obj => obj.type === type && obj.name === name);- if (prop && prop.type != 'button') {- prop.value = value;- prop.callback(value);- }- });- }- }+ if(ComfyApp.isImageNode(this)) {+ options.push({+ content: "Open in MaskEditor",+ callback: (obj) => {+ ComfyApp.copyToClipspace(this);+ ComfyApp.clipspace_return_node = this;+ ComfyApp.open_maskeditor();}-- app.graph.setDirtyCanvas(true);- }- }- );+ });+ }}};}