From 238128b6eb6319bf20cbeaa1a4a05d4d45892d36 Mon Sep 17 00:00:00 2001
From: space-nuko <24979496+space-nuko@users.noreply.github.com>
Date: Sat, 20 May 2023 10:39:20 -0500
Subject: [PATCH] More efficient loading for combo widget

---
 litegraph                               |   2 +-
 src/lib/nodes/widgets/ComfyComboNode.ts |   4 +-
 src/lib/widgets/ComboWidget.svelte      | 145 ++++++++++++------------
 3 files changed, 76 insertions(+), 75 deletions(-)

diff --git a/litegraph b/litegraph
index db6a916..e326ab3 160000
--- a/litegraph
+++ b/litegraph
@@ -1 +1 @@
-Subproject commit db6a9167575db269524564d5527c512a06c0f8d2
+Subproject commit e326ab331e39b4c4c43f3f10666e384781776e3f
diff --git a/src/lib/nodes/widgets/ComfyComboNode.ts b/src/lib/nodes/widgets/ComfyComboNode.ts
index bb8b5f9..de6fedd 100644
--- a/src/lib/nodes/widgets/ComfyComboNode.ts
+++ b/src/lib/nodes/widgets/ComfyComboNode.ts
@@ -40,13 +40,13 @@ export default class ComfyComboNode extends ComfyWidgetNode<string> {
     // Wait until the initial graph load for combo to be valid.
     firstLoad: Writable<boolean>;
     lightUp: Writable<boolean>;
-    valuesForCombo: Writable<any[] | null>; // Changed when the combo box has values.
+    valuesForCombo: Writable<any[]>; // Changed when the combo box has values.
 
     constructor(name?: string) {
         super(name, "A")
         this.firstLoad = writable(false)
         this.lightUp = writable(true)
-        this.valuesForCombo = writable(null)
+        this.valuesForCombo = writable([])
     }
 
     override onPropertyChanged(property: any, value: any) {
diff --git a/src/lib/widgets/ComboWidget.svelte b/src/lib/widgets/ComboWidget.svelte
index ec384a0..cb28b69 100644
--- a/src/lib/widgets/ComboWidget.svelte
+++ b/src/lib/widgets/ComboWidget.svelte
@@ -11,10 +11,10 @@
  export let widget: WidgetLayout | null = null;
  export let isMobile: boolean = false;
  let node: ComfyComboNode | null = null;
- let nodeValue: Writable<string> | null = null;
+ let nodeValue: Writable<string> = writable("");
  let propsChanged: Writable<number> | null = null;
  let lightUp: Writable<boolean> = writable(false);
- let valuesForCombo: Writable<any[]> | null = null;
+ let valuesForCombo: Writable<any[]> = writable([])
  let lastConfigured: any = null;
  let option: any = null;
 
@@ -132,77 +132,69 @@
 </script>
 
 <div class="wrapper comfy-combo" class:mobile={isMobile} class:updated={$lightUp}>
-    {#key $valuesForCombo}
-        {#if node !== null && nodeValue !== null}
-            {#if $valuesForCombo == null}
-                <span>Loading...</span>
-            {:else}
-                <label>
-                    {#if widget.attrs.title !== ""}
-                        <BlockTitle show_label={true}>
-                            {widget.attrs.title}
-                            <span class="count-text">({$valuesForCombo.length})</span>
-                        </BlockTitle>
-                    {/if}
-                    <Select
-                        value={$nodeValue}
-                        bind:justValue={option}
-                        bind:hoverItemIndex
-                        bind:filterText
-                        bind:listOpen
-                        bind:input
-                        items={$valuesForCombo}
-                        disabled={isDisabled(widget)}
-                        clearable={false}
-                        showChevron={true}
-                        listAutoWidth={true}
-                        inputAttributes={{ autocomplete: 'off' }}
-                        on:change
-                        on:focus={onFocus}
-                        on:hoverItem={(e) => handleHover(e.detail)}
-                        on:select={(e) => handleSelect(e.detail.index)}
-                        on:blur
-                        on:filter={onFilter}>
-                        <div class="comfy-select-list" slot="list" let:filteredItems>
-                            {#if filteredItems.length > 0}
-                                {@const itemSize = isMobile ? 50 : 25}
-                                {@const itemsToShow = isMobile ? 10 : 30}
-                                <VirtualList
-                                    items={filteredItems}
-                                    width="100%"
-                                    height={Math.min(filteredItems.length, itemsToShow) * itemSize}
-                                    itemCount={filteredItems.length}
-                                    {itemSize}
-                                    overscanCount={5}
-                                    scrollToIndex={hoverItemIndex}>
-                                    <div slot="item"
-                                         class="comfy-select-item"
-                                         class:mobile={isMobile}
-                                         let:index={i}
-                                         let:style
-                                         {style}
-                                         class:active={activeIndex === filteredItems[i].index}
-                                         class:hover={hoverItemIndex === i}
-                                         on:click={() => handleSelect(filteredItems[i].index)}
-                                        on:focus={() => handleHover(i)}
-                                        on:mouseover={() => handleHover(i)}>
-                                        {@const item = filteredItems[i]}
-                                        <span class="comfy-select-label">
-                                            {item.label}
-                                        </span>
-                                    </div>
-                                </VirtualList>
-                            {:else}
-                                <div class="comfy-empty-list">
-                                    <span>(No items)</span>
-                                </div>
-                            {/if}
-                        </div>
-                    </Select>
-                </label>
-            {/if}
+    <label>
+        {#if widget.attrs.title !== ""}
+            <BlockTitle show_label={true}>
+                {widget.attrs.title}
+                <span class="count-text">({$valuesForCombo.length})</span>
+            </BlockTitle>
         {/if}
-    {/key}
+        <Select
+            value={$valuesForCombo.length === 0 ? "(Loading...)" : $nodeValue}
+            bind:justValue={option}
+            bind:hoverItemIndex
+            bind:filterText
+            bind:listOpen
+            bind:input
+            items={$valuesForCombo}
+            disabled={$valuesForCombo.length === 0 || isDisabled(widget)}
+            clearable={false}
+            showChevron={true}
+            listAutoWidth={true}
+            inputAttributes={{ autocomplete: 'off' }}
+            on:change
+            on:focus={onFocus}
+            on:hoverItem={(e) => handleHover(e.detail)}
+            on:select={(e) => handleSelect(e.detail.index)}
+            on:blur
+            on:filter={onFilter}>
+            <div class="comfy-select-list" slot="list" let:filteredItems>
+                {#if filteredItems.length > 0}
+                    {@const itemSize = isMobile ? 50 : 25}
+                    {@const itemsToShow = isMobile ? 10 : 30}
+                    <VirtualList
+                        items={filteredItems}
+                        width="100%"
+                        height={Math.min(filteredItems.length, itemsToShow) * itemSize}
+                        itemCount={filteredItems.length}
+                        {itemSize}
+                        overscanCount={5}
+                        scrollToIndex={hoverItemIndex}>
+                        <div slot="item"
+                                class="comfy-select-item"
+                                class:mobile={isMobile}
+                                let:index={i}
+                                let:style
+                                {style}
+                                class:active={activeIndex === filteredItems[i].index}
+                                class:hover={hoverItemIndex === i}
+                                on:click={() => handleSelect(filteredItems[i].index)}
+                            on:focus={() => handleHover(i)}
+                            on:mouseover={() => handleHover(i)}>
+                            {@const item = filteredItems[i]}
+                            <span class="comfy-select-label">
+                                {item.label}
+                            </span>
+                        </div>
+                    </VirtualList>
+                {:else}
+                    <div class="comfy-empty-list">
+                        <span>(No items)</span>
+                    </div>
+                {/if}
+            </div>
+        </Select>
+    </label>
 </div>
 
 <style lang="scss">
@@ -257,6 +249,15 @@
      --item-background-hover: var(--comfy-dropdown-item-background-hover);
      --item-color-active: var(--comfy-dropdown-item-color-active);
      --item-background-active: var(--comfy-dropdown-item-background-active);
+     --disabled-color: var(--comfy-disabled-textbox-text-color);
+     --disabled-border-color: var(--comfy-disabled-textbox-border-color);
+     --disabled-background: var(--comfy-disabled-textbox-background-fill);
+ }
+
+
+ :global(.svelte-select.disabled) {
+     --input-color: var(--comfy-disabled-textbox-text-color) !important;
+     --selected-item-color: var(--comfy-disabled-textbox-text-color) !important;
  }
 
  :global(.svelte-select-list) {