Skip to content

Commit 5c0eac3

Browse files
authored
Merge pull request Expensify#70530 from mukhrr/fix/67759
fixed some educational tooltips' horizontal and vertical aligning
2 parents 317c7af + 5243691 commit 5c0eac3

3 files changed

Lines changed: 11 additions & 5 deletions

File tree

src/components/FloatingActionButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ function FloatingActionButton({onPress, onLongPress, isActive, accessibilityLabe
7777

7878
const longPressFabAction = (event: GestureResponderEvent | KeyboardEvent | undefined) => {
7979
// Only execute on narrow layout - prevent event from firing on wide screens
80-
if (!shouldUseNarrowLayout) {
80+
if (isLHBVisible) {
8181
return;
8282
}
8383
// Drop focus to avoid blue focus ring.

src/components/SelectionList/InviteMemberListItem.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import useTheme from '@hooks/useTheme';
1515
import useThemeStyles from '@hooks/useThemeStyles';
1616
import {getIsUserSubmittedExpenseOrScannedReceipt} from '@libs/OptionsListUtils';
1717
import {isSelectedManagerMcTest} from '@libs/ReportUtils';
18+
import variables from '@styles/variables';
1819
import CONST from '@src/CONST';
1920
import BaseListItem from './BaseListItem';
2021
import type {InviteMemberListItemProps, ListItem} from './types';
@@ -102,6 +103,8 @@ function InviteMemberListItem<TItem extends ListItem>({
102103
horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT,
103104
vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP,
104105
}}
106+
shiftVertical={variables.inviteMemberListItemTooltipShiftVertical}
107+
shiftHorizontal={variables.inviteMemberListItemTooltipShiftHorizontal}
105108
shouldHideOnNavigate
106109
wrapperStyle={styles.productTrainingTooltipWrapper}
107110
>

src/styles/variables.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,17 +281,20 @@ export default {
281281

282282
searchTypeColumnWidth: 52,
283283

284-
gbrTooltipShiftHorizontal: -15,
285-
gbrTooltipShiftVertical: -10,
286-
fabTooltipShiftHorizontal: -11,
287-
lhbFabTooltipShiftHorizontal: 4,
284+
gbrTooltipShiftHorizontal: -14,
285+
gbrTooltipShiftVertical: -16,
286+
lhbFabTooltipShiftHorizontal: 8,
287+
lhbFabTooltipShiftVertical: 12,
288+
lhbFabTooltipShiftVerticalMobile: 6,
288289
workspaceLHNTooltipShiftHorizontal: 23,
289290
savedSearchShiftHorizontal: -10,
290291
savedSearchShiftVertical: 6,
291292
navigationTabBarInboxTooltipShiftHorizontal: 36,
292293
accountSwitcherTooltipShiftVertical: 7,
293294
accountSwitcherTooltipShiftHorizontal: 4,
294295
expenseReportsTypeTooltipShiftHorizontal: 10,
296+
inviteMemberListItemTooltipShiftVertical: -8,
297+
inviteMemberListItemTooltipShiftHorizontal: 4,
295298

296299
inlineImagePreviewMinSize: 64,
297300
inlineImagePreviewMaxSize: 148,

0 commit comments

Comments
 (0)