mirrors/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2025-05-29 06:15:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add prettier for codestyle and re-format everything (#1294)

Browse source
This commit is contained in:
Erik Michelson 2021-06-06 23:14:00 +02:00 • committed by GitHub
parent 8b78154075
commit 0aae1f70d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
319 changed files with 4809 additions and 3936 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/components/editor-page/renderer-pane/hooks/use-on-iframe-load.ts
View file

@ -7,8 +7,13 @@
import { RefObject, useCallback, useRef } from 'react'
import { IframeEditorToRendererCommunicator } from '../../../render-page/iframe-editor-to-renderer-communicator'
export const useOnIframeLoad = (frameReference: RefObject<HTMLIFrameElement>, iframeCommunicator: IframeEditorToRendererCommunicator,
rendererOrigin: string, renderPageUrl: string, onNavigateAway: () => void): () => void => {
export const useOnIframeLoad = (
frameReference: RefObject<HTMLIFrameElement>,
iframeCommunicator: IframeEditorToRendererCommunicator,
rendererOrigin: string,
renderPageUrl: string,
onNavigateAway: () => void
): (() => void) => {
const sendToRenderPage = useRef<boolean>(true)
return useCallback(() => {

103
src/components/editor-page/renderer-pane/render-iframe.tsx
View file

@ -18,25 +18,24 @@ import { ShowOnPropChangeImageLightbox } from './show-on-prop-change-image-light
export interface RenderIframeProps extends RendererProps {
onRendererReadyChange?: (rendererReady: boolean) => void
rendererType: RendererType,
rendererType: RendererType
forcedDarkMode?: boolean
frameClasses?: string
}
export const RenderIframe: React.FC<RenderIframeProps> = (
{
markdownContent,
onTaskCheckedChange,
onFrontmatterChange,
scrollState,
onFirstHeadingChange,
onScroll,
onMakeScrollSource,
frameClasses,
onRendererReadyChange,
rendererType,
forcedDarkMode
}) => {
export const RenderIframe: React.FC<RenderIframeProps> = ({
markdownContent,
onTaskCheckedChange,
onFrontmatterChange,
scrollState,
onFirstHeadingChange,
onScroll,
onMakeScrollSource,
frameClasses,
onRendererReadyChange,
rendererType,
forcedDarkMode
}) => {
const savedDarkMode = useIsDarkModeActivated()
const darkMode = forcedDarkMode ?? savedDarkMode
const [rendererReady, setRendererReady] = useState<boolean>(false)
@ -44,10 +43,16 @@ export const RenderIframe: React.FC<RenderIframeProps> = (
const frameReference = useRef<HTMLIFrameElement>(null)
const rendererOrigin = useSelector((state: ApplicationState) => state.config.iframeCommunication.rendererOrigin)
const renderPageUrl = `${ rendererOrigin }render`
const renderPageUrl = `${rendererOrigin}render`
const resetRendererReady = useCallback(() => setRendererReady(false), [])
const iframeCommunicator = useContextOrStandaloneIframeCommunicator()
const onIframeLoad = useOnIframeLoad(frameReference, iframeCommunicator, rendererOrigin, renderPageUrl, resetRendererReady)
const onIframeLoad = useOnIframeLoad(
frameReference,
iframeCommunicator,
rendererOrigin,
renderPageUrl,
resetRendererReady
)
const [frameHeight, setFrameHeight] = useState<number>(0)
useEffect(() => {
@ -55,23 +60,35 @@ export const RenderIframe: React.FC<RenderIframeProps> = (
}, [onRendererReadyChange, rendererReady])
useEffect(() => () => iframeCommunicator.unregisterEventListener(), [iframeCommunicator])
useEffect(() => iframeCommunicator.onFirstHeadingChange(onFirstHeadingChange), [iframeCommunicator,
onFirstHeadingChange])
useEffect(() => iframeCommunicator.onFrontmatterChange(onFrontmatterChange), [iframeCommunicator,
onFrontmatterChange])
useEffect(
() => iframeCommunicator.onFirstHeadingChange(onFirstHeadingChange),
[iframeCommunicator, onFirstHeadingChange]
)
useEffect(
() => iframeCommunicator.onFrontmatterChange(onFrontmatterChange),
[iframeCommunicator, onFrontmatterChange]
)
useEffect(() => iframeCommunicator.onSetScrollState(onScroll), [iframeCommunicator, onScroll])
useEffect(() => iframeCommunicator.onSetScrollSourceToRenderer(onMakeScrollSource), [iframeCommunicator,
onMakeScrollSource])
useEffect(() => iframeCommunicator.onTaskCheckboxChange(onTaskCheckedChange), [iframeCommunicator,
onTaskCheckedChange])
useEffect(
() => iframeCommunicator.onSetScrollSourceToRenderer(onMakeScrollSource),
[iframeCommunicator, onMakeScrollSource]
)
useEffect(
() => iframeCommunicator.onTaskCheckboxChange(onTaskCheckedChange),
[iframeCommunicator, onTaskCheckedChange]
)
useEffect(() => iframeCommunicator.onImageClicked(setLightboxDetails), [iframeCommunicator])
useEffect(() => iframeCommunicator.onRendererReady(() => {
iframeCommunicator.sendSetBaseConfiguration({
baseUrl: window.location.toString(),
rendererType
})
setRendererReady(true)
}), [darkMode, rendererType, iframeCommunicator, rendererReady, scrollState])
useEffect(
() =>
iframeCommunicator.onRendererReady(() => {
iframeCommunicator.sendSetBaseConfiguration({
baseUrl: window.location.toString(),
rendererType
})
setRendererReady(true)
}),
[darkMode, rendererType, iframeCommunicator, rendererReady, scrollState]
)
useEffect(() => iframeCommunicator.onHeightChange(setFrameHeight), [iframeCommunicator])
useEffect(() => {
@ -94,11 +111,19 @@ export const RenderIframe: React.FC<RenderIframeProps> = (
}
}, [iframeCommunicator, markdownContent, rendererReady])
return <Fragment>
<ShowOnPropChangeImageLightbox details={ lightboxDetails }/>
<iframe style={ { height: `${ frameHeight }px` } } data-cy={ 'documentIframe' } onLoad={ onIframeLoad }
title="render" src={ renderPageUrl }
{ ...isTestMode() ? {} : { sandbox: 'allow-downloads allow-same-origin allow-scripts allow-popups' } }
ref={ frameReference } className={ `border-0 ${ frameClasses ?? '' }` }/>
</Fragment>
return (
<Fragment>
<ShowOnPropChangeImageLightbox details={lightboxDetails} />
<iframe
style={{ height: `${frameHeight}px` }}
data-cy={'documentIframe'}
onLoad={onIframeLoad}
title='render'
src={renderPageUrl}
{...(isTestMode() ? {} : { sandbox: 'allow-downloads allow-same-origin allow-scripts allow-popups' })}
ref={frameReference}
className={`border-0 ${frameClasses ?? ''}`}
/>
</Fragment>
)
}

9
src/components/editor-page/renderer-pane/show-on-prop-change-image-lightbox.tsx
View file

@ -26,7 +26,12 @@ export const ShowOnPropChangeImageLightbox: React.FC<ShowOnPropChangeImageLightb
}, [details])
return (
<ImageLightboxModal show={ show } onHide={ hideLightbox } src={ details?.src }
alt={ details?.alt } title={ details?.title }/>
<ImageLightboxModal
show={show}
onHide={hideLightbox}
src={details?.src}
alt={details?.alt}
title={details?.title}
/>
)
}

26
src/components/editor-page/renderer-pane/yaml-array-deprecation-alert.tsx
View file

@ -15,17 +15,21 @@ import { ShowIf } from '../../common/show-if/show-if'
export const YamlArrayDeprecationAlert: React.FC = () => {
useTranslation()
const yamlDeprecatedTags = useSelector((state: ApplicationState) => state.noteDetails.frontmatter.deprecatedTagsSyntax)
const yamlDeprecatedTags = useSelector(
(state: ApplicationState) => state.noteDetails.frontmatter.deprecatedTagsSyntax
)
return <ShowIf condition={ yamlDeprecatedTags }>
<Alert data-cy={ 'yamlArrayDeprecationAlert' } className={ 'text-wrap' } variant='warning' dir='auto'>
<span className={ 'text-wrap' }>
<span className={ 'text-wrap' }>
<Trans i18nKey='editor.deprecatedTags'/>
return (
<ShowIf condition={yamlDeprecatedTags}>
<Alert data-cy={'yamlArrayDeprecationAlert'} className={'text-wrap'} variant='warning' dir='auto'>
<span className={'text-wrap'}>
<span className={'text-wrap'}>
<Trans i18nKey='editor.deprecatedTags' />
</span>
</span>
</span>
<br/>
<TranslatedExternalLink i18nKey={ 'common.readForMoreInfo' } href={ links.faq } className={ 'text-primary' }/>
</Alert>
</ShowIf>
<br />
<TranslatedExternalLink i18nKey={'common.readForMoreInfo'} href={links.faq} className={'text-primary'} />
</Alert>
</ShowIf>
)
}