Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
coopwire-hypothesis
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
孙灵跃 Leon Sun
coopwire-hypothesis
Commits
36874166
Commit
36874166
authored
Feb 06, 2023
by
Alejandro Celaya
Committed by
Alejandro Celaya
Feb 15, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make sure profile modal is not added to the DOM until it's first opened
parent
49951bfe
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
11 deletions
+16
-11
ProfileModal.tsx
src/annotator/components/ProfileModal.tsx
+10
-2
ProfileModal-test.js
src/annotator/components/test/ProfileModal-test.js
+5
-7
index.ts
src/annotator/index.ts
+1
-1
profile.tsx
src/annotator/profile.tsx
+0
-1
No files found.
src/annotator/components/ProfileModal.tsx
View file @
36874166
import
{
useEffect
,
useRef
,
useState
}
from
'preact/hooks'
;
import
classnames
from
'classnames'
;
import
{
CancelIcon
,
IconButton
}
from
'@hypothesis/frontend-shared/lib/next'
;
import
classnames
from
'classnames'
;
import
{
useEffect
,
useRef
,
useState
}
from
'preact/hooks'
;
import
type
{
Emitter
,
EventBus
}
from
'../util/emitter'
;
...
...
@@ -14,11 +14,15 @@ type ProfileModalProps = {
export
function
ProfileModal
({
eventBus
,
config
}:
ProfileModalProps
)
{
const
[
isHidden
,
setIsHidden
]
=
useState
(
true
);
const
emitterRef
=
useRef
<
Emitter
|
null
>
(
null
);
// Used only to track when was this modal first open, delaying the iframe to
// be loaded until strictly necessary.
const
[
hasOpened
,
setHasOpened
]
=
useState
(
false
);
useEffect
(()
=>
{
const
emitter
=
eventBus
.
createEmitter
();
emitter
.
subscribe
(
'openProfile'
,
()
=>
{
setIsHidden
(
false
);
setHasOpened
(
true
);
});
emitterRef
.
current
=
emitter
;
...
...
@@ -32,6 +36,10 @@ export function ProfileModal({ eventBus, config }: ProfileModalProps) {
emitterRef
.
current
?.
publish
(
'closeProfile'
);
};
if
(
!
hasOpened
)
{
return
null
;
}
return
(
<
div
className=
{
classnames
(
...
...
src/annotator/components/test/ProfileModal-test.js
View file @
36874166
import
{
act
}
from
'preact/test-utils'
;
import
{
mount
}
from
'enzyme'
;
import
{
act
}
from
'preact/test-utils'
;
import
{
EventBus
}
from
'../../util/emitter'
;
import
{
ProfileModal
}
from
'../ProfileModal'
;
...
...
@@ -34,17 +34,15 @@ describe('ProfileModal', () => {
components
.
forEach
(
component
=>
component
.
unmount
());
});
it
(
'
hides modal on first render
'
,
()
=>
{
it
(
'
does not render anything before the modal has been opened at least once
'
,
()
=>
{
const
wrapper
=
createComponent
();
const
outer
=
wrapper
.
find
(
outerSelector
);
assert
.
isTrue
(
outer
.
hasClass
(
'hidden'
));
assert
.
equal
(
wrapper
.
find
(
outerSelector
).
length
,
0
);
});
it
(
'shows modal on "openProfile" event'
,
()
=>
{
const
wrapper
=
createComponent
();
emitter
.
publish
(
'openProfile'
,
'myGroup'
);
emitter
.
publish
(
'openProfile'
);
wrapper
.
update
();
const
outer
=
wrapper
.
find
(
outerSelector
);
...
...
@@ -57,7 +55,7 @@ describe('ProfileModal', () => {
it
(
'hides modal on closing'
,
()
=>
{
const
wrapper
=
createComponent
();
emitter
.
publish
(
'openProfile'
,
'myGroup'
);
emitter
.
publish
(
'openProfile'
);
wrapper
.
update
();
let
outer
=
wrapper
.
find
(
outerSelector
);
...
...
src/annotator/index.ts
View file @
36874166
...
...
@@ -9,8 +9,8 @@ import {
}
from
'../shared/messaging'
;
import
type
{
Destroyable
}
from
'../types/annotator'
;
import
type
{
NotebookConfig
}
from
'./components/NotebookModal'
;
import
{
getConfig
}
from
'./config/index'
;
import
type
{
ProfileConfig
}
from
'./components/ProfileModal'
;
import
{
getConfig
}
from
'./config/index'
;
import
{
Guest
}
from
'./guest'
;
import
type
{
GuestConfig
}
from
'./guest'
;
import
{
...
...
src/annotator/profile.tsx
View file @
36874166
import
{
render
}
from
'preact'
;
import
type
{
Destroyable
}
from
'../types/annotator'
;
import
type
{
ProfileConfig
}
from
'./components/ProfileModal'
;
import
{
ProfileModal
}
from
'./components/ProfileModal'
;
import
type
{
EventBus
}
from
'./util/emitter'
;
...
...
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