Merge pull request #3261 from GCWing/gcwing/dev

fix: preserve browser scroll position and configure commit attribution

Author: GCWing

scripts/check-core-boundaries.test.mjs

@@ -3081,6 +3081,10 @@ test('third-party capability profiles reject ambient feature unions and unreview
       uses_default_features: false,
       features: ['vendored-libgit2'],
     }]),
+    packageAt('openbitfun-webdriver', 'src/crates/adapters/webdriver/Cargo.toml', [{
+      name: 'image', kind: null, optional: false, uses_default_features: false,
+      features: ['jpeg', 'png'],
+    }]),
   ];
 
   assert.deepEqual(findThirdPartyCapabilityFeatureViolations(validPackages), []);
@@ -3091,6 +3095,7 @@ test('third-party capability profiles reject ambient feature unions and unreview
   mutatedPackages[2].dependencies[0].features.push('rustls-tls-native-roots');
   mutatedPackages[3].dependencies[0].features.push('https');
   mutatedPackages[3].dependencies[0].rename = 'private-git2';
+  mutatedPackages[4].dependencies[0].features = ['png', 'webp'];
   mutatedPackages.push(packageAt('future-image-owner', 'src/apps/future/Cargo.toml', [{
     name: 'image',
     kind: null,
@@ -3107,6 +3112,8 @@ test('third-party capability profiles reject ambient feature unions and unreview
   assert.match(messages, /openbitfun-core Tokio Tungstenite dependency has unexpected features: rustls-tls-native-roots/);
   assert.match(messages, /openbitfun-services-core Git2 dependency has unexpected features: https/);
   assert.match(messages, /openbitfun-services-core Git2 dependency does not match its reviewed owner shape/);
+  assert.match(messages, /openbitfun-webdriver Image dependency missing features: jpeg/);
+  assert.match(messages, /openbitfun-webdriver Image dependency has unexpected features: webp/);
   assert.match(messages, /future-image-owner Image dependency is missing a reviewed owner profile/);
 });
 

scripts/core-boundaries/cargo-dependency-boundaries.mjs

@@ -574,7 +574,8 @@ const THIRD_PARTY_CAPABILITY_PROFILES = new Map([
       ['openbitfun-skin-market-service', dependencyProfile(['gif', 'jpeg', 'png', 'webp'], {
         useDefaultFeatures: false,
       })],
-      ['openbitfun-webdriver', dependencyProfile(['png'], {
+      // The embedded bridge captures PNG and encodes JPEG previews itself.
+      ['openbitfun-webdriver', dependencyProfile(['jpeg', 'png'], {
         useDefaultFeatures: false,
       })],
     ]),

src/crates/adapters/webdriver/Cargo.toml

@@ -16,10 +16,10 @@ tokio = { workspace = true, features = ["net", "rt", "sync", "time"] }
 serde = { workspace = true }
 serde_json = { workspace = true }
 log = { workspace = true }
-tauri = { workspace = true }
+tauri = { workspace = true, features = ["unstable"] }
 uuid = { workspace = true }
 base64 = { workspace = true }
-image = { workspace = true, features = ["png"] }
+image = { workspace = true, features = ["jpeg", "png"] }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 block2 = { workspace = true }

src/crates/adapters/webdriver/src/runtime/api/element.rs

@@ -67,11 +67,11 @@ pub(crate) fn clear() -> &'static str {
 }
 
 pub(crate) fn send_keys() -> &'static str {
-    "(id, text) => { const el = window.__openbitfunWd.getElement(id); if (!el) { throw new Error('Element not found'); } window.__openbitfunWd.insertText(el, text); return null; }"
+    "(id, text) => { const el = window.__openbitfunWd.getElement(id); if (!el) { throw new Error('Element not found'); } if ('value' in el || el.isContentEditable) { window.__openbitfunWd.scrollElementIntoView(el); window.__openbitfunWd.focusWithoutScroll(el); } window.__openbitfunWd.insertText(el, text); return null; }"
 }
 
 pub(crate) fn screenshot_metadata() -> &'static str {
-    "(id) => { const el = window.__openbitfunWd.getElement(id); if (!el || !el.isConnected) { throw new Error('stale element reference'); } el.scrollIntoView({ block: 'center', inline: 'center' }); const rect = el.getBoundingClientRect(); return { x: rect.x, y: rect.y, width: rect.width, height: rect.height, devicePixelRatio: window.devicePixelRatio || 1 }; }"
+    "(id) => { const el = window.__openbitfunWd.getElement(id); if (!el || !el.isConnected) { throw new Error('stale element reference'); } window.__openbitfunWd.scrollElementIntoView(el); const rect = el.getBoundingClientRect(); return { x: rect.x, y: rect.y, width: rect.width, height: rect.height, devicePixelRatio: window.devicePixelRatio || 1 }; }"
 }
 
 pub(crate) fn get_shadow_root() -> &'static str {

src/crates/adapters/webdriver/src/runtime/script/core/execution.rs

@@ -78,6 +78,8 @@ pub(super) fn script() -> &'static str {
       validateFrameElement,
       getShadowRoot,
       isDisplayed,
+      scrollElementIntoView,
+      focusWithoutScroll,
       clearElement,
       insertText,
       setElementText,

src/crates/adapters/webdriver/src/runtime/script/core/interaction.rs

@@ -0,0 +1,28 @@
+pub(super) fn script() -> &'static str {
+    r####"
+    // Reveal an offscreen target with minimal movement. Centering also scrolls
+    // overflow:hidden ancestors, which can displace the surrounding app chrome.
+    const scrollElementIntoView = (element) => {
+      element.scrollIntoView({ behavior: "instant", block: "nearest", inline: "nearest" });
+    };
+
+    // Positioning belongs to the caller; focus must not move it again, especially
+    // after pointer coordinates have already been resolved.
+    const focusWithoutScroll = (element) => {
+      if (typeof element.focus === "function") {
+        element.focus({ preventScroll: true });
+      }
+    };
+
+    // A large target can remain only partly visible after nearest scrolling.
+    // Use its visible center rather than a point outside the viewport.
+    const getInViewCenter = (element) => {
+      const rect = element.getClientRects()[0] || element.getBoundingClientRect();
+      const ownerWindow = element.ownerDocument.defaultView || window;
+      return {
+        x: (Math.max(0, rect.left) + Math.min(ownerWindow.innerWidth, rect.right)) / 2,
+        y: (Math.max(0, rect.top) + Math.min(ownerWindow.innerHeight, rect.bottom)) / 2
+      };
+    };
+"####
+}

src/crates/adapters/webdriver/src/runtime/script/core/mod.rs

@@ -2,6 +2,7 @@ mod alert;
 mod context;
 mod cookie;
 mod execution;
+mod interaction;
 mod locator;
 mod runtime;
 mod shadow;
@@ -10,13 +11,14 @@ mod visibility;
 
 pub(super) fn head() -> String {
     format!(
-        "{runtime}{store}{context}{locator}{shadow}{visibility}",
+        "{runtime}{store}{context}{locator}{shadow}{visibility}{interaction}",
         runtime = runtime::script(),
         store = store::script(),
         context = context::script(),
         locator = locator::script(),
         shadow = shadow::script(),
-        visibility = visibility::script()
+        visibility = visibility::script(),
+        interaction = interaction::script()
     )
 }
 

src/crates/adapters/webdriver/src/runtime/script/input.rs

@@ -72,8 +72,11 @@ pub(super) fn script() -> &'static str {
       if (!element) {
         return;
       }
+      if ("value" in element || element.isContentEditable) {
+        scrollElementIntoView(element);
+        focusWithoutScroll(element);
+      }
       if ("value" in element) {
-        element.focus();
         if (!dispatchBeforeInputEvent(element, "deleteContentBackward", null)) {
           return;
         }
@@ -82,7 +85,6 @@ pub(super) fn script() -> &'static str {
         return;
       }
       if (element.isContentEditable) {
-        element.focus();
         element.textContent = "";
         emitInputEvents(element, "deleteContentBackward", null);
       }
@@ -112,7 +114,7 @@ pub(super) fn script() -> &'static str {
           return;
         }
         const selection = ownerWindow.getSelection();
-        element.focus();
+        focusWithoutScroll(element);
         if (selection && selection.rangeCount > 0) {
           selection.deleteFromDocument();
           selection.getRangeAt(0).insertNode(element.ownerDocument.createTextNode(text));

src/crates/adapters/webdriver/src/runtime/script/pointer/mouse.rs

@@ -37,15 +37,16 @@ pub(super) fn script() -> &'static str {
         };
       }
 
-      if (origin && typeof origin === "object" && typeof origin[ELEMENT_KEY] === "string") {
-        const element = getElement(origin[ELEMENT_KEY]);
+      // Script arguments have already deserialized wire element references.
+      if (isElementLike(origin) || (origin && typeof origin === "object" && typeof origin[ELEMENT_KEY] === "string")) {
+        const element = isElementLike(origin) ? origin : getElement(origin[ELEMENT_KEY]);
         if (!element) {
           throw new Error("Element not found");
         }
-        const rect = element.getBoundingClientRect();
+        const { x, y } = getInViewCenter(element);
         return {
-          x: rect.left + rect.width / 2 + (Number(action?.x) || 0),
-          y: rect.top + rect.height / 2 + (Number(action?.y) || 0),
+          x: x + (Number(action?.x) || 0),
+          y: y + (Number(action?.y) || 0),
           target: element
         };
       }
@@ -108,13 +109,9 @@ pub(super) fn script() -> &'static str {
       if (!element) {
         throw new Error("Element not found");
       }
-      element.scrollIntoView({ block: "center", inline: "center" });
-      if (typeof element.focus === "function") {
-        element.focus();
-      }
-      const rect = element.getBoundingClientRect();
-      const x = rect.left + rect.width / 2;
-      const y = rect.top + rect.height / 2;
+      scrollElementIntoView(element);
+      focusWithoutScroll(element);
+      const { x, y } = getInViewCenter(element);
       updatePointerTarget(getFrameContext(), x, y, element);
       const runtime = ensureRuntimeState();
       const buttonMask = pointerButtonMask(button);

src/crates/adapters/webdriver/src/runtime/script/pointer/pointer_source.rs

@@ -35,9 +35,7 @@ pub(super) fn script() -> &'static str {
           if (action.duration) {
             await sleep(action.duration);
           }
-          if (typeof target.focus === "function") {
-            target.focus();
-          }
+          focusWithoutScroll(target);
           runtime.pointer.buttons |= buttonMask;
           dispatchMouseEvent(target, "mousedown", runtime.pointer.x, runtime.pointer.y, button, runtime.pointer.buttons, frameContext);
           continue;