mirror of
https://github.com/laurent22/joplin.git
synced 2024-12-15 09:04:04 +02:00
cb3e1cf1e9
commit2fb6cee901
Merge:4e303be85f
db509955f6
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 16:24:07 2020 +0100 Merge branch 'dev' into rn_63 commit4e303be85f
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 16:14:39 2020 +0100 Clean up commite3a37ec2d6
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 15:57:55 2020 +0100 Use different script for pre-commit and manual start commitbd236648fc
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 15:56:45 2020 +0100 Removed RN eslint config commite7feda41c9
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 15:27:08 2020 +0100 Revert "Disable git hook for now" This reverts commit89263ac742
. commitcfd63fe46f
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 13:02:32 2020 +0100 Ask permission to use geo-location commit66059939a3
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 12:26:20 2020 +0100 Fixed WebView race condition commit1e0d2b7b86
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 11:56:21 2020 +0100 Fixed webview issues commitf537d22d7f
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 11:08:29 2020 +0100 Improve resource file watching commiteec32cf70a
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 18:40:13 2020 +0100 Removed cache package dependency and implemented one more suitable for React Native commitefa346fea4
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 14:57:21 2020 +0100 iOS: Added fonts to Info.plist although it was working without it commit572b647bc0
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 14:56:49 2020 +0100 Specify content-type header for OneDrive to prevent network error commitbcedf6c7f0
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:45:01 2020 +0100 iOS: Disable long press menu since it is already built-in commit7359dd61d1
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:37:40 2020 +0100 Removed unused react-native-device-info commit2d63ab36d3
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:35:54 2020 +0100 iOS: Fixed taking a picture commit8e2875a91c
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:11:13 2020 +0100 iOS: Restored camera roll functionality commit75f5edf2ad
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 11:40:13 2020 +0100 iOS: Fixed build settings commitb220c98419
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 11:40:03 2020 +0100 iOS: Got images to work with WebKit commitc34b43e841
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 10:24:52 2020 +0100 iOS: Restore more settings commit32997611e6
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 10:15:14 2020 +0100 iOS: Added back icons and other properties commitb5811d7f7c
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 23:53:14 2020 +0100 Got iOS build to work commitdc6d7c00e0
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 18:40:06 2020 +0100 Imported old settings in gradle build commitdff59f5603
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 18:20:00 2020 +0100 Restored sharing commit0bdb449e72
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 17:25:40 2020 +0100 Updated NoteBodyViewer commit0c0d228815
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 16:54:42 2020 +0100 Fixed networking commit6ff45ce485
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 13:11:00 2020 +0100 Fixed document picker commitcc889182b6
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 12:56:27 2020 +0100 Added back support for alarms commit040261abfa
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 22:04:49 2020 +0100 Fixed Clipboard and remove image-picker package commit1077ad8f16
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 21:54:52 2020 +0100 Fixed Select Alarm dialog and PoorManIntervals class commit8296676fd5
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 21:32:52 2020 +0100 Fixed icons and warnings commit3b0e3f6f43
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 17:02:59 2020 +0100 Got app to build again commit89263ac742
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:41:17 2020 +0100 Disable git hook for now commitd6da162f67
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:39:12 2020 +0100 Restored back all RN packages commit7f8ce3732c
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:13:12 2020 +0100 Restored base packages commitea59726eb3
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:05:17 2020 +0100 Started over from scratch
112 lines
3.2 KiB
TypeScript
112 lines
3.2 KiB
TypeScript
import { useRef, useMemo, useCallback } from 'react';
|
|
|
|
import Setting from 'lib/models/Setting';
|
|
import useSource from './hooks/useSource';
|
|
import useOnMessage from './hooks/useOnMessage';
|
|
import useOnResourceLongPress from './hooks/useOnResourceLongPress';
|
|
|
|
const React = require('react');
|
|
const { View } = require('react-native');
|
|
const { WebView } = require('react-native-webview');
|
|
const { themeStyle } = require('lib/components/global-style.js');
|
|
const BackButtonDialogBox = require('lib/components/BackButtonDialogBox').default;
|
|
const { reg } = require('lib/registry.js');
|
|
|
|
interface Props {
|
|
themeId: number,
|
|
style: any,
|
|
noteBody: string,
|
|
noteMarkupLanguage: number,
|
|
highlightedKeywords: string[],
|
|
noteResources: any,
|
|
paddingBottom: number,
|
|
noteHash: string,
|
|
onJoplinLinkClick: Function,
|
|
onCheckboxChange?: Function,
|
|
onMarkForDownload?: Function,
|
|
onLoadEnd?: Function,
|
|
}
|
|
|
|
export default function NoteBodyViewer(props:Props) {
|
|
const theme = themeStyle(props.themeId);
|
|
|
|
const webViewStyle:any = useMemo(() => {
|
|
return { backgroundColor: theme.backgroundColor };
|
|
}, [theme.backgroundColor]);
|
|
|
|
const dialogBoxRef = useRef(null);
|
|
|
|
const { source, injectedJs } = useSource(
|
|
props.noteBody,
|
|
props.noteMarkupLanguage,
|
|
props.themeId,
|
|
props.highlightedKeywords,
|
|
props.noteResources,
|
|
props.paddingBottom,
|
|
props.noteHash
|
|
);
|
|
|
|
const onResourceLongPress = useOnResourceLongPress(
|
|
props.onJoplinLinkClick,
|
|
dialogBoxRef
|
|
);
|
|
|
|
const onMessage = useOnMessage(
|
|
props.onCheckboxChange,
|
|
props.noteBody,
|
|
props.onMarkForDownload,
|
|
props.onJoplinLinkClick,
|
|
onResourceLongPress
|
|
);
|
|
|
|
const onLoadEnd = useCallback(() => {
|
|
if (props.onLoadEnd) props.onLoadEnd();
|
|
}, [props.onLoadEnd]);
|
|
|
|
function onError() {
|
|
reg.logger().error('WebView error');
|
|
}
|
|
|
|
// On iOS scalesPageToFit work like this:
|
|
//
|
|
// Find the widest image, resize it *and everything else* by x% so that
|
|
// the image fits within the viewport. The problem is that it means if there's
|
|
// a large image, everything is going to be scaled to a very small size, making
|
|
// the text unreadable.
|
|
//
|
|
// On Android:
|
|
//
|
|
// Find the widest elements and scale them (and them only) to fit within the viewport
|
|
// It means it's going to scale large images, but the text will remain at the normal
|
|
// size.
|
|
//
|
|
// That means we can use scalesPageToFix on Android but not on iOS.
|
|
// The weird thing is that on iOS, scalesPageToFix=false along with a CSS
|
|
// rule "img { max-width: 100% }", works like scalesPageToFix=true on Android.
|
|
// So we use scalesPageToFix=false on iOS along with that CSS rule.
|
|
//
|
|
// 2020-10-15: As we've now fully switched to WebKit for iOS (useWebKit=true) and
|
|
// since the WebView package went through many versions it's possible that
|
|
// the above no longer applies.
|
|
|
|
return (
|
|
<View style={props.style}>
|
|
<WebView
|
|
theme={theme}
|
|
useWebKit={true}
|
|
allowingReadAccessToURL={`file://${Setting.value('resourceDir')}`}
|
|
style={webViewStyle}
|
|
source={source}
|
|
injectedJavaScript={injectedJs.join('\n')}
|
|
originWhitelist={['file://*', './*', 'http://*', 'https://*']}
|
|
mixedContentMode="always"
|
|
allowFileAccess={true}
|
|
onLoadEnd={onLoadEnd}
|
|
onError={onError}
|
|
onMessage={onMessage}
|
|
/>
|
|
<BackButtonDialogBox ref={dialogBoxRef}/>
|
|
</View>
|
|
);
|
|
}
|