Fix NODE_DEFAULT_SHAPE in color palette (#2033)

Co-authored-by: github-actions <github-actions@github.com>

package-lock.json

@@ -11,7 +11,7 @@
       "dependencies": {
         "@atlaskit/pragmatic-drag-and-drop": "^1.3.1",
         "@comfyorg/comfyui-electron-types": "^0.3.34",
-        "@comfyorg/litegraph": "^0.8.47",
+        "@comfyorg/litegraph": "^0.8.48",
         "@primevue/themes": "^4.0.5",
         "@vueuse/core": "^11.0.0",
         "@xterm/addon-fit": "^0.10.0",
@@ -1957,9 +1957,9 @@
       "license": "GPL-3.0-only"
     },
     "node_modules/@comfyorg/litegraph": {
-      "version": "0.8.47",
+      "version": "0.8.48",
-      "resolved": "https://registry.npmjs.org/@comfyorg/litegraph/-/litegraph-0.8.47.tgz",
+      "resolved": "https://registry.npmjs.org/@comfyorg/litegraph/-/litegraph-0.8.48.tgz",
-      "integrity": "sha512-JWKXWiqDyJjHz8oQ2kW8AVhTwYoGXHjynFuNeJrx1mtXurT6om1ywZoRptJbAwvNcSvbVWmdBdG0mf2NOqqwKQ==",
+      "integrity": "sha512-acbbo5LXPqgo5mxa+hxWKx6oUalEotkjgk6/UpYyOp+fVN3UPHCD07jgijcujDQTVUYzeNWVj0v9iZBU5DBTpg==",
       "license": "MIT"
     },
     "node_modules/@cspotcode/source-map-support": {

package.json

@@ -83,7 +83,7 @@
   "dependencies": {
     "@atlaskit/pragmatic-drag-and-drop": "^1.3.1",
     "@comfyorg/comfyui-electron-types": "^0.3.34",
-    "@comfyorg/litegraph": "^0.8.47",
+    "@comfyorg/litegraph": "^0.8.48",
     "@primevue/themes": "^4.0.5",
     "@vueuse/core": "^11.0.0",
     "@xterm/addon-fit": "^0.10.0",

src/assets/palettes/arc.json

@@ -40,7 +40,7 @@
       "NODE_DEFAULT_COLOR": "#2b2f38",
       "NODE_DEFAULT_BGCOLOR": "#242730",
       "NODE_DEFAULT_BOXCOLOR": "#6e7581",
-      "NODE_DEFAULT_SHAPE": "box",
+      "NODE_DEFAULT_SHAPE": 2,
       "NODE_BOX_OUTLINE_COLOR": "#FFF",
       "NODE_BYPASS_BGCOLOR": "#FF00FF",
       "NODE_ERROR_COLOUR": "#E00",

src/assets/palettes/dark.json

@@ -31,7 +31,7 @@
       "NODE_DEFAULT_COLOR": "#333",
       "NODE_DEFAULT_BGCOLOR": "#353535",
       "NODE_DEFAULT_BOXCOLOR": "#666",
-      "NODE_DEFAULT_SHAPE": "box",
+      "NODE_DEFAULT_SHAPE": 2,
       "NODE_BOX_OUTLINE_COLOR": "#FFF",
       "NODE_BYPASS_BGCOLOR": "#FF00FF",
       "NODE_ERROR_COLOUR": "#E00",

src/assets/palettes/github.json

@@ -40,7 +40,7 @@
       "NODE_DEFAULT_COLOR": "#161b22",
       "NODE_DEFAULT_BGCOLOR": "#13171d",
       "NODE_DEFAULT_BOXCOLOR": "#30363d",
-      "NODE_DEFAULT_SHAPE": "box",
+      "NODE_DEFAULT_SHAPE": 2,
       "NODE_BOX_OUTLINE_COLOR": "#e5eaf0",
       "NODE_BYPASS_BGCOLOR": "#FF00FF",
       "NODE_ERROR_COLOUR": "#E00",

src/assets/palettes/light.json

@@ -26,7 +26,7 @@
       "NODE_DEFAULT_COLOR": "#F7F7F7",
       "NODE_DEFAULT_BGCOLOR": "#F5F5F5",
       "NODE_DEFAULT_BOXCOLOR": "#CCC",
-      "NODE_DEFAULT_SHAPE": "box",
+      "NODE_DEFAULT_SHAPE": 2,
       "NODE_BOX_OUTLINE_COLOR": "#000",
       "NODE_BYPASS_BGCOLOR": "#FF00FF",
       "NODE_ERROR_COLOUR": "#E00",

src/assets/palettes/nord.json

@@ -40,7 +40,7 @@
       "NODE_DEFAULT_COLOR": "#2e3440",
       "NODE_DEFAULT_BGCOLOR": "#161b22",
       "NODE_DEFAULT_BOXCOLOR": "#545d70",
-      "NODE_DEFAULT_SHAPE": "box",
+      "NODE_DEFAULT_SHAPE": 2,
       "NODE_BOX_OUTLINE_COLOR": "#e5eaf0",
       "NODE_BYPASS_BGCOLOR": "#FF00FF",
       "NODE_ERROR_COLOUR": "#E00",

src/assets/palettes/solarized.json

@@ -25,7 +25,7 @@
       "NODE_DEFAULT_COLOR": "#094656",
       "NODE_DEFAULT_BGCOLOR": "#073642",
       "NODE_DEFAULT_BOXCOLOR": "#839496",
-      "NODE_DEFAULT_SHAPE": "box",
+      "NODE_DEFAULT_SHAPE": 2,
       "NODE_BOX_OUTLINE_COLOR": "#fdf6e3",
       "NODE_BYPASS_BGCOLOR": "#FF00FF",
       "NODE_ERROR_COLOUR": "#E00",

src/extensions/core/colorPalette.ts

@@ -276,7 +276,19 @@ app.registerExtension({
               colorPalette.colors.litegraph_base.hasOwnProperty(key) &&
               LiteGraph.hasOwnProperty(key)
             ) {
-              LiteGraph[key] = colorPalette.colors.litegraph_base[key]
+              const value = colorPalette.colors.litegraph_base[key]
+              if (key === 'NODE_DEFAULT_SHAPE' && typeof value === 'string') {
+                console.warn(
+                  `litegraph_base.NODE_DEFAULT_SHAPE only accepts [${[
+                    LiteGraph.BOX_SHAPE,
+                    LiteGraph.ROUND_SHAPE,
+                    LiteGraph.CARD_SHAPE
+                  ].join(', ')}] but got ${value}`
+                )
+                LiteGraph.NODE_DEFAULT_SHAPE = LiteGraph.ROUND_SHAPE
+              } else {
+                LiteGraph[key] = value
+              }
             }
           }
         }

src/locales/en/nodeDefs.json

@@ -5317,6 +5317,14 @@
       },
       "overlap": {
         "name": "overlap"
+      },
+      "temporal_size": {
+        "name": "temporal_size",
+        "tooltip": "Only used for video VAEs: Amount of frames to decode at a time."
+      },
+      "temporal_overlap": {
+        "name": "temporal_overlap",
+        "tooltip": "Only used for video VAEs: Amount of frames to overlap."
       }
     }
   },

