Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CP Staging] Fix/issue 31069 #31184

Merged
merged 4 commits into from
Nov 10, 2023
Merged

[CP Staging] Fix/issue 31069 #31184

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f07068
fix: RNW patch for measureInWindow
sangar-1028 Nov 10, 2023
5e9f3df
fix: remove shouldUseTargetLocation from PopoverWithMeasuredContent
sangar-1028 Nov 10, 2023
a75ce3e
fix: emoji picker not open first time
sangar-1028 Nov 10, 2023
6bf03f2
fix: remove unnecessary variable
sangar-1028 Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions patches/react-native-web+0.19.9+003+measureInWindow.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/node_modules/react-native-web/dist/exports/UIManager/index.js b/node_modules/react-native-web/dist/exports/UIManager/index.js
index 15b71d5..46b9e01 100644
--- a/node_modules/react-native-web/dist/exports/UIManager/index.js
+++ b/node_modules/react-native-web/dist/exports/UIManager/index.js
@@ -77,7 +77,7 @@ var UIManager = {
measureInWindow(node, callback) {
if (node) {
setTimeout(() => {
- var _getRect2 = getRect(node),
+ var _getRect2 = node.getBoundingClientRect(),
height = _getRect2.height,
left = _getRect2.left,
top = _getRect2.top,
1 change: 0 additions & 1 deletion src/components/EmojiPicker/EmojiPicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ const EmojiPicker = forwardRef((props, ref) => {
outerStyle={StyleUtils.getOuterModalStyle(windowHeight, props.viewportOffsetTop)}
innerContainerStyle={styles.popoverInnerContainer}
avoidKeyboard
shouldUseTargetLocation
>
<EmojiPickerMenu
onEmojiSelected={selectEmoji}
Expand Down
1 change: 0 additions & 1 deletion src/components/EmojiPicker/EmojiPickerButtonDropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ function EmojiPickerButtonDropdown(props) {
horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT,
vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP,
shiftVertical: 4,
shouldUseTargetLocation: true,
});
};

Expand Down
17 changes: 3 additions & 14 deletions src/components/PopoverWithMeasuredContent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import React, {useMemo, useState} from 'react';
import {View} from 'react-native';
import _ from 'underscore';
import useWindowDimensions from '@hooks/useWindowDimensions';
import getClickedTargetLocation from '@libs/getClickedTargetLocation';
import {computeHorizontalShift, computeVerticalShift} from '@styles/getPopoverWithMeasuredContentStyles';
import styles from '@styles/styles';
import CONST from '@src/CONST';
Expand Down Expand Up @@ -37,9 +36,6 @@ const propTypes = {
height: PropTypes.number,
width: PropTypes.number,
}),

/** Whether we should use the target location from anchor element directly */
shouldUseTargetLocation: PropTypes.bool,
};

const defaultProps = {
Expand All @@ -55,7 +51,6 @@ const defaultProps = {
width: 0,
},
withoutOverlay: false,
shouldUseTargetLocation: false,
};

/**
Expand Down Expand Up @@ -95,9 +90,6 @@ function PopoverWithMeasuredContent(props) {
setIsContentMeasured(true);
};

const {x: horizontal, y: vertical} = props.anchorRef.current ? getClickedTargetLocation(props.anchorRef.current) : {};
const clickedTargetLocation = props.anchorRef.current && props.shouldUseTargetLocation ? {horizontal, vertical} : props.anchorPosition;

const adjustedAnchorPosition = useMemo(() => {
let horizontalConstraint;
switch (props.anchorAlignment.horizontal) {
Expand All @@ -111,17 +103,14 @@ function PopoverWithMeasuredContent(props) {
break;
case CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT:
default:
horizontalConstraint = {left: clickedTargetLocation.horizontal};
horizontalConstraint = {left: props.anchorPosition.horizontal};
}

let verticalConstraint;
const anchorLocationVertical = clickedTargetLocation.vertical;
const anchorLocationVertical = props.anchorPosition.vertical;
s-alves10 marked this conversation as resolved.
Show resolved Hide resolved

switch (props.anchorAlignment.vertical) {
case CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM:
if (!anchorLocationVertical) {
break;
}
verticalConstraint = {top: anchorLocationVertical - popoverHeight};
break;
case CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.CENTER:
Expand All @@ -138,7 +127,7 @@ function PopoverWithMeasuredContent(props) {
...horizontalConstraint,
...verticalConstraint,
};
}, [props.anchorPosition, props.anchorAlignment, clickedTargetLocation.vertical, clickedTargetLocation.horizontal, popoverWidth, popoverHeight]);
}, [props.anchorPosition, props.anchorAlignment, popoverWidth, popoverHeight]);

const horizontalShift = computeHorizontalShift(adjustedAnchorPosition.left, popoverWidth, windowWidth);
const verticalShift = computeVerticalShift(adjustedAnchorPosition.top, popoverHeight, windowHeight);
Expand Down
Loading