@webspatial/core-sdk 1.6.0 → 1.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webspatial/core-sdk",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "this is the core js API for webspatial",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/scene-polyfill.test.ts

@@ -4,6 +4,7 @@ import {
   initScene,
   injectSceneHook,
   __getSceneConfigSnapshotForTest,
+  hijackWindowATag,
 } from './scene-polyfill'
 import { SpatialSceneCreationOptions } from './types/types'
 import { pointToPhysical } from './physicalMetrics'
@@ -464,3 +465,62 @@ describe('initScene callback chaining', () => {
     expect(cb2).toHaveBeenCalledWith(firstReturn)
   })
 })
+
+describe('hijackWindowATag', () => {
+  afterEach(() => {
+    document.body.innerHTML = ''
+    document.onclick = null
+    vi.restoreAllMocks()
+  })
+
+  it('handles clicks on nested elements inside anchor tags', () => {
+    const openSpy = vi.spyOn(window, 'open').mockImplementation(() => null)
+    hijackWindowATag(window)
+
+    const anchor = document.createElement('a')
+    anchor.href = 'https://example.com/detail'
+    anchor.target = '_blank'
+
+    const image = document.createElement('img')
+    anchor.appendChild(image)
+    document.body.appendChild(anchor)
+
+    image.dispatchEvent(
+      new MouseEvent('click', { bubbles: true, cancelable: true }),
+    )
+
+    expect(openSpy).toHaveBeenCalledWith('https://example.com/detail', '_blank')
+  })
+})
+
+describe('hijackWindowATag – defaultPrevented', () => {
+  afterEach(() => {
+    document.body.innerHTML = ''
+    document.onclick = null
+    vi.restoreAllMocks()
+  })
+
+  it('does not open a new window when the click was already preventDefault-ed', () => {
+    const openSpy = vi.spyOn(window, 'open').mockImplementation(() => null)
+    hijackWindowATag(window)
+
+    const anchor = document.createElement('a')
+    anchor.href = 'https://example.com/detail'
+    anchor.target = '_blank'
+
+    const span = document.createElement('span')
+    anchor.appendChild(span)
+    document.body.appendChild(anchor)
+
+    // Simulate an app-level handler that cancels the click before the polyfill sees it.
+    span.addEventListener('click', ev => {
+      ev.preventDefault()
+    })
+
+    span.dispatchEvent(
+      new MouseEvent('click', { bubbles: true, cancelable: true }),
+    )
+
+    expect(openSpy).not.toHaveBeenCalled()
+  })
+})

package/src/scene-polyfill.ts

@@ -523,23 +523,22 @@ export function hijackWindowOpen(window: WindowProxy) {
 export function hijackWindowATag(openedWindow: WindowProxy) {
   openedWindow!.document.onclick = function (e) {
     let element = e.target as HTMLElement | null
-    let found = false
 
     // Look for <a> element in the clicked elements parents and if found override navigation behavior if needed
-    while (!found) {
-      if (element && element.tagName == 'A') {
+    while (element) {
+      if (element.tagName == 'A') {
         // When using libraries like react route's <Link> it sets an onclick event, when this happens we should do nothing and let that occur
 
         // if onClick is set for the element, the raw onclick will be noop() trapped so the onclick check is no longer trustable
         // we handle all the scenarios
 
-        if (handleATag(e)) {
+        if (handleATag(e, element as HTMLAnchorElement)) {
           return false // prevent default action and stop event propagation
         }
 
         return true
       }
-      if (element && element.parentElement) {
+      if (element.parentElement) {
         element = element.parentElement
       } else {
         break
@@ -548,18 +547,17 @@ export function hijackWindowATag(openedWindow: WindowProxy) {
   }
 }
 
-function handleATag(event: MouseEvent) {
-  const targetElement = event.target as HTMLElement
-  if (targetElement.tagName === 'A') {
-    const link = targetElement as HTMLAnchorElement
-    const target = link.target
-    const url = link.href
-
-    if (target && target !== '_self') {
-      event.preventDefault()
-      window.open(url, target)
-      return true
-    }
+function handleATag(event: MouseEvent, link: HTMLAnchorElement) {
+  // Respect clicks that have already been cancelled (e.g. by app/router handlers).
+  if (event.defaultPrevented) return false
+  // Use the anchor found during bubbling so nested clicks like <a><img /></a> are handled correctly.
+  const target = link.target
+  const url = link.href
+
+  if (target && target !== '_self') {
+    event.preventDefault()
+    window.open(url, target)
+    return true
   }
 }