Desktop: Multiple window support #11181
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService'; | ||
| import { _ } from '@joplin/lib/locale'; | ||
| import { stateUtils } from '@joplin/lib/reducer'; | ||
|
|
||
| export const declaration: CommandDeclaration = { | ||
| name: 'openNoteInNewWindow', | ||
| label: () => _('Edit in new window'), | ||
| iconName: 'icon-share', | ||
| }; | ||
|
|
||
| export const runtime = (): CommandRuntime => { | ||
| return { | ||
| execute: async (context: CommandContext, noteId: string = null) => { | ||
| noteId = noteId || stateUtils.selectedNoteId(context.state); | ||
| context.dispatch({ type: 'NOTE_WINDOW_OPEN', noteId }); | ||
| }, | ||
| enabledCondition: 'oneNoteSelected', | ||
| }; | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| import shim from '@joplin/lib/shim'; | ||
| import * as React from 'react'; | ||
| import { useState, useEffect, useRef } from 'react'; | ||
| import { createPortal } from 'react-dom'; | ||
|
|
||
| interface Props { | ||
| // Note: children will be rendered in a different DOM from this node. Avoid using document.* methods | ||
| // in child components. | ||
| children: React.ReactNode[]|React.ReactNode; | ||
| newWindow: boolean; | ||
| onClose: ()=> void; | ||
| } | ||
|
|
||
| const NewWindowOrIFrame: React.FC<Props> = props => { | ||
| const [iframeRef, setIframeRef] = useState<HTMLIFrameElement|null>(null); | ||
| const [loaded, setLoaded] = useState(false); | ||
| const [doc, setDoc] = useState<Document>(null); | ||
|
|
||
| const onCloseRef = useRef(props.onClose); | ||
| onCloseRef.current = props.onClose; | ||
|
|
||
| useEffect(() => { | ||
| let openedWindow: Window|null = null; | ||
| const unmounted = false; | ||
| if (iframeRef) { | ||
| setDoc(iframeRef?.contentWindow?.document); | ||
| } else if (props.newWindow) { | ||
| openedWindow = window.open('about:blank'); | ||
| setDoc(openedWindow.document); | ||
|
|
||
| // .onbeforeunload and .onclose events don't seem to fire when closed by a user -- rely on polling | ||
| // instead: | ||
| void (async () => { | ||
| while (!unmounted) { | ||
| await new Promise<void>(resolve => { | ||
| shim.setTimeout(() => resolve(), 2000); | ||
| }); | ||
|
|
||
| if (openedWindow?.closed) { | ||
| onCloseRef.current?.(); | ||
| openedWindow = null; | ||
| break; | ||
| } | ||
| } | ||
| })(); | ||
| } | ||
|
|
||
| return () => { | ||
| // Delay: Closing immediately causes Electron to crash | ||
| setTimeout(() => { | ||
| if (!openedWindow?.closed) { | ||
| openedWindow?.close(); | ||
| onCloseRef.current?.(); | ||
| openedWindow = null; | ||
| } | ||
| }, 200); | ||
|
|
||
| if (iframeRef && !openedWindow) { | ||
| onCloseRef.current?.(); | ||
| } | ||
| }; | ||
| }, [iframeRef, props.newWindow]); | ||
|
|
||
| useEffect(() => { | ||
| if (!doc) return; | ||
|
|
||
| doc.open(); | ||
| doc.write('<!DOCTYPE html><html><head></head><body></body></html>'); | ||
| doc.close(); | ||
|
|
||
| const cssUrls = [ | ||
| 'style.min.css', | ||
| 'style/icons/style.css', | ||
| 'vendor/lib/@fortawesome/fontawesome-free/css/all.min.css', | ||
| 'vendor/lib/react-datetime/css/react-datetime.css', | ||
| 'vendor/lib/smalltalk/css/smalltalk.css', | ||
| 'vendor/lib/roboto-fontface/css/roboto/roboto-fontface.css', | ||
| 'vendor/lib/codemirror/lib/codemirror.css', | ||
| ]; | ||
|
|
||
| for (const url of cssUrls) { | ||
| const style = doc.createElement('link'); | ||
| style.rel = 'stylesheet'; | ||
| style.href = url; | ||
| doc.head.appendChild(style); | ||
| } | ||
|
|
||
| doc.body.style.height = '100vh'; | ||
|
|
||
| setLoaded(true); | ||
| }, [doc]); | ||
| const parentNode = loaded ? doc?.body : null; | ||
|
|
||
| // eslint-disable-next-line @typescript-eslint/no-explicit-any -- Needed to allow adding the portal to the DOM | ||
| const contentPortal = parentNode && createPortal(props.children, parentNode) as any; | ||
|
Collaborator
Author
There was a problem hiding this comment. Related documentation/explanation:
|
||
| if (props.newWindow) { | ||
| return <div style={{ display: 'none' }}>{contentPortal}</div>; | ||
| } else { | ||
| return <iframe | ||
| ref={setIframeRef} | ||
| style={{ flexGrow: 1, width: '100%', height: '100%', border: 'none' }} | ||
| > | ||
| {contentPortal} | ||
| </iframe>; | ||
| } | ||
| }; | ||
|
|
||
| export default NewWindowOrIFrame; | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.