Merge branch 'main' into 2.24-stable

Author: m-bert

src/components/Text.tsx

@@ -35,6 +35,11 @@ export const Text = forwardRef(
  }
  };
 
+ // This is a special case for `Text` component. After https://github.com/software-mansion/react-native-gesture-handler/pull/3379 we check for
+ // `displayName` field. However, `Text` from RN has this field set to `Text`, but is also present in `RNSVGElements` set.
+ // We don't want to treat our `Text` as the one from `SVG`, therefore we add special field to ref.
+ refHandler.rngh = true;
+
  useEffect(() => {
  if (Platform.OS !== 'web') {
  return;

src/web/utils.ts

@@ -280,6 +280,12 @@ export function isRNSVGElement(viewRef: SVGRef | GestureHandlerRef) {
 // Second condition was introduced to handle case where SVG element was wrapped with
 // `createAnimatedComponent` from Reanimated.
 export function isRNSVGNode(node: any) {
+ // If `ref` has `rngh` field, it means that component comes from Gesture Handler. This is a special case for
+ // `Text` component, which is present in `RNSVGElements` set, yet we don't want to treat it as SVG.
+ if (node.ref?.rngh) {
+ return false;
+ }
+
  return (
  Object.getPrototypeOf(node?.type)?.name === 'WebShape' ||
  RNSVGElements.has(node?.type?.displayName)