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.

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

fix: Fixed more button disappearing on calendar on small screens #1401

Merged
merged 6 commits into from
Jan 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions src/components/EventCalendar/EventCalendar.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@
text-decoration: underline;
color: #31bb6b;
}
.day__events {
background-color: #def6e1;
}
.btn__today {
transition: ease-in all 200ms;
font-family: Arial;
Expand Down Expand Up @@ -116,3 +119,9 @@
height: 5rem;
}
}

@media only screen and (max-width: 500px) {
.btn__more {
font-size: 12px;
}
}
22 changes: 18 additions & 4 deletions src/components/EventCalendar/EventCalendar.test.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable react/react-in-jsx-scope */
import Calendar from './EventCalendar';
import { render, screen, fireEvent } from '@testing-library/react';
import { render, screen, fireEvent, act } from '@testing-library/react';
import { MockedProvider } from '@apollo/react-testing';
import { I18nextProvider } from 'react-i18next';

Expand Down Expand Up @@ -212,7 +212,7 @@ describe('Calendar', () => {
// const todayCell = screen.getByText(new Date().getDate().toString());
// expect(todayCell).toHaveClass(styles.day__today);
});
it('Should expand and contract when clicked on more and less button', () => {
it('Should expand and contract when clicked on View all and View less button', () => {
const multipleEventData = [
{
_id: '1',
Expand Down Expand Up @@ -265,11 +265,25 @@ describe('Calendar', () => {
</I18nextProvider>
</MockedProvider>
);
const moreButton = screen.getByText('More');
const moreButton = screen.getByText('View all');
fireEvent.click(moreButton);
expect(screen.getByText('Event 3')).toBeInTheDocument();
const lessButton = screen.getByText('Less');
const lessButton = screen.getByText('View less');
fireEvent.click(lessButton);
expect(screen.queryByText('Event 3')).not.toBeInTheDocument();
});

test('Handles window resize', () => {
render(
<MockedProvider addTypename={false} link={link}>
<I18nextProvider i18n={i18nForTest}>
<Calendar eventData={eventData} />
</I18nextProvider>
</MockedProvider>
);

act(() => {
window.dispatchEvent(new Event('resize'));
});
});
});
22 changes: 19 additions & 3 deletions src/components/EventCalendar/EventCalendar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,15 @@ const Calendar: React.FC<InterfaceCalendarProps> = ({
const [currentYear, setCurrentYear] = useState(today.getFullYear());
const [events, setEvents] = useState<InterfaceEvent[] | null>(null);
const [expanded, setExpanded] = useState<number>(-1);
const [windowWidth, setWindowWidth] = useState<number>(window.screen.width);

useEffect(() => {
function handleResize(): void {
setWindowWidth(window.screen.width);
}
window.addEventListener('resize', handleResize);
return () => window.removeEventListener('resize', handleResize);
}, []);

const filterData = (
eventData: InterfaceEvent[],
Expand Down Expand Up @@ -208,7 +217,13 @@ const Calendar: React.FC<InterfaceCalendarProps> = ({
});

return (
<div key={index} className={className} data-testid="day">
<div
key={index}
className={
className + ' ' + (allEventsList?.length > 0 && styles.day__events)
}
data-testid="day"
>
{date.getDate()}
<div
className={expanded === index ? styles.expand_list_container : ''}
Expand All @@ -222,14 +237,15 @@ const Calendar: React.FC<InterfaceCalendarProps> = ({
>
{expanded === index ? allEventsList : allEventsList?.slice(0, 2)}
</div>
{allEventsList?.length > 2 && (
{(allEventsList?.length > 2 ||
(windowWidth <= 700 && allEventsList?.length > 0)) && (
<button
className={styles.btn__more}
onClick={() => {
toggleExpand(index);
}}
>
{expanded === index ? 'Less' : 'More'}
{expanded === index ? 'View less' : 'View all'}
</button>
)}
</div>
Expand Down
Loading