mirror of https://github.com/laurent22/joplin.git
Desktop: Accessibility: Add setting to increase scrollbar and other small control sizes (#11627)
Henry Heino
GitHub
parent
e177bffb1c
commit
35a0b22df2
|
|
@ -289,7 +289,6 @@ packages/app-desktop/gui/NoteEditor/utils/useEffectiveNoteId.js
|
|||
packages/app-desktop/gui/NoteEditor/utils/useFolder.js
|
||||
packages/app-desktop/gui/NoteEditor/utils/useFormNote.test.js
|
||||
packages/app-desktop/gui/NoteEditor/utils/useFormNote.js
|
||||
packages/app-desktop/gui/NoteEditor/utils/useMarkupToHtml.js
|
||||
packages/app-desktop/gui/NoteEditor/utils/useMessageHandler.js
|
||||
packages/app-desktop/gui/NoteEditor/utils/useNoteSearchBar.js
|
||||
packages/app-desktop/gui/NoteEditor/utils/usePluginEditorView.test.js
|
||||
|
|
@ -480,6 +479,7 @@ packages/app-desktop/gui/hooks/useDocument.js
|
|||
packages/app-desktop/gui/hooks/useEffectDebugger.js
|
||||
packages/app-desktop/gui/hooks/useElementHeight.js
|
||||
packages/app-desktop/gui/hooks/useImperativeHandlerDebugger.js
|
||||
packages/app-desktop/gui/hooks/useMarkupToHtml.js
|
||||
packages/app-desktop/gui/hooks/usePrevious.js
|
||||
packages/app-desktop/gui/hooks/usePropsDebugger.js
|
||||
packages/app-desktop/gui/lib/SearchInput/SearchInput.js
|
||||
|
|
|
|||
|
|
@ -264,7 +264,6 @@ packages/app-desktop/gui/NoteEditor/utils/useEffectiveNoteId.js
|
|||
packages/app-desktop/gui/NoteEditor/utils/useFolder.js
|
||||
packages/app-desktop/gui/NoteEditor/utils/useFormNote.test.js
|
||||
packages/app-desktop/gui/NoteEditor/utils/useFormNote.js
|
||||
packages/app-desktop/gui/NoteEditor/utils/useMarkupToHtml.js
|
||||
packages/app-desktop/gui/NoteEditor/utils/useMessageHandler.js
|
||||
packages/app-desktop/gui/NoteEditor/utils/useNoteSearchBar.js
|
||||
packages/app-desktop/gui/NoteEditor/utils/usePluginEditorView.test.js
|
||||
|
|
@ -455,6 +454,7 @@ packages/app-desktop/gui/hooks/useDocument.js
|
|||
packages/app-desktop/gui/hooks/useEffectDebugger.js
|
||||
packages/app-desktop/gui/hooks/useElementHeight.js
|
||||
packages/app-desktop/gui/hooks/useImperativeHandlerDebugger.js
|
||||
packages/app-desktop/gui/hooks/useMarkupToHtml.js
|
||||
packages/app-desktop/gui/hooks/usePrevious.js
|
||||
packages/app-desktop/gui/hooks/usePropsDebugger.js
|
||||
packages/app-desktop/gui/lib/SearchInput/SearchInput.js
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import * as React from 'react';
|
|||
import { useState, useEffect, useRef, forwardRef, useCallback, useImperativeHandle, ForwardedRef, useContext } from 'react';
|
||||
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
import { EditorCommand, MarkupToHtmlOptions, NoteBodyEditorProps, NoteBodyEditorRef } from '../../../utils/types';
|
||||
import { EditorCommand, NoteBodyEditorProps, NoteBodyEditorRef } from '../../../utils/types';
|
||||
import { commandAttachFileToBody, getResourcesFromPasteEvent } from '../../../utils/resourceHandling';
|
||||
import { ScrollOptions, ScrollOptionTypes } from '../../../utils/types';
|
||||
import { CommandValue } from '../../../utils/types';
|
||||
|
|
@ -34,6 +34,7 @@ import useWebviewIpcMessage from '../utils/useWebviewIpcMessage';
|
|||
import useEditorSearchHandler from '../utils/useEditorSearchHandler';
|
||||
import { focus } from '@joplin/lib/utils/focusHandler';
|
||||
import { WindowIdContext } from '../../../../NewWindowOrIFrame';
|
||||
import { MarkupToHtmlOptions } from '../../../../hooks/useMarkupToHtml';
|
||||
|
||||
function markupRenderOptions(override: MarkupToHtmlOptions = null): MarkupToHtmlOptions {
|
||||
return { ...override };
|
||||
|
|
|
|||
|
|
@ -1035,6 +1035,7 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: any) => {
|
|||
|
||||
const allAssetsOptions: NoteStyleOptions = {
|
||||
contentMaxWidthTarget: '.mce-content-body',
|
||||
scrollbarSize: props.scrollbarSize,
|
||||
themeId: props.contentMarkupLanguage === MarkupLanguage.Html ? 1 : null,
|
||||
whiteBackgroundNoteRendering: props.whiteBackgroundNoteRendering,
|
||||
};
|
||||
|
|
@ -1051,7 +1052,7 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: any) => {
|
|||
cancelled = true;
|
||||
};
|
||||
// eslint-disable-next-line @seiyab/react-hooks/exhaustive-deps -- Old code before rule was applied
|
||||
}, [editor, props.themeId, props.markupToHtml, props.allAssets, props.content, props.resourceInfos, props.contentKey, props.contentMarkupLanguage, props.whiteBackgroundNoteRendering]);
|
||||
}, [editor, props.themeId, props.scrollbarSize, props.markupToHtml, props.allAssets, props.content, props.resourceInfos, props.contentKey, props.contentMarkupLanguage, props.whiteBackgroundNoteRendering]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!editor) return () => {};
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import useNoteSearchBar from './utils/useNoteSearchBar';
|
|||
import useMessageHandler from './utils/useMessageHandler';
|
||||
import useWindowCommandHandler from './utils/useWindowCommandHandler';
|
||||
import useDropHandler from './utils/useDropHandler';
|
||||
import useMarkupToHtml from './utils/useMarkupToHtml';
|
||||
import useMarkupToHtml from '../hooks/useMarkupToHtml';
|
||||
import useFormNote, { OnLoadEvent, OnSetFormNote } from './utils/useFormNote';
|
||||
import useEffectiveNoteId from './utils/useEffectiveNoteId';
|
||||
import useFolder from './utils/useFolder';
|
||||
|
|
@ -45,7 +45,6 @@ import PlainEditor from './NoteBody/PlainEditor/PlainEditor';
|
|||
import CodeMirror6 from './NoteBody/CodeMirror/v6/CodeMirror';
|
||||
import CodeMirror5 from './NoteBody/CodeMirror/v5/CodeMirror';
|
||||
import { openItemById } from './utils/contextMenu';
|
||||
import getPluginSettingValue from '@joplin/lib/services/plugins/utils/getPluginSettingValue';
|
||||
import { MarkupLanguage } from '@joplin/renderer';
|
||||
import useScrollWhenReadyOptions from './utils/useScrollWhenReadyOptions';
|
||||
import useScheduleSaveCallbacks from './utils/useScheduleSaveCallbacks';
|
||||
|
|
@ -180,7 +179,7 @@ function NoteEditorContent(props: NoteEditorProps) {
|
|||
whiteBackgroundNoteRendering,
|
||||
customCss: props.customCss,
|
||||
plugins: props.plugins,
|
||||
settingValue: getPluginSettingValue,
|
||||
scrollbarSize: props.scrollbarSize,
|
||||
});
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
|
||||
|
|
@ -200,9 +199,10 @@ function NoteEditorContent(props: NoteEditorProps) {
|
|||
return markupToHtml.allAssets(markupLanguage, theme, {
|
||||
contentMaxWidth: props.contentMaxWidth,
|
||||
contentMaxWidthTarget: options.contentMaxWidthTarget,
|
||||
scrollbarSize: props.scrollbarSize,
|
||||
whiteBackgroundNoteRendering: options.whiteBackgroundNoteRendering,
|
||||
});
|
||||
}, [props.themeId, props.customCss, props.contentMaxWidth]);
|
||||
}, [props.themeId, props.scrollbarSize, props.customCss, props.contentMaxWidth]);
|
||||
|
||||
const handleProvisionalFlag = useCallback(() => {
|
||||
if (props.isProvisional) {
|
||||
|
|
@ -494,6 +494,7 @@ function NoteEditorContent(props: NoteEditorProps) {
|
|||
plugins: props.plugins,
|
||||
fontSize: Setting.value('style.editor.fontSize'),
|
||||
contentMaxWidth: props.contentMaxWidth,
|
||||
scrollbarSize: props.scrollbarSize,
|
||||
isSafeMode: props.isSafeMode,
|
||||
useCustomPdfViewer: props.useCustomPdfViewer,
|
||||
// We need it to identify the context for which media is rendered.
|
||||
|
|
@ -747,6 +748,7 @@ const mapStateToProps = (state: AppState, ownProps: ConnectProps) => {
|
|||
'setTags',
|
||||
], whenClauseContext)[0] as ToolbarButtonInfo,
|
||||
contentMaxWidth: state.settings['style.editor.contentMaxWidth'],
|
||||
scrollbarSize: state.settings['style.scrollbarSize'],
|
||||
isSafeMode: state.settings.isSafeMode,
|
||||
useCustomPdfViewer: false,
|
||||
syncUserId: state.settings['sync.userId'],
|
||||
|
|
|
|||
|
|
@ -5,3 +5,5 @@
|
|||
@use "./styles/note-title-wrapper.scss";
|
||||
@use "./styles/note-editor-wrapper.scss";
|
||||
@use "./styles/note-editor-viewer-row.scss";
|
||||
@use "./styles/revision-viewer-root.scss";
|
||||
@use "./styles/revision-viewer-title.scss";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
|
||||
.revision-viewer-root {
|
||||
background-color: var(--joplin-background-color);
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
flex: 1;
|
||||
}
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
|
||||
.revision-viewer-title {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
margin-bottom: 10px;
|
||||
border-width: 1px;
|
||||
border-bottom-style: solid;
|
||||
border-color: var(--joplin-divider-color);
|
||||
padding-bottom: 10px;
|
||||
|
||||
> .revisions {
|
||||
margin-left: 10px;
|
||||
flex: 0.5;
|
||||
}
|
||||
|
||||
> .title {
|
||||
flex: 1;
|
||||
}
|
||||
}
|
||||
|
|
@ -9,6 +9,8 @@ import { DropHandler } from './useDropHandler';
|
|||
import { SearchMarkers } from './useSearchMarkers';
|
||||
import { ParseOptions } from '@joplin/lib/HtmlToMd';
|
||||
import { ScrollStrategy } from '@joplin/editor/CodeMirror/CodeMirrorControl';
|
||||
import { MarkupToHtmlOptions } from '../../hooks/useMarkupToHtml';
|
||||
import { ScrollbarSize } from '@joplin/lib/models/settings/builtInMetadata';
|
||||
|
||||
export interface AllAssetsOptions {
|
||||
contentMaxWidthTarget?: string;
|
||||
|
|
@ -51,6 +53,7 @@ export interface NoteEditorProps {
|
|||
toolbarButtonInfos: ToolbarItem[];
|
||||
setTagsToolbarButtonInfo: ToolbarButtonInfo;
|
||||
contentMaxWidth: number;
|
||||
scrollbarSize: ScrollbarSize;
|
||||
isSafeMode: boolean;
|
||||
useCustomPdfViewer: boolean;
|
||||
shareCacheSetting: string;
|
||||
|
|
@ -72,22 +75,7 @@ export interface NoteBodyEditorRef {
|
|||
execCommand(command: CommandValue): Promise<void>;
|
||||
}
|
||||
|
||||
export interface MarkupToHtmlOptions {
|
||||
replaceResourceInternalToExternalLinks?: boolean;
|
||||
resourceInfos?: ResourceInfos;
|
||||
contentMaxWidth?: number;
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
|
||||
plugins?: Record<string, any>;
|
||||
bodyOnly?: boolean;
|
||||
mapsToLine?: boolean;
|
||||
useCustomPdfViewer?: boolean;
|
||||
noteId?: string;
|
||||
vendorDir?: string;
|
||||
platformName?: string;
|
||||
allowedFilePrefixes?: string[];
|
||||
whiteBackgroundNoteRendering?: boolean;
|
||||
}
|
||||
|
||||
export { MarkupToHtmlOptions };
|
||||
export type MarkupToHtmlHandler = (markupLanguage: MarkupLanguage, markup: string, options: MarkupToHtmlOptions)=> Promise<RenderResult>;
|
||||
export type HtmlToMarkdownHandler = (markupLanguage: number, html: string, originalCss: string, parseOptions?: ParseOptions)=> Promise<string>;
|
||||
|
||||
|
|
@ -105,6 +93,8 @@ export interface NoteBodyEditorProps {
|
|||
// avoid cases where black text is rendered over a dark background.
|
||||
whiteBackgroundNoteRendering: boolean;
|
||||
|
||||
scrollbarSize: ScrollbarSize;
|
||||
|
||||
content: string;
|
||||
contentKey: string;
|
||||
contentMarkupLanguage: number;
|
||||
|
|
|
|||
|
|
@ -1,16 +1,14 @@
|
|||
import * as React from 'react';
|
||||
import { themeStyle } from '@joplin/lib/theme';
|
||||
import { _ } from '@joplin/lib/locale';
|
||||
import NoteTextViewer from './NoteTextViewer';
|
||||
import NoteTextViewer, { NoteViewerControl } from './NoteTextViewer';
|
||||
import HelpButton from './HelpButton';
|
||||
import BaseModel from '@joplin/lib/BaseModel';
|
||||
import Revision from '@joplin/lib/models/Revision';
|
||||
import Setting from '@joplin/lib/models/Setting';
|
||||
import RevisionService from '@joplin/lib/services/RevisionService';
|
||||
import { MarkupToHtml } from '@joplin/renderer';
|
||||
import { MarkupLanguage } from '@joplin/renderer';
|
||||
import time from '@joplin/lib/time';
|
||||
import bridge from '../services/bridge';
|
||||
import markupLanguageUtils from '@joplin/lib/utils/markupLanguageUtils';
|
||||
import { NoteEntity, RevisionEntity } from '@joplin/lib/services/database/types';
|
||||
import { AppState } from '../app.reducer';
|
||||
const urlUtils = require('@joplin/lib/urlUtils');
|
||||
|
|
@ -18,147 +16,109 @@ const ReactTooltip = require('react-tooltip');
|
|||
const { connect } = require('react-redux');
|
||||
import shared from '@joplin/lib/components/shared/note-screen-shared';
|
||||
import shim, { MessageBoxType } from '@joplin/lib/shim';
|
||||
import { RefObject, useCallback, useRef, useState } from 'react';
|
||||
import useQueuedAsyncEffect from '@joplin/lib/hooks/useQueuedAsyncEffect';
|
||||
import useMarkupToHtml from './hooks/useMarkupToHtml';
|
||||
import useAsyncEffect from '@joplin/lib/hooks/useAsyncEffect';
|
||||
import { ScrollbarSize } from '@joplin/lib/models/settings/builtInMetadata';
|
||||
|
||||
interface Props {
|
||||
themeId: number;
|
||||
noteId: string;
|
||||
// eslint-disable-next-line @typescript-eslint/ban-types -- Old code before rule was applied
|
||||
onBack: Function;
|
||||
onBack: ()=> void;
|
||||
customCss: string;
|
||||
scrollbarSize: ScrollbarSize;
|
||||
}
|
||||
|
||||
interface State {
|
||||
note: NoteEntity;
|
||||
revisions: RevisionEntity[];
|
||||
currentRevId: string;
|
||||
restoring: boolean;
|
||||
}
|
||||
const useNoteContent = (
|
||||
viewerRef: RefObject<NoteViewerControl>,
|
||||
currentRevId: string,
|
||||
revisions: RevisionEntity[],
|
||||
themeId: number,
|
||||
customCss: string,
|
||||
scrollbarSize: ScrollbarSize,
|
||||
) => {
|
||||
const [note, setNote] = useState<NoteEntity>(null);
|
||||
|
||||
class NoteRevisionViewerComponent extends React.PureComponent<Props, State> {
|
||||
const markupToHtml = useMarkupToHtml({
|
||||
themeId,
|
||||
customCss,
|
||||
plugins: {},
|
||||
whiteBackgroundNoteRendering: false,
|
||||
scrollbarSize,
|
||||
});
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
|
||||
private viewerRef_: any;
|
||||
// eslint-disable-next-line @typescript-eslint/ban-types -- Old code before rule was applied
|
||||
private helpButton_onClick: Function;
|
||||
useAsyncEffect(async (event) => {
|
||||
if (!revisions.length || !currentRevId) {
|
||||
setNote(null);
|
||||
} else {
|
||||
const revIndex = BaseModel.modelIndexById(revisions, currentRevId);
|
||||
const note = await RevisionService.instance().revisionNote(revisions, revIndex);
|
||||
if (!note || event.cancelled) return;
|
||||
setNote(note);
|
||||
}
|
||||
}, [revisions, currentRevId, themeId, customCss, viewerRef]);
|
||||
|
||||
public constructor(props: Props) {
|
||||
super(props);
|
||||
useQueuedAsyncEffect(async () => {
|
||||
const noteBody = note?.body ?? _('This note has no history');
|
||||
const markupLanguage = note.markup_language ?? MarkupLanguage.Markdown;
|
||||
const result = await markupToHtml(markupLanguage, noteBody, {
|
||||
resources: await shared.attachedResources(noteBody),
|
||||
whiteBackgroundNoteRendering: markupLanguage === MarkupLanguage.Html,
|
||||
});
|
||||
|
||||
this.state = {
|
||||
revisions: [],
|
||||
currentRevId: '',
|
||||
note: null,
|
||||
restoring: false,
|
||||
};
|
||||
viewerRef.current.setHtml(result.html, {
|
||||
pluginAssets: result.pluginAssets,
|
||||
});
|
||||
}, [note, viewerRef]);
|
||||
|
||||
this.viewerRef_ = React.createRef();
|
||||
return note;
|
||||
};
|
||||
|
||||
this.viewer_domReady = this.viewer_domReady.bind(this);
|
||||
this.revisionList_onChange = this.revisionList_onChange.bind(this);
|
||||
this.importButton_onClick = this.importButton_onClick.bind(this);
|
||||
this.backButton_click = this.backButton_click.bind(this);
|
||||
this.webview_ipcMessage = this.webview_ipcMessage.bind(this);
|
||||
}
|
||||
const NoteRevisionViewerComponent: React.FC<Props> = ({ themeId, noteId, onBack, customCss, scrollbarSize }) => {
|
||||
const helpButton_onClick = useCallback(() => {}, []);
|
||||
const viewerRef = useRef<NoteViewerControl|null>(null);
|
||||
|
||||
public style() {
|
||||
const theme = themeStyle(this.props.themeId);
|
||||
const [revisions, setRevisions] = useState<RevisionEntity[]>([]);
|
||||
const [currentRevId, setCurrentRevId] = useState('');
|
||||
const [restoring, setRestoring] = useState(false);
|
||||
|
||||
const style = {
|
||||
root: {
|
||||
backgroundColor: theme.backgroundColor,
|
||||
display: 'flex',
|
||||
flex: 1,
|
||||
flexDirection: 'column',
|
||||
},
|
||||
titleInput: { ...theme.inputStyle, flex: 1 },
|
||||
revisionList: { ...theme.dropdownList, marginLeft: 10, flex: 0.5 },
|
||||
};
|
||||
const note = useNoteContent(viewerRef, currentRevId, revisions, themeId, customCss, scrollbarSize);
|
||||
|
||||
return style;
|
||||
}
|
||||
|
||||
private async viewer_domReady() {
|
||||
const viewer_domReady = useCallback(async () => {
|
||||
// this.viewerRef_.current.openDevTools();
|
||||
|
||||
const revisions = await Revision.allByType(BaseModel.TYPE_NOTE, this.props.noteId);
|
||||
const revisions = await Revision.allByType(BaseModel.TYPE_NOTE, noteId);
|
||||
|
||||
this.setState(
|
||||
{
|
||||
revisions: revisions,
|
||||
currentRevId: revisions.length ? revisions[revisions.length - 1].id : '',
|
||||
},
|
||||
() => {
|
||||
void this.reloadNote();
|
||||
},
|
||||
);
|
||||
}
|
||||
setRevisions(revisions);
|
||||
setCurrentRevId(revisions.length ? revisions[revisions.length - 1].id : '');
|
||||
}, [noteId]);
|
||||
|
||||
private async importButton_onClick() {
|
||||
if (!this.state.note) return;
|
||||
this.setState({ restoring: true });
|
||||
await RevisionService.instance().importRevisionNote(this.state.note);
|
||||
this.setState({ restoring: false });
|
||||
await shim.showMessageBox(RevisionService.instance().restoreSuccessMessage(this.state.note), { type: MessageBoxType.Info });
|
||||
}
|
||||
const importButton_onClick = useCallback(async () => {
|
||||
if (!note) return;
|
||||
setRestoring(true);
|
||||
await RevisionService.instance().importRevisionNote(note);
|
||||
setRestoring(false);
|
||||
await shim.showMessageBox(RevisionService.instance().restoreSuccessMessage(note), { type: MessageBoxType.Info });
|
||||
}, [note]);
|
||||
|
||||
private backButton_click() {
|
||||
if (this.props.onBack) this.props.onBack();
|
||||
}
|
||||
const backButton_click = useCallback(() => {
|
||||
if (onBack) onBack();
|
||||
}, [onBack]);
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
|
||||
private revisionList_onChange(event: any) {
|
||||
const revisionList_onChange: React.ChangeEventHandler<HTMLSelectElement> = useCallback((event) => {
|
||||
const value = event.target.value;
|
||||
|
||||
if (!value) {
|
||||
if (this.props.onBack) this.props.onBack();
|
||||
if (onBack) onBack();
|
||||
} else {
|
||||
this.setState(
|
||||
{
|
||||
currentRevId: value,
|
||||
},
|
||||
() => {
|
||||
void this.reloadNote();
|
||||
},
|
||||
);
|
||||
setCurrentRevId(value);
|
||||
}
|
||||
}
|
||||
|
||||
public async reloadNote() {
|
||||
let noteBody = '';
|
||||
let markupLanguage = MarkupToHtml.MARKUP_LANGUAGE_MARKDOWN;
|
||||
if (!this.state.revisions.length || !this.state.currentRevId) {
|
||||
noteBody = _('This note has no history');
|
||||
this.setState({ note: null });
|
||||
} else {
|
||||
const revIndex = BaseModel.modelIndexById(this.state.revisions, this.state.currentRevId);
|
||||
const note = await RevisionService.instance().revisionNote(this.state.revisions, revIndex);
|
||||
if (!note) return;
|
||||
noteBody = note.body;
|
||||
markupLanguage = note.markup_language;
|
||||
this.setState({ note: note });
|
||||
}
|
||||
|
||||
const theme = themeStyle(this.props.themeId);
|
||||
|
||||
const markupToHtml = markupLanguageUtils.newMarkupToHtml({}, {
|
||||
resourceBaseUrl: `joplin-content://note-viewer/${Setting.value('resourceDir')}/`,
|
||||
customCss: this.props.customCss ? this.props.customCss : '',
|
||||
});
|
||||
|
||||
const result = await markupToHtml.render(markupLanguage, noteBody, theme, {
|
||||
codeTheme: theme.codeThemeCss,
|
||||
resources: await shared.attachedResources(noteBody),
|
||||
postMessageSyntax: 'ipcProxySendToHost',
|
||||
});
|
||||
|
||||
this.viewerRef_.current.setHtml(result.html, {
|
||||
// cssFiles: result.cssFiles,
|
||||
pluginAssets: result.pluginAssets,
|
||||
});
|
||||
}
|
||||
}, [onBack]);
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
|
||||
private async webview_ipcMessage(event: any) {
|
||||
const webview_ipcMessage = useCallback(async (event: any) => {
|
||||
// For the revision view, we only support a minimal subset of the IPC messages.
|
||||
// For example, we don't need interactive checkboxes or sync between viewer and editor view.
|
||||
// We try to get most links work though, except for internal (joplin://) links.
|
||||
|
|
@ -182,60 +142,57 @@ class NoteRevisionViewerComponent extends React.PureComponent<Props, State> {
|
|||
console.warn(error);
|
||||
bridge().showErrorMessageBox(error.message);
|
||||
}
|
||||
}
|
||||
}, []);
|
||||
|
||||
public render() {
|
||||
const theme = themeStyle(this.props.themeId);
|
||||
const style = this.style();
|
||||
const theme = themeStyle(themeId);
|
||||
|
||||
const revisionListItems = [];
|
||||
const revs = this.state.revisions.slice().reverse();
|
||||
for (let i = 0; i < revs.length; i++) {
|
||||
const rev = revs[i];
|
||||
const stats = Revision.revisionPatchStatsText(rev);
|
||||
const revisionListItems = [];
|
||||
const revs = revisions.slice().reverse();
|
||||
for (let i = 0; i < revs.length; i++) {
|
||||
const rev = revs[i];
|
||||
const stats = Revision.revisionPatchStatsText(rev);
|
||||
|
||||
revisionListItems.push(
|
||||
<option key={rev.id} value={rev.id}>
|
||||
{`${time.formatMsToLocal(rev.item_updated_time)} (${stats})`}
|
||||
</option>,
|
||||
);
|
||||
}
|
||||
|
||||
const restoreButtonTitle = _('Restore');
|
||||
const helpMessage = _('Click "%s" to restore the note. It will be copied in the notebook named "%s". The current version of the note will not be replaced or modified.', restoreButtonTitle, RevisionService.instance().restoreFolderTitle());
|
||||
|
||||
const titleInput = (
|
||||
<div style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', marginBottom: 10, borderWidth: 1, borderBottomStyle: 'solid', borderColor: theme.dividerColor, paddingBottom: 10 }}>
|
||||
<button onClick={this.backButton_click} style={{ ...theme.buttonStyle, marginRight: 10, height: theme.inputStyle.height }}>
|
||||
<i style={theme.buttonIconStyle} className={'fa fa-chevron-left'}></i>{_('Back')}
|
||||
</button>
|
||||
<input readOnly type="text" style={style.titleInput} value={this.state.note ? this.state.note.title : ''} />
|
||||
<select disabled={!this.state.revisions.length} value={this.state.currentRevId} style={style.revisionList} onChange={this.revisionList_onChange}>
|
||||
{revisionListItems}
|
||||
</select>
|
||||
<button disabled={!this.state.revisions.length || this.state.restoring} onClick={this.importButton_onClick} style={{ ...theme.buttonStyle, marginLeft: 10, height: theme.inputStyle.height }}>
|
||||
{restoreButtonTitle}
|
||||
</button>
|
||||
<HelpButton tip={helpMessage} id="noteRevisionHelpButton" onClick={this.helpButton_onClick} />
|
||||
</div>
|
||||
);
|
||||
|
||||
const viewer = <NoteTextViewer themeId={this.props.themeId} viewerStyle={{ display: 'flex', flex: 1, borderLeft: 'none' }} ref={this.viewerRef_} onDomReady={this.viewer_domReady} onIpcMessage={this.webview_ipcMessage} />;
|
||||
|
||||
return (
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
|
||||
<div style={style.root as any}>
|
||||
{titleInput}
|
||||
{viewer}
|
||||
<ReactTooltip place="bottom" delayShow={300} className="help-tooltip" />
|
||||
</div>
|
||||
revisionListItems.push(
|
||||
<option key={rev.id} value={rev.id}>
|
||||
{`${time.formatMsToLocal(rev.item_updated_time)} (${stats})`}
|
||||
</option>,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
const restoreButtonTitle = _('Restore');
|
||||
const helpMessage = _('Click "%s" to restore the note. It will be copied in the notebook named "%s". The current version of the note will not be replaced or modified.', restoreButtonTitle, RevisionService.instance().restoreFolderTitle());
|
||||
|
||||
const titleInput = (
|
||||
<div className='revision-viewer-title'>
|
||||
<button onClick={backButton_click} style={{ ...theme.buttonStyle, marginRight: 10, height: theme.inputStyle.height }}>
|
||||
<i style={theme.buttonIconStyle} className={'fa fa-chevron-left'}></i>{_('Back')}
|
||||
</button>
|
||||
<input readOnly type="text" className='title' style={theme.inputStyle} value={note?.title ?? ''} />
|
||||
<select disabled={!revisions.length} value={currentRevId} className='revisions' style={theme.dropdownList} onChange={revisionList_onChange}>
|
||||
{revisionListItems}
|
||||
</select>
|
||||
<button disabled={!revisions.length || restoring} onClick={importButton_onClick} className='restore'style={{ ...theme.buttonStyle, marginLeft: 10, height: theme.inputStyle.height }}>
|
||||
{restoreButtonTitle}
|
||||
</button>
|
||||
<HelpButton tip={helpMessage} id="noteRevisionHelpButton" onClick={helpButton_onClick} />
|
||||
</div>
|
||||
);
|
||||
|
||||
const viewer = <NoteTextViewer themeId={themeId} viewerStyle={{ display: 'flex', flex: 1, borderLeft: 'none' }} ref={viewerRef} onDomReady={viewer_domReady} onIpcMessage={webview_ipcMessage} />;
|
||||
|
||||
return (
|
||||
<div className='revision-viewer-root'>
|
||||
{titleInput}
|
||||
{viewer}
|
||||
<ReactTooltip place="bottom" delayShow={300} className="help-tooltip" />
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
const mapStateToProps = (state: AppState) => {
|
||||
return {
|
||||
themeId: state.settings.theme,
|
||||
scrollbarSize: state.settings['style.scrollbarSize'],
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -17,9 +17,11 @@ import { themeStyle } from '@joplin/lib/theme';
|
|||
import useDocument from '../hooks/useDocument';
|
||||
import { connect } from 'react-redux';
|
||||
import { AppState } from '../../app.reducer';
|
||||
import { ScrollbarSize } from '@joplin/lib/models/settings/builtInMetadata';
|
||||
|
||||
interface Props {
|
||||
themeId: number;
|
||||
scrollbarSize: ScrollbarSize;
|
||||
editorFontSetting: string;
|
||||
customChromeCssPaths: string[];
|
||||
}
|
||||
|
|
@ -106,6 +108,11 @@ const StyleSheetContainer: React.FC<Props> = props => {
|
|||
/* Theme CSS */
|
||||
${themeCss}
|
||||
|
||||
/* Base scrollbar size */
|
||||
:root {
|
||||
--scrollbar-size: ${Number(props.scrollbarSize)}px;
|
||||
}
|
||||
|
||||
/* Editor font CSS */
|
||||
${editorCss}
|
||||
`);
|
||||
|
|
@ -118,6 +125,7 @@ export default connect((state: AppState) => {
|
|||
return {
|
||||
themeId: state.settings.theme,
|
||||
editorFontSetting: state.settings['style.editor.fontFamily'] as string,
|
||||
scrollbarSize: state.settings['style.scrollbarSize'],
|
||||
customChromeCssPaths: state.customChromeCssPaths,
|
||||
};
|
||||
})(StyleSheetContainer);
|
||||
|
|
|
|||
|
|
@ -6,20 +6,27 @@ import shim from '@joplin/lib/shim';
|
|||
|
||||
const { themeStyle } = require('@joplin/lib/theme');
|
||||
import Note from '@joplin/lib/models/Note';
|
||||
import { MarkupToHtmlOptions, ResourceInfos } from './types';
|
||||
import { ResourceInfos } from '../NoteEditor/utils/types';
|
||||
import { resourceFullPath } from '@joplin/lib/models/utils/resourceUtils';
|
||||
import { RenderOptions } from '@joplin/renderer/types';
|
||||
import getPluginSettingValue from '@joplin/lib/services/plugins/utils/getPluginSettingValue';
|
||||
import { ScrollbarSize } from '@joplin/lib/models/settings/builtInMetadata';
|
||||
|
||||
export interface MarkupToHtmlOptions extends RenderOptions {
|
||||
resourceInfos?: ResourceInfos;
|
||||
replaceResourceInternalToExternalLinks?: boolean;
|
||||
}
|
||||
|
||||
interface HookDependencies {
|
||||
themeId: number;
|
||||
customCss: string;
|
||||
plugins: PluginStates;
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
|
||||
settingValue: (pluginId: string, key: string)=> any;
|
||||
whiteBackgroundNoteRendering: boolean;
|
||||
scrollbarSize: ScrollbarSize;
|
||||
}
|
||||
|
||||
export default function useMarkupToHtml(deps: HookDependencies) {
|
||||
const { themeId, customCss, plugins, whiteBackgroundNoteRendering } = deps;
|
||||
const { themeId, customCss, plugins, whiteBackgroundNoteRendering, scrollbarSize } = deps;
|
||||
|
||||
const resourceBaseUrl = useMemo(() => {
|
||||
return `joplin-content://note-viewer/${Setting.value('resourceDir')}/`;
|
||||
|
|
@ -32,8 +39,7 @@ export default function useMarkupToHtml(deps: HookDependencies) {
|
|||
});
|
||||
}, [plugins, customCss, resourceBaseUrl]);
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
|
||||
return useCallback(async (markupLanguage: number, md: string, options: MarkupToHtmlOptions = null): Promise<any> => {
|
||||
return useCallback(async (markupLanguage: number, md: string, options: MarkupToHtmlOptions|null = null) => {
|
||||
options = {
|
||||
replaceResourceInternalToExternalLinks: false,
|
||||
resourceInfos: {},
|
||||
|
|
@ -61,8 +67,9 @@ export default function useMarkupToHtml(deps: HookDependencies) {
|
|||
splitted: true,
|
||||
externalAssetsOnly: true,
|
||||
codeHighlightCacheKey: 'useMarkupToHtml',
|
||||
settingValue: deps.settingValue,
|
||||
settingValue: getPluginSettingValue,
|
||||
whiteBackgroundNoteRendering,
|
||||
scrollbarSize: scrollbarSize,
|
||||
itemIdToUrl: (id: string, urlParameters = '') => {
|
||||
if (!(id in resources) || !resources[id]) {
|
||||
return null;
|
||||
|
|
@ -74,5 +81,5 @@ export default function useMarkupToHtml(deps: HookDependencies) {
|
|||
});
|
||||
|
||||
return result;
|
||||
}, [themeId, markupToHtml, whiteBackgroundNoteRendering, resourceBaseUrl, deps.settingValue]);
|
||||
}, [themeId, markupToHtml, whiteBackgroundNoteRendering, scrollbarSize, resourceBaseUrl]);
|
||||
}
|
||||
|
|
@ -415,6 +415,12 @@
|
|||
|
||||
addPluginAssets(event.options.pluginAssets);
|
||||
|
||||
if (event.options.increaseControlSize) {
|
||||
document.documentElement.classList.add('-larger-controls');
|
||||
} else {
|
||||
document.documentElement.classList.remove('-larger-controls');
|
||||
}
|
||||
|
||||
if (event.options.downloadResources === 'manual') {
|
||||
webviewLib.setupResourceManualDownload();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,8 +31,8 @@ a {
|
|||
}
|
||||
|
||||
::-webkit-scrollbar {
|
||||
width: 7px;
|
||||
height: 7px;
|
||||
width: var(--scrollbar-size, 7px);
|
||||
height: var(--scrollbar-size, 7px);
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-corner {
|
||||
|
|
@ -45,7 +45,7 @@ a {
|
|||
|
||||
::-webkit-scrollbar-thumb {
|
||||
background: rgba(100, 100, 100, 0.3);
|
||||
border-radius: 5px;
|
||||
border-radius: calc(var(--scrollbar-size, 7px) * 0.7);
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-track:hover {
|
||||
|
|
|
|||
|
|
@ -19,6 +19,12 @@ export enum CameraDirection {
|
|||
Front,
|
||||
}
|
||||
|
||||
export enum ScrollbarSize {
|
||||
Small = 7,
|
||||
Medium = 12,
|
||||
Large = 24,
|
||||
}
|
||||
|
||||
const builtInMetadata = (Setting: typeof SettingType) => {
|
||||
const platform = shim.platformName();
|
||||
const mobilePlatform = shim.mobilePlatform();
|
||||
|
|
@ -1120,6 +1126,26 @@ const builtInMetadata = (Setting: typeof SettingType) => {
|
|||
|
||||
'style.editor.contentMaxWidth': { value: 0, type: SettingItemType.Int, public: true, storage: SettingStorage.File, isGlobal: true, appTypes: [AppType.Desktop], section: 'appearance', label: () => _('Editor maximum width'), description: () => _('Set it to 0 to make it take the complete available space. Recommended width is 600.') },
|
||||
|
||||
'style.scrollbarSize': {
|
||||
value: ScrollbarSize.Small,
|
||||
type: SettingItemType.String,
|
||||
public: true,
|
||||
section: 'appearance',
|
||||
appTypes: [AppType.Desktop],
|
||||
isEnum: true,
|
||||
|
||||
options: () => ({
|
||||
[ScrollbarSize.Small]: _('Small'),
|
||||
[ScrollbarSize.Medium]: _('Medium'),
|
||||
[ScrollbarSize.Large]: _('Large'),
|
||||
}),
|
||||
|
||||
label: () => _('Scrollbar size'),
|
||||
description: () => _('Configures the size of scrollbars used in the app.'),
|
||||
storage: SettingStorage.File,
|
||||
isGlobal: true,
|
||||
},
|
||||
|
||||
'ui.layout': { value: {}, type: SettingItemType.Object, storage: SettingStorage.File, isGlobal: true, public: false, appTypes: [AppType.Desktop] },
|
||||
|
||||
'ui.lastSelectedPluginPanel': {
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import Folder from '../../models/Folder';
|
|||
import Note from '../../models/Note';
|
||||
import Setting from '../../models/Setting';
|
||||
import { MarkupToHtml } from '@joplin/renderer';
|
||||
import { NoteEntity, ResourceEntity } from '../database/types';
|
||||
import { NoteEntity, ResourceEntity, ResourceLocalStateEntity } from '../database/types';
|
||||
import { contentScriptsToRendererRules } from '../plugins/utils/loadContentScripts';
|
||||
import { basename, friendlySafeFilename, rtrimSlashes, dirname } from '../../path-utils';
|
||||
import htmlpack from '@joplin/htmlpack';
|
||||
|
|
@ -17,6 +17,8 @@ import getPluginSettingValue from '../plugins/utils/getPluginSettingValue';
|
|||
import { LinkRenderingType } from '@joplin/renderer/MdToHtml';
|
||||
import Logger from '@joplin/utils/Logger';
|
||||
import { parseRenderedNoteMetadata } from './utils';
|
||||
import ResourceLocalState from '../../models/ResourceLocalState';
|
||||
import { ResourceInfos } from '@joplin/renderer/types';
|
||||
|
||||
const logger = Logger.create('InteropService_Exporter_Html');
|
||||
|
||||
|
|
@ -28,7 +30,7 @@ export default class InteropService_Exporter_Html extends InteropService_Exporte
|
|||
private createdDirs_: string[] = [];
|
||||
private resourceDir_: string;
|
||||
private markupToHtml_: MarkupToHtml;
|
||||
private resources_: ResourceEntity[] = [];
|
||||
private resources_: ResourceInfos = {};
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
|
||||
private style_: any;
|
||||
private packIntoSingleFile_ = false;
|
||||
|
|
@ -174,10 +176,14 @@ export default class InteropService_Exporter_Html extends InteropService_Exporte
|
|||
}
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
|
||||
public async processResource(resource: any, filePath: string) {
|
||||
public async processResource(resource: ResourceEntity, filePath: string) {
|
||||
const destResourcePath = `${this.resourceDir_}/${basename(filePath)}`;
|
||||
await shim.fsDriver().copy(filePath, destResourcePath);
|
||||
this.resources_.push(resource);
|
||||
const localState: ResourceLocalStateEntity = await ResourceLocalState.load(resource.id);
|
||||
this.resources_[resource.id] = {
|
||||
localState,
|
||||
item: resource,
|
||||
};
|
||||
}
|
||||
|
||||
public async close() {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import HtmlToHtml from './HtmlToHtml';
|
|||
import htmlUtils from './htmlUtils';
|
||||
import { Options as NoteStyleOptions } from './noteStyle';
|
||||
import { AllHtmlEntities } from 'html-entities';
|
||||
import { FsDriver, MarkupRenderer, MarkupToHtmlConverter, OptionsResourceModel, RenderResult } from './types';
|
||||
import { FsDriver, MarkupRenderer, MarkupToHtmlConverter, OptionsResourceModel, RenderOptions, RenderResult } from './types';
|
||||
import defaultResourceModel from './defaultResourceModel';
|
||||
const MarkdownIt = require('markdown-it');
|
||||
|
||||
|
|
@ -95,7 +95,7 @@ export default class MarkupToHtml implements MarkupToHtmlConverter {
|
|||
}
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
|
||||
public async render(markupLanguage: MarkupLanguage, markup: string, theme: any, options: any): Promise<RenderResult> {
|
||||
public async render(markupLanguage: MarkupLanguage, markup: string, theme: any, options: RenderOptions): Promise<RenderResult> {
|
||||
if (this.options_.isSafeMode) {
|
||||
const htmlentities = new AllHtmlEntities();
|
||||
return {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import { fileExtension } from '@joplin/utils/path';
|
|||
import setupLinkify from './MdToHtml/setupLinkify';
|
||||
import validateLinks from './MdToHtml/validateLinks';
|
||||
import { Options as NoteStyleOptions } from './noteStyle';
|
||||
import { FsDriver, ItemIdToUrlHandler, MarkupRenderer, OptionsResourceModel, RenderOptions, RenderResult, RenderResultPluginAsset } from './types';
|
||||
import { FsDriver, ItemIdToUrlHandler, MarkupRenderer, OptionsResourceModel, RenderOptions, RenderResult, RenderResultPluginAsset, ResourceInfos } from './types';
|
||||
import hljs from './highlight';
|
||||
import * as MarkdownIt from 'markdown-it';
|
||||
|
||||
|
|
@ -161,8 +161,7 @@ export interface RuleOptions {
|
|||
postMessageSyntax: string;
|
||||
ResourceModel: OptionsResourceModel;
|
||||
resourceBaseUrl: string;
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
|
||||
resources: any; // resourceId: Resource
|
||||
resources: ResourceInfos; // resourceId: Resource
|
||||
|
||||
// Used by checkboxes to specify how it should be rendered
|
||||
checkboxRenderingType?: number;
|
||||
|
|
@ -643,6 +642,7 @@ export default class MdToHtml implements MarkupRenderer {
|
|||
const renderedBody = markdownIt.render(body, context);
|
||||
|
||||
let cssStrings = noteStyle(options.theme, {
|
||||
scrollbarSize: options.scrollbarSize,
|
||||
contentMaxWidth: options.contentMaxWidth,
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ describe('linkReplacement', () => {
|
|||
ResourceModel: defaultResourceModel,
|
||||
resources: {
|
||||
[resourceId]: {
|
||||
item: {},
|
||||
item: { id: 'test' },
|
||||
localState: {
|
||||
fetch_status: 2, // FETCH_STATUS_DONE
|
||||
},
|
||||
|
|
@ -46,7 +46,7 @@ describe('linkReplacement', () => {
|
|||
ResourceModel: defaultResourceModel,
|
||||
resources: {
|
||||
[resourceId]: {
|
||||
item: {},
|
||||
item: { id: 'test' },
|
||||
localState: {
|
||||
fetch_status: 0, // FETCH_STATUS_IDLE
|
||||
},
|
||||
|
|
@ -66,7 +66,7 @@ describe('linkReplacement', () => {
|
|||
ResourceModel: defaultResourceModel,
|
||||
resources: {
|
||||
[resourceId]: {
|
||||
item: {},
|
||||
item: { id: 'test' },
|
||||
localState: {
|
||||
fetch_status: 2, // FETCH_STATUS_DONE
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import { LinkRenderingType } from '../MdToHtml';
|
||||
import { ItemIdToUrlHandler, OptionsResourceModel } from '../types';
|
||||
import { ItemIdToUrlHandler, OptionsResourceModel, ResourceInfos } from '../types';
|
||||
import * as utils from '../utils';
|
||||
import createEventHandlingAttrs from './createEventHandlingAttrs';
|
||||
const Entities = require('html-entities').AllHtmlEntities;
|
||||
|
|
@ -9,8 +9,7 @@ const { getClassNameForMimeType } = require('font-awesome-filetypes');
|
|||
|
||||
export interface Options {
|
||||
title?: string;
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
|
||||
resources?: any;
|
||||
resources?: ResourceInfos;
|
||||
ResourceModel?: OptionsResourceModel;
|
||||
linkRenderingType?: LinkRenderingType;
|
||||
plainResourceRendering?: boolean;
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ function formatCssSize(v: any): string {
|
|||
export interface Options {
|
||||
contentMaxWidth?: number;
|
||||
contentMaxWidthTarget?: string;
|
||||
scrollbarSize?: number;
|
||||
themeId?: number;
|
||||
whiteBackgroundNoteRendering?: boolean;
|
||||
}
|
||||
|
|
@ -117,9 +118,17 @@ export default function(theme: any, options: Options = null) {
|
|||
border-radius: 3px;
|
||||
background-color: ${theme.codeBackgroundColor};
|
||||
}
|
||||
|
||||
:root {
|
||||
--scrollbar-size: ${Number(options.scrollbarSize ?? 7)}px;
|
||||
}
|
||||
|
||||
::-webkit-scrollbar {
|
||||
width: 7px;
|
||||
height: 7px;
|
||||
width: var(--scrollbar-size);
|
||||
height: var(--scrollbar-size);
|
||||
}
|
||||
::-webkit-scrollbar-thumb {
|
||||
border-radius: calc(var(--scrollbar-size) / 2);
|
||||
}
|
||||
::-webkit-scrollbar-corner {
|
||||
background: none;
|
||||
|
|
|
|||
|
|
@ -4,12 +4,27 @@ import { Options as NoteStyleOptions } from './noteStyle';
|
|||
export type ItemIdToUrlHandler = (resourceId: string, urlParameters?: string)=> string;
|
||||
|
||||
interface ResourceEntity {
|
||||
id: string;
|
||||
id?: string;
|
||||
title?: string;
|
||||
mime?: string;
|
||||
file_extension?: string;
|
||||
updated_time?: number;
|
||||
|
||||
encryption_applied?: number;
|
||||
encryption_blob_encrypted?: number;
|
||||
}
|
||||
|
||||
interface ResourceLocalState {
|
||||
fetch_status?: number;
|
||||
}
|
||||
|
||||
export interface ResourceInfo {
|
||||
localState: ResourceLocalState;
|
||||
item: ResourceEntity;
|
||||
}
|
||||
|
||||
export type ResourceInfos = Record<string, ResourceInfo>;
|
||||
|
||||
export interface FsDriver {
|
||||
writeFile: (path: string, content: string, encoding: string)=> Promise<void>;
|
||||
exists: (path: string)=> Promise<boolean>;
|
||||
|
|
@ -19,6 +34,7 @@ export interface FsDriver {
|
|||
|
||||
export interface RenderOptions {
|
||||
contentMaxWidth?: number;
|
||||
scrollbarSize?: number;
|
||||
bodyOnly?: boolean;
|
||||
splitted?: boolean;
|
||||
enableLongPress?: boolean;
|
||||
|
|
@ -48,13 +64,15 @@ export interface RenderOptions {
|
|||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
|
||||
settingValue?: (pluginId: string, key: string)=> any;
|
||||
|
||||
resources?: Record<string, ResourceEntity>;
|
||||
resources?: ResourceInfos;
|
||||
|
||||
onResourceLoaded?: ()=> void;
|
||||
editPopupFiletypes?: string[];
|
||||
createEditPopupSyntax?: string;
|
||||
destroyEditPopupSyntax?: string;
|
||||
|
||||
platformName?: string;
|
||||
|
||||
// HtmlToHtml only
|
||||
whiteBackgroundNoteRendering?: boolean;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import { attributesHtml } from './htmlUtils';
|
||||
import { ItemIdToUrlHandler, OptionsResourceModel } from './types';
|
||||
import { ItemIdToUrlHandler, OptionsResourceModel, ResourceInfo, ResourceInfos } from './types';
|
||||
|
||||
const Entities = require('html-entities').AllHtmlEntities;
|
||||
const htmlentities = new Entities().encode;
|
||||
|
|
@ -98,8 +98,7 @@ export const resourceStatusName = function(index: number) {
|
|||
throw new Error(`Unknown index: ${index}`);
|
||||
};
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
|
||||
export const resourceStatus = function(ResourceModel: OptionsResourceModel, resourceInfo: any) {
|
||||
export const resourceStatus = function(ResourceModel: OptionsResourceModel, resourceInfo: ResourceInfo) {
|
||||
if (!ResourceModel) return 'ready';
|
||||
|
||||
let status = 'ready';
|
||||
|
|
@ -130,8 +129,7 @@ type ImageMarkupData = {
|
|||
title: string;
|
||||
}|{ src: string; before: string; after: string };
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
|
||||
export const imageReplacement = function(ResourceModel: OptionsResourceModel, markup: ImageMarkupData, resources: any, resourceBaseUrl: string, itemIdToUrl: ItemIdToUrlHandler = null) {
|
||||
export const imageReplacement = function(ResourceModel: OptionsResourceModel, markup: ImageMarkupData, resources: ResourceInfos, resourceBaseUrl: string, itemIdToUrl: ItemIdToUrlHandler = null) {
|
||||
if (!ResourceModel || !resources) return null;
|
||||
|
||||
const src = markup.src;
|
||||
|
|
|
|||
Loading…
Reference in New Issue