Bind SharedValues in handler config

packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/FlingGestureHandler.kt

@@ -132,8 +132,9 @@ class FlingGestureHandler : GestureHandler() {
 
     override fun create(context: Context?): FlingGestureHandler = FlingGestureHandler()
 
-    override fun setConfig(handler: FlingGestureHandler, config: ReadableMap) {
-      super.setConfig(handler, config)
+    override fun updateConfig(handler: FlingGestureHandler, config: ReadableMap) {
+      super.updateConfig(handler, config)
+
       if (config.hasKey(KEY_NUMBER_OF_POINTERS)) {
         handler.numberOfPointersRequired = config.getInt(KEY_NUMBER_OF_POINTERS)
       }

packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/GestureHandler.kt

@@ -865,8 +865,12 @@ open class GestureHandler {
 
     fun create(context: Context?, handlerTag: Int): T = create(context).also { it.tag = handlerTag }
 
-    open fun setConfig(handler: T, config: ReadableMap) {
+    fun setConfig(handler: T, config: ReadableMap) {
       handler.resetConfig()
+      updateConfig(handler, config)
+    }
+
+    open fun updateConfig(handler: T, config: ReadableMap) {
       if (config.hasKey(KEY_SHOULD_CANCEL_WHEN_OUTSIDE)) {
         handler.shouldCancelWhenOutside = config.getBoolean(KEY_SHOULD_CANCEL_WHEN_OUTSIDE)
       }

packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/LongPressGestureHandler.kt

@@ -181,8 +181,8 @@ class LongPressGestureHandler(context: Context) : GestureHandler() {
 
     override fun create(context: Context?): LongPressGestureHandler = LongPressGestureHandler((context)!!)
 
-    override fun setConfig(handler: LongPressGestureHandler, config: ReadableMap) {
-      super.setConfig(handler, config)
+    override fun updateConfig(handler: LongPressGestureHandler, config: ReadableMap) {
+      super.updateConfig(handler, config)
       if (config.hasKey(KEY_MIN_DURATION_MS)) {
         handler.minDurationMs = config.getInt(KEY_MIN_DURATION_MS).toLong()
       }

packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/NativeViewGestureHandler.kt

@@ -175,8 +175,8 @@ class NativeViewGestureHandler : GestureHandler() {
 
     override fun create(context: Context?): NativeViewGestureHandler = NativeViewGestureHandler()
 
-    override fun setConfig(handler: NativeViewGestureHandler, config: ReadableMap) {
-      super.setConfig(handler, config)
+    override fun updateConfig(handler: NativeViewGestureHandler, config: ReadableMap) {
+      super.updateConfig(handler, config)
       if (config.hasKey(KEY_SHOULD_ACTIVATE_ON_START)) {
         handler.shouldActivateOnStart = config.getBoolean(KEY_SHOULD_ACTIVATE_ON_START)
       }

packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/PanGestureHandler.kt

@@ -260,8 +260,8 @@ class PanGestureHandler(context: Context?) : GestureHandler() {
 
     override fun create(context: Context?): PanGestureHandler = PanGestureHandler(context)
 
-    override fun setConfig(handler: PanGestureHandler, config: ReadableMap) {
-      super.setConfig(handler, config)
+    override fun updateConfig(handler: PanGestureHandler, config: ReadableMap) {
+      super.updateConfig(handler, config)
       var hasCustomActivationCriteria = false
       if (config.hasKey(KEY_ACTIVE_OFFSET_X_START)) {
         handler.activeOffsetXStart =

packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/TapGestureHandler.kt

@@ -145,8 +145,8 @@ class TapGestureHandler : GestureHandler() {
 
     override fun create(context: Context?): TapGestureHandler = TapGestureHandler()
 
-    override fun setConfig(handler: TapGestureHandler, config: ReadableMap) {
-      super.setConfig(handler, config)
+    override fun updateConfig(handler: TapGestureHandler, config: ReadableMap) {
+      super.updateConfig(handler, config)
       if (config.hasKey(KEY_NUMBER_OF_TAPS)) {
         handler.numberOfTaps = config.getInt(KEY_NUMBER_OF_TAPS)
       }

packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerModule.kt

@@ -90,19 +90,24 @@ class RNGestureHandlerModule(reactContext: ReactApplicationContext?) :
     }
   }
 
-  private fun <T : GestureHandler> updateGestureHandlerHelper(handlerTag: Int, config: ReadableMap) {
+  @ReactMethod
+  override fun setGestureHandlerConfig(handlerTagDouble: Double, config: ReadableMap) {
+    val handlerTag = handlerTagDouble.toInt()
     val handler = registry.getHandler(handlerTag) ?: return
     val factory = RNGestureHandlerFactoryUtil.findFactoryForHandler<GestureHandler>(handler) ?: return
+
     interactionManager.dropRelationsForHandlerWithTag(handlerTag)
     interactionManager.configureInteractions(handler, config)
     factory.setConfig(handler, config)
   }
 
   @ReactMethod
-  override fun updateGestureHandler(handlerTagDouble: Double, config: ReadableMap) {
+  override fun updateGestureHandlerConfig(handlerTagDouble: Double, config: ReadableMap) {
     val handlerTag = handlerTagDouble.toInt()
+    val handler = registry.getHandler(handlerTag) ?: return
+    val factory = RNGestureHandlerFactoryUtil.findFactoryForHandler<GestureHandler>(handler) ?: return
 
-    updateGestureHandlerHelper<GestureHandler>(handlerTag, config)
+    factory.updateConfig(handler, config)
   }
 
   @ReactMethod

packages/react-native-gesture-handler/apple/Handlers/RNFlingHandler.m

@@ -255,9 +255,9 @@ - (void)resetConfig
 #endif
 }
 
-- (void)configure:(NSDictionary *)config
+- (void)updateConfig:(NSDictionary *)config
 {
-  [super configure:config];
+  [super updateConfig:config];
   RNBetterSwipeGestureRecognizer *recognizer = (RNBetterSwipeGestureRecognizer *)_recognizer;
 
   id prop = config[@"direction"];

packages/react-native-gesture-handler/apple/Handlers/RNForceTouchHandler.m

@@ -153,9 +153,9 @@ - (void)resetConfig
   recognizer.minForce = defaultMinForce;
 }
 
-- (void)configure:(NSDictionary *)config
+- (void)updateConfig:(NSDictionary *)config
 {
-  [super configure:config];
+  [super updateConfig:config];
   RNForceTouchGestureRecognizer *recognizer = (RNForceTouchGestureRecognizer *)_recognizer;
 
   APPLY_FLOAT_PROP(maxForce);

packages/react-native-gesture-handler/apple/Handlers/RNHoverHandler.m

@@ -141,9 +141,9 @@ - (void)resetConfig
 #endif
 }
 
-- (void)configure:(NSDictionary *)config
+- (void)updateConfig:(NSDictionary *)config
 {
-  [super configure:config];
+  [super updateConfig:config];
 
 #if CHECK_TARGET(13_4)
   if (@available(iOS 13.4, *)) {

packages/react-native-gesture-handler/apple/Handlers/RNLongPressHandler.m

@@ -217,9 +217,9 @@ - (void)resetConfig
   recognizer.allowableMovement = 10;
 }
 
-- (void)configure:(NSDictionary *)config
+- (void)updateConfig:(NSDictionary *)config
 {
-  [super configure:config];
+  [super updateConfig:config];
   RNBetterLongPressGestureRecognizer *recognizer = (RNBetterLongPressGestureRecognizer *)_recognizer;
 
   id prop = config[@"minDurationMs"];

packages/react-native-gesture-handler/apple/Handlers/RNNativeViewHandler.mm

@@ -123,9 +123,9 @@ - (instancetype)initWithTag:(NSNumber *)tag
   return self;
 }
 
-- (void)configure:(NSDictionary *)config
+- (void)updateConfig:(NSDictionary *)config
 {
-  [super configure:config];
+  [super updateConfig:config];
   _shouldActivateOnStart = [RCTConvert BOOL:config[@"shouldActivateOnStart"]];
   _disallowInterruption = [RCTConvert BOOL:config[@"disallowInterruption"]];
 }

packages/react-native-gesture-handler/apple/Handlers/RNPanHandler.m

@@ -381,9 +381,9 @@ - (void)resetConfig
   recognizer.activateAfterLongPress = NAN;
 }
 
-- (void)configure:(NSDictionary *)config
+- (void)updateConfig:(NSDictionary *)config
 {
-  [super configure:config];
+  [super updateConfig:config];
   RNBetterPanGestureRecognizer *recognizer = (RNBetterPanGestureRecognizer *)_recognizer;
 
   APPLY_FLOAT_PROP(minVelocityX);

packages/react-native-gesture-handler/apple/Handlers/RNTapHandler.m

@@ -284,9 +284,9 @@ - (void)resetConfig
   recognizer.maxDistSq = NAN;
 }
 
-- (void)configure:(NSDictionary *)config
+- (void)updateConfig:(NSDictionary *)config
 {
-  [super configure:config];
+  [super updateConfig:config];
   RNBetterTapGestureRecognizer *recognizer = (RNBetterTapGestureRecognizer *)_recognizer;
 
   APPLY_INT_PROP(numberOfTaps);

packages/react-native-gesture-handler/apple/RNGestureHandler.h

@@ -84,7 +84,8 @@
 - (void)bindToView:(nonnull RNGHUIView *)view;
 - (void)unbindFromView;
 - (void)resetConfig NS_REQUIRES_SUPER;
-- (void)configure:(nullable NSDictionary *)config NS_REQUIRES_SUPER;
+- (void)setConfig:(nullable NSDictionary *)config NS_REQUIRES_SUPER;
+- (void)updateConfig:(nullable NSDictionary *)config NS_REQUIRES_SUPER;
 - (void)handleGesture:(nonnull id)recognizer;
 - (void)handleGesture:(nonnull id)recognizer inState:(RNGestureHandlerState)state;
 - (BOOL)containsPointInView;

packages/react-native-gesture-handler/apple/RNGestureHandler.mm

@@ -113,9 +113,14 @@ - (void)resetConfig
 #endif
 }
 
-- (void)configure:(NSDictionary *)config
+- (void)setConfig:(NSDictionary *)config
 {
   [self resetConfig];
+  [self updateConfig:config];
+}
+
+- (void)updateConfig:(NSDictionary *)config
+{
   _handlersToWaitFor = [RCTConvert NSNumberArray:config[@"waitFor"]];
   _simultaneousHandlers = [RCTConvert NSNumberArray:config[@"simultaneousHandlers"]];
   _handlersThatShouldWait = [RCTConvert NSNumberArray:config[@"blocksHandlers"]];

packages/react-native-gesture-handler/apple/RNGestureHandlerManager.h

@@ -24,7 +24,9 @@
                toViewWithTag:(nonnull NSNumber *)viewTag
               withActionType:(RNGestureHandlerActionType)actionType;
 
-- (void)updateGestureHandler:(nonnull NSNumber *)handlerTag config:(nonnull NSDictionary *)config;
+- (void)setGestureHandlerConfig:(nonnull NSNumber *)handlerTag config:(nonnull NSDictionary *)config;
+
+- (void)updateGestureHandlerConfig:(nonnull NSNumber *)handlerTag config:(nonnull NSDictionary *)config;
 
 - (void)dropGestureHandler:(nonnull NSNumber *)handlerTag;
 

packages/react-native-gesture-handler/apple/RNGestureHandlerManager.mm

@@ -112,7 +112,7 @@ - (void)createGestureHandler:(NSString *)handlerName tag:(NSNumber *)handlerTag
   }
 
   RNGestureHandler *gestureHandler = [[nodeClass alloc] initWithTag:handlerTag];
-  [gestureHandler configure:config];
+  [gestureHandler setConfig:config];
   [_registry registerGestureHandler:gestureHandler];
 
   __weak id<RNGestureHandlerEventEmitter> emitter = self;
@@ -178,10 +178,16 @@ - (void)attachGestureHandler:(nonnull NSNumber *)handlerTag
   [self registerViewWithGestureRecognizerAttachedIfNeeded:view];
 }
 
-- (void)updateGestureHandler:(NSNumber *)handlerTag config:(NSDictionary *)config
+- (void)setGestureHandlerConfig:(NSNumber *)handlerTag config:(NSDictionary *)config
 {
   RNGestureHandler *handler = [_registry handlerWithTag:handlerTag];
-  [handler configure:config];
+  [handler setConfig:config];
+}
+
+- (void)updateGestureHandlerConfig:(NSNumber *)handlerTag config:(NSDictionary *)config
+{
+  RNGestureHandler *handler = [_registry handlerWithTag:handlerTag];
+  [handler updateConfig:config];
 }
 
 - (void)dropGestureHandler:(NSNumber *)handlerTag

packages/react-native-gesture-handler/apple/RNGestureHandlerModule.mm

@@ -145,10 +145,17 @@ - (void)attachGestureHandler:(double)handlerTag newView:(double)viewTag actionTy
   }];
 }
 
-- (void)updateGestureHandler:(double)handlerTag newConfig:(NSDictionary *)config
+- (void)setGestureHandlerConfig:(double)handlerTag newConfig:(NSDictionary *)config
 {
   [self addOperationBlock:^(RNGestureHandlerManager *manager) {
-    [manager updateGestureHandler:[NSNumber numberWithDouble:handlerTag] config:config];
+    [manager setGestureHandlerConfig:[NSNumber numberWithDouble:handlerTag] config:config];
+  }];
+}
+
+- (void)updateGestureHandlerConfig:(double)handlerTag newConfig:(NSDictionary *)config
+{
+  [self addOperationBlock:^(RNGestureHandlerManager *manager) {
+    [manager updateGestureHandlerConfig:[NSNumber numberWithDouble:handlerTag] config:config];
   }];
 }
 

packages/react-native-gesture-handler/src/RNGestureHandlerModule.web.ts

@@ -41,7 +41,7 @@
       NodeManager.getHandler(handlerTag),
       config as unknown as Config
     );
-    this.updateGestureHandler(handlerTag, config as unknown as Config);
+    this.setGestureHandlerConfig(handlerTag, config as unknown as Config);
   },
   attachGestureHandler(
     handlerTag: number,
@@ -63,7 +63,7 @@
     }
 
     // @ts-ignore Types should be HTMLElement or React.Component
     NodeManager.getHandler(handlerTag).init(newView, propsRef, actionType);
   },
   detachGestureHandler(handlerTag: number) {
     if (shouldPreventDrop) {
@@ -73,14 +73,17 @@
 
     NodeManager.detachGestureHandler(handlerTag);
   },
-  updateGestureHandler(handlerTag: number, newConfig: Config) {
+  setGestureHandlerConfig(handlerTag: number, newConfig: Config) {
     NodeManager.getHandler(handlerTag).updateGestureConfig(newConfig);
 
     InteractionManager.instance.configureInteractions(
       NodeManager.getHandler(handlerTag),
       newConfig
     );
   },
+  updateGestureHandlerConfig(_handlerTag: number, _newConfig: Config) {
+    // TODO: To be implemented
+  },
   getGestureHandlerNode(handlerTag: number) {
     return NodeManager.getHandler(handlerTag);
   },

packages/react-native-gesture-handler/src/RNGestureHandlerModule.windows.ts

@@ -47,7 +47,10 @@ export default {
   ) {
     // NO-OP
   },
-  updateGestureHandler(_handlerTag: number, _newConfig: Config) {
+  setGestureHandlerConfig(_handlerTag: number, _newConfig: Config) {
+    // NO-OP
+  },
+  updateGestureHandlerConfig(_handlerTag: number, _newConfig: Config) {
     // NO-OP
   },
   getGestureHandlerNode(_handlerTag: number) {

packages/react-native-gesture-handler/src/handlers/createHandler.tsx

@@ -396,12 +396,15 @@ export default function createHandler<
       });
     };
 
-    private updateGestureHandler = (
+    private setGestureHandlerConfig = (
       newConfig: Readonly<Record<string, unknown>>
     ) => {
       this.config = newConfig;
 
-      RNGestureHandlerModule.updateGestureHandler(this.handlerTag, newConfig);
+      RNGestureHandlerModule.setGestureHandlerConfig(
+        this.handlerTag,
+        newConfig
+      );
       scheduleFlushOperations();
     };
 
@@ -426,7 +429,7 @@ export default function createHandler<
           config
         );
         if (!deepEqual(this.config, newConfig)) {
-          this.updateGestureHandler(newConfig);
+          this.setGestureHandlerConfig(newConfig);
         }
       }
     }
@@ -439,7 +442,7 @@ export default function createHandler<
         [...allowedProps, ...customNativeProps],
         config
       );
-      this.updateGestureHandler(newConfig);
+      this.setGestureHandlerConfig(newConfig);
     }
 
     override render() {

packages/react-native-gesture-handler/src/handlers/gestures/GestureDetector/attachHandlers.ts

@@ -61,7 +61,7 @@ export function attachHandlers({
       return;
     }
     for (const handler of gesturesToAttach) {
-      RNGestureHandlerModule.updateGestureHandler(
+      RNGestureHandlerModule.setGestureHandlerConfig(
         handler.handlerTag,
         filterConfig(
           handler.config,

packages/react-native-gesture-handler/src/handlers/gestures/GestureDetector/updateHandlers.ts

@@ -65,7 +65,7 @@ export function updateHandlers(
       handler.config = newGestures[i].config;
       handler.handlers = newGestures[i].handlers;
 
-      RNGestureHandlerModule.updateGestureHandler(
+      RNGestureHandlerModule.setGestureHandlerConfig(
         handler.handlerTag,
         filterConfig(
           handler.config,

packages/react-native-gesture-handler/src/handlers/gestures/reanimatedWrapper.ts

@@ -2,8 +2,16 @@ import { ComponentClass } from 'react';
 import { tagMessage } from '../../utils';
 import { UpdateEvent } from '../../v3/types';
 
-export interface SharedValue<T> {
-  value: T;
+export interface SharedValue<Value = unknown> {
+  value: Value;
+  get(): Value;
+  set(value: Value | ((value: Value) => Value)): void;
+  addListener: (listenerID: number, listener: (value: Value) => void) => void;
+  removeListener: (listenerID: number) => void;
+  modify: (
+    modifier?: <T extends Value>(value: T) => T,
+    forceUpdate?: boolean
+  ) => void;
 }
 
 export type ReanimatedContext = {
@@ -31,6 +39,9 @@ let Reanimated:
       useSharedValue: <T>(value: T) => SharedValue<T>;
       setGestureState: (handlerTag: number, newState: number) => void;
       isSharedValue: (value: unknown) => value is SharedValue<unknown>;
+      runOnUI<A extends any[], R>(
+        fn: (...args: A) => R
+      ): (...args: Parameters<typeof fn>) => void;
     }
   | undefined;