split visibility method and sort instead

split out the visibility method for pasting and use a sort inside the paste handler to prioritize on-screen fields rather than targeting ONLY on screen fields
erksu · May 19, 2023 · 7b61acb · 7b61acb
1 parent e373fd0
commit 7b61acb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/javascript/dragdrop.js b/javascript/dragdrop.js
@@ -81,7 +81,10 @@ window.addEventListener('paste', e => {
     }
 
     const visibleImageFields = [...gradioApp().querySelectorAll('[data-testid="image"]')]
-        .filter(el => uiElementIsVisible(el));
+        .filter(el => uiElementIsVisible(el))
+        .sort((a,b) => uiElementInSight(b) - uiElementInSight(a));
+
+
     if (!visibleImageFields.length) {
         return;
     }

diff --git a/script.js b/script.js
@@ -99,10 +99,14 @@ function uiElementIsVisible(el) {
     const computedStyle = getComputedStyle(el);
     const isVisible = computedStyle.display !== 'none';
 
+    if (!isVisible) return false;
+    return uiElementIsVisible(el.parentNode);
+}
+
+function uiElementInSight(el) {
     const clRect = el.getBoundingClientRect();
     const windowHeight = window.innerHeight;
-    const onScreen = clRect.bottom > 0 && clRect.top < windowHeight;
+    const isOnScreen = clRect.bottom > 0 && clRect.top < windowHeight;
 
-    if (!isVisible || !onScreen) return false;
-    return uiElementIsVisible(el.parentNode);
+    return isOnScreen;
 }