Skip to content

Handle popover showing from side only in sidebar screen #6558

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

Merged
Jag96 merged 6 commits into from
Dec 15, 2021
Merged

Handle popover showing from side only in sidebar screen #6558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b57fcbe
Handle popover showing from side only in sidebar screen
AlfredoAlc Dec 1, 2021
fc5fe83
Merge branch 'main' into alfredo-fab-options-large-screens
AlfredoAlc Dec 2, 2021
cabd74b
Merge branch 'Expensify:main' into alfredo-fab-options-large-screens
AlfredoAlc Dec 7, 2021
f260608
Send correct value
AlfredoAlc Dec 10, 2021
d07d3d0
Sends correct animations
AlfredoAlc Dec 10, 2021
077c4a5
Send relevant props
AlfredoAlc Dec 10, 2021
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
3 changes: 2 additions & 1 deletion src/components/Popover/index.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ const Popover = (props) => {
const propsWithoutAnimation = _.omit(props, ['animationIn', 'animationOut', 'popoverAnchorPosition', 'disableAnimation']);
return (
<Modal
type={CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED}
type={props.fromSidebarMediumScreen ? CONST.MODAL.MODAL_TYPE.POPOVER : CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED}
popoverAnchorPosition={props.fromSidebarMediumScreen ? props.anchorPosition : undefined}
// eslint-disable-next-line react/jsx-props-no-spreading
{...propsWithoutAnimation}

Expand Down
1 change: 1 addition & 0 deletions src/components/PopoverMenu/BasePopoverMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ class BasePopoverMenu extends PureComponent {
animationIn={this.props.animationIn}
animationOut={this.props.animationOut}
disableAnimation={this.props.disableAnimation}
fromSidebarMediumScreen={this.props.fromSidebarMediumScreen}
>
<View style={this.props.isSmallScreenWidth ? {} : styles.createMenuContainer}>
{!_.isEmpty(this.props.headerText) && (
Expand Down
1 change: 1 addition & 0 deletions src/pages/home/sidebar/SidebarScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ class SidebarScreen extends Component {
isVisible={this.state.isCreateMenuActive}
anchorPosition={styles.createMenuPositionSidebar}
onItemSelected={this.onCreateMenuItemSelected}
fromSidebarMediumScreen={!this.props.isSmallScreenWidth}
menuItems={[
{
icon: Expensicons.ChatBubble,
Expand Down