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

Resize and automatically hide attachment carousel arrows #17269

Merged
merged 18 commits into from
Apr 27, 2023
+86 −25
Merged

Resize and automatically hide attachment carousel arrows #17269

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b4aff76
automatically hide the arrows
bernhardoj Apr 11, 2023
96521b8
resize and reposition the arrows
bernhardoj Apr 11, 2023
88774c8
apply lint suggestion
bernhardoj Apr 11, 2023
a43a140
move schedule hide arrow inside setstate callback
bernhardoj Apr 12, 2023
770daa3
resize and realign the arrow
bernhardoj Apr 12, 2023
ad615bf
change function name
bernhardoj Apr 13, 2023
d59db5a
fix arrows hide while pressing/touching the arrows
bernhardoj Apr 13, 2023
82a731d
move delay time to const
bernhardoj Apr 13, 2023
0cef025
move delay time to const
bernhardoj Apr 13, 2023
70e0d04
adjust the spacing for large and small screen
bernhardoj Apr 13, 2023
e2f01b3
update variable name
bernhardoj Apr 13, 2023
d5a333e
Merge branch 'main' into fix/15896-improve-attachment-carousel-arrow
bernhardoj Apr 13, 2023
a2c3184
ignore mouse enter & leave on touch screen device
bernhardoj Apr 14, 2023
7c38790
Merge branch 'main' into fix/15896-improve-attachment-carousel-arrow
bernhardoj Apr 19, 2023
1912a5f
fix issue after merge with main
bernhardoj Apr 19, 2023
4d103e3
fix lint and issue after merged
bernhardoj Apr 19, 2023
29dfd7c
remove unnecessary binding
bernhardoj Apr 19, 2023
f67bbb5
Merge branch 'main' into fix/15896-improve-attachment-carousel-arrow
bernhardoj Apr 25, 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
26 changes: 23 additions & 3 deletions src/components/AttachmentCarousel/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ class AttachmentCarousel extends React.Component {

componentDidMount() {
this.makeStateWithReports();
this.scheduleHideArrow();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a Comment here why?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's already pretty clear that we want to automatically hide the arrow when the component mounts. Adding a comment feels redundant to me.

}

componentDidUpdate(prevProps) {
Expand Down Expand Up @@ -83,12 +84,31 @@ class AttachmentCarousel extends React.Component {
};
}

/**
* On a touch screen device, automatically hide the arrows
* if there is no interaction for 3 seconds.
*/
scheduleHideArrow() {
if (!this.canUseTouchScreen) {
return;
}
this.scheduleHideArrowTimeout = setTimeout(() => {
this.toggleArrowsVisibility(false);
}, 3000);
}

/**
* Toggles the visibility of the arrows
* @param {Boolean} shouldShowArrow
*/
toggleArrowsVisibility(shouldShowArrow) {
this.setState({shouldShowArrow});
this.setState({shouldShowArrow}, () => {
if (this.state.shouldShowArrow) {
this.scheduleHideArrow();
} else {
clearTimeout(this.scheduleHideArrowTimeout);
}
});
}

/**
Expand Down Expand Up @@ -171,7 +191,7 @@ class AttachmentCarousel extends React.Component {
<View style={styles.leftAttachmentArrow}>
<Tooltip text={this.props.translate('common.previous')}>
<Button
medium
small
innerStyles={[styles.arrowIcon]}
icon={Expensicons.BackArrow}
iconFill={themeColors.text}
Expand All @@ -185,7 +205,7 @@ class AttachmentCarousel extends React.Component {
<View style={styles.rightAttachmentArrow}>
<Tooltip text={this.props.translate('common.next')}>
<Button
medium
small
innerStyles={[styles.arrowIcon]}
icon={Expensicons.ArrowRight}
iconFill={themeColors.text}
Expand Down
12 changes: 8 additions & 4 deletions src/styles/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2189,18 +2189,22 @@ const styles = {
leftAttachmentArrow: {
zIndex: 23,
position: 'absolute',
left: 32,
left: 8,
},

rightAttachmentArrow: {
zIndex: 23,
position: 'absolute',
right: 32,
right: 8,
},

arrowIcon: {
height: 52,
width: 52,
height: 40,
width: 40,
alignItems: 'center',
paddingHorizontal: 0,
paddingTop: 0,
paddingBottom: 0,
},

detailsPageSectionVersion: {
Expand Down