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 app exits editor on focus keyboard
Ammar Ahmed339a15803c39
diff --git a/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/MainActivity.java b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/MainActivity.javaindex 43e46657a..d0e0d3504 100644--- a/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/MainActivity.java+++ b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/MainActivity.java@@ -32,19 +32,6 @@ public class MainActivity extends ReactActivity {startService(new Intent(getBaseContext(), OnClearFromRecentService.class));} catch (Exception ignored) {}- if (Build.VERSION.SDK_INT >= 35) {- final View rootView = findViewById(android.R.id.content);- ViewCompat.setOnApplyWindowInsetsListener(rootView, (v, insets) -> {- Insets innerPadding = insets.getInsets(WindowInsetsCompat.Type.ime());- rootView.setPadding(- innerPadding.left,- innerPadding.top,- innerPadding.right,- innerPadding.bottom- );- return insets;- });- }}/**diff --git a/apps/mobile/app/navigation/fluid-panels-view.tsx b/apps/mobile/app/navigation/fluid-panels-view.tsxindex 337736f63..e15b71c38 100644--- a/apps/mobile/app/navigation/fluid-panels-view.tsx+++ b/apps/mobile/app/navigation/fluid-panels-view.tsx@@ -108,13 +108,11 @@ export const FluidPanelsView = React.memo(}});- console.log(orientation);-useEffect(() => {if (!appLoading) {setTimeout(() => {setIsLoading(false);- }, 500);+ }, 200);}}, [appLoading]);@@ -226,9 +224,12 @@ export const FluidPanelsView = React.memo(editorState().movedAway === false &&useTabStore.getState().getCurrentNoteId()) {- fluidTabsRef.current?.goToIndex(2, false);+ fluidTabsRef.current?.goToPage("editor", false);} else {- fluidTabsRef.current?.goToIndex(1, false);+ fluidTabsRef.current?.goToPage(+ fluidTabsRef.current?.page(),+ false+ );}break;}@@ -239,6 +240,7 @@ export const FluidPanelsView = React.memo(const checkDeviceType = React.useCallback((size: { width: number; height: number }) => {+ if (DDS.width === size.width && orientation === DDS.orientation) return;DDS.setSize(size, orientation);const nextDeviceMode = DDS.isLargeTablet()? "tablet"diff --git a/apps/mobile/app/services/device-detection.js b/apps/mobile/app/services/device-detection.jsindex de626e4e6..7df8768fd 100644--- a/apps/mobile/app/services/device-detection.js+++ b/apps/mobile/app/services/device-detection.js@@ -50,6 +50,7 @@ export class DeviceDetectionService {windowSize = size || windowSize;this.width = windowSize.width;this.height = windowSize.height;+ this.orientation = orientation;this.adjustedWidth = this.width * this.pixelDensity;this.adjustedHeight = this.height * this.pixelDensity;screenSize = Dimensions.get("screen");diff --git a/apps/mobile/package-lock.json b/apps/mobile/package-lock.jsonindex 31f89d87e..5208abdb7 100644--- a/apps/mobile/package-lock.json+++ b/apps/mobile/package-lock.json@@ -1,12 +1,12 @@{"name": "@notesnook/mobile",- "version": "3.3.10-beta.2",+ "version": "3.3.10-beta.3","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "@notesnook/mobile",- "version": "3.3.10-beta.2",+ "version": "3.3.10-beta.3","hasInstallScript": true,"license": "GPL-3.0-or-later","dependencies": {@@ -97,7 +97,7 @@"react-native-keyboard-aware-scroll-view": "^0.9.5","react-native-keychain": "4.0.5","react-native-material-menu": "^2.0.0",- "react-native-mmkv-storage": "^12.0.0",+ "react-native-mmkv-storage": "^12.0.1","react-native-modal-datetime-picker": "14.0.0","react-native-navigation-bar-color": "2.0.2","react-native-notification-sounds": "0.5.5",@@ -108,7 +108,7 @@"react-native-progress": "5.0.0","react-native-qrcode-svg": "^6.0.6","react-native-quick-sqlite": "^8.2.7",- "react-native-reanimated": "^4.1.3",+ "react-native-reanimated": "^4.2.0","react-native-reanimated-progress-bar": "1.0.1","react-native-safe-area-context": "^5.6.1","react-native-scoped-storage": "^1.9.5",@@ -125,7 +125,7 @@"react-native-vector-icons": "10.3.0","react-native-webview": "^13.13.5","react-native-wheel-color-picker": "^1.3.1",- "react-native-worklets": "^0.6.1",+ "react-native-worklets": "^0.7.1","react-native-zip-archive": "6.0.9","timeago.js": "4.0.2","toggle-switch-react-native": "3.2.0",@@ -2001,6 +2001,7 @@"version": "7.28.5","resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.28.5.tgz","integrity": "sha512-N6fut9IZlPnjPwgiQkXNhb+cT8wQKFlJNqcZkWlcTqkcqx6/kU4ynGmLFoa4LViBSirn05YAwk+sQBbPfxtYzQ==",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.27.1",@@ -2483,16 +2484,16 @@}},"node_modules/@babel/preset-typescript": {- "version": "7.28.5",- "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.28.5.tgz",- "integrity": "sha512-+bQy5WOI2V6LJZpPVxY+yp66XdZ2yifu0Mc1aP5CQKgjn4QM5IN2i5fAZ4xKop47pr8rpVhiAeu+nDQa12C8+g==",+ "version": "7.27.1",+ "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.27.1.tgz",+ "integrity": "sha512-l7WfQfX0WK4M0v2RudjuQK4u99BS6yLHYEmdtVPP7lKV013zr9DygFuWNlnbvQ9LR+LS0Egz/XAvGx5U9MX0fQ==","license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.27.1","@babel/helper-validator-option": "^7.27.1","@babel/plugin-syntax-jsx": "^7.27.1","@babel/plugin-transform-modules-commonjs": "^7.27.1",- "@babel/plugin-transform-typescript": "^7.28.5"+ "@babel/plugin-transform-typescript": "^7.27.1"},"engines": {"node": ">=6.9.0"@@ -17655,13 +17656,10 @@}},"node_modules/react-native-mmkv-storage": {- "version": "12.0.0",- "resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-12.0.0.tgz",- "integrity": "sha512-sssZInILQBquytDDfjosjEdvevwMPk3fqQQjdjfnH362IcsBsApvtT8yJS406Mz9aJ6VhqVsZw/awltsUuPSYg==",+ "version": "12.0.1",+ "resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-12.0.1.tgz",+ "integrity": "sha512-4I4NzjStuCqkeXGfJ7pcACNQ2FlZKlAQqeRvI80iZL7mQcaO5NMO26ILUk2f4LPEvxaT2ns+NcqPMZSj7L83ng==","license": "MIT",- "bin": {- "mmkv-link": "autolink/postlink/run.js"- },"peerDependencies": {"react-native": "*"}@@ -17799,19 +17797,18 @@}},"node_modules/react-native-reanimated": {- "version": "4.1.3",- "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-4.1.3.tgz",- "integrity": "sha512-GP8wsi1u3nqvC1fMab/m8gfFwFyldawElCcUSBJQgfrXeLmsPPUOpDw44lbLeCpcwUuLa05WTVePdTEwCLTUZg==",+ "version": "4.2.0",+ "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-4.2.0.tgz",+ "integrity": "sha512-frhu5b8/m/VvaMWz48V8RxcsXnE3hrlErQ5chr21MzAeDCpY4X14sQjvm+jvu3aOI+7Cz2atdRpyhhIuqxVaXg==","license": "MIT","dependencies": {- "react-native-is-edge-to-edge": "^1.2.1",- "semver": "7.7.2"+ "react-native-is-edge-to-edge": "1.2.1",+ "semver": "7.7.3"},"peerDependencies": {- "@babel/core": "^7.0.0-0","react": "*","react-native": "*",- "react-native-worklets": ">=0.5.0"+ "react-native-worklets": ">=0.7.0"}},"node_modules/react-native-reanimated-progress-bar": {@@ -17826,9 +17823,9 @@}},"node_modules/react-native-reanimated/node_modules/semver": {- "version": "7.7.2",- "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",- "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",+ "version": "7.7.3",+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",+ "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==","license": "ISC","bin": {"semver": "bin/semver.js"@@ -18093,33 +18090,49 @@}},"node_modules/react-native-worklets": {- "version": "0.6.1",- "resolved": "https://registry.npmjs.org/react-native-worklets/-/react-native-worklets-0.6.1.tgz",- "integrity": "sha512-URca8l7c7Uog7gv4mcg9KILdJlnbvwdS5yfXQYf5TDkD2W1VY1sduEKrD+sA3lUPXH/TG1vmXAvNxCNwPMYgGg==",- "license": "MIT",- "dependencies": {- "@babel/plugin-transform-arrow-functions": "^7.0.0-0",- "@babel/plugin-transform-class-properties": "^7.0.0-0",- "@babel/plugin-transform-classes": "^7.0.0-0",- "@babel/plugin-transform-nullish-coalescing-operator": "^7.0.0-0",- "@babel/plugin-transform-optional-chaining": "^7.0.0-0",- "@babel/plugin-transform-shorthand-properties": "^7.0.0-0",- "@babel/plugin-transform-template-literals": "^7.0.0-0",- "@babel/plugin-transform-unicode-regex": "^7.0.0-0",- "@babel/preset-typescript": "^7.16.7",- "convert-source-map": "^2.0.0",- "semver": "7.7.2"+ "version": "0.7.1",+ "resolved": "https://registry.npmjs.org/react-native-worklets/-/react-native-worklets-0.7.1.tgz",+ "integrity": "sha512-KNsvR48ULg73QhTlmwPbdJLPsWcyBotrGPsrDRDswb5FYpQaJEThUKc2ncXE4UM5dn/ewLoQHjSjLaKUVPxPhA==",+ "license": "MIT",+ "dependencies": {+ "@babel/plugin-transform-arrow-functions": "7.27.1",+ "@babel/plugin-transform-class-properties": "7.27.1",+ "@babel/plugin-transform-classes": "7.28.4",+ "@babel/plugin-transform-nullish-coalescing-operator": "7.27.1",+ "@babel/plugin-transform-optional-chaining": "7.27.1",+ "@babel/plugin-transform-shorthand-properties": "7.27.1",+ "@babel/plugin-transform-template-literals": "7.27.1",+ "@babel/plugin-transform-unicode-regex": "7.27.1",+ "@babel/preset-typescript": "7.27.1",+ "convert-source-map": "2.0.0",+ "semver": "7.7.3"},"peerDependencies": {- "@babel/core": "^7.0.0-0",+ "@babel/core": "*","react": "*","react-native": "*"}},+ "node_modules/react-native-worklets/node_modules/@babel/plugin-transform-optional-chaining": {+ "version": "7.27.1",+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.27.1.tgz",+ "integrity": "sha512-BQmKPPIuc8EkZgNKsv0X4bPmOoayeu4F1YCwx2/CfmDSXDbp7GnzlUH+/ul5VGfRg1AoFPsrIThlEBj2xb4CAg==",+ "license": "MIT",+ "dependencies": {+ "@babel/helper-plugin-utils": "^7.27.1",+ "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"+ },+ "engines": {+ "node": ">=6.9.0"+ },+ "peerDependencies": {+ "@babel/core": "^7.0.0-0"+ }+ },"node_modules/react-native-worklets/node_modules/semver": {- "version": "7.7.2",- "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",- "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",+ "version": "7.7.3",+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",+ "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==","license": "ISC","bin": {"semver": "bin/semver.js"diff --git a/apps/mobile/package.json b/apps/mobile/package.jsonindex f1bd29019..760642823 100644--- a/apps/mobile/package.json+++ b/apps/mobile/package.json@@ -113,7 +113,7 @@"react-native-keyboard-aware-scroll-view": "^0.9.5","react-native-keychain": "4.0.5","react-native-material-menu": "^2.0.0",- "react-native-mmkv-storage": "^12.0.0",+ "react-native-mmkv-storage": "^12.0.1","react-native-modal-datetime-picker": "14.0.0","react-native-navigation-bar-color": "2.0.2","react-native-notification-sounds": "0.5.5",@@ -124,7 +124,7 @@"react-native-progress": "5.0.0","react-native-qrcode-svg": "^6.0.6","react-native-quick-sqlite": "^8.2.7",- "react-native-reanimated": "^4.1.3",+ "react-native-reanimated": "^4.2.0","react-native-reanimated-progress-bar": "1.0.1","react-native-safe-area-context": "^5.6.1","react-native-scoped-storage": "^1.9.5",@@ -141,7 +141,7 @@"react-native-vector-icons": "10.3.0","react-native-webview": "^13.13.5","react-native-wheel-color-picker": "^1.3.1",- "react-native-worklets": "^0.6.1",+ "react-native-worklets": "^0.7.1","react-native-zip-archive": "6.0.9","timeago.js": "4.0.2","toggle-switch-react-native": "3.2.0",