Skip to content

Fixed : One of the popup modal options is highlighted by default #8581

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
roryabraham merged 5 commits into from
May 3, 2022
Merged

Fixed : One of the popup modal options is highlighted by default #8581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
09d1942
added fadeIn value to animationIn props according to issue 8133
metehanozyurt Apr 10, 2022
47d82d6
added fadeOut value to animationOut props
metehanozyurt Apr 10, 2022
ddda2e1
videoChatButtonAndMenu changed to fadeIn and fadeOut
metehanozyurt Apr 21, 2022
41b6912
removed animationIn and animationOut in pages , added default props
metehanozyurt Apr 27, 2022
6f52136
Merge branch 'Expensify:main' into issue-8133
metehanozyurt Apr 30, 2022
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
2 changes: 0 additions & 2 deletions src/components/AvatarWithImagePicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,6 @@ class AvatarWithImagePicker extends React.Component {
onItemSelected={() => this.setState({isMenuVisible: false})}
menuItems={this.createMenuItems(openPicker)}
anchorPosition={this.props.anchorPosition}
animationIn="fadeInDown"
animationOut="fadeOutUp"
/>
</>
)
Expand Down
2 changes: 0 additions & 2 deletions src/components/ButtonWithMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@ class ButtonWithMenu extends PureComponent {
onClose={() => this.setMenuVisibility(false)}
onItemSelected={() => this.setMenuVisibility(false)}
anchorPosition={styles.createMenuPositionRightSidepane}
animationIn="fadeInUp"
animationOut="fadeOutDown"
headerText={this.props.menuHeaderText}
menuItems={_.map(this.props.options, item => ({
...item,
Expand Down
4 changes: 0 additions & 4 deletions src/components/Popover/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ const Popover = (props) => {
popoverAnchorPosition={props.anchorPosition}
// eslint-disable-next-line react/jsx-props-no-spreading
{...props}
animationIn={props.isSmallScreenWidth ? undefined : props.animationIn}
animationOut={props.isSmallScreenWidth ? undefined : props.animationOut}
animationInTiming={props.disableAnimation ? 1 : props.animationInTiming}
animationOutTiming={props.disableAnimation ? 1 : props.animationOutTiming}
shouldCloseOnOutsideClick
Expand All @@ -33,8 +31,6 @@ const Popover = (props) => {
// eslint-disable-next-line react/jsx-props-no-spreading
{...props}
fullscreen={props.isSmallScreenWidth ? true : props.fullscreen}
animationIn={props.isSmallScreenWidth ? undefined : props.animationIn}
animationOut={props.isSmallScreenWidth ? undefined : props.animationOut}
animationInTiming={props.disableAnimation && !props.isSmallScreenWidth ? 1 : props.animationInTiming}
animationOutTiming={props.disableAnimation && !props.isSmallScreenWidth ? 1 : props.animationOutTiming}
/>
Expand Down
3 changes: 3 additions & 0 deletions src/components/Popover/popoverPropTypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ const propTypes = {
const defaultProps = {
...(_.omit(defaultModalProps, ['type', 'popoverAnchorPosition'])),

animationIn: 'fadeIn',
animationOut: 'fadeOut',

// Anchor position is optional only because it is not relevant on mobile
anchorPosition: {},
disableAnimation: true,
Expand Down
2 changes: 0 additions & 2 deletions src/components/ThreeDotsMenu/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ class ThreeDotsMenu extends Component {
isVisible={this.state.isPopupMenuVisible}
anchorPosition={this.props.anchorPosition}
onItemSelected={() => this.togglePopupMenu()}
animationIn="fadeInDown"
animationOut="fadeOutUp"
menuItems={this.props.menuItems}
/>
</>
Expand Down
2 changes: 0 additions & 2 deletions src/components/VideoChatButtonAndMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,6 @@ class VideoChatButtonAndMenu extends Component {
left: this.state.videoChatIconPosition.x - 150,
top: this.state.videoChatIconPosition.y + 40,
}}
animationIn="fadeInDown"
animationOut="fadeOutUp"
>
{_.map(this.menuItemData, ({icon, text, onPress}) => (
<MenuItem
Expand Down
2 changes: 0 additions & 2 deletions src/pages/home/report/ReportActionCompose.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,8 +446,6 @@ class ReportActionCompose extends React.Component {
onClose={() => this.setMenuVisibility(false)}
onItemSelected={() => this.setMenuVisibility(false)}
anchorPosition={styles.createMenuPositionReportActionCompose}
animationIn="fadeInUp"
animationOut="fadeOutDown"
menuItems={[
...(!hasExcludedIOUEmails
&& Permissions.canUseIOU(this.props.betas) ? [
Expand Down