fix

LNReader · nyagami · May 28, 2024 · Mar 2, 2024 · Mar 2, 2024 · Mar 2, 2024
commit d5db2fd0c2d7a8b45cce602df32e27419cccfaf0
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "expo-web-browser": "~12.3.2",
     "i18n-js": "^3.8.0",
     "lodash-es": "^4.17.21",
-    "qs": "^6.11.2",
+    "qs": "^6.12.0",
     "react": "18.2.0",
     "react-native": "0.72.10",
     "react-native-background-actions": "^3.0.1",

diff --git a/src/plugins/pluginManager.ts b/src/plugins/pluginManager.ts
@@ -136,7 +136,7 @@ const updatePlugin = async (plugin: PluginItem) => {
 
 const fetchPlugins = (): Promise<Record<Language, Array<PluginItem>>> => {
   // plugins host
-  const githubUsername = 'Rider21';
+  const githubUsername = 'LNReader';
   const githubRepository = 'lnreader-sources';
 
   return fetch(

diff --git a/src/plugins/types/index.ts b/src/plugins/types/index.ts
@@ -69,4 +69,5 @@ export interface Plugin extends PluginItem {
   searchNovels: (searchTerm: string, pageNo: number) => Promise<NovelItem[]>;
   fetchImage: (url: string) => Promise<string>;
   resolveUrl?: (path: string, isNovel?: boolean) => string;
+  webStorageUtilized?: boolean;
 }
diff --git a/src/screens/WebviewScreen/WebviewScreen.tsx b/src/screens/WebviewScreen/WebviewScreen.tsx
@@ -2,6 +2,7 @@ import React, { useRef, useState } from 'react';
 import WebView, { WebViewNavigation } from 'react-native-webview';
 import { ProgressBar } from 'react-native-paper';
 
+import { getPlugin } from '@plugins/pluginManager';
 import { useBackHandler } from '@hooks';
 import { useTheme } from '@hooks/persisted';
 import { WebviewScreenProps } from '@navigators/types';
@@ -18,6 +19,7 @@ type StorageData = {
 
 const WebviewScreen = ({ route, navigation }: WebviewScreenProps) => {
   const { name, url, pluginId, isNovel } = route.params;
+  const isSave = getPlugin(pluginId)?.webStorageUtilized;
   const uri = resolveUrl(pluginId, url, isNovel);
 
   const theme = useTheme();
@@ -43,7 +45,7 @@ const WebviewScreen = ({ route, navigation }: WebviewScreenProps) => {
   };
 
   const saveData = () => {
-    if (pluginId && tempData) {
+    if (pluginId && tempData && isSave) {
       storage.mmkv.set(
         pluginId + '_LocalStorage',
         JSON.stringify(tempData?.localStorage || {}),
@@ -59,7 +61,8 @@ const WebviewScreen = ({ route, navigation }: WebviewScreenProps) => {
     if (menuVisible) {
       setMenuVisible(false);
       return true;
-    } else if (canGoBack) {
+    }
+    if (canGoBack) {
       webViewRef.current?.goBack();
       return true;
     }

diff --git a/src/screens/WebviewScreen/components/Menu.tsx b/src/screens/WebviewScreen/components/Menu.tsx
@@ -21,11 +21,11 @@ const Menu: React.FC<MenuProps> = ({
   webView,
   setMenuVisible,
 }) => {
-  const insets = useSafeAreaInsets();
+  const { top } = useSafeAreaInsets();
 
   return (
     <Pressable  => setMenuVisible(false)} style={styles.container}>
-      <View style={[styles.menuContainer, { top: insets.top }]}>
+      <View style={[styles.menuContainer, { top }]}>
         <Pressable
           style={[styles.menuButton, { backgroundColor: theme.surface2 }]}
            => {
@@ -98,6 +98,5 @@ const styles = StyleSheet.create({
   },
   menuButton: {
     padding: 15,
-    marginVertical: 5,
   },
 });