mirror of
https://github.com/willmiao/ComfyUI-Lora-Manager.git
synced 2026-06-10 12:59:24 -03:00
Revert "Merge pull request #959 from id-fa/fix/lora-loader-list-scroll-nodes2"
This reverts commit01dac57c35, reversing changes made to62f9e3f44a.
This commit is contained in:
@@ -784,59 +784,6 @@ export function forwardWheelToCanvas(container, options = {}) {
|
||||
}, { passive: false });
|
||||
}
|
||||
|
||||
// Marks elements whose wheel scrolling must win over the canvas zoom.
|
||||
const LIST_WHEEL_SCROLL_CLASS = 'lm-wheel-scrollable';
|
||||
let listWheelScrollHookInstalled = false;
|
||||
|
||||
/**
|
||||
* Keep vertical wheel scrolling inside a scrollable widget container instead of
|
||||
* letting ComfyUI zoom the canvas.
|
||||
*
|
||||
* In Nodes 2.0 / Vue mode ComfyUI's wheel→zoom handler runs on the document /
|
||||
* canvas in the capture phase, which is *outer* than the widget, so a listener
|
||||
* on the container (even in capture) fires too late. The reliable place to win
|
||||
* is a single hook on `window` in the capture phase — the very first step of
|
||||
* event dispatch. When the wheel is over a marked, scrollable element we scroll
|
||||
* it manually and fully consume the event; otherwise we leave it alone so canvas
|
||||
* zoom keeps working.
|
||||
* @param {HTMLElement} container - The scrollable element (overflow: auto)
|
||||
*/
|
||||
export function enableListWheelScroll(container) {
|
||||
if (!container) return;
|
||||
container.classList.add(LIST_WHEEL_SCROLL_CLASS);
|
||||
|
||||
if (listWheelScrollHookInstalled) return;
|
||||
listWheelScrollHookInstalled = true;
|
||||
|
||||
window.addEventListener('wheel', (event) => {
|
||||
// Let pinch/zoom and horizontal gestures fall through to the canvas.
|
||||
if (event.ctrlKey) return;
|
||||
if (Math.abs(event.deltaX) > Math.abs(event.deltaY)) return;
|
||||
|
||||
const target = event.target;
|
||||
if (!target || typeof target.closest !== 'function') return;
|
||||
const el = target.closest(`.${LIST_WHEEL_SCROLL_CLASS}`);
|
||||
if (!el) return;
|
||||
|
||||
const canScrollY = el.scrollHeight > el.clientHeight + 1;
|
||||
if (!canScrollY) return; // Nothing to scroll → allow canvas zoom.
|
||||
|
||||
// Translate the wheel delta to pixels (line / page modes → approx px).
|
||||
const unit = event.deltaMode === 1
|
||||
? 16
|
||||
: event.deltaMode === 2
|
||||
? el.clientHeight
|
||||
: 1;
|
||||
|
||||
el.scrollTop += event.deltaY * unit;
|
||||
|
||||
// Consume the event so neither ComfyUI's zoom nor forwardWheelToCanvas react.
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
event.stopImmediatePropagation();
|
||||
}, { capture: true, passive: false });
|
||||
}
|
||||
|
||||
// Get connected Lora Pool node from pool_config input
|
||||
export function getConnectedPoolConfigNode(node) {
|
||||
if (!node?.inputs) {
|
||||
|
||||
Reference in New Issue
Block a user