Skip to content

Commit 3401ab2

Browse files
authored
Merge pull request Expensify#65557 from Expensify/georgia-revert-64709
[CP Staging] Revert Expensify#64709
2 parents cf2829b + 0b961a6 commit 3401ab2

3 files changed

Lines changed: 11 additions & 12 deletions

File tree

src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.tsx

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {useIsFocused} from '@react-navigation/native';
22
import {Str} from 'expensify-common';
3-
import React, {useEffect, useRef, useState} from 'react';
3+
import React, {useEffect, useRef} from 'react';
44
// eslint-disable-next-line no-restricted-imports
55
import type {Text as RNText} from 'react-native';
66
import {StyleSheet} from 'react-native';
@@ -9,7 +9,6 @@ import Text from '@components/Text';
99
import Tooltip from '@components/Tooltip';
1010
import useResponsiveLayout from '@hooks/useResponsiveLayout';
1111
import useStyleUtils from '@hooks/useStyleUtils';
12-
import useTheme from '@hooks/useTheme';
1312
import useThemeStyles from '@hooks/useThemeStyles';
1413
import {canUseTouchScreen} from '@libs/DeviceCapabilities';
1514
import {hideContextMenu, showContextMenu} from '@pages/home/report/ContextMenu/ReportActionContextMenu';
@@ -32,12 +31,10 @@ function BaseAnchorForCommentsOnly({
3231
wrapperStyle,
3332
...rest
3433
}: BaseAnchorForCommentsOnlyProps) {
35-
const theme = useTheme();
3634
const styles = useThemeStyles();
3735
const StyleUtils = useStyleUtils();
3836
const linkRef = useRef<RNText>(null);
3937
const flattenStyle = StyleSheet.flatten(style);
40-
const [isHovered, setIsHovered] = useState(false);
4138

4239
useEffect(
4340
() => () => {
@@ -55,7 +52,6 @@ function BaseAnchorForCommentsOnly({
5552
linkProps.href = href;
5653
}
5754
const defaultTextStyle = canUseTouchScreen() || shouldUseNarrowLayout ? {} : {...styles.userSelectText, ...styles.cursorPointer};
58-
const hoverStyle = isHovered ? StyleUtils.getColorStyle(theme.linkHover) : {};
5955
const isEmail = Str.isValidEmail(href.replace(/mailto:/i, ''));
6056
const linkHref = !linkHasImage ? href : undefined;
6157
const isFocused = useIsFocused();
@@ -83,8 +79,6 @@ function BaseAnchorForCommentsOnly({
8379
}}
8480
onPressIn={onPressIn}
8581
onPressOut={onPressOut}
86-
onHoverIn={() => setIsHovered(true)}
87-
onHoverOut={() => setIsHovered(false)}
8882
role={CONST.ROLE.LINK}
8983
accessibilityLabel={href}
9084
wrapperStyle={wrapperStyle}
@@ -95,7 +89,7 @@ function BaseAnchorForCommentsOnly({
9589
>
9690
<Text
9791
ref={linkRef}
98-
style={StyleSheet.flatten([style, defaultTextStyle, hoverStyle])}
92+
style={StyleSheet.flatten([style, defaultTextStyle])}
9993
role={CONST.ROLE.LINK}
10094
hrefAttrs={{
10195
rel,

src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,15 @@ function AnchorRenderer({tnode, style, key}: AnchorRendererProps) {
133133
// eslint-disable-next-line react/jsx-props-no-multi-spaces
134134
target={htmlAttribs.target || '_blank'}
135135
rel={htmlAttribs.rel || 'noopener noreferrer'}
136-
style={[style, parentStyle, styles.textDecorationLineNone, isChildOfTaskTitle && styles.taskTitleMenuItem, styles.dInlineFlex]}
136+
style={[
137+
style,
138+
parentStyle,
139+
textDecorationLineStyle,
140+
styles.textUnderlinePositionUnder,
141+
styles.textDecorationSkipInkNone,
142+
isChildOfTaskTitle && styles.taskTitleMenuItem,
143+
styles.dInlineFlex,
144+
]}
137145
key={key}
138146
// Only pass the press handler for internal links. For public links or whitelisted internal links fallback to default link handling
139147
onPress={onLinkPress}

src/styles/utils/textDecorationLine.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import type {TextStyle} from 'react-native';
22

33
export default {
4-
textDecorationLineNone: {
5-
textDecorationLine: 'none',
6-
},
74
lineThrough: {
85
textDecorationLine: 'line-through',
96
textDecorationStyle: 'solid',

0 commit comments

Comments
 (0)