chore: remove hover effect & add cursor: pointer (#122)

* chore: remove hover effect * fix: set cursor pointer by default, update tests * feat(iOS): Implement cursor style prop # Conflicts: # packages/react-native/Libraries/StyleSheet/StyleSheetTypes.d.ts --------- Co-authored-by: Saad Najmi <sanajmi@microsoft.com>
callstack · Mar 6, 2024 · 4dad1eb · 4dad1eb
1 parent 229d9c7
commit 4dad1eb
Show file tree

Hide file tree

Showing 17 changed files with 213 additions and 144 deletions.
diff --git a/packages/react-native/Libraries/Components/Pressable/Pressable.js b/packages/react-native/Libraries/Components/Pressable/Pressable.js
@@ -20,11 +20,11 @@ import type {
   AccessibilityState,
   AccessibilityValue,
 } from '../View/ViewAccessibility';
-import type {HoverEffect} from '../View/ViewPropTypes';
 
 import {PressabilityDebugView} from '../../Pressability/PressabilityDebug';
 import usePressability from '../../Pressability/usePressability';
 import {type RectOrSize} from '../../StyleSheet/Rect';
+import StyleSheet from '../../StyleSheet/StyleSheet';
 import useMergeRefs from '../../Utilities/useMergeRefs';
 import View from '../View/View';
 import useAndroidRippleForView, {
@@ -33,18 +33,12 @@ import useAndroidRippleForView, {
 import * as React from 'react';
 import {useMemo, useRef, useState} from 'react';
 
-const defaultHoverEffect: HoverEffect = 'highlight';
-
 type ViewStyleProp = $ElementType<React.ElementConfig<typeof View>, 'style'>;
 
 export type StateCallbackType = $ReadOnly<{|
   pressed: boolean,
 |}>;
 
-type VisionOSProps = $ReadOnly<{|
-  visionos_hoverEffect?: ?HoverEffect,
-|}>;
-
 type Props = $ReadOnly<{|
   /**
    * Accessibility.
@@ -200,10 +194,6 @@ type Props = $ReadOnly<{|
    * https://github.com/facebook/react-native/issues/34424
    */
   'aria-label'?: ?string,
-  /**
-   * Props needed for visionOS.
-   */
-  ...VisionOSProps,
 |}>;
 
 /**
@@ -243,7 +233,6 @@ function Pressable(props: Props, forwardedRef): React.Node {
     style,
     testOnly_pressed,
     unstable_pressDelay,
-    visionos_hoverEffect = defaultHoverEffect,
     ...restProps
   } = props;
 
@@ -352,15 +341,23 @@ function Pressable(props: Props, forwardedRef): React.Node {
       {...restPropsWithDefaults}
       {...eventHandlers}
       ref={mergedRef}
-      style={typeof style === 'function' ? style({pressed}) : style}
-      collapsable={false}
-      visionos_hoverEffect={visionos_hoverEffect}>
+      style={[
+        styles.pressable,
+        typeof style === 'function' ? style({pressed}) : style,
+      ]}
+      collapsable={false}>
       {typeof children === 'function' ? children({pressed}) : children}
       {__DEV__ ? <PressabilityDebugView color="red" hitSlop={hitSlop} /> : null}
     </View>
   );
 }
 
+const styles = StyleSheet.create({
+  pressable: {
+    cursor: 'pointer',
+  },
+});
+
 function usePressState(forcePressed: boolean): [boolean, (boolean) => void] {
   const [pressed, setPressed] = useState(false);
   return [pressed || forcePressed, setPressed];

diff --git a/...eact-native/Libraries/Components/Pressable/__tests__/__snapshots__/Pressable-test.js.snap b/...eact-native/Libraries/Components/Pressable/__tests__/__snapshots__/Pressable-test.js.snap
@@ -31,7 +31,14 @@ exports[`<Pressable /> should render as expected: should deep render when mocked
   onResponderTerminate={[Function]}
   onResponderTerminationRequest={[Function]}
   onStartShouldSetResponder={[Function]}
-  visionos_hoverEffect="highlight"
+  style={
+    Array [
+      Object {
+        "cursor": "pointer",
+      },
+      undefined,
+    ]
+  }
 >
   <View />
 </View>
@@ -68,7 +75,14 @@ exports[`<Pressable /> should render as expected: should deep render when not mo
   onResponderTerminate={[Function]}
   onResponderTerminationRequest={[Function]}
   onStartShouldSetResponder={[Function]}
-  visionos_hoverEffect="highlight"
+  style={
+    Array [
+      Object {
+        "cursor": "pointer",
+      },
+      undefined,
+    ]
+  }
 >
   <View />
 </View>
@@ -117,7 +131,14 @@ exports[`<Pressable disabled={true} /> should be disabled when disabled is true:
   onResponderTerminate={[Function]}
   onResponderTerminationRequest={[Function]}
   onStartShouldSetResponder={[Function]}
-  visionos_hoverEffect="highlight"
+  style={
+    Array [
+      Object {
+        "cursor": "pointer",
+      },
+      undefined,
+    ]
+  }
 >
   <View />
 </View>
@@ -154,7 +175,14 @@ exports[`<Pressable disabled={true} /> should be disabled when disabled is true:
   onResponderTerminate={[Function]}
   onResponderTerminationRequest={[Function]}
   onStartShouldSetResponder={[Function]}
-  visionos_hoverEffect="highlight"
+  style={
+    Array [
+      Object {
+        "cursor": "pointer",
+      },
+      undefined,
+    ]
+  }
 >
   <View />
 </View>
@@ -207,7 +235,14 @@ exports[`<Pressable disabled={true} accessibilityState={{}} /> should be disable
   onResponderTerminate={[Function]}
   onResponderTerminationRequest={[Function]}
   onStartShouldSetResponder={[Function]}
-  visionos_hoverEffect="highlight"
+  style={
+    Array [
+      Object {
+        "cursor": "pointer",
+      },
+      undefined,
+    ]
+  }
 >
   <View />
 </View>
@@ -244,7 +279,14 @@ exports[`<Pressable disabled={true} accessibilityState={{}} /> should be disable
   onResponderTerminate={[Function]}
   onResponderTerminationRequest={[Function]}
   onStartShouldSetResponder={[Function]}
-  visionos_hoverEffect="highlight"
+  style={
+    Array [
+      Object {
+        "cursor": "pointer",
+      },
+      undefined,
+    ]
+  }
 >
   <View />
 </View>
@@ -299,7 +341,14 @@ exports[`<Pressable disabled={true} accessibilityState={{checked: true}} /> shou
   onResponderTerminate={[Function]}
   onResponderTerminationRequest={[Function]}
   onStartShouldSetResponder={[Function]}
-  visionos_hoverEffect="highlight"
+  style={
+    Array [
+      Object {
+        "cursor": "pointer",
+      },
+      undefined,
+    ]
+  }
 >
   <View />
 </View>
@@ -336,7 +385,14 @@ exports[`<Pressable disabled={true} accessibilityState={{checked: true}} /> shou
   onResponderTerminate={[Function]}
   onResponderTerminationRequest={[Function]}
   onStartShouldSetResponder={[Function]}
-  visionos_hoverEffect="highlight"
+  style={
+    Array [
+      Object {
+        "cursor": "pointer",
+      },
+      undefined,
+    ]
+  }
 >
   <View />
 </View>
@@ -399,7 +455,14 @@ exports[`<Pressable disabled={true} accessibilityState={{disabled: false}} /> sh
   onResponderTerminate={[Function]}
   onResponderTerminationRequest={[Function]}
   onStartShouldSetResponder={[Function]}
-  visionos_hoverEffect="highlight"
+  style={
+    Array [
+      Object {
+        "cursor": "pointer",
+      },
+      undefined,
+    ]
+  }
 >
   <View />
 </View>
@@ -436,7 +499,14 @@ exports[`<Pressable disabled={true} accessibilityState={{disabled: false}} /> sh
   onResponderTerminate={[Function]}
   onResponderTerminationRequest={[Function]}
   onStartShouldSetResponder={[Function]}
-  visionos_hoverEffect="highlight"
+  style={
+    Array [
+      Object {
+        "cursor": "pointer",
+      },
+      undefined,
+    ]
+  }
 >
   <View />
 </View>

diff --git a/packages/react-native/Libraries/Components/Touchable/TouchableHighlight.js b/packages/react-native/Libraries/Components/Touchable/TouchableHighlight.js
@@ -9,7 +9,6 @@
  */
 
 import type {ColorValue} from '../../StyleSheet/StyleSheet';
-import type {HoverEffect} from '../View/ViewPropTypes';
 import typeof TouchableWithoutFeedback from './TouchableWithoutFeedback';
 
 import View from '../../Components/View/View';
@@ -33,15 +32,10 @@ type IOSProps = $ReadOnly<{|
   hasTVPreferredFocus?: ?boolean,
 |}>;
 
-type VisionOSProps = $ReadOnly<{|
-  hoverEffect?: ?HoverEffect,
-|}>;
-
 type Props = $ReadOnly<{|
   ...React.ElementConfig<TouchableWithoutFeedback>,
   ...AndroidProps,
   ...IOSProps,
-  ...VisionOSProps,
 
   activeOpacity?: ?number,
   underlayColor?: ?ColorValue,
@@ -335,10 +329,13 @@ class TouchableHighlight extends React.Component<Props, State> {
         accessibilityElementsHidden={
           this.props['aria-hidden'] ?? this.props.accessibilityElementsHidden
         }
-        style={StyleSheet.compose(
-          this.props.style,
-          this.state.extraStyles?.underlay,
-        )}
+        style={[
+          styles.touchable,
+          StyleSheet.compose(
+            this.props.style,
+            this.state.extraStyles?.underlay,
+          ),
+        ]}
         onLayout={this.props.onLayout}
         hitSlop={this.props.hitSlop}
         hasTVPreferredFocus={this.props.hasTVPreferredFocus}
@@ -347,7 +344,6 @@ class TouchableHighlight extends React.Component<Props, State> {
         nextFocusLeft={this.props.nextFocusLeft}
         nextFocusRight={this.props.nextFocusRight}
         nextFocusUp={this.props.nextFocusUp}
-        visionos_hoverEffect={this.props.hoverEffect}
         focusable={
           this.props.focusable !== false && this.props.onPress !== undefined
         }
@@ -386,6 +382,12 @@ class TouchableHighlight extends React.Component<Props, State> {
   }
 }
 
+const styles = StyleSheet.create({
+  touchable: {
+    cursor: 'pointer',
+  },
+});
+
 const Touchable: React.AbstractComponent<
   $ReadOnly<$Diff<Props, {|hostRef: React.Ref<typeof View>|}>>,
   React.ElementRef<typeof View>,

diff --git a/packages/react-native/Libraries/Components/Touchable/TouchableOpacity.d.ts b/packages/react-native/Libraries/Components/Touchable/TouchableOpacity.d.ts
@@ -11,7 +11,7 @@ import type * as React from 'react';
 import {Constructor} from '../../../types/private/Utilities';
 import {TimerMixin} from '../../../types/private/TimerMixin';
 import {NativeMethods} from '../../../types/public/ReactNativeTypes';
-import {HoverEffect, TVParallaxProperties} from '../View/ViewPropTypes';
+import {TVParallaxProperties} from '../View/ViewPropTypes';
 import {TouchableMixin} from './Touchable';
 import {TouchableWithoutFeedbackProps} from './TouchableWithoutFeedback';
 
@@ -86,11 +86,6 @@ export interface TouchableOpacityProps
    * @platform android
    */
   tvParallaxProperties?: TVParallaxProperties | undefined;
-
-  /**
-   * Hover style to apply to the view. Only supported on visionOS.
-   */
-  visionos_hoverEffect?: HoverEffect | undefined;
 }
 
 /**

diff --git a/packages/react-native/Libraries/Components/Touchable/TouchableOpacity.js b/packages/react-native/Libraries/Components/Touchable/TouchableOpacity.js
@@ -9,7 +9,6 @@
  */
 
 import type {ViewStyleProp} from '../../StyleSheet/StyleSheet';
-import type {HoverEffect} from '../View/ViewPropTypes';
 import typeof TouchableWithoutFeedback from './TouchableWithoutFeedback';
 
 import Animated from '../../Animated/Animated';
@@ -19,11 +18,10 @@ import Pressability, {
 } from '../../Pressability/Pressability';
 import {PressabilityDebugView} from '../../Pressability/PressabilityDebug';
 import flattenStyle from '../../StyleSheet/flattenStyle';
+import StyleSheet from '../../StyleSheet/StyleSheet';
 import Platform from '../../Utilities/Platform';
 import * as React from 'react';
 
-const defaultHoverEffect: HoverEffect = 'highlight';
-
 type TVProps = $ReadOnly<{|
   hasTVPreferredFocus?: ?boolean,
   nextFocusDown?: ?number,
@@ -33,14 +31,9 @@ type TVProps = $ReadOnly<{|
   nextFocusUp?: ?number,
 |}>;
 
-type VisionOSProps = $ReadOnly<{|
-  visionos_hoverEffect?: ?HoverEffect,
-|}>;
-
 type Props = $ReadOnly<{|
   ...React.ElementConfig<TouchableWithoutFeedback>,
   ...TVProps,
-  ...VisionOSProps,
 
   activeOpacity?: ?number,
   style?: ?ViewStyleProp,
@@ -138,10 +131,6 @@ type State = $ReadOnly<{|
  *
  */
 class TouchableOpacity extends React.Component<Props, State> {
-  static defaultProps: {|visionos_hoverEffect: HoverEffect|} = {
-    visionos_hoverEffect: defaultHoverEffect,
-  };
-
   state: State = {
     anim: new Animated.Value(this._getChildStyleOpacityWithDefault()),
     pressability: new Pressability(this._createPressabilityConfig()),
@@ -287,7 +276,7 @@ class TouchableOpacity extends React.Component<Props, State> {
         accessibilityElementsHidden={
           this.props['aria-hidden'] ?? this.props.accessibilityElementsHidden
         }
-        style={[this.props.style, {opacity: this.state.anim}]}
+        style={[styles.touchable, this.props.style, {opacity: this.state.anim}]}
         nativeID={this.props.id ?? this.props.nativeID}
         testID={this.props.testID}
         onLayout={this.props.onLayout}
@@ -298,7 +287,6 @@ class TouchableOpacity extends React.Component<Props, State> {
         nextFocusUp={this.props.nextFocusUp}
         hasTVPreferredFocus={this.props.hasTVPreferredFocus}
         hitSlop={this.props.hitSlop}
-        visionos_hoverEffect={this.props.visionos_hoverEffect}
         focusable={
           this.props.focusable !== false && this.props.onPress !== undefined
         }
@@ -336,6 +324,12 @@ class TouchableOpacity extends React.Component<Props, State> {
   }
 }
 
+const styles = StyleSheet.create({
+  touchable: {
+    cursor: 'pointer',
+  },
+});
+
 const Touchable: React.AbstractComponent<
   Props,
   React.ElementRef<typeof Animated.View>,