src/locales/ja/nodeDefs.json

@@ -5287,6 +5287,14 @@
       "samples": {
         "name": "サンプル"
       },
+      "temporal_overlap": {
+        "name": "temporal_overlap",
+        "tooltip": "ビデオVAE専用：重複するフレームの数。"
+      },
+      "temporal_size": {
+        "name": "temporal_size",
+        "tooltip": "ビデオVAE専用：一度にデコードするフレームの数。"
+      },
       "tile_size": {
         "name": "タイルサイズ"
       },

src/locales/ko/nodeDefs.json

@@ -5287,6 +5287,14 @@
       "samples": {
         "name": "샘플"
       },
+      "temporal_overlap": {
+        "name": "temporal_overlap",
+        "tooltip": "비디오 VAE에만 사용됩니다: 겹치는 프레임의 양."
+      },
+      "temporal_size": {
+        "name": "temporal_size",
+        "tooltip": "비디오 VAE에만 사용됩니다: 한 번에 디코딩할 프레임의 양."
+      },
       "tile_size": {
         "name": "타일_크기"
       },

src/locales/ru/nodeDefs.json

@@ -5287,6 +5287,14 @@
       "samples": {
         "name": "образцы"
       },
+      "temporal_overlap": {
+        "name": "temporal_overlap",
+        "tooltip": "Используется только для видео VAE: количество кадров для перекрытия."
+      },
+      "temporal_size": {
+        "name": "temporal_size",
+        "tooltip": "Используется только для видео VAE: количество кадров для декодирования за раз."
+      },
       "tile_size": {
         "name": "размер_плитки"
       },

src/locales/zh/nodeDefs.json

@@ -5287,6 +5287,14 @@
       "samples": {
         "name": "样本"
       },
+      "temporal_overlap": {
+        "name": "时间重叠",
+        "tooltip": "仅用于视频VAEs：重叠的帧数。"
+      },
+      "temporal_size": {
+        "name": "时间尺寸",
+        "tooltip": "仅用于视频VAEs：一次解码的帧数。"
+      },
       "tile_size": {
         "name": "瓷砖大小"
       },

src/types/colorPaletteTypes.ts

@@ -1,3 +1,4 @@
+import { LiteGraph } from '@comfyorg/litegraph'
 import { z } from 'zod'
 
 const nodeSlotSchema = z
@@ -42,7 +43,11 @@ const litegraphBaseSchema = z
     NODE_DEFAULT_COLOR: z.string(),
     NODE_DEFAULT_BGCOLOR: z.string(),
     NODE_DEFAULT_BOXCOLOR: z.string(),
-    NODE_DEFAULT_SHAPE: z.string(),
+    NODE_DEFAULT_SHAPE: z.union([
+      z.literal(LiteGraph.BOX_SHAPE),
+      z.literal(LiteGraph.ROUND_SHAPE),
+      z.literal(LiteGraph.CARD_SHAPE)
+    ]),
     NODE_BOX_OUTLINE_COLOR: z.string(),
     NODE_BYPASS_BGCOLOR: z.string(),
     NODE_ERROR_COLOUR: z.string(),