From d90a1f54370f4b8c91d2eec2c3bbc4af9bf181d6 Mon Sep 17 00:00:00 2001
From: Florian Friedrich <ffried@me.com>
Date: Wed, 19 Jul 2023 17:39:49 +0200
Subject: [PATCH 1/3] Fix isPressed for ButtonConfiguration

---
 Sources/TokamakCore/Views/Controls/Button.swift | 4 ++--
 Sources/TokamakDOM/Views/Buttons/Button.swift   | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Sources/TokamakCore/Views/Controls/Button.swift b/Sources/TokamakCore/Views/Controls/Button.swift
index d9d37afac..f77891e9c 100644
--- a/Sources/TokamakCore/Views/Controls/Button.swift
+++ b/Sources/TokamakCore/Views/Controls/Button.swift
@@ -103,7 +103,7 @@ public struct _Button<Label>: View where Label: View {
   public let action: () -> ()
 
   @State
-  public var isPressed = false
+  public var isPressed: (down: Bool, inside: Bool) = (false, false)
 
   let anyStyle: AnyButtonStyle
   public var style: Any.Type { anyStyle.type }
@@ -112,7 +112,7 @@ public struct _Button<Label>: View where Label: View {
       configuration: .init(
         role: role,
         label: .init(body: AnyView(label)),
-        isPressed: isPressed
+        isPressed: isPressed.down && isPressed.inside
       )
     )
   }
diff --git a/Sources/TokamakDOM/Views/Buttons/Button.swift b/Sources/TokamakDOM/Views/Buttons/Button.swift
index 6c1b46b66..78b6d57c5 100644
--- a/Sources/TokamakDOM/Views/Buttons/Button.swift
+++ b/Sources/TokamakDOM/Views/Buttons/Button.swift
@@ -22,9 +22,13 @@ extension _Button: DOMPrimitive {
   @_spi(TokamakCore)
   public var renderedBody: AnyView {
     let listeners: [String: Listener] = [
-      "pointerdown": { _ in isPressed = true },
+      // Only fires on down *inside*. Set both to true.
+      "pointerdown": { _ in isPressed = (true, true) },
+      "pointerenter": { _ in isPressed.inside = true },
+      // "pointerup" does not fire when the pointer left. Set both to false.
+      "pointerleave": { _ in isPressed = (false, false) },
       "pointerup": { _ in
-        isPressed = false
+        isPressed.down = false
         action()
       },
     ]

From 688cfd14190b9e250c1550aa74565593210cccf2 Mon Sep 17 00:00:00 2001
From: Florian Friedrich <ffried@me.com>
Date: Mon, 24 Jul 2023 15:17:23 +0200
Subject: [PATCH 2/3] Fix re-entering clicked button

---
 Sources/TokamakDOM/Views/Buttons/Button.swift | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Sources/TokamakDOM/Views/Buttons/Button.swift b/Sources/TokamakDOM/Views/Buttons/Button.swift
index 78b6d57c5..d6034fd4b 100644
--- a/Sources/TokamakDOM/Views/Buttons/Button.swift
+++ b/Sources/TokamakDOM/Views/Buttons/Button.swift
@@ -17,6 +17,7 @@
 
 import TokamakCore
 import TokamakStaticHTML
+import JavaScriptKit
 
 extension _Button: DOMPrimitive {
   @_spi(TokamakCore)
@@ -24,9 +25,12 @@ extension _Button: DOMPrimitive {
     let listeners: [String: Listener] = [
       // Only fires on down *inside*. Set both to true.
       "pointerdown": { _ in isPressed = (true, true) },
-      "pointerenter": { _ in isPressed.inside = true },
-      // "pointerup" does not fire when the pointer left. Set both to false.
-      "pointerleave": { _ in isPressed = (false, false) },
+      "pointerenter": {
+        // See https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/buttons#value
+        let buttons: UInt32? = $0.buttons.fromJSValue()
+        isPressed = (buttons != 0, true)
+      },
+      "pointerleave": { _ in isPressed.inside = false },
       "pointerup": { _ in
         isPressed.down = false
         action()

From ad72cbbc84a12a4413dc175462e3a7646ccd1eae Mon Sep 17 00:00:00 2001
From: Florian Friedrich <ffried@me.com>
Date: Mon, 24 Jul 2023 15:24:09 +0200
Subject: [PATCH 3/3] Add labels

---
 Sources/TokamakDOM/Views/Buttons/Button.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Sources/TokamakDOM/Views/Buttons/Button.swift b/Sources/TokamakDOM/Views/Buttons/Button.swift
index d6034fd4b..0af330fff 100644
--- a/Sources/TokamakDOM/Views/Buttons/Button.swift
+++ b/Sources/TokamakDOM/Views/Buttons/Button.swift
@@ -24,11 +24,11 @@ extension _Button: DOMPrimitive {
   public var renderedBody: AnyView {
     let listeners: [String: Listener] = [
       // Only fires on down *inside*. Set both to true.
-      "pointerdown": { _ in isPressed = (true, true) },
+      "pointerdown": { _ in isPressed = (down: true, inside: true) },
       "pointerenter": {
         // See https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/buttons#value
         let buttons: UInt32? = $0.buttons.fromJSValue()
-        isPressed = (buttons != 0, true)
+        isPressed = (down: buttons != 0, inside: true)
       },
       "pointerleave": { _ in isPressed.inside = false },
       "pointerup": { _ in