-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #120 from marcaufderheyde/ux/mobile-nav-drawer
[CAN-143] Merge Mobile Drawer into Develop
- Loading branch information
Showing
26 changed files
with
573 additions
and
148 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| name: Develop Branch CI | ||
|
|
||
| on: | ||
| pull_request: | ||
| branches: ['develop'] | ||
|
|
||
| jobs: | ||
| build-and-test: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Detect package manager | ||
| id: detect-package-manager | ||
| run: | | ||
| if [ -f "${{ github.workspace }}/package.json" ]; then | ||
| echo "manager=npm" >> $GITHUB_OUTPUT | ||
| echo "command=ci" >> $GITHUB_OUTPUT | ||
| echo "runner=npx --no-install" >> $GITHUB_OUTPUT | ||
| exit 0 | ||
| elif [ -f "${{ github.workspace }}/yarn.lock" ]; then | ||
| echo "manager=yarn" >> $GITHUB_OUTPUT | ||
| echo "command=install" >> $GITHUB_OUTPUT | ||
| echo "runner=yarn" >> $GITHUB_OUTPUT | ||
| exit 0 | ||
| else | ||
| echo "Unable to determine package manager" | ||
| exit 1 | ||
| fi | ||
| - name: Setup Node | ||
| uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: '20.9.0' | ||
| cache: ${{ steps.detect-package-manager.outputs.manager }} | ||
|
|
||
| - name: Install dependencies | ||
| run: ${{ steps.detect-package-manager.outputs.manager }} ${{ steps.detect-package-manager.outputs.command }} | ||
|
|
||
| - name: Build project | ||
| run: ${{ steps.detect-package-manager.outputs.runner }} next build | ||
|
|
||
| - name: Run tests | ||
| run: ${{ steps.detect-package-manager.outputs.manager }} run test |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| import React, { ReactNode } from 'react'; | ||
| import { render, screen, fireEvent } from '@testing-library/react'; | ||
| import '@testing-library/jest-dom'; | ||
|
|
||
| type DrawerProps = { | ||
| isOpen: boolean; | ||
| onClose: () => void; | ||
| children: ReactNode; | ||
| className?: string; | ||
| }; | ||
|
|
||
| const MockDrawer: React.FC<DrawerProps> = ({ | ||
| isOpen, | ||
| onClose, | ||
| children, | ||
| className, | ||
| }) => { | ||
| if (!isOpen) return null; | ||
| return ( | ||
| <div data-testid="mock-drawer" className={className}> | ||
| <div data-testid="mock-close" onClick={onClose}> | ||
| Close | ||
| </div> | ||
| <div data-testid="mock-content">{children}</div> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| jest.mock('./Drawer', () => ({ | ||
| __esModule: true, | ||
| default: jest.fn((props: DrawerProps) => MockDrawer(props)), | ||
| })); | ||
|
|
||
| const Drawer = require('./Drawer').default; | ||
|
|
||
| describe('Drawer Component', () => { | ||
| const mockOnClose = jest.fn(); | ||
| const defaultProps: DrawerProps = { | ||
| isOpen: true, | ||
| onClose: mockOnClose, | ||
| children: <div>Drawer Content</div>, | ||
| }; | ||
|
|
||
| beforeEach(() => { | ||
| jest.clearAllMocks(); | ||
| }); | ||
|
|
||
| it('renders correctly when open', () => { | ||
| render(<Drawer {...defaultProps} />); | ||
| expect(screen.getByTestId('mock-drawer')).toBeInTheDocument(); | ||
| expect(screen.getByText('Drawer Content')).toBeInTheDocument(); | ||
| }); | ||
|
|
||
| it('does not render when closed', () => { | ||
| render(<Drawer {...defaultProps} isOpen={false} />); | ||
| expect(screen.queryByTestId('mock-drawer')).not.toBeInTheDocument(); | ||
| }); | ||
|
|
||
| it('calls onClose when close button is clicked', () => { | ||
| render(<Drawer {...defaultProps} />); | ||
| fireEvent.click(screen.getByTestId('mock-close')); | ||
| expect(mockOnClose).toHaveBeenCalled(); | ||
| }); | ||
|
|
||
| it('applies custom className', () => { | ||
| render(<Drawer {...defaultProps} className="custom-class" />); | ||
| expect(screen.getByTestId('mock-drawer')).toHaveClass('custom-class'); | ||
| }); | ||
|
|
||
| it('renders children correctly', () => { | ||
| const customContent = ( | ||
| <div data-testid="custom-content">Custom Content</div> | ||
| ); | ||
| render(<Drawer {...defaultProps}>{customContent}</Drawer>); | ||
| expect(screen.getByTestId('custom-content')).toBeInTheDocument(); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| 'use client'; | ||
|
|
||
| import { PropsWithChildren, FunctionComponent, useRef } from 'react'; | ||
| import Close from '../Close/Close'; | ||
| import Swipeable from '../OpenStreetMap/Swipeable'; | ||
| import { Transition, TransitionStatus } from 'react-transition-group'; | ||
|
|
||
| type DrawerProps = { | ||
| readonly children: React.ReactElement; | ||
| readonly className?: string; | ||
| readonly isOpen: boolean; | ||
| readonly onClose: () => void; | ||
| readonly closeButtonColor?: string; | ||
| }; | ||
|
|
||
| type Position = { | ||
| x: string; | ||
| y: string; | ||
| }; | ||
|
|
||
| const Drawer: FunctionComponent<DrawerProps> = ( | ||
| props: PropsWithChildren<DrawerProps> | ||
| ) => { | ||
| const transformDuration: number = 300; | ||
| const backgroundDelay: number = 100; | ||
| const drawerContainerRef = useRef(null); | ||
| const drawerContainerDefaultTransitionStyle: React.CSSProperties = { | ||
| transform: `translateX(100%)`, | ||
| transition: `transform ${transformDuration}ms ease`, | ||
| }; | ||
| const drawerContainerTransitionStyles: Record< | ||
| TransitionStatus, | ||
| React.CSSProperties | ||
| > = { | ||
| entering: { | ||
| transform: `translateX(0)`, | ||
| }, | ||
| entered: { | ||
| transform: `translateX(0)`, | ||
| }, | ||
| exiting: { | ||
| transform: `translateX(100%)`, | ||
| transition: `transform ${transformDuration}ms ease ${transformDuration + backgroundDelay}ms`, | ||
| }, | ||
| exited: { | ||
| transform: `translateX(100%)`, | ||
| transition: `transform ${transformDuration}ms ease ${transformDuration + backgroundDelay}ms`, | ||
| }, | ||
| unmounted: { | ||
| transform: `translateX(100%)`, | ||
| transition: `transform ${transformDuration}ms ease ${transformDuration + backgroundDelay}ms `, | ||
| }, | ||
| }; | ||
|
|
||
| const drawerRef = useRef(null); | ||
| const drawerDelay: number = 400; | ||
| const drawerDefaultTransitionStyle: React.CSSProperties = { | ||
| transform: `translateX(100vw)`, | ||
| transition: `transform ${transformDuration}ms ease `, | ||
| }; | ||
| const drawerTransitionStyles: Record< | ||
| TransitionStatus, | ||
| React.CSSProperties | ||
| > = { | ||
| entering: { | ||
| transform: `translateX(calc(100vw - 100%))`, | ||
| transition: `transform ${transformDuration}ms ease ${drawerDelay}ms`, | ||
| }, | ||
| entered: { | ||
| transform: `translateX(calc(100vw - 100%))`, | ||
| transition: `transform ${transformDuration}ms ease ${drawerDelay}ms`, | ||
| }, | ||
| exiting: { | ||
| transform: `translateX(100vw)`, | ||
| }, | ||
| exited: { | ||
| transform: `translateX(100vw)`, | ||
| }, | ||
| unmounted: { | ||
| transform: `translateX(100vw)`, | ||
| }, | ||
| }; | ||
|
|
||
| return ( | ||
| <Swipeable | ||
| onRightSwipe={() => { | ||
| props.onClose(); | ||
| }} | ||
| > | ||
| <Transition | ||
| nodeRef={drawerContainerRef} | ||
| in={props.isOpen} | ||
| timeout={transformDuration * 3} | ||
| unmountOnExit={true} | ||
| > | ||
| {(state) => ( | ||
| <div | ||
| onClick={() => { | ||
| props.onClose(); | ||
| }} | ||
| ref={drawerContainerRef} | ||
| style={{ | ||
| ...drawerContainerDefaultTransitionStyle, | ||
| ...drawerContainerTransitionStyles[state], | ||
| }} | ||
| className={ | ||
| 'fixed z-50 min-w-full min-h-full top-0 left-0 bg-[#B6CF54]' | ||
| } | ||
| > | ||
| <Transition | ||
| nodeRef={drawerRef} | ||
| timeout={transformDuration} | ||
| in={props.isOpen} | ||
| unmountOnExit={true} | ||
| appear={true} | ||
| > | ||
| {(state) => ( | ||
| <div | ||
| ref={drawerRef} | ||
| onClick={(e) => { | ||
| e.stopPropagation(); | ||
| }} | ||
| style={{ | ||
| ...drawerDefaultTransitionStyle, | ||
| ...drawerTransitionStyles[state], | ||
| }} | ||
| className={ | ||
| 'fixed min-h-full bg-transparent min-w-[80%] top-0 left-0 drop-shadow-lg ' + | ||
| props.className | ||
| } | ||
| > | ||
| <div | ||
| onClick={props.onClose} | ||
| className='absolute top-[2em] right-[2em] z-[2]' | ||
| > | ||
| <Close | ||
| color={ | ||
| props.closeButtonColor ?? 'grey' | ||
| } | ||
| /> | ||
| </div> | ||
| {props.children} | ||
| </div> | ||
| )} | ||
| </Transition> | ||
| </div> | ||
| )} | ||
| </Transition> | ||
| </Swipeable> | ||
| ); | ||
| }; | ||
|
|
||
| export default Drawer; |
Oops, something went wrong.