From 457c93cd198083d8a874d5ed9eb969f72ab0d8f0 Mon Sep 17 00:00:00 2001
From: David <DarkVamprism+Github@gmail.com>
Date: Thu, 4 Dec 2025 11:58:22 +0800
Subject: [PATCH] Started changing UI to match the rest of ComfyUI

Completed Main Container
---
 js/comfyui-manager.js | 131 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 112 insertions(+), 19 deletions(-)

diff --git a/js/comfyui-manager.js b/js/comfyui-manager.js
index e65a2c65..ebf4edd2 100644
--- a/js/comfyui-manager.js
+++ b/js/comfyui-manager.js
@@ -1249,31 +1249,124 @@ class ManagerMenuDialog extends ComfyDialog {
 	constructor() {
 		super();
 
-		const close_button = $el("button", { id: "cm-close-button", type: "button", textContent: "Close", onclick: () => this.close() });
+		const dialog_mask = $el("div.p-dialog-mask.p-overlay-mask.p-overlay-mask-enter", {
+			parent: document.body,
+			style: {
+				position: "fixed",
+				height: "100%",
+				width: "100%",
+				left: "0px",
+				top: "0px",
+				display: "flex",
+				justifyContent: "center",
+				alignItems: "center",
+				pointerEvents: "auto",
+				zIndex: "3203"
+			},
+			// [FIXME] Make clicking the mask close the dialog
+			// data-pc-section="mask"
+		});
 
-		const content =
-				$el("div.comfy-modal-content",
+		const header_actions = $el("div.p-dialog-header-actions", {
+				// [FIXME]
+				// data-pc-section="headeractions"
+			}
+		);
+
+		const close_button = $el("button.p-button.p-component.p-button-icon-only.p-button-secondary.p-button-rounded.p-button-text.p-dialog-close-button", {
+				parent: header_actions,
+				type: "button",
+				ariaLabel: "Close",
+				onclick: () => this.close(),
+				// "data-pc-name": "pcclosebutton",
+				// "data-p-disabled": "false",
+				// "data-p-severity": "secondary",
+				// "data-pc-group-section": "headericon",
+				// "data-pc-extend": "button",
+				// "data-pc-section": "root",
+				// [FIXME] Not sure how to do most of the SVG using $el
+				innerHTML: '<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg" class="p-icon p-button-icon" aria-hidden="true"><path d="M8.01186 7.00933L12.27 2.75116C12.341 2.68501 12.398 2.60524 12.4375 2.51661C12.4769 2.42798 12.4982 2.3323 12.4999 2.23529C12.5016 2.13827 12.4838 2.0419 12.4474 1.95194C12.4111 1.86197 12.357 1.78024 12.2884 1.71163C12.2198 1.64302 12.138 1.58893 12.0481 1.55259C11.9581 1.51625 11.8617 1.4984 11.7647 1.50011C11.6677 1.50182 11.572 1.52306 11.4834 1.56255C11.3948 1.60204 11.315 1.65898 11.2488 1.72997L6.99067 5.98814L2.7325 1.72997C2.59553 1.60234 2.41437 1.53286 2.22718 1.53616C2.03999 1.53946 1.8614 1.61529 1.72901 1.74767C1.59663 1.88006 1.5208 2.05865 1.5175 2.24584C1.5142 2.43303 1.58368 2.61419 1.71131 2.75116L5.96948 7.00933L1.71131 11.2675C1.576 11.403 1.5 11.5866 1.5 11.7781C1.5 11.9696 1.576 12.1532 1.71131 12.2887C1.84679 12.424 2.03043 12.5 2.2219 12.5C2.41338 12.5 2.59702 12.424 2.7325 12.2887L6.99067 8.03052L11.2488 12.2887C11.3843 12.424 11.568 12.5 11.7594 12.5C11.9509 12.5 12.1346 12.424 12.27 12.2887C12.4053 12.1532 12.4813 11.9696 12.4813 11.7781C12.4813 11.5866 12.4053 11.403 12.27 11.2675L8.01186 7.00933Z" fill="currentColor"></path></svg><span class="p-button-label" data-pc-section="label">&nbsp;</span><!---->'
+			}
+		);
+
+		const dialog_header = $el("div.p-dialog-header", {
+			// [FIXME]
+			// data-pc-section:"header"
+			},
+			[
+				$el("div", [
+					$el("div",
+						{
+							id: "cm-manager",
+							// [FIXME]
+							// data-v-#########:""
+						},
+						[
+							$el("h2.px-4", [
+								// [TODO] Find better icon
+								$el("i.mdi.mdi-puzzle", {
+									style: {
+										"font-size": "1.25rem",
+										"margin-right": ".5rem"
+									}
+								}),
+								$el("span", { textContent: `ComfyUI Manager ${manager_version}` })
+							])
+						]
+					)
+				]),
+				header_actions
+			]
+		);
+
+		const content =	$el("div.p-dialog-content",
+			[
+				$el("div.cm-menu-container",
 					[
-						$el("tr.cm-title", {}, [
-								$el("font", {size:6, color:"white"}, [`ComfyUI Manager ${manager_version}`])]
-							),
-						$el("br", {}, []),
-						$el("div.cm-menu-container",
-							[
-								$el("div.cm-menu-column", [...this.createControlsLeft()]),
-								$el("div.cm-menu-column", [...this.createControlsMid()]),
-								$el("div.cm-menu-column", [...this.createControlsRight()])
-							]),
+						$el("div.cm-menu-column", [...this.createControlsLeft()]),
+						$el("div.cm-menu-column", [...this.createControlsMid()]),
+						$el("div.cm-menu-column", [...this.createControlsRight()])
+					]),
 
-						$el("br", {}, []),
-						close_button,
-					]
-				);
+				$el("br", {}, []),
+			]
+		);
 
 		content.style.width = '100%';
 		content.style.height = '100%';
 
-		this.element = $el("div.comfy-modal", { id:'cm-manager-dialog', parent: document.body }, [ content ]);
+		const manager_dialog = $el("div.p-dialog.p-component.global-dialog", {
+				id:'cm-manager-dialog',
+				parent: dialog_mask,
+				style: {
+					'display': 'flex',
+					'flex-direction': 'column',
+					'pointer-events': 'auto',
+					'margin': '0px',
+				},
+				role: 'dialog',
+				ariaModal: 'true',
+				// [FIXME]
+				// ariaLabbelledby: 'cm-title',
+				// maximized: 'false',
+				// data-pc-name: 'dialog',
+				// data-pc-section: 'root',
+				// data-pd-focustrap: 'true'
+			},
+			[ dialog_header, content ]
+		);
+
+		const hidden_accessible = $el("span.p-hidden-accessible.p-hidden-focusable", {
+			parent: manager_dialog,
+			tabindex: "0",
+			role: "presentation",
+			ariaHidden: "true",
+			"data-p-hidden-accessible": "true",
+			"data-p-hidden-focusable": "true",
+			"data-pc-section": "firstfocusableelement"
+		});
+
+		this.element = dialog_mask;
 	}
 
 	get isVisible() {
@@ -1281,7 +1374,7 @@ class ManagerMenuDialog extends ComfyDialog {
 	}
 
 	show() {
-		this.element.style.display = "block";
+		this.element.style.display = "flex";
 	}
 
 	toggleVisibility() {