fix(jsx/dom): remove lookbehind assertion in event regexp (#2524)

* fix(jsx/dom): remove lookbehind assertion in event regexp for iOS Safari 16.3 * chore: denoify
honojs · Apr 18, 2024 · 68cabde · 68cabde
1 parent ed51b0b
commit 68cabde
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/deno_dist/jsx/dom/render.ts b/deno_dist/jsx/dom/render.ts
@@ -90,7 +90,7 @@ let nameSpaceContext: JSXContext<string> | undefined = undefined
 const isNodeString = (node: Node): node is NodeString => Array.isArray(node)
 
 const getEventSpec = (key: string): [string, boolean] | undefined => {
-  const match = key.match(/^on([A-Z][a-zA-Z]+?)((?<!Pointer)Capture)?$/)
+  const match = key.match(/^on([A-Z][a-zA-Z]+?(?:PointerCapture)?)(Capture)?$/)
   if (match) {
     const [, eventName, capture] = match
     return [(eventAliasMap[eventName] || eventName).toLowerCase(), !!capture]

diff --git a/src/jsx/dom/index.test.tsx b/src/jsx/dom/index.test.tsx
@@ -598,6 +598,33 @@ describe('DOM', () => {
       root.querySelector('button')?.click()
       expect(clicked).toEqual(['div', 'button', 'button'])
     })
+
+    it('onGotPointerCapture', async () => {
+      const App = () => {
+        return <div onGotPointerCapture={() => {}}></div>
+      }
+      const addEventListenerSpy = vi.spyOn(dom.window.Node.prototype, 'addEventListener')
+      render(<App />, root)
+      expect(addEventListenerSpy).toHaveBeenCalledOnce()
+      expect(addEventListenerSpy).toHaveBeenCalledWith(
+        'gotpointercapture',
+        expect.any(Function),
+        false
+      )
+    })
+    it('onGotPointerCaptureCapture', async () => {
+      const App = () => {
+        return <div onGotPointerCaptureCapture={() => {}}></div>
+      }
+      const addEventListenerSpy = vi.spyOn(dom.window.Node.prototype, 'addEventListener')
+      render(<App />, root)
+      expect(addEventListenerSpy).toHaveBeenCalledOnce()
+      expect(addEventListenerSpy).toHaveBeenCalledWith(
+        'gotpointercapture',
+        expect.any(Function),
+        true
+      )
+    })
   })
 
   it('simple Counter', async () => {

diff --git a/src/jsx/dom/render.ts b/src/jsx/dom/render.ts
@@ -90,7 +90,7 @@ let nameSpaceContext: JSXContext<string> | undefined = undefined
 const isNodeString = (node: Node): node is NodeString => Array.isArray(node)
 
 const getEventSpec = (key: string): [string, boolean] | undefined => {
-  const match = key.match(/^on([A-Z][a-zA-Z]+?)((?<!Pointer)Capture)?$/)
+  const match = key.match(/^on([A-Z][a-zA-Z]+?(?:PointerCapture)?)(Capture)?$/)
   if (match) {
     const [, eventName, capture] = match
     return [(eventAliasMap[eventName] || eventName).toLowerCase(), !!capture]