refactor: remove pan gesture code

kirillzyusko · Dec 12, 2024 · 3c7d00d · 3c7d00d
1 parent 049435d
commit 3c7d00d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 36 deletions.
diff --git a/TODO b/TODO
@@ -8,7 +8,7 @@
 - (x) 4 two events get dispatched after 2nd onInteractive (fix with pan gesture responder - when it's active ignore plain keyboard events)
 - (x) 5 TimingAnimation is unsynchronized
 - (x) 6 hide interactively -> tap input many times -> keyboard is shown and composer is not moving and it looks like events are broken -> for RCTRootView we need to resign synchronously
-- 7 remove pan gesture responder stuff
+- (x) 7 remove pan gesture responder stuff
 - 8 resolve swiftlint issues
 - 9 resolve various flickers (test iOS 15 - 18)
 - 10 iOS 15 sometimes keyboardDidDisappear gets triggered before onKeyboardMove events (duration = 85) --> caused by constant usage of onMove?

diff --git a/ios/observers/KeyboardEventsIgnorer.swift b/ios/observers/KeyboardEventsIgnorer.swift
@@ -12,11 +12,10 @@ public class KeyboardEventsIgnorer: NSObject {
   @objc public static let shared = KeyboardEventsIgnorer()
 
   var shouldIgnoreKeyboardEvents = false
-  @objc public var isInteractiveGesture = false
 
   public var shouldIgnore: Bool {
-    print("KeyboardEventsIgnorer \(shouldIgnoreKeyboardEvents) \(isInteractiveGesture)")
-    return shouldIgnoreKeyboardEvents || isInteractiveGesture
+    print("KeyboardEventsIgnorer \(shouldIgnoreKeyboardEvents)")
+    return shouldIgnoreKeyboardEvents
   }
 
   override init() {

diff --git a/ios/views/KeyboardGestureAreaManager.mm b/ios/views/KeyboardGestureAreaManager.mm
@@ -53,14 +53,13 @@ - (UIView *)view
 
 // MARK: View
 #ifdef RCT_NEW_ARCH_ENABLED
-@interface KeyboardGestureArea () <RCTKeyboardGestureAreaViewProtocol, UIGestureRecognizerDelegate>
+@interface KeyboardGestureArea () <RCTKeyboardGestureAreaViewProtocol>
 #else
-@interface KeyboardGestureArea () <UIGestureRecognizerDelegate>
+@interface KeyboardGestureArea ()
 #endif
 @end
 
 @implementation KeyboardGestureArea {
-  UIPanGestureRecognizer *_panGestureRecognizer;
 }
 
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -84,7 +83,6 @@ + (void)load
 - (instancetype)init
 {
   if (self = [super init]) {
-    [self setupGestureRecognizers];
   }
   return self;
 }
@@ -93,40 +91,12 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
 {
   self = [super initWithFrame:CGRectZero];
   if (self) {
-    [self setupGestureRecognizers];
   }
 
   return self;
 }
 #endif
 
-// MARK: Gesture Recognizers
-- (void)setupGestureRecognizers
-{
-  _panGestureRecognizer = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(handlePanGesture:)];
-  _panGestureRecognizer.delegate = self; // Set delegate to enable simultaneous recognition
-  [self addGestureRecognizer:_panGestureRecognizer];
-}
-
-- (void)handlePanGesture:(UIPanGestureRecognizer *)gestureRecognizer
-{
-  if (gestureRecognizer.state == UIGestureRecognizerStateBegan) {
-    [KeyboardEventsIgnorer shared].isInteractiveGesture = YES;
-  }
-  if (gestureRecognizer.state == UIGestureRecognizerStateEnded) {
-    NSLog(@"set to false");
-    [KeyboardEventsIgnorer shared].isInteractiveGesture = NO;
-  }
-
-}
-
-- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
-    shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
-{
-  // Allow simultaneous gesture recognition
-  return YES;
-}
-
 // MARK: lifecycle methods
 - (void)didMoveToSuperview
 {