Skip to content

fix: side navigation doesn't work on mobile #6719

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
merged 1 commit into from
Nov 11, 2022
Merged

fix: side navigation doesn't work on mobile #6719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 3 additions & 7 deletions src/shared/containers/timeline-wall/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function TimelineWallContainer(props) {
const role = 'Admin User';
const authToken = _.get(auth, 'tokenV3');
const isMobile = useMediaQuery({
query: '(max-device-width: 768px)',
query: '(max-width: 768px)',
});

useEffect(() => {
Expand Down Expand Up @@ -89,7 +89,7 @@ function TimelineWallContainer(props) {
let date = moment(`${currentYear}-${currentMonth + 1}`).format('YYYY-MM');

while (!target) {
target = document.getElementById(`${moment(date).year()}-${(moment(date).month()).toString().padStart(2, '0')}`);
target = document.getElementById(`${isMobile ? 'mobile-' : 'desktop-'}${moment(date).year()}-${(moment(date).month()).toString().padStart(2, '0')}`);

if (target || !moment(date).isValid() || moment(date).year() > maxYear) {
break;
Expand All @@ -100,11 +100,7 @@ function TimelineWallContainer(props) {
if (target) {
const yOffset = -10;
const coordinate = target.getBoundingClientRect().top + window.pageYOffset + yOffset;
if (isMobile) {
setTimeout(target.scrollTo(), 100);
} else {
window.scrollTo({ top: coordinate, behavior: 'smooth' });
}
window.scrollTo({ top: coordinate, behavior: 'smooth' });
} else {
window.scrollTo({ top: 0, behavior: 'smooth' });
}
Expand Down
6 changes: 4 additions & 2 deletions src/shared/containers/timeline-wall/timeline-events/events/event-item/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import './styles.scss';
import { DEFAULT_AVATAR_URL } from '../../../../../utils/url';

function EventItem({
className, isLeft, eventItem, deleteEvent, isAdmin, userAvatars,
className, isLeft, eventItem, deleteEvent, isAdmin, userAvatars, idPrefix,
}) {
const [isExpanded, setIsExpanded] = useState(false);
const [showModalPhoto, setShowModalPhoto] = useState(false);
Expand All @@ -33,7 +33,7 @@ function EventItem({
'color-red': eventItem.color === 'red',
'color-purple': eventItem.color === 'purple',
})}
id={moment(eventItem.eventDate).format('YYYY-MM')}
id={`${idPrefix}${moment(eventItem.eventDate).format('YYYY-MM')}`}
>
{isLeft ? null : (<div styleName="dot dot-left" />)}
{isLeft ? null : (<IconTooltipLeft styleName="tooltip-indicator" />)}
Expand Down Expand Up @@ -137,6 +137,7 @@ EventItem.defaultProps = {
},
isAdmin: false,
userAvatars: {},
idPrefix: '',
};

/**
Expand All @@ -149,6 +150,7 @@ EventItem.propTypes = {
isAdmin: PT.bool,
userAvatars: PT.shape(),
deleteEvent: PT.func.isRequired,
idPrefix: PT.string,
};

export default EventItem;
3 changes: 3 additions & 0 deletions src/shared/containers/timeline-wall/timeline-events/events/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ function Events({
userAvatars={userAvatars}
isAdmin={isAdmin}
deleteEvent={deleteEvent}
idPrefix="desktop-"
/>
))}
</div>
Expand All @@ -84,6 +85,7 @@ function Events({
userAvatars={userAvatars}
isAdmin={isAdmin}
deleteEvent={deleteEvent}
idPrefix="desktop-"
/>
))}
</div>
Expand All @@ -101,6 +103,7 @@ function Events({
userAvatars={userAvatars}
isAdmin={isAdmin}
deleteEvent={deleteEvent}
idPrefix="mobile-"
/>
))}
</div>
Expand Down