Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
baas-ide
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
guxukai
baas-ide
Commits
b11b7adb
Commit
b11b7adb
authored
Jul 27, 2021
by
ioedeveloper
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix disappearing modal after tab switch
parent
df7a142d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
8 deletions
+18
-8
remix-ui-modal-dialog.tsx
libs/remix-ui/modal-dialog/src/lib/remix-ui-modal-dialog.tsx
+18
-8
No files found.
libs/remix-ui/modal-dialog/src/lib/remix-ui-modal-dialog.tsx
View file @
b11b7adb
...
@@ -16,6 +16,24 @@ export const ModalDialog = (props: ModalDialogProps) => {
...
@@ -16,6 +16,24 @@ export const ModalDialog = (props: ModalDialogProps) => {
modal
.
current
.
focus
()
modal
.
current
.
focus
()
},
[
props
.
hide
])
},
[
props
.
hide
])
useEffect
(()
=>
{
function
handleBlur
(
e
)
{
if
(
!
e
.
currentTarget
.
contains
(
e
.
relatedTarget
))
{
e
.
stopPropagation
()
if
(
document
.
activeElement
!==
this
)
{
handleHide
()
}
}
}
if
(
modal
.
current
)
{
modal
.
current
.
addEventListener
(
'blur'
,
handleBlur
)
return
()
=>
{
modal
.
current
.
removeEventListener
(
'blur'
,
handleBlur
)
}
}
},
[
modal
.
current
])
const
modalKeyEvent
=
(
keyCode
)
=>
{
const
modalKeyEvent
=
(
keyCode
)
=>
{
if
(
keyCode
===
27
)
{
// Esc
if
(
keyCode
===
27
)
{
// Esc
if
(
props
.
cancelFn
)
props
.
cancelFn
()
if
(
props
.
cancelFn
)
props
.
cancelFn
()
...
@@ -40,13 +58,6 @@ export const ModalDialog = (props: ModalDialogProps) => {
...
@@ -40,13 +58,6 @@ export const ModalDialog = (props: ModalDialogProps) => {
handleHide
()
handleHide
()
}
}
const
handleBlur
=
(
e
)
=>
{
if
(
!
e
.
currentTarget
.
contains
(
e
.
relatedTarget
))
{
e
.
stopPropagation
()
handleHide
()
}
}
return
(
return
(
<
div
<
div
data
-
id=
{
`${props.id}ModalDialogContainer-react`
}
data
-
id=
{
`${props.id}ModalDialogContainer-react`
}
...
@@ -58,7 +69,6 @@ export const ModalDialog = (props: ModalDialogProps) => {
...
@@ -58,7 +69,6 @@ export const ModalDialog = (props: ModalDialogProps) => {
>
>
<
div
className=
"modal-dialog"
role=
"document"
>
<
div
className=
"modal-dialog"
role=
"document"
>
<
div
<
div
onBlur=
{
handleBlur
}
ref=
{
modal
}
ref=
{
modal
}
tabIndex=
{
-
1
}
tabIndex=
{
-
1
}
className=
{
'modal-content remixModalContent '
+
(
props
.
modalClass
?
props
.
modalClass
:
''
)
}
className=
{
'modal-content remixModalContent '
+
(
props
.
modalClass
?
props
.
modalClass
:
''
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment