Skip to content

fix: trigger close only when click wrap itself #218

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
Dec 19, 2020
Merged

fix: trigger close only when click wrap itself #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6eb938
fix: trigger close only when click wrap itself
kerm1it Dec 17, 2020
c0ed853
chore: clean code
kerm1it Dec 17, 2020
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
2 changes: 0 additions & 2 deletions src/Dialog/Content/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ export interface ContentProps extends IDialogChildProps {

export interface ContentRef {
focus: () => void;
getDOM: () => HTMLDivElement;
changeActive: (next: boolean) => void;
}

Expand Down Expand Up @@ -58,7 +57,6 @@ const Content = React.forwardRef<ContentRef, ContentProps>((props, ref) => {
focus: () => {
sentinelStartRef.current?.focus();
},
getDOM: () => dialogRef.current,
changeActive: (next) => {
const { activeElement } = document;
if (next && activeElement === sentinelEndRef.current) {
Expand Down
2 changes: 1 addition & 1 deletion src/Dialog/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ export default function Dialog(props: IDialogChildProps) {
if(contentClickRef.current) {
contentClickRef.current = false;
} else if (
!contains(contentRef.current.getDOM(), e.target as HTMLElement)
wrapperRef.current === e.target
) {
onInternalClose(e);
}
Expand Down