diff --git a/apps/mobile/app/components/side-menu/side-menu-home.tsx b/apps/mobile/app/components/side-menu/side-menu-home.tsx index 89de84521..a21bddbc1 100644 --- a/apps/mobile/app/components/side-menu/side-menu-home.tsx +++ b/apps/mobile/app/components/side-menu/side-menu-home.tsx @@ -18,8 +18,8 @@ along with this program. If not, see . */ import { strings } from "@notesnook/intl"; import { useThemeColors } from "@notesnook/theme"; -import React from "react"; -import { View } from "react-native"; +import React, { Fragment } from "react"; +import { FlatList, View } from "react-native"; import { DraxProvider, DraxScrollView } from "react-native-drax"; import { db } from "../../common/database"; import { useMenuStore } from "../../stores/use-menu-store"; @@ -74,50 +74,55 @@ export function SideMenuHome() { {!isAppLoading && introCompleted ? ( - } + data={[0]} + keyboardDismissMode="interactive" + keyboardShouldPersistTaps="handled" + keyExtractor={() => "scroll-items"} + renderItem={() => ( + <> + { + db.settings.setSideBarOrder("routes", data); + }} + onHiddenItemsChanged={(data) => { + db.settings.setSideBarHiddenItems("routes", data); + }} + itemOrder={order} + hiddenItems={hiddensItems} + alwaysBounceVertical={false} + data={MenuItemsList} + style={{ + width: "100%" + }} + showsVerticalScrollIndicator={false} + renderDraggableItem={({ item, index }) => { + return ( + + ); + }} + /> + + + + )} style={{ paddingHorizontal: DefaultAppStyles.GAP }} - > - { - db.settings.setSideBarOrder("routes", data); - }} - onHiddenItemsChanged={(data) => { - db.settings.setSideBarHiddenItems("routes", data); - }} - itemOrder={order} - hiddenItems={hiddensItems} - alwaysBounceVertical={false} - data={MenuItemsList} - style={{ - width: "100%" - }} - contentContainerStyle={{ - gap: 2 - }} - showsVerticalScrollIndicator={false} - renderDraggableItem={({ item, index }) => { - return ( - - ); - }} - /> - - - + nestedScrollEnabled={false} + /> ) : null} diff --git a/apps/mobile/native/globals.js b/apps/mobile/native/globals.js index c5fdbd861..5a9359e62 100644 --- a/apps/mobile/native/globals.js +++ b/apps/mobile/native/globals.js @@ -28,18 +28,6 @@ setI18nGlobal(i18n); i18n.activate("en"); setI18nGlobal(i18n); -if (global.__DEV__) { - const err = console.error; - console.error = function (message) { - if (typeof message === 'string' && message.includes('VirtualizedLists should never be')) { - err.apply(console, ["VirtualizedLists should never be nested inside plain ScrollViews"]); - return; - } - err.apply(console, arguments); - }; -} - - try { ScriptManager.shared.addResolver(async (scriptId) => { // `scriptId` will be either 'student' or 'teacher'