diff options
author | bobzel <zzzman@gmail.com> | 2020-07-07 10:01:33 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-07 10:01:33 -0400 |
commit | 06ef30846b8014d6701caa86b264612ceabc27d1 (patch) | |
tree | 69e1699c41688ffa984c3acc267f5ef2e77d62e2 /src/client/views/MainView.tsx | |
parent | 0438137cd435c47ce334b15a4ad00cbd70d80662 (diff) | |
parent | 915f35e6d6c0b0f7bdb18c0c2a6aa88ee5df5eed (diff) |
Merge pull request #433 from browngraphicslab/anika_linking
Pull Request for Andy
Diffstat (limited to 'src/client/views/MainView.tsx')
-rw-r--r-- | src/client/views/MainView.tsx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx index eba9bb344..584ed2f1c 100644 --- a/src/client/views/MainView.tsx +++ b/src/client/views/MainView.tsx @@ -61,6 +61,7 @@ import { LinkMenu } from './linking/LinkMenu'; import { LinkDocPreview } from './nodes/LinkDocPreview'; import { Fade } from '@material-ui/core'; import { LinkCreatedBox } from './nodes/LinkCreatedBox'; +import { LinkDescriptionPopup } from './nodes/LinkDescriptionPopup'; import HypothesisAuthenticationManager from '../apis/HypothesisAuthenticationManager'; @observer @@ -610,6 +611,7 @@ export class MainView extends React.Component { </GestureOverlay> <PreviewCursor /> <LinkCreatedBox /> + {LinkDescriptionPopup.descriptionPopup ? <LinkDescriptionPopup /> : null} {DocumentLinksButton.EditLink ? <LinkMenu location={DocumentLinksButton.EditLinkLoc} docView={DocumentLinksButton.EditLink} addDocTab={DocumentLinksButton.EditLink.props.addDocTab} changeFlyout={emptyFunction} /> : (null)} {LinkDocPreview.LinkInfo ? <LinkDocPreview location={LinkDocPreview.LinkInfo.Location} backgroundColor={this.defaultBackgroundColors} linkDoc={LinkDocPreview.LinkInfo.linkDoc} linkSrc={LinkDocPreview.LinkInfo.linkSrc} href={LinkDocPreview.LinkInfo.href} |