A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
mobile: fix login 2fa sheet gets blocked by keyboard
Ammar Ahmeddd67b1a80318
diff --git a/apps/mobile/app/components/attachments/index.tsx b/apps/mobile/app/components/attachments/index.tsxindex 1d6458c51..6ad64f2ca 100644--- a/apps/mobile/app/components/attachments/index.tsx+++ b/apps/mobile/app/components/attachments/index.tsx@@ -355,6 +355,7 @@ export const AttachmentDialog = ({ note }: { note?: Note }) => {AttachmentDialog.present = (note?: Note) => {presentSheet({- component: () => <AttachmentDialog note={note} />+ component: () => <AttachmentDialog note={note} />,+ keyboardHandlerDisabled: true});};diff --git a/apps/mobile/app/components/auth/login.js b/apps/mobile/app/components/auth/login.jsindex 70d27b482..33221dc0b 100644--- a/apps/mobile/app/components/auth/login.js+++ b/apps/mobile/app/components/auth/login.js@@ -17,12 +17,16 @@ You should have received a copy of the GNU General Public Licensealong with this program. If not, see <http://www.gnu.org/licenses/>.*/+import { useThemeColors } from "@notesnook/theme";import React, { useEffect, useState } from "react";import { TouchableOpacity, View, useWindowDimensions } from "react-native";import { SheetManager } from "react-native-actions-sheet";import { DDS } from "../../services/device-detection";import { eSendEvent } from "../../services/event-manager";-import { useThemeColors } from "@notesnook/theme";+import Sync from "../../services/sync";+import { useSettingStore } from "../../stores/use-setting-store";+import { useUserStore } from "../../stores/use-user-store";+import { eUserLoggedIn } from "../../utils/events";import { SIZE } from "../../utils/size";import { sleep } from "../../utils/time";import SheetProvider from "../sheet-provider";@@ -34,11 +38,6 @@ import Paragraph from "../ui/typography/paragraph";import { hideAuth } from "./common";import { ForgotPassword } from "./forgot-password";import { useLogin } from "./use-login";-import { useSettingStore } from "../../stores/use-setting-store";-import { eUserLoggedIn } from "../../utils/events";-import { useUserStore } from "../../stores/use-user-store";-import Sync from "../../services/sync";-import { Notice } from "../ui/notice";const LoginSteps = {emailAuth: 1,@@ -184,7 +183,11 @@ export const Login = ({ changeMode }) => {defaultValue={email.current}editable={step === LoginSteps.emailAuth && !loading}onSubmit={() => {- passwordInputRef.current?.focus();+ if (step === LoginSteps.emailAuth) {+ login();+ } else {+ passwordInputRef.current?.focus();+ }}}/>@@ -243,6 +246,7 @@ export const Login = ({ changeMode }) => {width: 250,borderRadius: 100}}+ height={50}fontSize={SIZE.md}type="accent"title={!loading ? "Continue" : null}diff --git a/apps/mobile/app/components/auth/two-factor.js b/apps/mobile/app/components/auth/two-factor.jsindex 8bd69a3a3..ed9a95ca6 100644--- a/apps/mobile/app/components/auth/two-factor.js+++ b/apps/mobile/app/components/auth/two-factor.js@@ -37,6 +37,7 @@ import Seperator from "../ui/seperator";import Heading from "../ui/typography/heading";import Paragraph from "../ui/typography/paragraph";import { useCallback } from "react";+import { ScrollView } from "react-native-actions-sheet";const TwoFactorVerification = ({ onMfaLogin, mfaInfo }) => {const { colors } = useThemeColors();@@ -143,7 +144,10 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo }) => {}, [currentMethod.method, mfaInfo.token, seconds, sending, start]);return (- <View>+ <ScrollView+ keyboardShouldPersistTaps="handled"+ keyboardDismissMode="interactive"+ ><Viewstyle={{alignItems: "center",@@ -214,6 +218,7 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo }) => {code.current = value;//onNext();}}+ onSubmitEditing={onNext}caretHiddeninputStyle={{fontSize: SIZE.lg,@@ -225,6 +230,7 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo }) => {keyboardType={currentMethod.method === "recoveryCode" ? "default" : "numeric"}+ enablesReturnKeyAutomaticallycontainerStyle={{height: 60,borderWidth: 0,@@ -297,7 +303,7 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo }) => {</>)}</View>- </View>+ </ScrollView>);};