Merge pull request #18153 from robertKozik/fix-opacity-view

Fix applying styling when it want to apply opacity on OpacityView
Expensify · Apr 28, 2023 · 5498e38 · 5498e38
2 parents 1a04e22 + facb886
commit 5498e38
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/src/components/OpacityView.js b/src/components/OpacityView.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import {View} from 'react-native';
 import Animated, {useAnimatedStyle, useSharedValue, withTiming} from 'react-native-reanimated';
 import PropTypes from 'prop-types';
 import * as StyleUtils from '../styles/StyleUtils';
@@ -49,10 +50,10 @@ const OpacityView = (props) => {
     }, [props.shouldDim, props.dimmingValue, opacity]);
 
     return (
-        <Animated.View
-            style={[opacityStyle, ...StyleUtils.parseStyleAsArray(props.style)]}
-        >
-            {props.children}
+        <Animated.View style={[opacityStyle]}>
+            <View style={StyleUtils.parseStyleAsArray(props.style)}>
+                {props.children}
+            </View>
         </Animated.View>
     );
 };

diff --git a/src/components/Pressable/GenericPressable/BaseGenericPressable.js b/src/components/Pressable/GenericPressable/BaseGenericPressable.js
@@ -10,7 +10,6 @@ import Accessibility from '../../../libs/Accessibility';
 import HapticFeedback from '../../../libs/HapticFeedback';
 import KeyboardShortcut from '../../../libs/KeyboardShortcut';
 import styles from '../../../styles/styles';
-import cursor from '../../../styles/utilities/cursor';
 import genericPressablePropTypes from './PropTypes';
 import CONST from '../../../CONST';
 import * as StyleUtils from '../../../styles/StyleUtils';
@@ -23,14 +22,14 @@ import * as StyleUtils from '../../../styles/StyleUtils';
  */
 const getCursorStyle = (isDisabled, isText) => {
     if (isDisabled) {
-        return cursor.cursorDisabled;
+        return styles.cursorDisabled;
     }
 
     if (isText) {
-        return cursor.cursorText;
+        return styles.cursorText;
     }
 
-    return cursor.cursorPointer;
+    return styles.cursorPointer;
 };
 
 const GenericPressable = forwardRef((props, ref) => {

diff --git a/src/styles/styles.js b/src/styles/styles.js
@@ -2472,14 +2472,6 @@ const styles = {
         outline: 'none',
     },
 
-    cursorPointer: {
-        cursor: 'pointer',
-    },
-
-    cursorText: {
-        cursor: 'text',
-    },
-
     fullscreenCard: {
         position: 'absolute',
         left: 0,