Merge branch 'main' into @kitten/fix/react-native-alias-name-resolution

Author: m-bert

packages/docs-gesture-handler/src/components/HandIcon/index.tsx

@@ -1,48 +1,8 @@
 import React from 'react';
 import useBaseUrl from '@docusaurus/useBaseUrl';
-import { useLocation } from '@docusaurus/router';
 import { Navbar } from '@swmansion/t-rex-ui';
-import TopPromoRotator, {
-  PROMO_VERSION,
-} from '@site/src/components/TopPromoRotator';
 
 export default function NavbarWrapper(props) {
-  const location = useLocation();
-  const baseUrl = useBaseUrl('/');
-  const isLanding = location.pathname === baseUrl;
-
-  const [showPromo, setShowPromo] = React.useState(true);
-
-  React.useEffect(() => {
-    if (isLanding || typeof globalThis === 'undefined') {
-      return;
-    }
-
-    try {
-      const raw = globalThis.localStorage?.getItem('topPromoState');
-      const state = raw ? JSON.parse(raw) : null;
-      if (state?.v === PROMO_VERSION && state?.hidden) {
-        setShowPromo(false);
-      }
-    } catch (_) {
-      // ignore
-    }
-  }, [isLanding]);
-
-  const handleClosePromo = React.useCallback(() => {
-    setShowPromo(false);
-    if (typeof globalThis !== 'undefined') {
-      try {
-        globalThis.localStorage?.setItem(
-          'topPromoState',
-          JSON.stringify({ v: PROMO_VERSION, hidden: true })
-        );
-      } catch {
-        // ignore
-      }
-    }
-  }, []);
-
   const titleImages = {
     light: useBaseUrl('/img/title.svg'),
     dark: useBaseUrl('/img/title-dark.svg'),
@@ -51,15 +11,7 @@ export default function NavbarWrapper(props) {
   const heroImages = {
     logo: useBaseUrl('/img/logo-hero.svg'),
   };
-
   return (
-    <div style={{ display: 'flex', flexDirection: 'column', flexShrink: 0 }}>
-      {isLanding ? (
-        <TopPromoRotator />
-      ) : (
-        showPromo && <TopPromoRotator onClose={handleClosePromo} />
-      )}
-      <Navbar heroImages={heroImages} titleImages={titleImages} {...props} />
-    </div>
+    <Navbar heroImages={heroImages} titleImages={titleImages} {...props} />
   );
 }

packages/docs-gesture-handler/src/components/TopPromoRotator/index.tsx

@@ -14,10 +14,8 @@ import com.facebook.react.views.swiperefresh.ReactSwipeRefreshLayout
 import com.facebook.react.views.text.ReactTextView
 import com.facebook.react.views.textinput.ReactEditText
 import com.facebook.react.views.view.ReactViewGroup
-import com.swmansion.gesturehandler.react.RNGestureHandlerButtonViewManager
 import com.swmansion.gesturehandler.react.RNGestureHandlerRootHelper
 import com.swmansion.gesturehandler.react.events.eventbuilders.NativeGestureHandlerEventDataBuilder
-import com.swmansion.gesturehandler.react.isScreenReaderOn
 
 class NativeViewGestureHandler : GestureHandler() {
   override val isContinuous = true
@@ -121,17 +119,6 @@ class NativeViewGestureHandler : GestureHandler() {
 
   override fun onHandle(event: MotionEvent, sourceEvent: MotionEvent) {
     val view = view!!
-
-    val isTouchExplorationEnabled = view.context.isScreenReaderOn()
-
-    if (view is RNGestureHandlerButtonViewManager.ButtonViewGroup && isTouchExplorationEnabled) {
-      // Fix for: https://github.com/software-mansion/react-native-gesture-handler/issues/2808
-      // When TalkBack is enabled, events are often not being sent to the orchestrator for processing.
-      // Instead, states will be changed directly by an alternative mechanism added in this PR:
-      // https://github.com/software-mansion/react-native-gesture-handler/pull/2234
-      return
-    }
-
     if (event.actionMasked == MotionEvent.ACTION_UP) {
       if (state == STATE_UNDETERMINED && !hook.canBegin(event)) {
         cancel()

packages/docs-gesture-handler/src/components/TopPromoRotator/styles.module.css

@@ -27,6 +27,7 @@ import androidx.core.view.children
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator
 import com.facebook.react.R
 import com.facebook.react.bridge.Dynamic
+import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.BackgroundStyleApplicator
 import com.facebook.react.uimanager.LengthPercentage
@@ -347,6 +348,7 @@ class RNGestureHandlerButtonViewManager :
     super.onAfterUpdateTransaction(view)
 
     view.updateBackground()
+    view.updateLongPressAccessibility()
   }
 
   override fun getDelegate(): ViewManagerDelegate<ButtonViewGroup>? = mDelegate
@@ -434,6 +436,23 @@ class RNGestureHandlerButtonViewManager :
       invalidate()
     }
 
+    fun updateLongPressAccessibility() {
+      val hasLongPress = hasLongPressAccessibilityAction()
+      setOnLongClickListener(if (hasLongPress) dummyLongClickListener else null)
+      isLongClickable = hasLongPress
+    }
+
+    private fun hasLongPressAccessibilityAction(): Boolean {
+      val actions = getTag(R.id.accessibility_actions) as? ReadableArray ?: return false
+      for (i in 0 until actions.size()) {
+        if (actions.getMap(i)?.getString("name") == "longpress") {
+          return true
+        }
+      }
+
+      return false
+    }
+
     override fun setBackgroundColor(color: Int) {
       BackgroundStyleApplicator.setBackgroundColor(this, color)
     }
@@ -876,10 +895,11 @@ class RNGestureHandlerButtonViewManager :
     }
 
     override fun performClick(): Boolean {
-      // don't preform click when a child button is pressed (mainly to prevent sound effect of
+      // don't perform click when a child button is pressed (mainly to prevent sound effect of
       // a parent button from playing)
       return if (!isChildTouched()) {
-        if (context.isScreenReaderOn()) {
+        // Don't activate native handlers when isPressed is true (motion events are passing through)
+        if (context.isScreenReaderOn() && !isPressed) {
           RNGestureHandlerRootView.findGestureHandlerRootView(this)?.activateNativeHandlers(this)
         } else if (receivedKeyEvent) {
           RNGestureHandlerRootView.findGestureHandlerRootView(this)?.activateNativeHandlers(this)
@@ -936,7 +956,14 @@ class RNGestureHandlerButtonViewManager :
       var resolveOutValue = TypedValue()
       var touchResponder: ButtonViewGroup? = null
       var soundResponder: ButtonViewGroup? = null
-      var dummyClickListener = OnClickListener { }
+      val dummyClickListener = OnClickListener { }
+      val dummyLongClickListener = OnLongClickListener { view ->
+        if (view.context.isScreenReaderOn()) {
+          view.performAccessibilityAction(AccessibilityNodeInfo.ACTION_LONG_CLICK, null)
+        } else {
+          false
+        }
+      }
     }
   }