Skip to content

fix: Show X button on the Modal of mobile mode #1009

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 2 commits into from
Mar 14, 2024
Merged

fix: Show X button on the Modal of mobile mode #1009

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b431980
Do not hide the X button on Modal when it's mobile
HoonBaek Mar 13, 2024
152e63d
Move the CloseButton into the ModalHeader
HoonBaek Mar 14, 2024
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
39 changes: 18 additions & 21 deletions src/ui/Modal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { ReactElement, ReactNode, useContext } from 'react';
import React, { ReactElement, ReactNode, useContext, MouseEvent } from 'react';
import { createPortal } from 'react-dom';

import './index.scss';
Expand All @@ -15,12 +15,27 @@ import Label, { LabelTypography, LabelColors } from '../Label';

export interface ModalHeaderProps {
titleText: string;
onCloseClick?: (e: MouseEvent<HTMLButtonElement>) => void;
}
export const ModalHeader = ({ titleText }: ModalHeaderProps): ReactElement => (
export const ModalHeader = ({ titleText, onCloseClick }: ModalHeaderProps): ReactElement => (
<div className="sendbird-modal__header">
<Label type={LabelTypography.H_1} color={LabelColors.ONBACKGROUND_1}>
{titleText}
</Label>
<div className="sendbird-modal__close">
<IconButton
width="32px"
height="32px"
onClick={onCloseClick}
>
<Icon
type={IconTypes.CLOSE}
fillColor={IconColors.DEFAULT}
width="24px"
height="24px"
/>
</IconButton>
</div>
</div>
);

Expand Down Expand Up @@ -127,7 +142,7 @@ export function Modal(props: ModalProps): ReactElement {
].join(' ')}
>
{renderHeader?.() || (
<ModalHeader titleText={titleText ?? ''} />
<ModalHeader titleText={titleText ?? ''} onCloseClick={handleClose} />
)}
<ModalBody>{children}</ModalBody>
{
Expand All @@ -141,24 +156,6 @@ export function Modal(props: ModalProps): ReactElement {
/>
))
}
{
!isMobile && (
<div className="sendbird-modal__close">
<IconButton
width="32px"
height="32px"
onClick={handleClose}
>
<Icon
type={IconTypes.CLOSE}
fillColor={IconColors.DEFAULT}
width="24px"
height="24px"
/>
</IconButton>
</div>
)
}
</div>
<div
className={`
Expand Down