Remove explicit press highlight handling.

KeyboardKit · Apr 6, 2021 · 733b094 · 733b094
1 parent bc0f16f
commit 733b094
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 28 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -24,8 +24,8 @@
         "repositoryURL": "https://github.com/danielsaidi/MockingKit.git",
         "state": {
           "branch": null,
-          "revision": "3fb3fb321c6752b06662462d2b10c7377b7d3843",
-          "version": "0.9.3"
+          "revision": "ebb888c98bd1de2f2409c7b06f2386a55120d910",
+          "version": "0.9.4"
         }
       },
       {

diff --git a/Sources/KeyboardKit/Gestures/KeyboardGestures.swift b/Sources/KeyboardKit/Gestures/KeyboardGestures.swift
@@ -80,32 +80,25 @@ private extension KeyboardGestures {
      This is a plain double-tap gesure.
      */
     var doubleTapGesture: some Gesture {
-        TapGesture(count: 2).onEnded {
-            doubleTapAction?()
-            triggerPressedHighlight()
-        }
+        TapGesture(count: 2)
+            .onEnded { doubleTapAction?() }
     }
 
     /**
      This is a drag gesture that starts immediately.
      */
     func dragGesture(for geo: GeometryProxy) -> some Gesture {
         DragGesture(minimumDistance: 0)
-            .onChanged { _ in
-                handlePressGesture(for: geo) }
-            .onEnded { _ in
-                handleReleaseGesture()
-                }
+            .onChanged { _ in handlePressGesture(for: geo) }
+            .onEnded { _ in handleReleaseGesture() }
     }
 
     /**
      This is a plain long press gesure.
      */
     var longPressGesture: some Gesture {
-        LongPressGesture().onEnded { _ in
-            longPressAction?()
-            startRepeatTimer()
-        }
+        LongPressGesture()
+            .onEnded { _ in handleLongPressGesture() }
     }
 
     /**
@@ -128,11 +121,8 @@ private extension KeyboardGestures {
      This is a plain tap gesure.
      */
     var tapGesture: some Gesture {
-        TapGesture().onEnded {
-            tapAction?()
-            triggerPressedHighlight()
-            inputCalloutContext.reset()
-        }
+        TapGesture()
+            .onEnded(handleTapGesture)
     }
 }
 
@@ -159,6 +149,11 @@ private extension KeyboardGestures {
         guard secondaryInputCalloutContext.isActive else { return }
     }
 
+    func handleLongPressGesture() {
+        longPressAction?()
+        startRepeatTimer()
+    }
+
     func handlePressGesture(for geo: GeometryProxy) {
         if isDragGestureTriggered { return }
         isDragGestureTriggered = true
@@ -182,6 +177,11 @@ private extension KeyboardGestures {
         dragAction?(drag.startLocation, drag.location)
     }
 
+    func handleTapGesture() {
+        tapAction?()
+        inputCalloutContext.reset()
+    }
+
     func startRepeatTimer() {
         guard let action = repeatAction else { return repeatTimer.stop() }
         repeatTimer.start(action: action)
@@ -190,12 +190,4 @@ private extension KeyboardGestures {
     func stopRepeatTimer() {
         repeatTimer.stop()
     }
-
-    func triggerPressedHighlight() {
-        if isInputCalloutEnabled { return }
-        isPressed.wrappedValue = true
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
-            isPressed.wrappedValue = false
-        }
-    }
 }