type fix

Author: youniaogu

App.tsx

@@ -2,12 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>UIAppFonts</key>
-	<array>
-		<string>MaterialIcons.ttf</string>
-		<string>MaterialCommunityIcons.ttf</string>
-		<string>Octicons.ttf</string>
-	</array>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -47,6 +41,12 @@
 	<string></string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string></string>
+	<key>UIAppFonts</key>
+	<array>
+		<string>MaterialIcons.ttf</string>
+		<string>MaterialCommunityIcons.ttf</string>
+		<string>Octicons.ttf</string>
+	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>

ios/MangaReader/Info.plist

@@ -1,40 +1,28 @@
-import React, { useState, useEffect, Fragment } from 'react';
+import React, { useState, useEffect, useCallback } from 'react';
+import { createNativeStackNavigator, NativeStackHeaderProps } from '@react-navigation/native-stack';
 import { navigationRef, customTheme, AsyncStatus } from '~/utils';
-import { createNativeStackNavigator } from '@react-navigation/native-stack';
+import { HeartAndBrowser, PrehandleDrawer } from '~/views/Detail';
+import { SearchAndPlugin, PluginSelect } from '~/views/Discovery';
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
 import { store, useAppSelector } from '~/redux';
 import { NavigationContainer } from '@react-navigation/native';
 import { NativeBaseProvider } from 'native-base';
 import { useMessageToast } from '~/hooks';
+import { SearchAndAbout } from '~/views/Home';
 import { StyleSheet } from 'react-native';
 import { Provider } from 'react-redux';
 import RNBootSplash from 'react-native-bootsplash';
 import loadable from '@loadable/component';
+import Header from '~/components/Header';
 
 interface NavigationScreenProps {
   ready?: boolean;
 }
 
-const Header = loadable(() => import('~/components/Header'));
 const Home = loadable(() => import('~/views/Home'));
-const SearchAndAbout = loadable(() => import('~/views/Home'), {
-  resolveComponent: (components) => components.SearchAndAbout,
-});
 const Search = loadable(() => import('~/views/Search'));
 const Discovery = loadable(() => import('~/views/Discovery'));
-const SearchAndPlugin = loadable(() => import('~/views/Discovery'), {
-  resolveComponent: (components) => components.SearchAndPlugin,
-});
-const PluginSelect = loadable(() => import('~/views/Discovery'), {
-  resolveComponent: (components) => components.PluginSelect,
-});
 const Detail = loadable(() => import('~/views/Detail'));
-const HeartAndBrowser = loadable(() => import('~/views/Detail'), {
-  resolveComponent: (components) => components.HeartAndBrowser,
-});
-const PrehandleDrawer = loadable(() => import('~/views/Detail'), {
-  resolveComponent: (components) => components.PrehandleDrawer,
-});
 const Chapter = loadable(() => import('~/views/Chapter'));
 const Plugin = loadable(() => import('~/views/Plugin'));
 const Webview = loadable(() => import('~/views/Webview'));
@@ -48,6 +36,11 @@ const NavigationScreen = ({ ready = false }: NavigationScreenProps) => {
   const latestRelease = useAppSelector((state) => state.release.latest);
   const haveUpdate = Boolean(latestRelease);
 
+  const DefaultHeader = useCallback(
+    (props: NativeStackHeaderProps) => <Header {...props} enableShake={haveUpdate} />,
+    [haveUpdate]
+  );
+
   useEffect(() => {
     if (ready && launchStatus === AsyncStatus.Fulfilled) {
       RNBootSplash.hide();
@@ -56,20 +49,17 @@ const NavigationScreen = ({ ready = false }: NavigationScreenProps) => {
   useMessageToast();
 
   return (
-    <Navigator
-      initialRouteName="Home"
-      screenOptions={{ header: (props) => <Header {...props} enableShake={haveUpdate} /> }}
-    >
-      <Screen name="Home" options={{ headerRight: () => <SearchAndAbout /> }} component={Home} />
+    <Navigator initialRouteName="Home" screenOptions={{ header: DefaultHeader }}>
+      <Screen name="Home" options={{ headerRight: SearchAndAbout }} component={Home} />
       <Screen
         name="Discovery"
-        options={{ title: '', headerLeft: () => <SearchAndPlugin /> }}
+        options={{ title: '', headerLeft: SearchAndPlugin }}
         component={Discovery}
       />
-      <Screen name="Search" options={{ headerRight: () => <PluginSelect /> }} component={Search} />
+      <Screen name="Search" options={{ headerRight: PluginSelect }} component={Search} />
       <Screen
         name="Detail"
-        options={{ title: 'loading...', headerRight: () => <HeartAndBrowser /> }}
+        options={{ title: 'loading...', headerRight: HeartAndBrowser }}
         component={Detail}
       />
       <Screen name="Chapter" options={{ headerShown: false }} component={Chapter} />
@@ -80,14 +70,6 @@ const NavigationScreen = ({ ready = false }: NavigationScreenProps) => {
   );
 };
 
-const ModalWrapper = () => {
-  return (
-    <Fragment>
-      <PrehandleDrawer />
-    </Fragment>
-  );
-};
-
 const App = () => {
   const [ready, setReady] = useState(false);
 
@@ -97,7 +79,7 @@ const App = () => {
         <NativeBaseProvider theme={customTheme}>
           <NavigationContainer ref={navigationRef} onReady={() => setReady(true)}>
             <NavigationScreen ready={ready} />
-            <ModalWrapper />
+            <PrehandleDrawer />
           </NavigationContainer>
         </NativeBaseProvider>
       </Provider>

src/App.tsx

@@ -1,9 +1,25 @@
 {
   "extends": "@tsconfig/react-native/tsconfig.json",
   "compilerOptions": {
+    "lib": [
+      "es2019",
+      "es2020.bigint",
+      "es2020.date",
+      "es2020.number",
+      "es2020.promise",
+      "es2020.string",
+      "es2020.symbol.wellknown",
+      "es2021.promise",
+      "es2021.string",
+      "es2021.weakref",
+      "es2022.array",
+      "es2022.object",
+      "es2022.string",
+      "dom"
+    ],
     "baseUrl": "./" /* Base directory to resolve non-absolute module names. */,
     "paths": {
       "~/*": ["src/*"]
-    },
-  },
+    }
+  }
 }