mirror of
https://github.com/streetwriters/notesnook.git
synced 2026-08-29 10:09:26 +02:00
Compare commits
251 Commits
fix-androi
...
fix-image-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5292f39b97 | ||
|
|
2447acca03 | ||
|
|
efa73a1c32 | ||
|
|
00250c6669 | ||
|
|
d11afda1a8 | ||
|
|
1350784c33 | ||
|
|
1852a216a2 | ||
|
|
422c2492c4 | ||
|
|
c9c72741b3 | ||
|
|
99dbcaff7d | ||
|
|
8d83f5474d | ||
|
|
a912a1a22e | ||
|
|
ea7afbe93e | ||
|
|
7b2a8c3e20 | ||
|
|
911adfc151 | ||
|
|
23f710856e | ||
|
|
7f6274821c | ||
|
|
4700843517 | ||
|
|
8823054227 | ||
|
|
7c63a3e004 | ||
|
|
2a59154268 | ||
|
|
ed15d53484 | ||
|
|
fc8a4bb55d | ||
|
|
dd1c1bb11d | ||
|
|
3ffbad5727 | ||
|
|
207ae39d13 | ||
|
|
ae141ac9c5 | ||
|
|
40f058b14b | ||
|
|
865c9f3e32 | ||
|
|
26df9bfdd8 | ||
|
|
1e52e01fb8 | ||
|
|
5fece5faaa | ||
|
|
d7fdaf6c46 | ||
|
|
8e1faf9f60 | ||
|
|
9dce39b32d | ||
|
|
80a0b75887 | ||
|
|
c9704e1031 | ||
|
|
31e32cd154 | ||
|
|
61c296fc37 | ||
|
|
c8d38235b2 | ||
|
|
b717a64607 | ||
|
|
0f2b1d3e14 | ||
|
|
4abefe63db | ||
|
|
fc31b2a8d7 | ||
|
|
2708bac4fb | ||
|
|
a47967dd53 | ||
|
|
53ba5562d3 | ||
|
|
347df32943 | ||
|
|
ac8c63526b | ||
|
|
a48bd360ca | ||
|
|
f476969e9e | ||
|
|
c45539dea6 | ||
|
|
d8f5815b84 | ||
|
|
2eaf07118a | ||
|
|
b636b09a96 | ||
|
|
c16bbcaad5 | ||
|
|
49ffcbea03 | ||
|
|
f772cf0f14 | ||
|
|
3f1406a05b | ||
|
|
21760b2b74 | ||
|
|
d8011f0239 | ||
|
|
b9a8b054e2 | ||
|
|
2ab321869e | ||
|
|
fcb45a24d6 | ||
|
|
7cdb13def6 | ||
|
|
2ab58f9203 | ||
|
|
df74448e17 | ||
|
|
ada98fca93 | ||
|
|
1d3650659f | ||
|
|
9b43af475b | ||
|
|
d9c592c7fb | ||
|
|
f10ac9fbb5 | ||
|
|
b7334c09d4 | ||
|
|
0cd3bd5739 | ||
|
|
33d69480eb | ||
|
|
5cae4eb0d9 | ||
|
|
840c7fda5e | ||
|
|
4ce24ac8fd | ||
|
|
ae9e80e12e | ||
|
|
43356e5b6a | ||
|
|
7b13f35424 | ||
|
|
0517c6ce41 | ||
|
|
54d06328c1 | ||
|
|
c74677acd4 | ||
|
|
7689e1a7c5 | ||
|
|
5ffae2a08b | ||
|
|
5fa80abdc8 | ||
|
|
a30598fedf | ||
|
|
48ffecfb5f | ||
|
|
89fe712104 | ||
|
|
5dd298ee86 | ||
|
|
275b285a8b | ||
|
|
96310a46e9 | ||
|
|
42f9bf1593 | ||
|
|
25aab6913a | ||
|
|
3bd7da68be | ||
|
|
a218738eff | ||
|
|
8bf283b3bc | ||
|
|
cb09430ff4 | ||
|
|
66d75492bb | ||
|
|
d772d38dc7 | ||
|
|
46a74f9512 | ||
|
|
7df1037e3f | ||
|
|
5c3136d07d | ||
|
|
6a9ddb770e | ||
|
|
f4c54fd27f | ||
|
|
05b12df7d7 | ||
|
|
dcf053eede | ||
|
|
5430966b02 | ||
|
|
7271140627 | ||
|
|
eb5ae0773b | ||
|
|
9661dd0c5e | ||
|
|
8e70860918 | ||
|
|
3540ecf4ab | ||
|
|
f1dba9ffc2 | ||
|
|
3f1761a540 | ||
|
|
a25d21038a | ||
|
|
d55a6a6fc0 | ||
|
|
e5cf902780 | ||
|
|
a99996fcf6 | ||
|
|
0cc9c31bc3 | ||
|
|
62da8484ad | ||
|
|
821b8eebaa | ||
|
|
269941c297 | ||
|
|
e37ff88f1f | ||
|
|
1a1b4bc43c | ||
|
|
2c59df9fb7 | ||
|
|
4fc30cc224 | ||
|
|
9bd7d392af | ||
|
|
3bcd288bc7 | ||
|
|
3b86e51c49 | ||
|
|
c286b1d595 | ||
|
|
2f6b1e6bcc | ||
|
|
abb918e179 | ||
|
|
dd0dc09977 | ||
|
|
211ab47165 | ||
|
|
bc44e28e1e | ||
|
|
ade60e4272 | ||
|
|
3f5bfcb499 | ||
|
|
782a979397 | ||
|
|
e7f1e2d533 | ||
|
|
12e5f2acc1 | ||
|
|
dccc79ace3 | ||
|
|
a9a5ba09ff | ||
|
|
a6c8bbbf0a | ||
|
|
e19e9eb96f | ||
|
|
9208140b97 | ||
|
|
8241bb8ae5 | ||
|
|
329c2e220f | ||
|
|
140e343289 | ||
|
|
0d99367a93 | ||
|
|
b802b3e165 | ||
|
|
46583e12d9 | ||
|
|
c9a3f31e8f | ||
|
|
53f68aaf81 | ||
|
|
f31df9a6cc | ||
|
|
c812581bb9 | ||
|
|
1e6e940f17 | ||
|
|
9ab670d933 | ||
|
|
c46e57418b | ||
|
|
83557401f5 | ||
|
|
2277644e89 | ||
|
|
5eb09a1d3e | ||
|
|
d957be7a7b | ||
|
|
44ddb49d0e | ||
|
|
24fcd5cd0c | ||
|
|
2a34225d49 | ||
|
|
e81c825fc7 | ||
|
|
c80286b587 | ||
|
|
e85f8b60b0 | ||
|
|
5daa99d969 | ||
|
|
073bb576b5 | ||
|
|
eaeac130df | ||
|
|
b21519c24e | ||
|
|
4f9fe9b1e0 | ||
|
|
f657380ec7 | ||
|
|
05b2e559d8 | ||
|
|
ab21f02c2d | ||
|
|
12b51ed72a | ||
|
|
b672fd540c | ||
|
|
95a20b3740 | ||
|
|
6f5a7a4923 | ||
|
|
1b4d98ac0e | ||
|
|
ef2ed2bba0 | ||
|
|
abf4612977 | ||
|
|
9c6637908d | ||
|
|
e1006ed501 | ||
|
|
7d034f7f16 | ||
|
|
76eec5f8bb | ||
|
|
698866f53d | ||
|
|
21e1e73bee | ||
|
|
52e89c7842 | ||
|
|
8b357559fa | ||
|
|
2be35fadff | ||
|
|
5fe366f4f3 | ||
|
|
a13cbadd44 | ||
|
|
aa993a2fce | ||
|
|
975af5701b | ||
|
|
3add56cfe4 | ||
|
|
522ea1520d | ||
|
|
c680121eb0 | ||
|
|
a9de0696c9 | ||
|
|
4a4c52e4c8 | ||
|
|
92f5e04788 | ||
|
|
0cad098551 | ||
|
|
46105b2175 | ||
|
|
8ffbda9626 | ||
|
|
1fc55a69c9 | ||
|
|
c417d4df91 | ||
|
|
43ccf72773 | ||
|
|
a177d36571 | ||
|
|
4428ccd3a0 | ||
|
|
218ffbd758 | ||
|
|
5ace95c9d1 | ||
|
|
77a2f86119 | ||
|
|
71db85458d | ||
|
|
0be59c71de | ||
|
|
2357e3de0b | ||
|
|
53b89a59ed | ||
|
|
202c9135c2 | ||
|
|
69e6263d34 | ||
|
|
ebe830bbcc | ||
|
|
44bb9752d2 | ||
|
|
2f6af50fe2 | ||
|
|
1d80ca7d3c | ||
|
|
d33baebac8 | ||
|
|
25aaef361a | ||
|
|
f3af39a093 | ||
|
|
149c2013a2 | ||
|
|
8fb0b6f94a | ||
|
|
f09e5cadcf | ||
|
|
724c69655b | ||
|
|
800f3ca5d3 | ||
|
|
193007370a | ||
|
|
c8aff3764b | ||
|
|
d72b502977 | ||
|
|
263c970320 | ||
|
|
aeebc9878d | ||
|
|
4f37c92ecd | ||
|
|
3180a88ef0 | ||
|
|
6672db6ac2 | ||
|
|
b6da62469e | ||
|
|
e67e6374c3 | ||
|
|
ff1fc5b391 | ||
|
|
2f8bf191aa | ||
|
|
c4af2b2159 | ||
|
|
690b157387 | ||
|
|
5a276a43a4 | ||
|
|
a364ae2e9d | ||
|
|
1e2055c81b | ||
|
|
31d110252c |
@@ -14,6 +14,8 @@ runs:
|
||||
apps/mobile/package-lock.json
|
||||
apps/desktop/package-lock.json
|
||||
apps/web/package-lock.json
|
||||
apps/monograph/package-lock.json
|
||||
apps/theme-builder/package-lock.json
|
||||
extensions/web-clipper/package-lock.json
|
||||
packages/core/package-lock.json
|
||||
packages/crypto/package-lock.json
|
||||
@@ -24,3 +26,4 @@ runs:
|
||||
packages/logger/package-lock.json
|
||||
packages/streamable-fs/package-lock.json
|
||||
packages/theme/package-lock.json
|
||||
packages/intl/package-lock.json
|
||||
|
||||
2
.github/workflows/android.publish.yml
vendored
2
.github/workflows/android.publish.yml
vendored
@@ -4,7 +4,7 @@ on: workflow_dispatch
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-22.04
|
||||
timeout-minutes: 40
|
||||
env:
|
||||
CMAKE_C_COMPILER_LAUNCHER: ccache
|
||||
|
||||
2
.github/workflows/core.tests.yml
vendored
2
.github/workflows/core.tests.yml
vendored
@@ -18,7 +18,7 @@ on:
|
||||
|
||||
jobs:
|
||||
test:
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-22.04
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
18
.github/workflows/desktop.publish.yml
vendored
18
.github/workflows/desktop.publish.yml
vendored
@@ -37,7 +37,7 @@ on:
|
||||
jobs:
|
||||
build:
|
||||
name: Build
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
@@ -49,6 +49,13 @@ jobs:
|
||||
run: |
|
||||
npm ci --ignore-scripts --prefer-offline --no-audit
|
||||
npm run bootstrap -- --scope=web
|
||||
npm run bootstrap -- --scope=desktop
|
||||
|
||||
- name: Install sqlite-better-trigram for all arch
|
||||
run: |
|
||||
npm i --cpu arm64 sqlite-better-trigram
|
||||
npm i --cpu x64 sqlite-better-trigram
|
||||
working-directory: ./apps/desktop
|
||||
|
||||
- name: Setup environment
|
||||
run: |
|
||||
@@ -57,6 +64,10 @@ jobs:
|
||||
- name: Generate desktop build
|
||||
run: npx nx build:desktop @notesnook/web
|
||||
|
||||
- name: Build desktop bundle
|
||||
working-directory: ./apps/desktop
|
||||
run: npm run bundle
|
||||
|
||||
- name: Archive build artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
@@ -71,7 +82,8 @@ jobs:
|
||||
|
||||
- name: Package desktop build
|
||||
run: |
|
||||
zip -r ./notesnook_build_v${{ steps.app_metadata.outputs.app_version }}.zip ./apps/web/build/
|
||||
cp -r ./apps/web/build ./apps/desktop/
|
||||
zip -r ./notesnook_build_v${{ steps.app_metadata.outputs.app_version }}.zip ./apps/desktop/build/
|
||||
echo "Build folder archived to ./notesnook_build_v${{ steps.app_metadata.outputs.app_version }}.zip"
|
||||
|
||||
- name: Upload desktop build
|
||||
@@ -87,7 +99,7 @@ jobs:
|
||||
- name: Generate flatpak sources
|
||||
if: inputs.publish-github && inputs.build-linux
|
||||
run: |
|
||||
sudo apt-get install -y flatpak flatpak-builder pipx
|
||||
sudo apt-get install -y --quiet flatpak flatpak-builder pipx
|
||||
git clone https://github.com/flatpak/flatpak-builder-tools.git /tmp/flatpak-builder-tools
|
||||
cd /tmp/flatpak-builder-tools/node
|
||||
pipx install .
|
||||
|
||||
4
.github/workflows/desktop.tests.yml
vendored
4
.github/workflows/desktop.tests.yml
vendored
@@ -14,7 +14,7 @@ on:
|
||||
jobs:
|
||||
build:
|
||||
name: Build
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
@@ -133,7 +133,7 @@ jobs:
|
||||
test-linux:
|
||||
name: Test for Linux
|
||||
needs: build
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-22.04
|
||||
|
||||
steps:
|
||||
- name: Check out Git repository
|
||||
|
||||
2
.github/workflows/editor.tests.yml
vendored
2
.github/workflows/editor.tests.yml
vendored
@@ -19,7 +19,7 @@ on:
|
||||
jobs:
|
||||
build:
|
||||
name: Build
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
2
.github/workflows/help.publish.yml
vendored
2
.github/workflows/help.publish.yml
vendored
@@ -11,7 +11,7 @@ on:
|
||||
jobs:
|
||||
build:
|
||||
name: Build
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
2
.github/workflows/monograph.publish.yml
vendored
2
.github/workflows/monograph.publish.yml
vendored
@@ -14,7 +14,7 @@ on: workflow_dispatch
|
||||
jobs:
|
||||
push_to_registry:
|
||||
name: Push Docker image to Docker Hub
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-22.04
|
||||
permissions:
|
||||
packages: write
|
||||
contents: read
|
||||
|
||||
2
.github/workflows/theme-builder.publish.yml
vendored
2
.github/workflows/theme-builder.publish.yml
vendored
@@ -5,7 +5,7 @@ on: workflow_dispatch
|
||||
jobs:
|
||||
build:
|
||||
name: Build
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
2
.github/workflows/vericrypt.publish.yml
vendored
2
.github/workflows/vericrypt.publish.yml
vendored
@@ -5,7 +5,7 @@ on: workflow_dispatch
|
||||
jobs:
|
||||
build:
|
||||
name: Build
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
2
.github/workflows/web.benchmarks.yml
vendored
2
.github/workflows/web.benchmarks.yml
vendored
@@ -14,7 +14,7 @@ on:
|
||||
jobs:
|
||||
bench:
|
||||
name: Bench
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
2
.github/workflows/web.publish.yml
vendored
2
.github/workflows/web.publish.yml
vendored
@@ -5,7 +5,7 @@ on: workflow_dispatch
|
||||
jobs:
|
||||
build:
|
||||
name: Build
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
4
.github/workflows/web.tests.yml
vendored
4
.github/workflows/web.tests.yml
vendored
@@ -19,7 +19,7 @@ on:
|
||||
jobs:
|
||||
build:
|
||||
name: Build
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
@@ -49,7 +49,7 @@ jobs:
|
||||
name: 🧪 Test (${{ matrix.shard }}/${{ strategy.job-total }})
|
||||
strategy:
|
||||
matrix:
|
||||
shard: [1, 2, 3, 4]
|
||||
shard: [1, 2, 3, 4, 5]
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -11,3 +11,4 @@ nx-cloud.env
|
||||
site
|
||||
node_modules.backup
|
||||
.nx
|
||||
*.patch
|
||||
|
||||
Binary file not shown.
1127
apps/desktop/package-lock.json
generated
1127
apps/desktop/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -2,7 +2,7 @@
|
||||
"name": "@notesnook/desktop",
|
||||
"productName": "Notesnook",
|
||||
"description": "Your private note taking space",
|
||||
"version": "3.0.23",
|
||||
"version": "3.0.28",
|
||||
"appAppleId": "1544027013",
|
||||
"private": true,
|
||||
"main": "./dist/cjs/index.js",
|
||||
@@ -25,7 +25,7 @@
|
||||
"repository": "https://github.com/streetwriters/notesnook",
|
||||
"license": "GPL-3.0-or-later",
|
||||
"dependencies": {
|
||||
"@lingui/core": "4.11.4",
|
||||
"@lingui/core": "5.1.2",
|
||||
"@notesnook/intl": "file:../../packages/intl",
|
||||
"@trpc/client": "10.45.2",
|
||||
"@trpc/server": "10.45.2",
|
||||
@@ -33,10 +33,10 @@
|
||||
"electron-trpc": "0.6.1",
|
||||
"electron-updater": "^6.3.4",
|
||||
"icojs": "^0.19.4",
|
||||
"sqlite-better-trigram": "^0.0.2",
|
||||
"sqlite-better-trigram": "0.0.2",
|
||||
"typed-emitter": "^2.1.0",
|
||||
"yargs": "^17.7.2",
|
||||
"zod": "^3.23.8"
|
||||
"zod": "3.23.8"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@streetwriters/kysely": "^0.27.4",
|
||||
@@ -45,15 +45,15 @@
|
||||
"chokidar": "^4.0.1",
|
||||
"electron": "^31.7.4",
|
||||
"electron-builder": "^25.1.8",
|
||||
"esbuild": "^0.24.0",
|
||||
"esbuild": "0.21.5",
|
||||
"vitest": "2.1.8",
|
||||
"node-abi": "^3.68.0",
|
||||
"node-gyp-build": "^4.8.2",
|
||||
"playwright": "^1.48.2",
|
||||
"prebuildify": "^6.0.1",
|
||||
"slugify": "^1.6.6",
|
||||
"slugify": "1.6.6",
|
||||
"tree-kill": "^1.2.2",
|
||||
"undici": "^6.19.8",
|
||||
"vitest": "^2.1.5"
|
||||
"undici": "^6.19.8"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"dmg-license": "^1.0.11"
|
||||
|
||||
@@ -36,7 +36,7 @@ await fs.rm("./build/", { force: true, recursive: true });
|
||||
|
||||
if (args.rebuild || !existsSync(path.join(webAppPath, "build"))) {
|
||||
await exec(
|
||||
"yarn nx build:desktop @notesnook/web",
|
||||
"npx nx build:desktop @notesnook/web",
|
||||
path.join(__dirname, "..", "..", "..")
|
||||
);
|
||||
}
|
||||
@@ -58,11 +58,13 @@ if (args.variant === "mas") {
|
||||
await exec(`yarn run build`);
|
||||
|
||||
if (args.run) {
|
||||
await exec(`yarn electron-builder --dir --x64`);
|
||||
await exec(`yarn electron-builder --dir --${process.arch}`);
|
||||
if (process.platform === "win32") {
|
||||
await exec(`.\\output\\win-unpacked\\Notesnook.exe`);
|
||||
} else if (process.platform === "darwin") {
|
||||
await exec(`./output/mac/Notesnook.app/Contents/MacOS/Notesnook`);
|
||||
if (process.arch === "arm64")
|
||||
await exec(`./output/mac-arm64/Notesnook.app/Contents/MacOS/Notesnook`);
|
||||
else await exec(`./output/mac/Notesnook.app/Contents/MacOS/Notesnook`);
|
||||
} else {
|
||||
await exec(`./output/linux-unpacked/Notesnook`);
|
||||
}
|
||||
|
||||
@@ -70,8 +70,8 @@ async function onChange(first) {
|
||||
|
||||
if (first) {
|
||||
await spawnAndWaitUntil(
|
||||
["yarn", "nx", "start:desktop", "@notesnook/web"],
|
||||
path.join(__dirname, "..", "..", ".."),
|
||||
["npm", "run", "start:desktop"],
|
||||
path.join(__dirname, "..", "..", "web"),
|
||||
(data) => data.includes("Network: use --host to expose")
|
||||
);
|
||||
}
|
||||
|
||||
@@ -32,6 +32,7 @@ import { withErrorBoundry } from "./components/exception-handler";
|
||||
import GlobalSafeAreaProvider from "./components/globalsafearea";
|
||||
import { useAppEvents } from "./hooks/use-app-events";
|
||||
import { ApplicationHolder } from "./navigation";
|
||||
import { NotePreviewConfigure } from "./screens/note-preview-configure";
|
||||
import { themeTrpcClient } from "./screens/settings/theme-selector";
|
||||
import Notifications from "./services/notifications";
|
||||
import SettingsService from "./services/settings";
|
||||
@@ -47,7 +48,7 @@ if (appLockEnabled || appLockMode !== "none") {
|
||||
useUserStore.getState().lockApp(true);
|
||||
}
|
||||
|
||||
const App = () => {
|
||||
const App = (props: { configureMode: "note-preview" }) => {
|
||||
useAppEvents();
|
||||
//@ts-ignore
|
||||
globalThis["IS_MAIN_APP_RUNNING"] = true;
|
||||
@@ -61,6 +62,7 @@ const App = () => {
|
||||
TipManager.init();
|
||||
}, 100);
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<View
|
||||
style={{
|
||||
@@ -90,7 +92,11 @@ const App = () => {
|
||||
width: "100%"
|
||||
}}
|
||||
>
|
||||
<ApplicationHolder />
|
||||
{props.configureMode === "note-preview" ? (
|
||||
<NotePreviewConfigure />
|
||||
) : (
|
||||
<ApplicationHolder />
|
||||
)}
|
||||
</GestureHandlerRootView>
|
||||
<AppLockedOverlay />
|
||||
</View>
|
||||
@@ -103,8 +109,8 @@ let currTheme =
|
||||
: SettingsService.getProperty("lighTheme");
|
||||
useThemeEngineStore.getState().setTheme(currTheme);
|
||||
|
||||
export const withTheme = (Element: () => JSX.Element) => {
|
||||
return function AppWithThemeProvider() {
|
||||
export const withTheme = (Element: (props: any) => JSX.Element) => {
|
||||
return function AppWithThemeProvider(props: any) {
|
||||
const [colorScheme, darkTheme, lightTheme] = useThemeStore((state) => [
|
||||
state.colorScheme,
|
||||
state.darkTheme,
|
||||
@@ -123,13 +129,14 @@ export const withTheme = (Element: () => JSX.Element) => {
|
||||
})
|
||||
.then((theme) => {
|
||||
if (theme) {
|
||||
console.log(theme.version, "theme updated");
|
||||
theme.colorScheme === "dark"
|
||||
? useThemeStore.getState().setDarkTheme(theme)
|
||||
: useThemeStore.getState().setLightTheme(theme);
|
||||
}
|
||||
})
|
||||
.catch(console.log);
|
||||
.catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
}, 1000);
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, []);
|
||||
@@ -144,7 +151,7 @@ export const withTheme = (Element: () => JSX.Element) => {
|
||||
|
||||
return (
|
||||
<I18nProvider i18n={i18n}>
|
||||
<Element />
|
||||
<Element {...props} />
|
||||
</I18nProvider>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -126,7 +126,6 @@ export async function setAppLockVerificationCipher(appLockPassword: string) {
|
||||
DatabaseLogger.info("setAppLockVerificationCipher");
|
||||
} catch (e) {
|
||||
DatabaseLogger.error(e);
|
||||
console.log(e);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -159,79 +158,77 @@ export function clearDatabaseKey() {
|
||||
|
||||
export async function getDatabaseKey(appLockPassword?: string) {
|
||||
if (DB_KEY) return DB_KEY;
|
||||
try {
|
||||
if (appLockPassword) {
|
||||
const databaseKeyCipher: Cipher =
|
||||
CipherStorage.getMap("databaseKeyCipher");
|
||||
const databaseKey = await decrypt(
|
||||
{
|
||||
password: appLockPassword
|
||||
},
|
||||
databaseKeyCipher
|
||||
);
|
||||
DatabaseLogger.info("Getting database key from cipher");
|
||||
DB_KEY = databaseKey;
|
||||
}
|
||||
if (appLockPassword) {
|
||||
const databaseKeyCipher: Cipher = CipherStorage.getMap("databaseKeyCipher");
|
||||
const databaseKey = await decrypt(
|
||||
{
|
||||
password: appLockPassword
|
||||
},
|
||||
databaseKeyCipher
|
||||
);
|
||||
DatabaseLogger.info("Getting database key from cipher");
|
||||
DB_KEY = databaseKey;
|
||||
}
|
||||
|
||||
if (!DB_KEY) {
|
||||
const hasKey = await Keychain.hasInternetCredentials(
|
||||
if (!DB_KEY) {
|
||||
const hasKey = await Keychain.hasInternetCredentials(KEYCHAIN_SERVER_DBKEY);
|
||||
if (hasKey) {
|
||||
const credentials = await Keychain.getInternetCredentials(
|
||||
KEYCHAIN_SERVER_DBKEY
|
||||
);
|
||||
if (hasKey) {
|
||||
const credentials = await Keychain.getInternetCredentials(
|
||||
KEYCHAIN_SERVER_DBKEY
|
||||
);
|
||||
|
||||
DatabaseLogger.info("Getting database key from Keychain");
|
||||
DB_KEY = (credentials as Keychain.UserCredentials).password;
|
||||
}
|
||||
DatabaseLogger.info("Getting database key from Keychain");
|
||||
DB_KEY = (credentials as Keychain.UserCredentials).password;
|
||||
}
|
||||
|
||||
if (!DB_KEY) {
|
||||
DatabaseLogger.info("Generating new database key");
|
||||
const password = generatePassword();
|
||||
const derivedDatabaseKey = await Sodium.deriveKey(
|
||||
password,
|
||||
NOTESNOOK_DB_KEY_SALT
|
||||
);
|
||||
|
||||
DB_KEY = derivedDatabaseKey.key as string;
|
||||
|
||||
await Keychain.setInternetCredentials(
|
||||
KEYCHAIN_SERVER_DBKEY,
|
||||
"notesnook",
|
||||
DB_KEY,
|
||||
KEYSTORE_CONFIG
|
||||
);
|
||||
}
|
||||
|
||||
if (await Keychain.hasInternetCredentials("notesnook")) {
|
||||
const userKeyCredentials = await Keychain.getInternetCredentials(
|
||||
"notesnook"
|
||||
);
|
||||
|
||||
if (userKeyCredentials) {
|
||||
const userKeyCipher: Cipher = (await encrypt(
|
||||
{
|
||||
key: DB_KEY,
|
||||
salt: NOTESNOOK_DB_KEY_SALT
|
||||
},
|
||||
userKeyCredentials.password
|
||||
)) as Cipher;
|
||||
// Store encrypted user key in MMKV
|
||||
MMKV.setMap(USER_KEY_CIPHER, userKeyCipher);
|
||||
await Keychain.resetInternetCredentials("notesnook");
|
||||
}
|
||||
DatabaseLogger.info("Migrated user credentials to cipher storage");
|
||||
}
|
||||
|
||||
return DB_KEY;
|
||||
} catch (e) {
|
||||
ToastManager.error(e as Error, "Error getting database key");
|
||||
console.log(e, "error");
|
||||
DatabaseLogger.error(e);
|
||||
return null;
|
||||
}
|
||||
|
||||
if (!DB_KEY) {
|
||||
DatabaseLogger.info("Generating new database key");
|
||||
const password = generatePassword();
|
||||
const derivedDatabaseKey = await Sodium.deriveKey(
|
||||
password,
|
||||
NOTESNOOK_DB_KEY_SALT
|
||||
);
|
||||
|
||||
DB_KEY = derivedDatabaseKey.key as string;
|
||||
|
||||
await Keychain.setInternetCredentials(
|
||||
KEYCHAIN_SERVER_DBKEY,
|
||||
"notesnook",
|
||||
DB_KEY,
|
||||
KEYSTORE_CONFIG
|
||||
);
|
||||
}
|
||||
|
||||
if (await Keychain.hasInternetCredentials("notesnook")) {
|
||||
const userKeyCredentials = await Keychain.getInternetCredentials(
|
||||
"notesnook"
|
||||
);
|
||||
|
||||
if (userKeyCredentials) {
|
||||
const userKeyCipher: Cipher = (await encrypt(
|
||||
{
|
||||
key: DB_KEY,
|
||||
salt: NOTESNOOK_DB_KEY_SALT
|
||||
},
|
||||
userKeyCredentials.password
|
||||
)) as Cipher;
|
||||
// Store encrypted user key in MMKV
|
||||
MMKV.setMap(USER_KEY_CIPHER, userKeyCipher);
|
||||
await Keychain.resetInternetCredentials("notesnook");
|
||||
}
|
||||
DatabaseLogger.info("Migrated user credentials to cipher storage");
|
||||
}
|
||||
|
||||
if (!DB_KEY) {
|
||||
throw new Error(
|
||||
`Failed to get database key, ${await Keychain.hasInternetCredentials(
|
||||
KEYCHAIN_SERVER_DBKEY
|
||||
)}`
|
||||
);
|
||||
}
|
||||
|
||||
return DB_KEY;
|
||||
}
|
||||
|
||||
export async function deriveCryptoKeyFallback(data: SerializedKey) {
|
||||
@@ -312,7 +309,6 @@ export async function getCryptoKey() {
|
||||
|
||||
return key;
|
||||
} catch (e) {
|
||||
console.log("getCryptoKey", e);
|
||||
DatabaseLogger.error(e);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -39,8 +39,6 @@ export async function setupDatabase(password?: string) {
|
||||
const key = await getDatabaseKey(password);
|
||||
if (!key) throw new Error(strings.databaseSetupFailed());
|
||||
|
||||
console.log("Opening database with key:", !!key);
|
||||
|
||||
database.host({
|
||||
API_HOST: "https://api.notesnook.com",
|
||||
AUTH_HOST: "https://auth.streetwriters.co",
|
||||
|
||||
@@ -27,13 +27,9 @@ import RNFetchBlob from "react-native-blob-util";
|
||||
*/
|
||||
export async function compressToBase64(path, type) {
|
||||
const { width: screenWidth, scale } = Dimensions.get("window");
|
||||
console.log("COMPRESSING TO BASE64...");
|
||||
|
||||
return new Promise((resolve) => {
|
||||
console.log(path, "image path...");
|
||||
|
||||
Image.getSize(path, async (width) => {
|
||||
console.log("image width", width);
|
||||
|
||||
const response = await ImageResizer.createResizedImage(
|
||||
path,
|
||||
screenWidth * scale,
|
||||
@@ -55,10 +51,12 @@ export async function compressToBase64(path, type) {
|
||||
: response.uri,
|
||||
"base64"
|
||||
);
|
||||
RNFetchBlob.fs.unlink(path.replace("file://", "")).catch(console.log);
|
||||
RNFetchBlob.fs
|
||||
.unlink(response.uri.replace("file://", ""))
|
||||
.catch(console.log);
|
||||
RNFetchBlob.fs.unlink(path.replace("file://", "")).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
RNFetchBlob.fs.unlink(response.uri.replace("file://", "")).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
|
||||
resolve(base64);
|
||||
});
|
||||
@@ -80,6 +78,8 @@ export async function compressToFile(path, type) {
|
||||
onlyScaleDown: true
|
||||
}
|
||||
);
|
||||
RNFetchBlob.fs.unlink(path.replace("file://", "")).catch(console.log);
|
||||
RNFetchBlob.fs.unlink(path.replace("file://", "")).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
return response.uri;
|
||||
}
|
||||
|
||||
@@ -83,7 +83,9 @@ export async function downloadAttachments(attachmentIds: string[]) {
|
||||
|
||||
const isCancelled = () => {
|
||||
if (useAttachmentStore.getState().downloading?.[groupId]?.canceled) {
|
||||
RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
|
||||
RNFetchBlob.fs.unlink(zipSourceFolder).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
useAttachmentStore.getState().setDownloading({
|
||||
groupId,
|
||||
current: 0,
|
||||
@@ -188,9 +190,13 @@ export async function downloadAttachments(attachmentIds: string[]) {
|
||||
ToastManager.error(e as Error, "Error zipping attachments");
|
||||
}
|
||||
// Remove source & zip file from cache.
|
||||
RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
|
||||
RNFetchBlob.fs.unlink(zipSourceFolder).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
if (Platform.OS === "android") {
|
||||
RNFetchBlob.fs.unlink(zipOutputFile).catch(console.log);
|
||||
RNFetchBlob.fs.unlink(zipOutputFile).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -321,10 +327,14 @@ export default async function downloadAttachment(
|
||||
if (attachment.dateUploaded) {
|
||||
RNFetchBlob.fs
|
||||
.unlink(RNFetchBlob.fs.dirs.CacheDir + `/${attachment.hash}`)
|
||||
.catch(console.log);
|
||||
.catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
RNFetchBlob.fs
|
||||
.unlink(RNFetchBlob.fs.dirs.CacheDir + `/${attachment.hash}_dcache`)
|
||||
.catch(console.log);
|
||||
.catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
}
|
||||
|
||||
useAttachmentStore.getState().setDownloading({
|
||||
|
||||
@@ -123,7 +123,9 @@ export async function downloadFile(
|
||||
cancelToken.cancel = async (reason) => {
|
||||
useAttachmentStore.getState().remove(filename);
|
||||
request.cancel();
|
||||
RNFetchBlob.fs.unlink(tempFilePath).catch(console.log);
|
||||
RNFetchBlob.fs.unlink(tempFilePath).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
DatabaseLogger.log(`Download cancelled: ${reason} ${filename}`);
|
||||
};
|
||||
|
||||
@@ -142,7 +144,9 @@ export async function downloadFile(
|
||||
useAttachmentStore.getState().remove(filename);
|
||||
|
||||
if (await exists(originalFilePath)) {
|
||||
await RNFetchBlob.fs.unlink(originalFilePath).catch(console.log);
|
||||
await RNFetchBlob.fs.unlink(originalFilePath).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
}
|
||||
|
||||
await RNFetchBlob.fs.mv(tempFilePath, originalFilePath);
|
||||
@@ -169,8 +173,12 @@ export async function downloadFile(
|
||||
}
|
||||
|
||||
useAttachmentStore.getState().remove(filename);
|
||||
RNFetchBlob.fs.unlink(tempFilePath).catch(console.log);
|
||||
RNFetchBlob.fs.unlink(originalFilePath).catch(console.log);
|
||||
RNFetchBlob.fs.unlink(tempFilePath).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
RNFetchBlob.fs.unlink(originalFilePath).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
DatabaseLogger.error(e, "Download failed: ", {
|
||||
url
|
||||
});
|
||||
@@ -188,7 +196,7 @@ export async function checkAttachment(hash: string) {
|
||||
|
||||
try {
|
||||
const size = await getUploadedFileSize(hash);
|
||||
console.log("File Size", size);
|
||||
|
||||
if (size === -1) return { success: true };
|
||||
|
||||
if (size === 0)
|
||||
|
||||
@@ -60,7 +60,9 @@ export async function readEncrypted<TOutputFormat extends DataFormat>(
|
||||
|
||||
return output as Output<TOutputFormat>;
|
||||
} catch (e) {
|
||||
RNFetchBlob.fs.unlink(path).catch(console.log);
|
||||
RNFetchBlob.fs.unlink(path).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
DatabaseLogger.error(e);
|
||||
}
|
||||
}
|
||||
@@ -90,8 +92,9 @@ export async function writeEncryptedBase64(
|
||||
type: "url"
|
||||
});
|
||||
|
||||
RNFetchBlob.fs.unlink(filepath).catch(console.log);
|
||||
console.log("encrypted file output: ", output);
|
||||
RNFetchBlob.fs.unlink(filepath).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
|
||||
return {
|
||||
...output,
|
||||
@@ -106,7 +109,9 @@ export async function deleteFile(
|
||||
await createCacheDir();
|
||||
const localFilePath = cacheDir + `/${filename}`;
|
||||
if (!requestOptions) {
|
||||
RNFetchBlob.fs.unlink(localFilePath).catch(console.log);
|
||||
RNFetchBlob.fs.unlink(localFilePath).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -117,7 +122,9 @@ export async function deleteFile(
|
||||
const status = response.info().status;
|
||||
const ok = status >= 200 && status < 300;
|
||||
if (ok) {
|
||||
RNFetchBlob.fs.unlink(localFilePath).catch(console.log);
|
||||
RNFetchBlob.fs.unlink(localFilePath).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
}
|
||||
return ok;
|
||||
} catch (e) {
|
||||
@@ -134,10 +141,14 @@ export async function clearFileStorage() {
|
||||
const oldCache = await RNFetchBlob.fs.ls(cacheDirOld);
|
||||
|
||||
for (const file of files) {
|
||||
await RNFetchBlob.fs.unlink(cacheDir + `/${file}`).catch(console.log);
|
||||
await RNFetchBlob.fs.unlink(cacheDir + `/${file}`).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
}
|
||||
for (const file of oldCache) {
|
||||
await RNFetchBlob.fs.unlink(cacheDirOld + `/${file}`).catch(console.log);
|
||||
await RNFetchBlob.fs.unlink(cacheDirOld + `/${file}`).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
}
|
||||
} catch (e) {
|
||||
DatabaseLogger.error(e, "clearFileStorage");
|
||||
@@ -161,20 +172,19 @@ export async function migrateFilesFromCache() {
|
||||
const migratedFilesPath = cacheDir + "/.migrated_1";
|
||||
const migrated = await RNFetchBlob.fs.exists(migratedFilesPath);
|
||||
if (migrated) {
|
||||
console.log("Files migrated already");
|
||||
return;
|
||||
}
|
||||
|
||||
const files = await RNFetchBlob.fs.ls(cacheDir);
|
||||
console.log("Files to migrate:", files.join(","));
|
||||
|
||||
const oldCache = await RNFetchBlob.fs.ls(cacheDirOld);
|
||||
for (const file of oldCache) {
|
||||
if (file.startsWith("org.") || file.startsWith("com.")) continue;
|
||||
RNFetchBlob.fs
|
||||
.mv(cacheDirOld + `/${file}`, cacheDir + `/${file}`)
|
||||
.catch(console.log);
|
||||
console.log("Moved", file);
|
||||
.catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
}
|
||||
await RNFetchBlob.fs.createFile(migratedFilesPath, "1", "utf8");
|
||||
} catch (e) {
|
||||
@@ -183,13 +193,17 @@ export async function migrateFilesFromCache() {
|
||||
}
|
||||
|
||||
export async function clearCache() {
|
||||
await RNFetchBlob.fs.unlink(cacheDir).catch(console.log);
|
||||
await RNFetchBlob.fs.unlink(cacheDir).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
await createCacheDir();
|
||||
eSendEvent("cache-cleared");
|
||||
}
|
||||
|
||||
export async function deleteCacheFileByPath(path: string) {
|
||||
await RNFetchBlob.fs.unlink(path).catch(console.log);
|
||||
await RNFetchBlob.fs.unlink(path).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
}
|
||||
|
||||
export async function deleteCacheFileByName(name: string) {
|
||||
@@ -198,15 +212,21 @@ export async function deleteCacheFileByName(name: string) {
|
||||
? await (RNFetchBlob.fs as any).pathForAppGroup(IOS_APPGROUPID)
|
||||
: null;
|
||||
const appGroupPath = `${iosAppGroup}/${name}`;
|
||||
await RNFetchBlob.fs.unlink(appGroupPath).catch(console.log);
|
||||
await RNFetchBlob.fs.unlink(`${cacheDir}/${name}`).catch(console.log);
|
||||
await RNFetchBlob.fs.unlink(appGroupPath).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
await RNFetchBlob.fs.unlink(`${cacheDir}/${name}`).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
}
|
||||
|
||||
export async function deleteDCacheFiles() {
|
||||
const files = await RNFetchBlob.fs.ls(cacheDir);
|
||||
for (const file of files) {
|
||||
if (file.includes("_dcache")) {
|
||||
await RNFetchBlob.fs.unlink(file).catch(console.log);
|
||||
if (file.includes("_dcache") || file.startsWith("NN_")) {
|
||||
await RNFetchBlob.fs.unlink(file).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -245,7 +265,9 @@ export async function exists(filename: string) {
|
||||
);
|
||||
RNFetchBlob.fs
|
||||
.unlink(existsInAppGroup ? appGroupPath : path)
|
||||
.catch(console.log);
|
||||
.catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -281,7 +303,7 @@ export async function getCacheSize() {
|
||||
await createCacheDir();
|
||||
const stat = await RNFetchBlob.fs.lstat(`file://` + cacheDir);
|
||||
let total = 0;
|
||||
console.log("Total files", stat.length);
|
||||
|
||||
stat.forEach((file) => {
|
||||
total += parseInt(file.size as unknown as string);
|
||||
});
|
||||
|
||||
@@ -115,7 +115,7 @@ export const FileSizeResult = {
|
||||
Error: -1
|
||||
};
|
||||
|
||||
export async function getUploadedFileSize(hash: string) {
|
||||
export async function getUploadedFileSize(hash: string, retry = 0) {
|
||||
try {
|
||||
const url = `${hosts.API_HOST}/s3?name=${hash}`;
|
||||
const token = await db.tokenManager.getAccessToken();
|
||||
@@ -123,8 +123,24 @@ export async function getUploadedFileSize(hash: string) {
|
||||
method: "HEAD",
|
||||
headers: { Authorization: `Bearer ${token}` }
|
||||
});
|
||||
|
||||
if (
|
||||
!attachmentInfo.ok ||
|
||||
attachmentInfo.headers?.get("content-length") === null
|
||||
) {
|
||||
if (retry < 3) {
|
||||
DatabaseLogger.log(`Retrying file size check: ${hash}, ${retry}`);
|
||||
return getUploadedFileSize(hash, retry + 1);
|
||||
}
|
||||
throw new Error(
|
||||
`File size check failed: ${hash}, ${
|
||||
attachmentInfo.status
|
||||
}, ${attachmentInfo.headers?.get("content-length")}`
|
||||
);
|
||||
}
|
||||
|
||||
const contentLength = parseInt(
|
||||
attachmentInfo.headers?.get("content-length") || "0"
|
||||
attachmentInfo.headers?.get("content-length") as string
|
||||
);
|
||||
return isNaN(contentLength) ? FileSizeResult.Empty : contentLength;
|
||||
} catch (e) {
|
||||
|
||||
@@ -17,9 +17,7 @@ You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
function info(context: string, ...logs: unknown[]) {
|
||||
console.log(`${new Date().toLocaleDateString()}::info::${context}:`, ...logs);
|
||||
}
|
||||
function info(context: string, ...logs: unknown[]) {}
|
||||
|
||||
function error(context: string, ...logs: unknown[]) {
|
||||
console.log(
|
||||
|
||||
@@ -41,7 +41,9 @@ export const Cta = ({ actions, style = {}, color, inline }) => {
|
||||
await sleep(500);
|
||||
}
|
||||
if (item.type === "link") {
|
||||
Linking.openURL(item.data).catch(console.log);
|
||||
Linking.openURL(item.data).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
} else if (item.type === "promo") {
|
||||
presentSheet({
|
||||
component: (
|
||||
|
||||
@@ -112,14 +112,19 @@ const AppLockedOverlay = () => {
|
||||
if (
|
||||
!biometricsAuthEnabled ||
|
||||
!(await BiometricService.isBiometryAvailable())
|
||||
)
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
biometricUnlockAwaitingUserInput.current = true;
|
||||
|
||||
if (Platform.OS === "android") {
|
||||
const activityName = await NotesnookModule.getActivityName();
|
||||
if (activityName !== "MainActivity") return;
|
||||
if (
|
||||
activityName !== "MainActivity" &&
|
||||
activityName !== "NotePreviewConfigureActivity"
|
||||
)
|
||||
return;
|
||||
}
|
||||
useSettingStore.getState().setRequestBiometrics(true);
|
||||
|
||||
@@ -180,7 +185,6 @@ const AppLockedOverlay = () => {
|
||||
DatabaseLogger.info("Locking app on entering foreground");
|
||||
useUserStore.getState().lockApp(true);
|
||||
}
|
||||
|
||||
if (
|
||||
!(
|
||||
biometricUnlockAwaitingUserInput.current ||
|
||||
|
||||
@@ -182,18 +182,17 @@ const Actions = ({
|
||||
relations
|
||||
.map((relation) => relation.fromId)
|
||||
.forEach(async (id) => {
|
||||
const tab = useTabStore.getState().getTabForNote(id);
|
||||
if (tab !== undefined) {
|
||||
const isFocused = useTabStore.getState().currentTab === tab;
|
||||
useTabStore.getState().forEachNoteTab(id, async (tab) => {
|
||||
const isFocused = useTabStore.getState().currentTab === tab.id;
|
||||
if (isFocused) {
|
||||
eSendEvent(eOnLoadNote, {
|
||||
item: await db.notes.note(id),
|
||||
forced: true
|
||||
});
|
||||
} else {
|
||||
editorController.current.commands.setLoading(true, tab);
|
||||
editorController.current.commands.setLoading(true, tab.id);
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
close?.();
|
||||
},
|
||||
|
||||
@@ -528,7 +528,9 @@ export const AttachmentDialog = ({
|
||||
setAttachments(results);
|
||||
setLoading(false);
|
||||
})
|
||||
.catch(console.log);
|
||||
.catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
}}
|
||||
/>
|
||||
)
|
||||
|
||||
@@ -88,7 +88,6 @@ export const ChangePassword = () => {
|
||||
await sleep(300);
|
||||
eSendEvent(eOpenRecoveryKeyDialog);
|
||||
} catch (e) {
|
||||
console.log(e.stack);
|
||||
setLoading(false);
|
||||
ToastManager.show({
|
||||
heading: strings.passwordChangeFailed(),
|
||||
|
||||
@@ -70,7 +70,7 @@ export const useLogin = (onFinishLogin, sessionExpired = false) => {
|
||||
switch (step) {
|
||||
case LoginSteps.emailAuth: {
|
||||
const mfaInfo = await db.user.authenticateEmail(email.current);
|
||||
console.log("email auth", mfaInfo);
|
||||
|
||||
if (mfaInfo) {
|
||||
TwoFactorVerification.present(
|
||||
async (mfa, callback) => {
|
||||
|
||||
@@ -75,9 +75,9 @@ const BaseDialog = ({
|
||||
background
|
||||
}: BaseDialogProps) => {
|
||||
const floating = useIsFloatingKeyboard();
|
||||
const appState = useAppState();
|
||||
const lockEvents = useRef(false);
|
||||
const [internalVisible, setIntervalVisible] = useState(true);
|
||||
const locked = useUserStore((state) => state.appLocked);
|
||||
|
||||
useEffect(() => {
|
||||
return () => {
|
||||
@@ -86,26 +86,20 @@ const BaseDialog = ({
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
if (useUserStore.getState().disableAppLockRequests) return;
|
||||
|
||||
if (SettingsService.canLockAppInBackground()) {
|
||||
if (appState === "background") {
|
||||
setIntervalVisible(false);
|
||||
if (useUserStore.getState().appLocked) {
|
||||
lockEvents.current = true;
|
||||
const unsub = useUserStore.subscribe((state) => {
|
||||
if (!state.appLocked) {
|
||||
setIntervalVisible(true);
|
||||
unsub();
|
||||
setTimeout(() => {
|
||||
lockEvents.current = false;
|
||||
});
|
||||
}
|
||||
if (locked) {
|
||||
setIntervalVisible(false);
|
||||
lockEvents.current = true;
|
||||
const unsub = useUserStore.subscribe((state) => {
|
||||
if (!state.appLocked) {
|
||||
setIntervalVisible(true);
|
||||
unsub();
|
||||
setTimeout(() => {
|
||||
lockEvents.current = false;
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}, [appState]);
|
||||
}, [locked]);
|
||||
|
||||
const Wrapper = useSafeArea ? SafeAreaView : View;
|
||||
|
||||
|
||||
@@ -80,8 +80,9 @@ export const Dialog = ({ context = "global" }) => {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
hide();
|
||||
setChecked(false);
|
||||
values.current.inputValue = undefined;
|
||||
setVisible(false);
|
||||
};
|
||||
|
||||
const show = useCallback(
|
||||
@@ -104,13 +105,14 @@ export const Dialog = ({ context = "global" }) => {
|
||||
eUnSubscribeEvent(eOpenSimpleDialog, show);
|
||||
eUnSubscribeEvent(eCloseSimpleDialog, hide);
|
||||
};
|
||||
}, [show]);
|
||||
}, [hide, show]);
|
||||
|
||||
const hide = () => {
|
||||
const hide = React.useCallback(() => {
|
||||
setChecked(false);
|
||||
values.current.inputValue = undefined;
|
||||
setVisible(false);
|
||||
};
|
||||
dialogInfo.onClose?.();
|
||||
}, [dialogInfo]);
|
||||
|
||||
const onNegativePress = async () => {
|
||||
if (dialogInfo.onClose) {
|
||||
|
||||
@@ -180,7 +180,7 @@ AttachImage.present = (response: ImageType[], context?: string) => {
|
||||
close={close}
|
||||
onAttach={(result) => {
|
||||
resolved = true;
|
||||
console.log("closing");
|
||||
|
||||
resolve(result);
|
||||
close?.();
|
||||
}}
|
||||
|
||||
@@ -307,9 +307,7 @@ const PDFPreview = () => {
|
||||
password={password}
|
||||
maxScale={6}
|
||||
onError={onError}
|
||||
onPressLink={(uri) => {
|
||||
console.log(`Link pressed: ${uri}`);
|
||||
}}
|
||||
onPressLink={(uri) => {}}
|
||||
style={{
|
||||
flex: 1,
|
||||
width: width,
|
||||
|
||||
@@ -62,7 +62,7 @@ export default function Progress() {
|
||||
eSubscribeEvent(PROGRESS_EVENTS.start, (options: ProgressOptions) => {
|
||||
setProgress(options.progress);
|
||||
cancelCallback.current = options.cancelCallback;
|
||||
console.log("options", options.fillBackground);
|
||||
|
||||
setData({
|
||||
title: options.title,
|
||||
paragraph: options.paragraph,
|
||||
|
||||
@@ -336,7 +336,7 @@ export class VaultDialog extends Component {
|
||||
);
|
||||
});
|
||||
}
|
||||
console.log("VAULT UPDATED EVENT");
|
||||
|
||||
eSendEvent("vaultUpdated");
|
||||
this.setState({
|
||||
loading: false
|
||||
@@ -406,7 +406,6 @@ export class VaultDialog extends Component {
|
||||
} else {
|
||||
await db.vault.add(this.state.note.id);
|
||||
|
||||
console.log("update note event...");
|
||||
eSendEvent(eUpdateNoteInEditor, this.state.note, true);
|
||||
|
||||
this.close();
|
||||
@@ -543,7 +542,6 @@ export class VaultDialog extends Component {
|
||||
this.close();
|
||||
})
|
||||
.catch((e) => {
|
||||
console.log("Error", e);
|
||||
this._takeErrorAction(e);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -78,10 +78,10 @@ class ExceptionHandler extends React.Component<{
|
||||
}
|
||||
|
||||
export const withErrorBoundry = (Element: React.ElementType, name: string) => {
|
||||
return function ErrorBoundary() {
|
||||
return function ErrorBoundary(props: any) {
|
||||
return (
|
||||
<ExceptionHandler component={name}>
|
||||
<Element />
|
||||
<Element {...props} />
|
||||
</ExceptionHandler>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -54,7 +54,7 @@ export const Header = ({
|
||||
onSearch
|
||||
}: {
|
||||
onLeftMenuButtonPress?: () => void;
|
||||
renderedInRoute: RouteName;
|
||||
renderedInRoute?: RouteName;
|
||||
id?: string;
|
||||
title: string;
|
||||
headerRightButtons?: HeaderRightButton[];
|
||||
|
||||
@@ -41,7 +41,7 @@ export const RightMenus = ({
|
||||
onSearch
|
||||
}: {
|
||||
headerRightButtons?: HeaderRightButton[];
|
||||
renderedInRoute: RouteName;
|
||||
renderedInRoute?: RouteName;
|
||||
id?: string;
|
||||
onPressDefaultRightButton?: () => void;
|
||||
search?: boolean;
|
||||
|
||||
@@ -41,7 +41,7 @@ export const Title = ({
|
||||
isHiddenOnRender?: boolean;
|
||||
accentColor?: string;
|
||||
isBeta?: boolean;
|
||||
renderedInRoute: string;
|
||||
renderedInRoute?: string;
|
||||
id?: string;
|
||||
}) => {
|
||||
const { colors } = useThemeColors();
|
||||
|
||||
@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import Sodium from "@ammarahmed/react-native-sodium";
|
||||
import { DataURL } from "@notesnook/core";
|
||||
import { DataURL, getFileNameWithExtension } from "@notesnook/core";
|
||||
import type { ImageAttributes } from "@notesnook/editor";
|
||||
import { useThemeColors } from "@notesnook/theme";
|
||||
import React, { useEffect, useRef, useState } from "react";
|
||||
@@ -34,6 +34,11 @@ import {
|
||||
import BaseDialog from "../dialog/base-dialog";
|
||||
import { IconButton } from "../ui/icon-button";
|
||||
import { ProgressBarComponent } from "../ui/svg/lazy";
|
||||
import RNFetchBlob from "react-native-blob-util";
|
||||
import Share from "react-native-share";
|
||||
import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
|
||||
import { useSettingStore } from "../../stores/use-setting-store";
|
||||
|
||||
const ImagePreview = () => {
|
||||
const { colors } = useThemeColors("dialog");
|
||||
|
||||
@@ -41,6 +46,8 @@ const ImagePreview = () => {
|
||||
const [image, setImage] = useState<string>();
|
||||
const [loading, setLoading] = useState(false);
|
||||
const imageRef = useRef<ImageAttributes>();
|
||||
const insets = useGlobalSafeAreaInsets();
|
||||
const [showHeader, setShowHeader] = useState(true);
|
||||
|
||||
useEffect(() => {
|
||||
eSubscribeEvent("ImagePreview", open);
|
||||
@@ -73,16 +80,86 @@ const ImagePreview = () => {
|
||||
silent: true,
|
||||
cache: true
|
||||
});
|
||||
const path = `${cacheDir}/${uri}`;
|
||||
|
||||
if (!uri) {
|
||||
setLoading(false);
|
||||
return;
|
||||
}
|
||||
const attachment = await db.attachments.attachment(hash);
|
||||
const path = `${cacheDir}/${
|
||||
"NN_" + (await getFileNameWithExtension(hash, attachment?.mimeType))
|
||||
}`;
|
||||
await RNFetchBlob.fs.mv(`${cacheDir}/${uri}`, path).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
setImage("file://" + path);
|
||||
setLoading(false);
|
||||
}, 100);
|
||||
};
|
||||
|
||||
const close = () => {
|
||||
const close = React.useCallback(() => {
|
||||
image &&
|
||||
RNFetchBlob.fs.unlink(image.replace("file://", "")).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
setImage(undefined);
|
||||
setVisible(false);
|
||||
};
|
||||
}, [image]);
|
||||
|
||||
const renderHeader = React.useCallback(
|
||||
() => (
|
||||
<View
|
||||
style={{
|
||||
paddingTop: insets.top,
|
||||
backgroundColor: "rgba(0,0,0,0.3)",
|
||||
position: "absolute",
|
||||
zIndex: 999,
|
||||
display: showHeader ? "flex" : "none"
|
||||
}}
|
||||
>
|
||||
<View
|
||||
style={{
|
||||
flexDirection: "row",
|
||||
width: "100%",
|
||||
justifyContent: "flex-end",
|
||||
alignItems: "center",
|
||||
height: 50,
|
||||
paddingHorizontal: 12,
|
||||
gap: 10
|
||||
}}
|
||||
>
|
||||
<IconButton
|
||||
name="share"
|
||||
color="white"
|
||||
style={{
|
||||
borderWidth: 0
|
||||
}}
|
||||
onPress={async () => {
|
||||
useSettingStore
|
||||
.getState()
|
||||
.setAppDidEnterBackgroundForAction(true);
|
||||
await Share.open({
|
||||
url: image
|
||||
}).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
useSettingStore
|
||||
.getState()
|
||||
.setAppDidEnterBackgroundForAction(false);
|
||||
}}
|
||||
/>
|
||||
<IconButton
|
||||
name="close"
|
||||
color="white"
|
||||
onPress={() => {
|
||||
close();
|
||||
}}
|
||||
/>
|
||||
</View>
|
||||
</View>
|
||||
),
|
||||
[close, image, insets.top, showHeader]
|
||||
);
|
||||
|
||||
return (
|
||||
visible && (
|
||||
@@ -90,6 +167,7 @@ const ImagePreview = () => {
|
||||
background="black"
|
||||
animation="slide"
|
||||
visible={true}
|
||||
useSafeArea={false}
|
||||
onRequestClose={close}
|
||||
transparent
|
||||
>
|
||||
@@ -130,43 +208,25 @@ const ImagePreview = () => {
|
||||
/>
|
||||
</View>
|
||||
) : (
|
||||
<ImageViewer
|
||||
enableImageZoom={true}
|
||||
renderIndicator={() => <></>}
|
||||
enableSwipeDown
|
||||
useNativeDriver
|
||||
onSwipeDown={close}
|
||||
saveToLocalByLongPress={false}
|
||||
renderHeader={() => (
|
||||
<View
|
||||
style={{
|
||||
flexDirection: "row",
|
||||
width: "100%",
|
||||
justifyContent: "flex-end",
|
||||
alignItems: "center",
|
||||
height: 50,
|
||||
paddingHorizontal: 24,
|
||||
position: "absolute",
|
||||
zIndex: 999,
|
||||
backgroundColor: "rgba(0,0,0,0.3)",
|
||||
marginTop: Platform.OS === "android" ? 30 : 0
|
||||
}}
|
||||
>
|
||||
<IconButton
|
||||
name="close"
|
||||
color="white"
|
||||
onPress={() => {
|
||||
close();
|
||||
}}
|
||||
/>
|
||||
</View>
|
||||
)}
|
||||
imageUrls={[
|
||||
{
|
||||
url: image as string
|
||||
}
|
||||
]}
|
||||
/>
|
||||
<>
|
||||
<ImageViewer
|
||||
enableImageZoom={true}
|
||||
renderIndicator={() => <></>}
|
||||
enableSwipeDown
|
||||
useNativeDriver
|
||||
onSwipeDown={close}
|
||||
saveToLocalByLongPress={false}
|
||||
onClick={() => {
|
||||
setShowHeader(!showHeader);
|
||||
}}
|
||||
renderHeader={renderHeader}
|
||||
imageUrls={[
|
||||
{
|
||||
url: image as string
|
||||
}
|
||||
]}
|
||||
/>
|
||||
</>
|
||||
)}
|
||||
</View>
|
||||
</BaseDialog>
|
||||
|
||||
@@ -76,7 +76,8 @@ const NoteItem = ({
|
||||
}: NoteItemProps) => {
|
||||
const isEditingNote = useTabStore(
|
||||
(state) =>
|
||||
state.tabs.find((t) => t.id === state.currentTab)?.noteId === item.id
|
||||
state.tabs.find((t) => t.id === state.currentTab)?.session?.noteId ===
|
||||
item.id
|
||||
);
|
||||
const { colors } = useThemeColors();
|
||||
const compactMode = useIsCompactModeEnabled(
|
||||
|
||||
@@ -28,7 +28,8 @@ export const Filler = ({ item, color }: { item: Item; color?: string }) => {
|
||||
const { colors } = useThemeColors();
|
||||
const isEditingNote = useTabStore(
|
||||
(state) =>
|
||||
state.tabs.find((t) => t.id === state.currentTab)?.noteId === item.id
|
||||
state.tabs.find((t) => t.id === state.currentTab)?.session?.noteId ===
|
||||
item.id
|
||||
);
|
||||
|
||||
const [selected] = useIsSelected(item);
|
||||
|
||||
@@ -153,9 +153,7 @@ export function ListItemWrapper(props: ListItemWrapperProps) {
|
||||
},
|
||||
items?.cacheItem(index) ? 100 : 0
|
||||
);
|
||||
} catch (e) {
|
||||
console.log("Error", e);
|
||||
}
|
||||
} catch (e) {}
|
||||
})();
|
||||
}, [index, items, refreshItem]);
|
||||
|
||||
|
||||
@@ -119,7 +119,6 @@ export const PricingPlans = ({
|
||||
setLoading(false);
|
||||
} catch (e) {
|
||||
setLoading(false);
|
||||
console.log("error getting sku", e);
|
||||
}
|
||||
}, [promo?.promoCode]);
|
||||
|
||||
@@ -171,7 +170,6 @@ export const PricingPlans = ({
|
||||
});
|
||||
return true;
|
||||
} catch (e) {
|
||||
console.log("PROMOCODE ERROR:", code, e);
|
||||
return false;
|
||||
}
|
||||
};
|
||||
@@ -231,7 +229,6 @@ export const PricingPlans = ({
|
||||
});
|
||||
} catch (e) {
|
||||
setBuying(false);
|
||||
console.log(e);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -141,7 +141,7 @@ export const Properties = ({ close = () => {}, item, buttons = [] }) => {
|
||||
close();
|
||||
eSendEvent(eOnLoadNote, {
|
||||
item: item,
|
||||
presistTab: true
|
||||
newTab: true
|
||||
});
|
||||
if (!DDS.isTab) {
|
||||
tabBarRef.current?.goToPage(1);
|
||||
|
||||
@@ -100,7 +100,6 @@ export const AddNotebookSheet = ({
|
||||
eSendEvent(eOnNotebookUpdated, parent);
|
||||
if (notebook) {
|
||||
setImmediate(() => {
|
||||
console.log(parent, notebook.id);
|
||||
eSendEvent(eOnNotebookUpdated, notebook.id);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -90,13 +90,12 @@ export const NotebookItem = ({
|
||||
for (const key in keys) {
|
||||
nextState[key] = !state.initialState[key] ? undefined : "deselected";
|
||||
}
|
||||
console.log("Single item selection");
|
||||
|
||||
state.setSelection({
|
||||
[item.id]: "selected",
|
||||
...nextState
|
||||
});
|
||||
} else {
|
||||
console.log("Multi item selection");
|
||||
state.markAs(item, "selected");
|
||||
}
|
||||
};
|
||||
|
||||
@@ -16,8 +16,8 @@ GNU General Public License for more details.
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
import { Note } from "@notesnook/core";
|
||||
import { EVENTS } from "@notesnook/core";
|
||||
import { EVENTS, Note } from "@notesnook/core";
|
||||
import { strings } from "@notesnook/intl";
|
||||
import { useThemeColors } from "@notesnook/theme";
|
||||
import React, { useEffect } from "react";
|
||||
import { View } from "react-native";
|
||||
@@ -25,27 +25,18 @@ import { FlatList } from "react-native-actions-sheet";
|
||||
import Icon from "react-native-vector-icons/MaterialCommunityIcons";
|
||||
import { db } from "../../../common/database";
|
||||
import { useDBItem } from "../../../hooks/use-db-item";
|
||||
import { useTabStore } from "../../../screens/editor/tiptap/use-tab-store";
|
||||
import {
|
||||
TabItem,
|
||||
useTabStore
|
||||
} from "../../../screens/editor/tiptap/use-tab-store";
|
||||
import { editorController } from "../../../screens/editor/tiptap/utils";
|
||||
import { eSendEvent, presentSheet } from "../../../services/event-manager";
|
||||
import { eUnlockNote } from "../../../utils/events";
|
||||
import { SIZE } from "../../../utils/size";
|
||||
import { Button } from "../../ui/button";
|
||||
import { IconButton } from "../../ui/icon-button";
|
||||
import { Pressable } from "../../ui/pressable";
|
||||
import Heading from "../../ui/typography/heading";
|
||||
import Paragraph from "../../ui/typography/paragraph";
|
||||
import { strings } from "@notesnook/intl";
|
||||
|
||||
type TabItem = {
|
||||
id: number;
|
||||
noteId?: string;
|
||||
previewTab?: boolean;
|
||||
locked?: boolean;
|
||||
noteLocked?: boolean;
|
||||
readonly?: boolean;
|
||||
pinned?: boolean;
|
||||
};
|
||||
|
||||
const TabItemComponent = (props: {
|
||||
tab: TabItem;
|
||||
@@ -53,7 +44,7 @@ const TabItemComponent = (props: {
|
||||
close?: (ctx?: string | undefined) => void;
|
||||
}) => {
|
||||
const { colors } = useThemeColors();
|
||||
const [item, update] = useDBItem(props.tab.noteId, "note");
|
||||
const [item, update] = useDBItem(props.tab.session?.noteId, "note");
|
||||
|
||||
useEffect(() => {
|
||||
const syncCompletedSubscription = db.eventManager?.subscribe(
|
||||
@@ -85,11 +76,11 @@ const TabItemComponent = (props: {
|
||||
onPress={() => {
|
||||
if (!props.isFocused) {
|
||||
useTabStore.getState().focusTab(props.tab.id);
|
||||
if (props.tab.locked) {
|
||||
if (props.tab.session?.locked) {
|
||||
eSendEvent(eUnlockNote);
|
||||
}
|
||||
|
||||
if (!props.tab.noteId) {
|
||||
if (!props.tab.session?.noteId) {
|
||||
setTimeout(() => {
|
||||
editorController?.current?.commands?.focus(props.tab.id);
|
||||
}, 300);
|
||||
@@ -97,11 +88,6 @@ const TabItemComponent = (props: {
|
||||
}
|
||||
props.close?.();
|
||||
}}
|
||||
onLongPress={() => {
|
||||
useTabStore.getState().updateTab(props.tab.id, {
|
||||
previewTab: false
|
||||
});
|
||||
}}
|
||||
>
|
||||
<View
|
||||
style={{
|
||||
@@ -112,9 +98,9 @@ const TabItemComponent = (props: {
|
||||
flexShrink: 1
|
||||
}}
|
||||
>
|
||||
{props.tab.noteLocked ? (
|
||||
{props.tab.session?.noteLocked ? (
|
||||
<>
|
||||
{props.tab.locked ? (
|
||||
{props.tab.session?.locked ? (
|
||||
<Icon size={SIZE.md} name="lock" />
|
||||
) : (
|
||||
<Icon size={SIZE.md} name="lock-open-outline" />
|
||||
@@ -122,7 +108,9 @@ const TabItemComponent = (props: {
|
||||
</>
|
||||
) : null}
|
||||
|
||||
{props.tab.readonly ? <Icon size={SIZE.md} name="pencil-lock" /> : null}
|
||||
{props.tab.session?.readonly ? (
|
||||
<Icon size={SIZE.md} name="pencil-lock" />
|
||||
) : null}
|
||||
|
||||
<Paragraph
|
||||
color={
|
||||
@@ -130,15 +118,10 @@ const TabItemComponent = (props: {
|
||||
? colors.selected.paragraph
|
||||
: colors.primary.paragraph
|
||||
}
|
||||
style={{
|
||||
fontFamily: props.tab.previewTab
|
||||
? "OpenSans-Italic"
|
||||
: "OpenSans-Regular"
|
||||
}}
|
||||
numberOfLines={1}
|
||||
size={SIZE.md}
|
||||
>
|
||||
{props.tab.noteId
|
||||
{props.tab.session?.noteId
|
||||
? item?.title || strings.untitledNote()
|
||||
: strings.newNote()}
|
||||
</Paragraph>
|
||||
@@ -157,8 +140,7 @@ const TabItemComponent = (props: {
|
||||
color={props.tab.pinned ? colors.primary.accent : colors.primary.icon}
|
||||
onPress={() => {
|
||||
useTabStore.getState().updateTab(props.tab.id, {
|
||||
pinned: !props.tab.pinned,
|
||||
previewTab: false
|
||||
pinned: !props.tab.pinned
|
||||
});
|
||||
}}
|
||||
top={0}
|
||||
@@ -197,6 +179,7 @@ export default function EditorTabs({
|
||||
}: {
|
||||
close?: (ctx?: string | undefined) => void;
|
||||
}) {
|
||||
const { colors } = useThemeColors();
|
||||
const [tabs, currentTab] = useTabStore((state) => [
|
||||
state.tabs,
|
||||
state.currentTab
|
||||
@@ -233,25 +216,13 @@ export default function EditorTabs({
|
||||
}}
|
||||
>
|
||||
<Heading size={SIZE.lg}>{strings.tabs()}</Heading>
|
||||
<Button
|
||||
<IconButton
|
||||
onPress={() => {
|
||||
useTabStore.getState().newTab();
|
||||
setTimeout(() => {
|
||||
editorController?.current?.commands?.focus(
|
||||
useTabStore.getState().currentTab
|
||||
);
|
||||
}, 500);
|
||||
close?.();
|
||||
}}
|
||||
title={strings.newTab()}
|
||||
icon="plus"
|
||||
style={{
|
||||
flexDirection: "row",
|
||||
justifyContent: "flex-start",
|
||||
borderRadius: 100,
|
||||
height: 35
|
||||
}}
|
||||
iconSize={SIZE.lg}
|
||||
name="plus"
|
||||
color={colors.primary.accent}
|
||||
/>
|
||||
</View>
|
||||
|
||||
|
||||
@@ -333,13 +333,17 @@ const ExportNotesSheet = ({
|
||||
if (Platform.OS === "ios") {
|
||||
Share.open({
|
||||
url: result?.fileDir + result.fileName
|
||||
}).catch(console.log);
|
||||
}).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
} else {
|
||||
FileViewer.open(result.filePath, {
|
||||
showOpenWithDialog: true,
|
||||
showAppsSuggestions: true,
|
||||
shareFile: true
|
||||
} as any).catch(console.log);
|
||||
} as any).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
}
|
||||
}}
|
||||
/>
|
||||
|
||||
@@ -62,7 +62,9 @@ export const ShareComponent = ({ uri, name, padding }) => {
|
||||
showOpenWithDialog: true,
|
||||
showAppsSuggestions: true,
|
||||
shareFile: true
|
||||
}).catch(console.log);
|
||||
}).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
}}
|
||||
/>
|
||||
</View>
|
||||
|
||||
@@ -22,24 +22,22 @@ import {
|
||||
VirtualizedGrouping,
|
||||
createInternalLink
|
||||
} from "@notesnook/core";
|
||||
import type { LinkAttributes } from "@notesnook/editor";
|
||||
import { NativeEvents } from "@notesnook/editor-mobile/src/utils/native-events";
|
||||
import { strings } from "@notesnook/intl";
|
||||
import { useThemeColors } from "@notesnook/theme";
|
||||
import React, { useEffect, useRef, useState } from "react";
|
||||
import { TextInput, View } from "react-native";
|
||||
import { FlatList } from "react-native-actions-sheet";
|
||||
import { db } from "../../../common/database";
|
||||
import { useDBItem } from "../../../hooks/use-db-item";
|
||||
import { editorController } from "../../../screens/editor/tiptap/utils";
|
||||
import { presentSheet } from "../../../services/event-manager";
|
||||
import { SIZE } from "../../../utils/size";
|
||||
import { Button } from "../../ui/button";
|
||||
import Input from "../../ui/input";
|
||||
import { Pressable } from "../../ui/pressable";
|
||||
import Paragraph from "../../ui/typography/paragraph";
|
||||
import type { LinkAttributes } from "@notesnook/editor";
|
||||
import {
|
||||
EditorEvents,
|
||||
editorController
|
||||
} from "../../../screens/editor/tiptap/utils";
|
||||
import { strings } from "@notesnook/intl";
|
||||
|
||||
const ListNoteItem = ({
|
||||
id,
|
||||
@@ -194,7 +192,7 @@ export default function LinkNote(props: {
|
||||
}
|
||||
: undefined
|
||||
);
|
||||
editorController.current?.postMessage(EditorEvents.resolve, {
|
||||
editorController.current?.postMessage(NativeEvents.resolve, {
|
||||
data: {
|
||||
href: link,
|
||||
title: selectedNote.title
|
||||
|
||||
@@ -113,11 +113,9 @@ const ManageTagsSheet = (props: {
|
||||
.sorted()
|
||||
.then((items) => {
|
||||
setTags(items);
|
||||
console.log("searched tags");
|
||||
});
|
||||
} else {
|
||||
db.tags.all.sorted(db.settings.getGroupOptions("tags")).then((items) => {
|
||||
console.log("items loaded tags", items.placeholders.length);
|
||||
setTags(items);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -191,13 +191,17 @@ class RecoveryKeySheet extends React.Component {
|
||||
Share.open({
|
||||
url: path,
|
||||
failOnCancel: false
|
||||
}).catch(console.log);
|
||||
}).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
} else {
|
||||
FileViewer.open(path, {
|
||||
showOpenWithDialog: true,
|
||||
showAppsSuggestions: true,
|
||||
shareFile: true
|
||||
}).catch(console.log);
|
||||
}).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
}
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
|
||||
@@ -273,7 +273,7 @@ const ListNoteItem = ({
|
||||
listType,
|
||||
noteInternalLinks.length
|
||||
]);
|
||||
console.log(noteInternalLinks);
|
||||
|
||||
const renderBlock = React.useCallback(
|
||||
(block: ContentBlock) => (
|
||||
<ListBlockItem
|
||||
@@ -419,7 +419,6 @@ export const ReferencesList = ({ item, close }: ReferencesListProps) => {
|
||||
id={index}
|
||||
items={items}
|
||||
onSelect={(note, blockId) => {
|
||||
console.log(note.id, blockId);
|
||||
eSendEvent(eOnLoadNote, {
|
||||
item: note,
|
||||
blockId: blockId
|
||||
|
||||
@@ -38,7 +38,7 @@ const Sort = ({ type, screen }) => {
|
||||
);
|
||||
const updateGroupOptions = async (_groupOptions) => {
|
||||
const groupType = screen === "Notes" ? "home" : type + "s";
|
||||
console.log("updateGroupOptions for group", groupType, "in", screen);
|
||||
|
||||
await db.settings.setGroupOptions(groupType, _groupOptions);
|
||||
setGroupOptions(_groupOptions);
|
||||
setTimeout(() => {
|
||||
|
||||
@@ -43,7 +43,7 @@ export const Update = ({ version: appVersion, fwdRef }) => {
|
||||
let notes = version?.notes
|
||||
? version.notes.replace("Thank you for using Notesnook!", "").split("- ")
|
||||
: ["Bug fixes and performance improvements"];
|
||||
notes = notes?.map((n) => n.replace(/\n/g, ""));
|
||||
notes = notes?.map((n) => n.replace(/\n|<br>/g, ""));
|
||||
const isGithubRelease = Config.GITHUB_RELEASE === "true";
|
||||
|
||||
const getSupportedAbi = () => {
|
||||
@@ -178,18 +178,20 @@ export const Update = ({ version: appVersion, fwdRef }) => {
|
||||
{version.body}
|
||||
</Paragraph>
|
||||
) : null}
|
||||
{notes.map((item) => (
|
||||
<Paragraph
|
||||
key={item}
|
||||
color={colors.secondary.paragraph}
|
||||
style={{
|
||||
marginBottom: 5
|
||||
}}
|
||||
selectable
|
||||
>
|
||||
• {item}
|
||||
</Paragraph>
|
||||
))}
|
||||
{notes.map((item) =>
|
||||
item && item !== "" ? (
|
||||
<Paragraph
|
||||
key={item}
|
||||
color={colors.secondary.paragraph}
|
||||
style={{
|
||||
marginBottom: 5
|
||||
}}
|
||||
selectable
|
||||
>
|
||||
• {item}
|
||||
</Paragraph>
|
||||
) : null
|
||||
)}
|
||||
</ScrollView>
|
||||
<Seperator />
|
||||
<Button
|
||||
@@ -215,7 +217,9 @@ export const Update = ({ version: appVersion, fwdRef }) => {
|
||||
marginTop: 10
|
||||
}}
|
||||
onPress={() => {
|
||||
Linking.openURL(GITHUB_PAGE_URL).catch(console.log);
|
||||
Linking.openURL(GITHUB_PAGE_URL).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
}}
|
||||
>
|
||||
{strings.readReleaseNotes()}
|
||||
|
||||
@@ -263,20 +263,22 @@ export const Pressable = ({
|
||||
const getStyle = useCallback(
|
||||
({ pressed }: PressableStateCallbackType): ViewStyle | ViewStyle[] => [
|
||||
{
|
||||
backgroundColor: pressed
|
||||
? RGB_Linear_Shade(alpha, hexToRGBA(selectedColor, opacity || 1))
|
||||
: hexToRGBA(primaryColor, opacity || 1),
|
||||
backgroundColor:
|
||||
pressed && !disabled
|
||||
? RGB_Linear_Shade(alpha, hexToRGBA(selectedColor, opacity || 1))
|
||||
: hexToRGBA(primaryColor, opacity || 1),
|
||||
width: "100%",
|
||||
alignSelf: "center",
|
||||
borderRadius: noborder ? 0 : br,
|
||||
justifyContent: "center",
|
||||
alignItems: "center",
|
||||
marginBottom: 0,
|
||||
borderColor: pressed
|
||||
? customSelectedColor
|
||||
? getColorLinearShade(customSelectedColor, 0.3, false)
|
||||
: borderSelectedColor || borderColor
|
||||
: borderColor || "transparent",
|
||||
borderColor:
|
||||
pressed && !disabled
|
||||
? customSelectedColor
|
||||
? getColorLinearShade(customSelectedColor, 0.3, false)
|
||||
: borderSelectedColor || borderColor
|
||||
: borderColor || "transparent",
|
||||
borderWidth: borderWidth
|
||||
},
|
||||
style,
|
||||
@@ -298,7 +300,8 @@ export const Pressable = ({
|
||||
borderColor,
|
||||
borderWidth,
|
||||
style,
|
||||
growFactor
|
||||
growFactor,
|
||||
disabled
|
||||
]
|
||||
);
|
||||
|
||||
|
||||
@@ -59,8 +59,9 @@ const SheetWrapper = ({
|
||||
const smallTablet = deviceMode === "smallTablet";
|
||||
const dimensions = useSettingStore((state) => state.dimensions);
|
||||
const insets = useGlobalSafeAreaInsets();
|
||||
const appState = useAppState();
|
||||
const lockEvents = useRef(false);
|
||||
const locked = useUserStore((state) => state.appLocked);
|
||||
|
||||
let width = dimensions.width > 600 ? 600 : 500;
|
||||
|
||||
const style = React.useMemo(() => {
|
||||
@@ -99,24 +100,21 @@ const SheetWrapper = ({
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (useUserStore.getState().disableAppLockRequests) return;
|
||||
if (SettingsService.canLockAppInBackground()) {
|
||||
if (appState === "background") {
|
||||
const ref = fwdRef || localRef;
|
||||
ref?.current?.hide();
|
||||
if (useUserStore.getState().appLocked) {
|
||||
lockEvents.current = true;
|
||||
const unsub = useUserStore.subscribe((state) => {
|
||||
if (!state.appLocked) {
|
||||
ref?.current?.show();
|
||||
unsub();
|
||||
lockEvents.current = false;
|
||||
}
|
||||
});
|
||||
}
|
||||
if (locked) {
|
||||
const ref = fwdRef || localRef;
|
||||
ref?.current?.hide();
|
||||
if (useUserStore.getState().appLocked) {
|
||||
lockEvents.current = true;
|
||||
const unsub = useUserStore.subscribe((state) => {
|
||||
if (!state.appLocked) {
|
||||
ref?.current?.show();
|
||||
unsub();
|
||||
lockEvents.current = false;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}, [appState, fwdRef]);
|
||||
}, [locked, fwdRef]);
|
||||
|
||||
return (
|
||||
<ScopedThemeProvider value="sheet">
|
||||
|
||||
@@ -315,7 +315,9 @@ const trialstarted: { id: string; steps: TStep[] } = {
|
||||
actionButton: {
|
||||
text: strings.joinDiscord(),
|
||||
action: () => {
|
||||
Linking.openURL("https://discord.gg/zQBK97EE22").catch(console.log);
|
||||
Linking.openURL("https://discord.gg/zQBK97EE22").catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -366,7 +368,9 @@ const Support = () => {
|
||||
width: "90%"
|
||||
}}
|
||||
onPress={() => {
|
||||
Linking.openURL("https://discord.gg/zQBK97EE22").catch(console.log);
|
||||
Linking.openURL("https://discord.gg/zQBK97EE22").catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
}}
|
||||
icon="discord"
|
||||
type="secondary"
|
||||
@@ -380,7 +384,9 @@ const Support = () => {
|
||||
width: "90%"
|
||||
}}
|
||||
onPress={() => {
|
||||
Linking.openURL("https://t.me/notesnook").catch(console.log);
|
||||
Linking.openURL("https://t.me/notesnook").catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
}}
|
||||
icon="telegram"
|
||||
type="secondary"
|
||||
|
||||
@@ -19,14 +19,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
/* eslint-disable no-inner-declarations */
|
||||
import {
|
||||
Color,
|
||||
createInternalLink,
|
||||
ItemReference,
|
||||
Note,
|
||||
Notebook,
|
||||
Reminder,
|
||||
Tag,
|
||||
TrashItem,
|
||||
VAULT_ERRORS,
|
||||
createInternalLink
|
||||
VAULT_ERRORS
|
||||
} from "@notesnook/core";
|
||||
import { strings } from "@notesnook/intl";
|
||||
import { DisplayedNotification } from "@notifee/react-native";
|
||||
@@ -50,11 +50,11 @@ import ReminderSheet from "../components/sheets/reminder";
|
||||
import { useSideBarDraggingStore } from "../components/side-menu/dragging-store";
|
||||
import { useTabStore } from "../screens/editor/tiptap/use-tab-store";
|
||||
import {
|
||||
ToastManager,
|
||||
eSendEvent,
|
||||
eSubscribeEvent,
|
||||
openVault,
|
||||
presentSheet
|
||||
presentSheet,
|
||||
ToastManager
|
||||
} from "../services/event-manager";
|
||||
import Navigation from "../services/navigation";
|
||||
import Notifications from "../services/notifications";
|
||||
@@ -544,14 +544,13 @@ export const useActions = ({
|
||||
const toggleReadyOnlyMode = async () => {
|
||||
const currentReadOnly = (item as Note).readonly;
|
||||
await db.notes.readonly(!currentReadOnly, item?.id);
|
||||
|
||||
if (useTabStore.getState().hasTabForNote(item.id)) {
|
||||
const tabId = useTabStore.getState().getTabForNote(item.id);
|
||||
if (!tabId) return;
|
||||
useTabStore.getState().updateTab(tabId, {
|
||||
readonly: !currentReadOnly
|
||||
useTabStore.getState().forEachNoteTab(item.id, (tab) => {
|
||||
useTabStore.getState().updateTab(tab.id, {
|
||||
session: {
|
||||
readonly: !currentReadOnly
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
Navigation.queueRoutesForUpdate();
|
||||
close();
|
||||
};
|
||||
|
||||
@@ -50,12 +50,17 @@ import { MMKV } from "../common/database/mmkv";
|
||||
import { endProgress, startProgress } from "../components/dialogs/progress";
|
||||
import Migrate from "../components/sheets/migrate";
|
||||
import NewFeature from "../components/sheets/new-feature";
|
||||
import ReminderSheet from "../components/sheets/reminder";
|
||||
import { Walkthrough } from "../components/walkthroughs";
|
||||
import { useTabStore } from "../screens/editor/tiptap/use-tab-store";
|
||||
import {
|
||||
resetTabStore,
|
||||
useTabStore
|
||||
} from "../screens/editor/tiptap/use-tab-store";
|
||||
import {
|
||||
clearAppState,
|
||||
editorController,
|
||||
editorState
|
||||
editorState,
|
||||
setAppState
|
||||
} from "../screens/editor/tiptap/utils";
|
||||
import { useDragState } from "../screens/settings/editor/state";
|
||||
import BackupService from "../services/backup";
|
||||
@@ -94,7 +99,6 @@ import {
|
||||
eLoginSessionExpired,
|
||||
eOnLoadNote,
|
||||
eOpenAnnouncementDialog,
|
||||
eUnlockNote,
|
||||
eUserLoggedIn,
|
||||
refreshNotesPage
|
||||
} from "../utils/events";
|
||||
@@ -148,7 +152,6 @@ const onUploadedAttachmentProgress = (data: any) => {
|
||||
};
|
||||
|
||||
const onUserSessionExpired = async () => {
|
||||
console.log("LOGGED OUT USER....");
|
||||
SettingsService.set({
|
||||
sessionExpired: true
|
||||
});
|
||||
@@ -157,6 +160,7 @@ const onUserSessionExpired = async () => {
|
||||
|
||||
const onAppOpenedFromURL = async (event: { url: string }) => {
|
||||
const url = event.url;
|
||||
|
||||
try {
|
||||
if (url.startsWith("https://app.notesnook.com/account/verified")) {
|
||||
await onUserEmailVerified();
|
||||
@@ -166,6 +170,25 @@ const onAppOpenedFromURL = async (event: { url: string }) => {
|
||||
eSendEvent(eOnLoadNote, { newNote: true });
|
||||
tabBarRef.current?.goToPage(1, false);
|
||||
return;
|
||||
} else if (url.startsWith("https://notesnook.com/open_note")) {
|
||||
const id = new URL(url).searchParams.get("id");
|
||||
if (id) {
|
||||
const note = await db.notes.note(id);
|
||||
if (note) {
|
||||
eSendEvent(eOnLoadNote, {
|
||||
item: note
|
||||
});
|
||||
tabBarRef.current?.goToPage(1, false);
|
||||
}
|
||||
}
|
||||
} else if (url.startsWith("https://notesnook.com/open_reminder")) {
|
||||
const id = new URL(url).searchParams.get("id");
|
||||
if (id) {
|
||||
const reminder = await db.reminders.reminder(id);
|
||||
if (reminder) ReminderSheet.present(reminder);
|
||||
}
|
||||
} else if (url.startsWith("https://notesnook.com/new_reminder")) {
|
||||
ReminderSheet.present();
|
||||
}
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
@@ -222,6 +245,7 @@ const onLogout = async (reason: string) => {
|
||||
await PremiumService.setPremiumStatus();
|
||||
await BiometricService.resetCredentials();
|
||||
MMKV.clearStore();
|
||||
resetTabStore();
|
||||
clearAllStores();
|
||||
setImmediate(() => {
|
||||
refreshAllStores();
|
||||
@@ -254,9 +278,7 @@ async function checkForShareExtensionLaunchedInBackground() {
|
||||
if (note) setTimeout(() => eSendEvent("loadingNote", note), 1);
|
||||
MMKV.removeItem("shareExtensionOpened");
|
||||
}
|
||||
} catch (e) {
|
||||
console.log(e);
|
||||
}
|
||||
} catch (e) {}
|
||||
}
|
||||
|
||||
async function saveEditorState() {
|
||||
@@ -502,7 +524,9 @@ export const useAppEvents = () => {
|
||||
}
|
||||
|
||||
if (SettingsService.getProperty("offlineMode")) {
|
||||
db.attachments.cacheAttachments().catch(console.log);
|
||||
db.attachments.cacheAttachments().catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
}
|
||||
}
|
||||
}, []);
|
||||
@@ -550,7 +574,6 @@ export const useAppEvents = () => {
|
||||
});
|
||||
}
|
||||
} catch (e) {
|
||||
console.log(e);
|
||||
ToastManager.error(e as Error, "Error updating user", "global");
|
||||
}
|
||||
|
||||
@@ -621,22 +644,17 @@ export const useAppEvents = () => {
|
||||
EV.subscribe(EVENTS.vaultLocked, async () => {
|
||||
// Lock all notes in all tabs...
|
||||
for (const tab of useTabStore.getState().tabs) {
|
||||
const noteId = useTabStore.getState().getTab(tab.id)?.noteId;
|
||||
const noteId = useTabStore.getState().getTab(tab.id)?.session?.noteId;
|
||||
if (!noteId) continue;
|
||||
const note = await db.notes.note(noteId);
|
||||
const locked = note && (await db.vaults.itemExists(note));
|
||||
if (locked) {
|
||||
useTabStore.getState().updateTab(tab.id, {
|
||||
locked: true
|
||||
session: {
|
||||
locked: true,
|
||||
noteLocked: true
|
||||
}
|
||||
});
|
||||
if (
|
||||
tab.id === useTabStore.getState().currentTab &&
|
||||
locked &&
|
||||
!editorState().movedAway
|
||||
) {
|
||||
// Show unlock note screen.
|
||||
eSendEvent(eUnlockNote);
|
||||
}
|
||||
}
|
||||
}
|
||||
}),
|
||||
@@ -645,6 +663,7 @@ export const useAppEvents = () => {
|
||||
|
||||
const emitterSubscriptions = [
|
||||
Linking.addEventListener("url", onAppOpenedFromURL),
|
||||
|
||||
SodiumEventEmitter.addListener(
|
||||
"onSodiumProgress",
|
||||
onFileEncryptionProgress
|
||||
@@ -730,13 +749,15 @@ export const useAppEvents = () => {
|
||||
setTimeout(() => {
|
||||
sub = AppState.addEventListener("change", onAppStateChanged);
|
||||
if (
|
||||
refValues.current.initialUrl?.startsWith(
|
||||
"https://app.notesnook.com/account/verified"
|
||||
)
|
||||
refValues.current.initialUrl &&
|
||||
!refValues.current.initialUrl?.includes("open_note")
|
||||
) {
|
||||
onUserEmailVerified();
|
||||
onAppOpenedFromURL({
|
||||
url: refValues.current.initialUrl!
|
||||
});
|
||||
}
|
||||
}, 1000);
|
||||
|
||||
refValues.current.removeInternetStateListener = NetInfo.addEventListener(
|
||||
onInternetStateChanged
|
||||
);
|
||||
@@ -779,9 +800,7 @@ export const useAppEvents = () => {
|
||||
useEffect(() => {
|
||||
if (!appLocked && isAppLoading) {
|
||||
initializeLogger()
|
||||
.catch((e) => {
|
||||
console.log(e);
|
||||
})
|
||||
.catch((e) => {})
|
||||
.finally(() => {
|
||||
//@ts-ignore
|
||||
initializeDatabase();
|
||||
|
||||
@@ -196,7 +196,6 @@ export const useTotalNotes = (type: "notebook" | "tag" | "color") => {
|
||||
}
|
||||
setTotalNotesById(totalNotesById);
|
||||
});
|
||||
console.log("useTotalNotes.getTotalNotes");
|
||||
},
|
||||
[type]
|
||||
);
|
||||
|
||||
@@ -31,7 +31,7 @@ export function useGroupOptions(type: any) {
|
||||
const onUpdate = (groupType: string) => {
|
||||
if (groupType !== type) return;
|
||||
const options = db.settings?.getGroupOptions(type) as any;
|
||||
console.log("useGroupOptions.onUpdate", type, options);
|
||||
|
||||
if (
|
||||
groupOptions?.groupBy !== options.groupBy ||
|
||||
groupOptions?.sortBy !== options.sortBy ||
|
||||
|
||||
@@ -74,10 +74,8 @@ export const useNotebook = (
|
||||
};
|
||||
|
||||
const onUpdate = (type: string) => {
|
||||
console.log("event", type);
|
||||
if (type !== "notebooks") return;
|
||||
onRequestUpdate();
|
||||
console.log("useNotebook.onUpdate", item?.id, Date.now());
|
||||
};
|
||||
|
||||
eSubscribeEvent(eGroupOptionsUpdated, onUpdate);
|
||||
|
||||
@@ -17,6 +17,7 @@ You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import { strings } from "@notesnook/intl";
|
||||
import { useThemeColors } from "@notesnook/theme";
|
||||
import { NavigationContainer } from "@react-navigation/native";
|
||||
import { createNativeStackNavigator } from "@react-navigation/native-stack";
|
||||
@@ -44,7 +45,6 @@ import useNavigationStore from "../stores/use-navigation-store";
|
||||
import { useSelectionStore } from "../stores/use-selection-store";
|
||||
import { useSettingStore } from "../stores/use-setting-store";
|
||||
import { rootNavigatorRef } from "../utils/global-refs";
|
||||
import { strings } from "@notesnook/intl";
|
||||
|
||||
const NativeStack = createNativeStackNavigator();
|
||||
const IntroStack = createNativeStackNavigator();
|
||||
@@ -76,11 +76,12 @@ const _Tabs = () => {
|
||||
const introCompleted = useSettingStore(
|
||||
(state) => state.settings.introCompleted
|
||||
);
|
||||
|
||||
const height = useSettingStore((state) => state.dimensions.height);
|
||||
const insets = useGlobalSafeAreaInsets();
|
||||
const screenHeight = height - (50 + insets.top + insets.bottom);
|
||||
React.useEffect(() => {
|
||||
setTimeout(() => {
|
||||
setTimeout(async () => {
|
||||
useNavigationStore.getState().update(homepage);
|
||||
}, 1000);
|
||||
}, [homepage]);
|
||||
|
||||
@@ -509,7 +509,8 @@ const onChangeTab = async (event) => {
|
||||
});
|
||||
} else {
|
||||
if (
|
||||
useTabStore.getState().getTab(useTabStore.getState().currentTab).locked
|
||||
useTabStore.getState().getTab(useTabStore.getState().currentTab).session
|
||||
?.locked
|
||||
) {
|
||||
eSendEvent(eUnlockNote);
|
||||
}
|
||||
@@ -523,13 +524,15 @@ const onChangeTab = async (event) => {
|
||||
|
||||
// Lock all tabs with locked notes...
|
||||
for (const tab of useTabStore.getState().tabs) {
|
||||
const noteId = useTabStore.getState().getTab(tab.id)?.noteId;
|
||||
const noteId = useTabStore.getState().getTab(tab.id)?.session?.noteId;
|
||||
if (!noteId) continue;
|
||||
const note = await db.notes.note(noteId);
|
||||
const locked = note && (await db.vaults.itemExists(note));
|
||||
if (locked) {
|
||||
useTabStore.getState().updateTab(tab.id, {
|
||||
locked: true
|
||||
session: {
|
||||
locked: true
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
"@streetwriters/showdown": "^3.0.1-alpha.2",
|
||||
"absolutify": "^0.1.0",
|
||||
"buffer": "^6.0.3",
|
||||
"dayjs": "^1.10.4",
|
||||
"deprecated-react-native-prop-types": "^4.1.0",
|
||||
"entities": "^3.0.1",
|
||||
"fflate": "^0.7.3",
|
||||
"html-to-text": "9.0.5",
|
||||
"phone": "^3.1.14",
|
||||
"qclone": "^1.2.0",
|
||||
"dayjs": "^1.11.13",
|
||||
"react-native-actions-sheet": "0.9.7",
|
||||
"react-native-drax": "^0.10.2",
|
||||
"react-native-image-zoom-viewer": "^3.0.1",
|
||||
@@ -36,10 +36,15 @@
|
||||
"@streetwriters/kysely": "^0.27.4",
|
||||
"pathe": "1.1.2",
|
||||
"react-native-format-currency": "0.0.5",
|
||||
"@lingui/react": "4.11.2",
|
||||
"@lingui/core": "4.11.2",
|
||||
"@lingui/core": "5.1.2",
|
||||
"@lingui/react": "5.1.2",
|
||||
"react-native-check-version": "^1.3.0",
|
||||
"react-native-material-menu": "^2.0.0"
|
||||
"react-native-material-menu": "^2.0.0",
|
||||
"@trpc/client": "^10.45.2",
|
||||
"@trpc/react-query": "^10.45.2",
|
||||
"@trpc/server": "^10.45.2",
|
||||
"@tanstack/react-query": "^4.36.1",
|
||||
"async-mutex": "0.5.0"
|
||||
},
|
||||
"sideEffects": false
|
||||
}
|
||||
|
||||
@@ -19,6 +19,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
/* eslint-disable @typescript-eslint/no-var-requires */
|
||||
|
||||
import { i18n } from "@lingui/core";
|
||||
import { strings } from "@notesnook/intl";
|
||||
import React, {
|
||||
forwardRef,
|
||||
useCallback,
|
||||
@@ -46,6 +48,7 @@ import {
|
||||
eUnlockWithPassword
|
||||
} from "../../utils/events";
|
||||
import { openLinkInBrowser } from "../../utils/functions";
|
||||
import { tabBarRef } from "../../utils/global-refs";
|
||||
import EditorOverlay from "./loading";
|
||||
import { EDITOR_URI } from "./source";
|
||||
import { EditorProps, useEditorType } from "./tiptap/types";
|
||||
@@ -58,9 +61,6 @@ import {
|
||||
openInternalLink,
|
||||
randId
|
||||
} from "./tiptap/utils";
|
||||
import { tabBarRef } from "../../utils/global-refs";
|
||||
import { strings } from "@notesnook/intl";
|
||||
import { i18n } from "@lingui/core";
|
||||
|
||||
const style: ViewStyle = {
|
||||
height: "100%",
|
||||
@@ -203,11 +203,13 @@ const useLockedNoteHandler = () => {
|
||||
|
||||
useEffect(() => {
|
||||
for (const tab of useTabStore.getState().tabs) {
|
||||
const noteId = useTabStore.getState().getTab(tab.id)?.noteId;
|
||||
const noteId = useTabStore.getState().getTab(tab.id)?.session?.noteId;
|
||||
if (!noteId) continue;
|
||||
if (tabRef.current && tabRef.current.noteLocked) {
|
||||
if (tabRef.current && tabRef.current.session?.noteLocked) {
|
||||
useTabStore.getState().updateTab(tabRef.current.id, {
|
||||
locked: true
|
||||
session: {
|
||||
locked: true
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -221,33 +223,38 @@ const useLockedNoteHandler = () => {
|
||||
biometryAvailable: !!biometry,
|
||||
biometryEnrolled: !!fingerprint
|
||||
});
|
||||
syncTabs();
|
||||
syncTabs("biometry");
|
||||
})();
|
||||
}, [tab?.id]);
|
||||
|
||||
useEffect(() => {
|
||||
const unlockWithBiometrics = async () => {
|
||||
try {
|
||||
if (!tabRef.current?.noteLocked || !tabRef.current) return;
|
||||
if (!tabRef.current?.session?.noteLocked || !tabRef.current) return;
|
||||
console.log("Trying to unlock with biometrics...");
|
||||
const credentials = await BiometricService.getCredentials(
|
||||
"Unlock note",
|
||||
"Unlock note to open it in editor."
|
||||
);
|
||||
|
||||
if (credentials && credentials?.password && tabRef.current.noteId) {
|
||||
if (
|
||||
credentials &&
|
||||
credentials?.password &&
|
||||
tabRef.current.session?.noteId
|
||||
) {
|
||||
const note = await db.vault.open(
|
||||
tabRef.current.noteId,
|
||||
tabRef.current.session?.noteId,
|
||||
credentials?.password
|
||||
);
|
||||
|
||||
eSendEvent(eOnLoadNote, {
|
||||
item: note
|
||||
});
|
||||
|
||||
useTabStore.getState().updateTab(tabRef.current.id, {
|
||||
locked: false
|
||||
item: note,
|
||||
refresh: true
|
||||
});
|
||||
} else {
|
||||
if (tabRef.current && tabRef.current.session?.locked) {
|
||||
editorController.current?.commands.focusPassInput();
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
@@ -261,7 +268,7 @@ const useLockedNoteHandler = () => {
|
||||
password: string;
|
||||
biometrics?: boolean;
|
||||
}) => {
|
||||
if (!tabRef.current?.noteId || !tabRef.current) return;
|
||||
if (!tabRef.current?.session?.noteId || !tabRef.current) return;
|
||||
if (!password || password.trim().length === 0) {
|
||||
ToastManager.show({
|
||||
heading: strings.passwordNotEntered(),
|
||||
@@ -271,7 +278,10 @@ const useLockedNoteHandler = () => {
|
||||
}
|
||||
|
||||
try {
|
||||
const note = await db.vault.open(tabRef.current?.noteId, password);
|
||||
const note = await db.vault.open(
|
||||
tabRef.current?.session?.noteId,
|
||||
password
|
||||
);
|
||||
if (enrollBiometrics && note) {
|
||||
try {
|
||||
const unlocked = await db.vault.unlock(password);
|
||||
@@ -299,13 +309,10 @@ const useLockedNoteHandler = () => {
|
||||
}
|
||||
}
|
||||
eSendEvent(eOnLoadNote, {
|
||||
item: note
|
||||
});
|
||||
useTabStore.getState().updateTab(tabRef.current.id, {
|
||||
locked: false
|
||||
item: note,
|
||||
refresh: true
|
||||
});
|
||||
} catch (e) {
|
||||
console.log(e);
|
||||
ToastManager.show({
|
||||
heading: strings.passwordIncorrect(),
|
||||
type: "error"
|
||||
@@ -315,7 +322,7 @@ const useLockedNoteHandler = () => {
|
||||
|
||||
const unlock = () => {
|
||||
if (
|
||||
(tabRef.current?.locked,
|
||||
(tabRef.current?.session?.locked,
|
||||
useTabStore.getState().biometryAvailable &&
|
||||
useTabStore.getState().biometryEnrolled &&
|
||||
!editorState().movedAway)
|
||||
@@ -324,10 +331,9 @@ const useLockedNoteHandler = () => {
|
||||
unlockWithBiometrics();
|
||||
}, 150);
|
||||
} else {
|
||||
console.log("Biometrics unavailable.", editorState().movedAway);
|
||||
if (!editorState().movedAway) {
|
||||
setTimeout(() => {
|
||||
if (tabRef.current && tabRef.current?.locked) {
|
||||
if (tabRef.current && tabRef.current?.session?.locked) {
|
||||
editorController.current?.commands.focus(tabRef.current?.id);
|
||||
}
|
||||
}, 100);
|
||||
@@ -342,13 +348,13 @@ const useLockedNoteHandler = () => {
|
||||
}),
|
||||
eSubscribeEvent(eUnlockWithPassword, onSubmit)
|
||||
];
|
||||
if (tabRef.current?.locked && tabBarRef.current?.page() === 2) {
|
||||
if (tabRef.current?.session?.locked && tabBarRef.current?.page() === 2) {
|
||||
unlock();
|
||||
}
|
||||
return () => {
|
||||
subs.map((s) => s?.unsubscribe());
|
||||
};
|
||||
}, [tab?.id, tab?.locked]);
|
||||
}, [tab?.id, tab?.session?.locked]);
|
||||
|
||||
return null;
|
||||
};
|
||||
|
||||
@@ -27,10 +27,10 @@ import WebView from "react-native-webview";
|
||||
import { useRef } from "react";
|
||||
import { EDITOR_URI } from "./source";
|
||||
import { EditorMessage } from "./tiptap/types";
|
||||
import { EventTypes } from "./tiptap/editor-events";
|
||||
import { EditorEvents } from "@notesnook/editor-mobile/src/utils/editor-events";
|
||||
import { Attachment } from "@notesnook/editor";
|
||||
import downloadAttachment from "../../common/filesystem/download-attachment";
|
||||
import { EditorEvents } from "./tiptap/utils";
|
||||
import { NativeEvents } from "@notesnook/editor-mobile/src/utils/native-events";
|
||||
import { useThemeColors } from "@notesnook/theme";
|
||||
import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
|
||||
import { db } from "../../common/database";
|
||||
@@ -69,12 +69,11 @@ export function ReadonlyEditor(props: {
|
||||
const data = event.nativeEvent.data;
|
||||
const editorMessage = JSON.parse(data) as EditorMessage<any>;
|
||||
|
||||
if (editorMessage.type === EventTypes.logger) {
|
||||
if (editorMessage.type === EditorEvents.logger) {
|
||||
logger.info("[READONLY EDITOR LOG]", editorMessage.value);
|
||||
}
|
||||
|
||||
if (editorMessage.type === EventTypes.readonlyEditorLoaded) {
|
||||
console.log("Readonly editor loaded.");
|
||||
if (editorMessage.type === EditorEvents.readonlyEditorLoaded) {
|
||||
props.onLoad?.((content: { data: string; id: string }) => {
|
||||
setTimeout(() => {
|
||||
noteId.current = content.id;
|
||||
@@ -87,10 +86,9 @@ export function ReadonlyEditor(props: {
|
||||
setLoading(false);
|
||||
}, 300);
|
||||
});
|
||||
} else if (editorMessage.type === EventTypes.getAttachmentData) {
|
||||
} else if (editorMessage.type === EditorEvents.getAttachmentData) {
|
||||
const attachment = (editorMessage.value as any).attachment as Attachment;
|
||||
|
||||
console.log("Getting attachment data:", attachment.hash, attachment.type);
|
||||
downloadAttachment(attachment.hash, true, {
|
||||
base64: attachment.type === "image",
|
||||
text: attachment.type === "web-clip",
|
||||
@@ -106,7 +104,7 @@ export function ReadonlyEditor(props: {
|
||||
);
|
||||
editorRef.current?.postMessage(
|
||||
JSON.stringify({
|
||||
type: EditorEvents.attachmentData,
|
||||
type: NativeEvents.attachmentData,
|
||||
value: {
|
||||
resolverId: (editorMessage.value as any).resolverId,
|
||||
data
|
||||
@@ -115,10 +113,9 @@ export function ReadonlyEditor(props: {
|
||||
);
|
||||
})
|
||||
.catch(() => {
|
||||
console.log("Error downloading attachment data");
|
||||
editorRef.current?.postMessage(
|
||||
JSON.stringify({
|
||||
type: EditorEvents.attachmentData,
|
||||
type: NativeEvents.attachmentData,
|
||||
data: {
|
||||
resolverId: (editorMessage.value as any).resolverId,
|
||||
data: undefined
|
||||
|
||||
@@ -18,9 +18,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import { Note } from "@notesnook/core";
|
||||
import type { Attachment } from "@notesnook/editor";
|
||||
import type { ImageAttributes } from "@notesnook/editor";
|
||||
import type { LinkAttributes } from "@notesnook/editor";
|
||||
import type {
|
||||
Attachment,
|
||||
ImageAttributes,
|
||||
LinkAttributes
|
||||
} from "@notesnook/editor";
|
||||
import { createRef, RefObject } from "react";
|
||||
import { Platform } from "react-native";
|
||||
import { EdgeInsets } from "react-native-safe-area-context";
|
||||
@@ -37,9 +39,6 @@ async function call(webview: RefObject<WebView | undefined>, action?: Action) {
|
||||
if (!webview.current || !action) return;
|
||||
setImmediate(() => webview.current?.injectJavaScript(action.job));
|
||||
const response = await getResponse(action.id);
|
||||
// if (!response) {
|
||||
// console.warn("webview job failed", action.id);
|
||||
// }
|
||||
return response ? response.value : response;
|
||||
}
|
||||
|
||||
@@ -75,110 +74,71 @@ class Commands {
|
||||
return call(this.ref, fn(job, name)) as Promise<T>;
|
||||
}
|
||||
|
||||
focus = async (tabId: number) => {
|
||||
async sendCommand<T>(command: string, ...args: any[]) {
|
||||
return this.doAsync(
|
||||
`response = globalThis.commands.${command}(${args
|
||||
.map((arg) =>
|
||||
typeof arg === "string" ? `"${arg}"` : JSON.stringify(arg)
|
||||
)
|
||||
.join(",")})`,
|
||||
command
|
||||
);
|
||||
}
|
||||
|
||||
focus = async (tabId: string) => {
|
||||
if (!this.ref.current) return;
|
||||
|
||||
const locked = useTabStore.getState().getTab(tabId)?.session?.locked;
|
||||
if (Platform.OS === "android") {
|
||||
//this.ref.current?.requestFocus();
|
||||
setTimeout(async () => {
|
||||
if (
|
||||
locked &&
|
||||
useTabStore.getState().biometryAvailable &&
|
||||
useTabStore.getState().biometryEnrolled
|
||||
)
|
||||
return;
|
||||
|
||||
if (!this.ref) return;
|
||||
textInput.current?.focus();
|
||||
|
||||
const locked = useTabStore.getState().getTab(tabId)?.locked;
|
||||
await this.doAsync(
|
||||
locked
|
||||
? `editorControllers[${tabId}]?.focusPassInput();`
|
||||
: `editors[${tabId}]?.commands.focus()`,
|
||||
"focus"
|
||||
);
|
||||
|
||||
await this.sendCommand("focus", tabId, locked);
|
||||
this.ref?.current?.requestFocus();
|
||||
}, 1);
|
||||
} else {
|
||||
await sleep(400);
|
||||
await this.doAsync(`editors[${tabId}]?.commands.focus()`, "focus");
|
||||
await this.sendCommand("focus", tabId, locked);
|
||||
}
|
||||
};
|
||||
|
||||
blur = async (tabId: number) =>
|
||||
await this.doAsync(
|
||||
`
|
||||
const editor = editors[${tabId}];
|
||||
const editorTitle = editorTitles[${tabId}];
|
||||
typeof editor !== "undefined" && editor.commands.blur();
|
||||
typeof editorTitle !== "undefined" && editorTitle.current && editorTitle.current.blur();
|
||||
|
||||
editorControllers[${tabId}]?.blurPassInput();
|
||||
blur = async (tabId: string) => this.sendCommand("blur", tabId);
|
||||
|
||||
`,
|
||||
"blur"
|
||||
);
|
||||
|
||||
clearContent = async (tabId: number) => {
|
||||
clearContent = async (tabId: string) => {
|
||||
this.previousSettings = null;
|
||||
await this.doAsync(
|
||||
`
|
||||
const editor = editors[${tabId}];
|
||||
const editorController = editorControllers[${tabId}];
|
||||
const editorTitle = editorTitles[${tabId}];
|
||||
const statusBar = statusBars[${tabId}];
|
||||
|
||||
if (typeof editor !== "undefined") {
|
||||
editor.commands.blur();
|
||||
editor.commands.clearContent(false);
|
||||
}
|
||||
|
||||
typeof editorTitle !== "undefined" && editorTitle.current && editorTitle.current?.blur();
|
||||
if (typeof editorController.content !== undefined) editorController.content.current = '';
|
||||
editorController.onUpdate();
|
||||
editorController.setTitle('');
|
||||
if (typeof statusBar !== "undefined") {
|
||||
statusBar.current.resetWords();
|
||||
statusBar.current.set({date:"",saved:""});
|
||||
}`,
|
||||
"clearContent"
|
||||
);
|
||||
await this.sendCommand("clearContent", tabId);
|
||||
};
|
||||
|
||||
setSessionId = async (id: string | null) =>
|
||||
await this.doAsync(`globalThis.sessionId = "${id}";`);
|
||||
await this.sendCommand("setSessionId", id);
|
||||
|
||||
setStatus = async (
|
||||
date: string | undefined,
|
||||
saved: string,
|
||||
tabId: number
|
||||
tabId: string
|
||||
) => {
|
||||
await this.doAsync(
|
||||
`
|
||||
const statusBar = statusBars[${tabId}];
|
||||
typeof statusBar !== "undefined" && statusBar.current.set({date:"${date}",saved:"${saved}"})`,
|
||||
"setStatus"
|
||||
this.sendCommand("setStatus", date, saved, tabId);
|
||||
};
|
||||
|
||||
setPlaceholder = async (placeholder: string) => {};
|
||||
|
||||
setLoading = async (loading?: boolean, tabId?: string) => {
|
||||
this.sendCommand(
|
||||
"setLoading",
|
||||
loading,
|
||||
tabId === undefined ? useTabStore.getState().currentTab : tabId
|
||||
);
|
||||
};
|
||||
|
||||
setPlaceholder = async (placeholder: string) => {
|
||||
// await this.doAsync(`
|
||||
// const element = document.querySelector(".is-editor-empty");
|
||||
// if (element) {
|
||||
// element.setAttribute("data-placeholder","${placeholder}");
|
||||
// }
|
||||
// `);
|
||||
};
|
||||
|
||||
setLoading = async (loading?: boolean, tabId?: number) => {
|
||||
await this.doAsync(`
|
||||
const editorController = editorControllers[${
|
||||
tabId || useTabStore.getState().currentTab
|
||||
}];
|
||||
editorController.setLoading(${loading})
|
||||
`);
|
||||
};
|
||||
|
||||
setInsets = async (insets: EdgeInsets) => {
|
||||
await this.doAsync(`
|
||||
if (typeof safeAreaController !== "undefined") {
|
||||
safeAreaController.update(${JSON.stringify(insets)})
|
||||
}
|
||||
`);
|
||||
this.sendCommand("setInsets", insets);
|
||||
};
|
||||
|
||||
updateSettings = async (settings?: Partial<Settings>) => {
|
||||
@@ -187,13 +147,7 @@ if (typeof statusBar !== "undefined") {
|
||||
...this.previousSettings,
|
||||
...settings
|
||||
};
|
||||
await this.doAsync(`
|
||||
if (typeof globalThis.settingsController !== "undefined") {
|
||||
globalThis.settingsController.update(${JSON.stringify(
|
||||
this.previousSettings
|
||||
)})
|
||||
}
|
||||
`);
|
||||
this.sendCommand("updateSettings", settings);
|
||||
};
|
||||
|
||||
setSettings = async (settings?: Partial<Settings>) => {
|
||||
@@ -206,123 +160,63 @@ if (typeof statusBar !== "undefined") {
|
||||
return;
|
||||
}
|
||||
}
|
||||
await this.doAsync(`
|
||||
if (typeof globalThis.settingsController !== "undefined") {
|
||||
globalThis.settingsController.update(${JSON.stringify(settings)})
|
||||
}
|
||||
`);
|
||||
this.sendCommand("setSettings", settings);
|
||||
};
|
||||
|
||||
setTags = async (note: Note | null | undefined) => {
|
||||
if (!note) return;
|
||||
const tabId = useTabStore.getState().getTabForNote(note.id);
|
||||
|
||||
const tags = await db.relations.to(note, "tag").resolve();
|
||||
await this.doAsync(
|
||||
`
|
||||
const tags = editorTags[${tabId}];
|
||||
if (tags && tags.current) {
|
||||
tags.current.setTags(${JSON.stringify(
|
||||
tags.map((tag) => ({
|
||||
title: tag.title,
|
||||
alias: tag.title,
|
||||
id: tag.id,
|
||||
type: tag.type
|
||||
}))
|
||||
)});
|
||||
}
|
||||
`,
|
||||
"setTags"
|
||||
);
|
||||
useTabStore.getState().forEachNoteTab(note.id, async (tab) => {
|
||||
const tabId = tab.id;
|
||||
const tags = await db.relations.to(note, "tag").resolve();
|
||||
await this.sendCommand("setTags", tabId, tags);
|
||||
});
|
||||
};
|
||||
|
||||
clearTags = async (tabId: number) => {
|
||||
await this.doAsync(
|
||||
`
|
||||
const tags = editorTags[${tabId}];
|
||||
logger("info", Object.keys(editorTags), typeof editorTags[0]);
|
||||
if (tags && tags.current) {
|
||||
tags.current.setTags([]);
|
||||
}
|
||||
`,
|
||||
"clearTags"
|
||||
);
|
||||
clearTags = async (tabId: string) => {
|
||||
await this.sendCommand("clearTags", tabId);
|
||||
};
|
||||
|
||||
insertAttachment = async (attachment: Attachment, tabId: number) => {
|
||||
await this.doAsync(
|
||||
`const editor = editors[${tabId}];
|
||||
editor && editor.commands.insertAttachment(${JSON.stringify(attachment)})`
|
||||
);
|
||||
insertAttachment = async (attachment: Attachment, tabId: string) => {
|
||||
await this.sendCommand("insertAttachment", attachment, tabId);
|
||||
};
|
||||
|
||||
setAttachmentProgress = async (
|
||||
attachmentProgress: Partial<Attachment>,
|
||||
tabId: number
|
||||
tabId: string
|
||||
) => {
|
||||
await this.doAsync(
|
||||
`const editor = editors[${tabId}];
|
||||
editor && editor.commands.updateAttachment(${JSON.stringify(
|
||||
attachmentProgress
|
||||
)}, {
|
||||
preventUpdate: true,
|
||||
query: (attachment) => {
|
||||
return attachment.hash === "${attachmentProgress.hash}";
|
||||
}
|
||||
})`
|
||||
);
|
||||
await this.sendCommand("setAttachmentProgress", attachmentProgress, tabId);
|
||||
};
|
||||
|
||||
insertImage = async (
|
||||
image: Omit<ImageAttributes, "bloburl"> & {
|
||||
dataurl: string;
|
||||
},
|
||||
tabId: number
|
||||
tabId: string
|
||||
) => {
|
||||
await this.doAsync(
|
||||
`const editor = editors[${tabId}];
|
||||
|
||||
const image = toBlobURL("${image.dataurl}", "${image.hash}");
|
||||
|
||||
editor && editor.commands.insertImage({
|
||||
...${JSON.stringify({
|
||||
...image,
|
||||
dataurl: undefined
|
||||
})},
|
||||
bloburl: image
|
||||
})`
|
||||
);
|
||||
await this.sendCommand("insertImage", image, tabId);
|
||||
};
|
||||
|
||||
handleBack = async () => {
|
||||
return this.doAsync<boolean>(
|
||||
'response = window.dispatchEvent(new Event("handleBackPress",{cancelable:true}));'
|
||||
);
|
||||
return this.sendCommand("handleBack");
|
||||
};
|
||||
|
||||
keyboardShown = async (keyboardShown: boolean) => {
|
||||
return this.doAsync(`globalThis['keyboardShown']=${keyboardShown};`);
|
||||
return this.sendCommand("keyboardShown", keyboardShown);
|
||||
};
|
||||
|
||||
getTableOfContents = async () => {
|
||||
const tabId = useTabStore.getState().currentTab;
|
||||
return this.doAsync(`
|
||||
response = editorControllers[${tabId}]?.getTableOfContents() || [];
|
||||
`);
|
||||
return this.sendCommand("getTableOfContents", tabId);
|
||||
};
|
||||
|
||||
focusPassInput = async () => {
|
||||
const tabId = useTabStore.getState().currentTab;
|
||||
return this.doAsync(`
|
||||
response = editorControllers[${tabId}]?.focusPassInput() || [];
|
||||
`);
|
||||
return this.sendCommand("focusPassInput", tabId);
|
||||
};
|
||||
|
||||
blurPassInput = async () => {
|
||||
const tabId = useTabStore.getState().currentTab;
|
||||
return this.doAsync(`
|
||||
response = editorControllers[${tabId}]?.blurPassInput() || [];
|
||||
`);
|
||||
return this.sendCommand("blurPassInput", tabId);
|
||||
};
|
||||
|
||||
createInternalLink = async (
|
||||
@@ -330,30 +224,18 @@ editor && editor.commands.insertImage({
|
||||
resolverId: string
|
||||
) => {
|
||||
if (!resolverId) return;
|
||||
return this.doAsync(`
|
||||
if (globalThis.pendingResolvers["${resolverId}"]) {
|
||||
globalThis.pendingResolvers["${resolverId}"](${JSON.stringify(
|
||||
attributes
|
||||
)});
|
||||
}`);
|
||||
return this.sendCommand("createInternalLink", attributes, resolverId);
|
||||
};
|
||||
|
||||
dismissCreateInternalLinkRequest = async (resolverId: string) => {
|
||||
if (!resolverId) return;
|
||||
return this.doAsync(`
|
||||
if (globalThis.pendingResolvers["${resolverId}"]) {
|
||||
globalThis.pendingResolvers["${resolverId}"](undefined);
|
||||
}
|
||||
`);
|
||||
return this.sendCommand("dismissCreateInternalLinkRequest", resolverId);
|
||||
};
|
||||
|
||||
scrollIntoViewById = async (id: string) => {
|
||||
const tabId = useTabStore.getState().currentTab;
|
||||
return this.doAsync(`
|
||||
response = editorControllers[${tabId}]?.scrollIntoView("${id}") || [];
|
||||
`);
|
||||
return this.sendCommand("scrollIntoViewById", id, tabId);
|
||||
};
|
||||
//todo add replace image function
|
||||
}
|
||||
|
||||
export default Commands;
|
||||
|
||||
@@ -43,6 +43,7 @@ import { eCloseSheet } from "../../../utils/events";
|
||||
import { useTabStore } from "./use-tab-store";
|
||||
import { editorController, editorState } from "./utils";
|
||||
import { strings } from "@notesnook/intl";
|
||||
import { useUserStore } from "../../../stores/use-user-store";
|
||||
|
||||
const showEncryptionSheet = (file: DocumentPickerResponse) => {
|
||||
presentSheet({
|
||||
@@ -60,7 +61,7 @@ const santizeUri = (uri: string) => {
|
||||
|
||||
type PickerOptions = {
|
||||
noteId?: string;
|
||||
tabId?: number;
|
||||
tabId?: string;
|
||||
type: "image" | "camera" | "file";
|
||||
reupload: boolean;
|
||||
hash?: string;
|
||||
@@ -131,7 +132,6 @@ const file = async (fileOptions: PickerOptions) => {
|
||||
|
||||
if (
|
||||
fileOptions.tabId !== undefined &&
|
||||
fileOptions.noteId &&
|
||||
useTabStore.getState().getNoteIdForTab(fileOptions.tabId) ===
|
||||
fileOptions.noteId
|
||||
) {
|
||||
@@ -194,9 +194,7 @@ const camera = async (options: PickerOptions) => {
|
||||
options
|
||||
);
|
||||
})
|
||||
.catch((e) => {
|
||||
console.log("camera error: ", e);
|
||||
});
|
||||
.catch((e) => {});
|
||||
} catch (e) {
|
||||
ToastManager.show({
|
||||
heading: (e as Error).message,
|
||||
@@ -224,9 +222,7 @@ const gallery = async (options: PickerOptions) => {
|
||||
options
|
||||
)
|
||||
)
|
||||
.catch((e) => {
|
||||
console.log("gallery error: ", e);
|
||||
});
|
||||
.catch((e) => {});
|
||||
} catch (e) {
|
||||
useSettingStore.getState().setAppDidEnterBackgroundForAction(false);
|
||||
ToastManager.show({
|
||||
@@ -234,13 +230,19 @@ const gallery = async (options: PickerOptions) => {
|
||||
type: "error",
|
||||
context: "global"
|
||||
});
|
||||
console.log("attachment error:", e);
|
||||
}
|
||||
};
|
||||
|
||||
const pick = async (options: PickerOptions) => {
|
||||
if (!PremiumService.get()) {
|
||||
const user = await db.user.getUser();
|
||||
if (!user) {
|
||||
ToastManager.show({
|
||||
heading: strings.loginRequired(),
|
||||
type: "error"
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (editorState().isFocused) {
|
||||
editorState().isFocused = true;
|
||||
}
|
||||
@@ -251,6 +253,7 @@ const pick = async (options: PickerOptions) => {
|
||||
}
|
||||
return;
|
||||
}
|
||||
useUserStore.getState().setDisableAppLockRequests(true);
|
||||
if (options?.type.startsWith("image") || options?.type === "camera") {
|
||||
if (options.type.startsWith("image")) {
|
||||
gallery(options);
|
||||
@@ -267,6 +270,7 @@ const handleImageResponse = async (
|
||||
options: PickerOptions
|
||||
) => {
|
||||
const result = await AttachImage.present(response, options.context);
|
||||
|
||||
if (!result) return;
|
||||
const compress = result.compress;
|
||||
|
||||
@@ -310,18 +314,14 @@ const handleImageResponse = async (
|
||||
? fileName.replace(/HEIC|HEIF/, "jpeg")
|
||||
: fileName;
|
||||
|
||||
console.log("attaching image...", fileName);
|
||||
|
||||
console.log("attaching file...");
|
||||
if (!(await attachFile(uri, hash, image.mime, fileName, options))) return;
|
||||
|
||||
if (Platform.OS === "ios") await RNFetchBlob.fs.unlink(uri);
|
||||
console.log("attaching image to note...");
|
||||
|
||||
if (
|
||||
options.tabId !== undefined &&
|
||||
useTabStore.getState().getNoteIdForTab(options.tabId) === options.noteId
|
||||
) {
|
||||
console.log("attaching image to note...");
|
||||
editorController.current?.commands.insertImage(
|
||||
{
|
||||
hash: hash,
|
||||
@@ -388,7 +388,6 @@ export async function attachFile(
|
||||
encryptionInfo.mimeType = type;
|
||||
encryptionInfo.filename = filename;
|
||||
encryptionInfo.alg = "xcha-stream";
|
||||
encryptionInfo.size = encryptionInfo.length;
|
||||
encryptionInfo.key = key;
|
||||
if (options?.reupload && exists) {
|
||||
const attachment = await db.attachments.attachment(hash);
|
||||
@@ -397,6 +396,7 @@ export async function attachFile(
|
||||
} else {
|
||||
encryptionInfo = { hash: hash };
|
||||
}
|
||||
|
||||
await db.attachments.add(encryptionInfo);
|
||||
return true;
|
||||
} catch (e) {
|
||||
|
||||
@@ -74,7 +74,7 @@ export type EditorMessage<T> = {
|
||||
value: T;
|
||||
type: string;
|
||||
noteId: string;
|
||||
tabId: number;
|
||||
tabId: string;
|
||||
resolverId?: string;
|
||||
hasTimeout?: boolean;
|
||||
};
|
||||
@@ -86,7 +86,7 @@ export type SavePayload = {
|
||||
type?: "tiptap";
|
||||
sessionHistoryId?: number;
|
||||
ignoreEdit: boolean;
|
||||
tabId: number;
|
||||
tabId: string;
|
||||
pendingChanges?: boolean;
|
||||
};
|
||||
|
||||
@@ -94,4 +94,5 @@ export type AppState = {
|
||||
editing: boolean;
|
||||
movedAway: boolean;
|
||||
timestamp: number;
|
||||
noteId?: string;
|
||||
};
|
||||
|
||||
@@ -21,7 +21,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
/* eslint-disable @typescript-eslint/no-var-requires */
|
||||
import { ItemReference } from "@notesnook/core";
|
||||
import type { Attachment } from "@notesnook/editor";
|
||||
import { EditorEvents } from "@notesnook/editor-mobile/src/utils/editor-events";
|
||||
import { NativeEvents } from "@notesnook/editor-mobile/src/utils/native-events";
|
||||
import { getDefaultPresets } from "@notesnook/editor/dist/cjs/toolbar/tool-definitions";
|
||||
import { strings } from "@notesnook/intl";
|
||||
import Clipboard from "@react-native-clipboard/clipboard";
|
||||
import React, { useCallback, useEffect, useRef } from "react";
|
||||
import {
|
||||
@@ -72,11 +75,9 @@ import {
|
||||
import { openLinkInBrowser } from "../../../utils/functions";
|
||||
import { tabBarRef } from "../../../utils/global-refs";
|
||||
import { useDragState } from "../../settings/editor/state";
|
||||
import { EventTypes } from "./editor-events";
|
||||
import { EditorMessage, EditorProps, useEditorType } from "./types";
|
||||
import { useTabStore } from "./use-tab-store";
|
||||
import { EditorEvents, editorState, openInternalLink } from "./utils";
|
||||
import { strings } from "@notesnook/intl";
|
||||
import { editorState, openInternalLink } from "./utils";
|
||||
|
||||
const publishNote = async () => {
|
||||
const user = useUserStore.getState().user;
|
||||
@@ -101,7 +102,7 @@ const publishNote = async () => {
|
||||
}
|
||||
const noteId = useTabStore
|
||||
.getState()
|
||||
.getNoteIdForTab(useTabStore.getState().currentTab);
|
||||
.getNoteIdForTab(useTabStore.getState().currentTab!);
|
||||
|
||||
if (noteId) {
|
||||
const note = await db.notes?.note(noteId);
|
||||
@@ -124,7 +125,7 @@ const publishNote = async () => {
|
||||
const showActionsheet = async () => {
|
||||
const noteId = useTabStore
|
||||
.getState()
|
||||
.getNoteIdForTab(useTabStore.getState().currentTab);
|
||||
.getNoteIdForTab(useTabStore.getState().currentTab!);
|
||||
if (noteId) {
|
||||
const note = await db.notes?.note(noteId);
|
||||
if (editorState().isFocused || editorState().isFocused) {
|
||||
@@ -177,7 +178,7 @@ export const useEditorEvents = (
|
||||
useEffect(() => {
|
||||
const handleKeyboardDidShow: KeyboardEventListener = () => {
|
||||
editor.commands.keyboardShown(true);
|
||||
editor.postMessage(EditorEvents.keyboardShown, undefined);
|
||||
editor.postMessage(NativeEvents.keyboardShown, undefined);
|
||||
};
|
||||
const handleKeyboardDidHide: KeyboardEventListener = () => {
|
||||
editor.commands.keyboardShown(false);
|
||||
@@ -247,7 +248,7 @@ export const useEditorEvents = (
|
||||
}
|
||||
editorState().currentlyEditing = false;
|
||||
// editor.reset(); Notes remain open.
|
||||
editor.commands?.blur(useTabStore.getState().currentTab);
|
||||
editor.commands?.blur(useTabStore.getState().currentTab!);
|
||||
setTimeout(async () => {
|
||||
if (deviceMode !== "mobile" && fullscreen) {
|
||||
if (fullscreen) {
|
||||
@@ -268,7 +269,6 @@ export const useEditorEvents = (
|
||||
}, [editor, deviceMode, fullscreen]);
|
||||
|
||||
const onHardwareBackPress = useCallback(() => {
|
||||
console.log(tabBarRef.current?.page());
|
||||
if (tabBarRef.current?.page() === 2) {
|
||||
onBackPress();
|
||||
return true;
|
||||
@@ -353,25 +353,25 @@ export const useEditorEvents = (
|
||||
const editorMessage = JSON.parse(data) as EditorMessage<any>;
|
||||
|
||||
if (editorMessage.hasTimeout && editorMessage.resolverId) {
|
||||
editor.postMessage(EditorEvents.resolve, {
|
||||
editor.postMessage(NativeEvents.resolve, {
|
||||
data: true,
|
||||
resolverId: editorMessage.resolverId
|
||||
});
|
||||
}
|
||||
|
||||
if (editorMessage.type === EventTypes.load) {
|
||||
if (editorMessage.type === EditorEvents.load) {
|
||||
DatabaseLogger.log("Editor is ready");
|
||||
editor.onLoad();
|
||||
return;
|
||||
}
|
||||
|
||||
if (editorMessage.type === EventTypes.back) {
|
||||
if (editorMessage.type === EditorEvents.back) {
|
||||
return onBackPress();
|
||||
}
|
||||
|
||||
if (
|
||||
editorMessage.sessionId !== editor.sessionId.current &&
|
||||
editorMessage.type !== EditorEvents.status
|
||||
editorMessage.type !== NativeEvents.status
|
||||
) {
|
||||
return;
|
||||
}
|
||||
@@ -381,8 +381,8 @@ export const useEditorEvents = (
|
||||
.getNoteIdForTab(editorMessage.tabId);
|
||||
|
||||
switch (editorMessage.type) {
|
||||
case EventTypes.content:
|
||||
DatabaseLogger.log("EventTypes.content");
|
||||
case EditorEvents.content:
|
||||
DatabaseLogger.log("EditorEvents.content");
|
||||
editor.saveContent({
|
||||
type: editorMessage.type,
|
||||
content: editorMessage.value.html as string,
|
||||
@@ -392,8 +392,8 @@ export const useEditorEvents = (
|
||||
pendingChanges: editorMessage.value?.pendingChanges
|
||||
});
|
||||
break;
|
||||
case EventTypes.title:
|
||||
DatabaseLogger.log("EventTypes.title");
|
||||
case EditorEvents.title:
|
||||
DatabaseLogger.log("EditorEvents.title");
|
||||
editor.saveContent({
|
||||
type: editorMessage.type,
|
||||
title: editorMessage.value?.title as string,
|
||||
@@ -403,10 +403,10 @@ export const useEditorEvents = (
|
||||
pendingChanges: editorMessage.value?.pendingChanges
|
||||
});
|
||||
break;
|
||||
case EventTypes.logger:
|
||||
case EditorEvents.logger:
|
||||
logger.info("[EDITOR LOG]", editorMessage.value);
|
||||
break;
|
||||
case EventTypes.dbLogger:
|
||||
case EditorEvents.dbLogger:
|
||||
if (editorMessage.value.error) {
|
||||
DatabaseLogger.error(
|
||||
editorMessage.value.error,
|
||||
@@ -419,12 +419,12 @@ export const useEditorEvents = (
|
||||
DatabaseLogger.info("[EDITOR_LOG]" + editorMessage.value.message);
|
||||
}
|
||||
break;
|
||||
case EventTypes.contentchange:
|
||||
case EditorEvents.contentchange:
|
||||
editor.onContentChanged(editorMessage.noteId);
|
||||
break;
|
||||
case EventTypes.selection:
|
||||
case EditorEvents.selection:
|
||||
break;
|
||||
case EventTypes.reminders:
|
||||
case EditorEvents.reminders:
|
||||
if (!noteId) {
|
||||
ToastManager.show({
|
||||
heading: strings.createNoteFirst(),
|
||||
@@ -442,7 +442,7 @@ export const useEditorEvents = (
|
||||
onAdd: () => ReminderSheet.present(undefined, note, true)
|
||||
});
|
||||
break;
|
||||
case EventTypes.newtag:
|
||||
case EditorEvents.newtag:
|
||||
if (!noteId) {
|
||||
ToastManager.show({
|
||||
heading: strings.createNoteFirst(),
|
||||
@@ -452,7 +452,7 @@ export const useEditorEvents = (
|
||||
}
|
||||
ManageTagsSheet.present([noteId]);
|
||||
break;
|
||||
case EventTypes.tag:
|
||||
case EditorEvents.tag:
|
||||
if (editorMessage.value) {
|
||||
if (!noteId) return;
|
||||
const note = await db.notes.note(noteId);
|
||||
@@ -468,7 +468,7 @@ export const useEditorEvents = (
|
||||
});
|
||||
}
|
||||
break;
|
||||
case EventTypes.filepicker:
|
||||
case EditorEvents.filepicker:
|
||||
editorState().isAwaitingResult = true;
|
||||
const { pick } = require("./picker").default;
|
||||
pick({
|
||||
@@ -480,14 +480,14 @@ export const useEditorEvents = (
|
||||
editorState().isAwaitingResult = false;
|
||||
}, 1000);
|
||||
break;
|
||||
case EventTypes.download: {
|
||||
case EditorEvents.download: {
|
||||
const downloadAttachment =
|
||||
require("../../../common/filesystem/download-attachment").default;
|
||||
downloadAttachment((editorMessage.value as Attachment)?.hash, true);
|
||||
break;
|
||||
}
|
||||
|
||||
case EventTypes.getAttachmentData: {
|
||||
case EditorEvents.getAttachmentData: {
|
||||
const attachment = (editorMessage.value as any)
|
||||
?.attachment as Attachment;
|
||||
|
||||
@@ -507,14 +507,14 @@ export const useEditorEvents = (
|
||||
!!data,
|
||||
editorMessage.resolverId
|
||||
);
|
||||
editor.postMessage(EditorEvents.resolve, {
|
||||
editor.postMessage(NativeEvents.resolve, {
|
||||
resolverId: editorMessage.resolverId,
|
||||
data
|
||||
});
|
||||
})
|
||||
.catch((e) => {
|
||||
DatabaseLogger.error(e);
|
||||
editor.postMessage(EditorEvents.resolve, {
|
||||
editor.postMessage(NativeEvents.resolve, {
|
||||
resolverId: editorMessage.resolverId,
|
||||
data: undefined
|
||||
});
|
||||
@@ -523,26 +523,26 @@ export const useEditorEvents = (
|
||||
break;
|
||||
}
|
||||
|
||||
case EventTypes.pro:
|
||||
case EditorEvents.pro:
|
||||
if (editor.state.current?.isFocused) {
|
||||
editor.state.current.isFocused = true;
|
||||
}
|
||||
eSendEvent(eOpenPremiumDialog);
|
||||
break;
|
||||
case EventTypes.monograph:
|
||||
case EditorEvents.monograph:
|
||||
publishNote();
|
||||
break;
|
||||
case EventTypes.properties:
|
||||
case EditorEvents.properties:
|
||||
showActionsheet();
|
||||
break;
|
||||
case EventTypes.scroll:
|
||||
case EditorEvents.scroll:
|
||||
editorState().scrollPosition = editorMessage.value;
|
||||
break;
|
||||
case EventTypes.fullscreen:
|
||||
case EditorEvents.fullscreen:
|
||||
editorState().isFullscreen = true;
|
||||
eSendEvent(eOpenFullscreenEditor);
|
||||
break;
|
||||
case EventTypes.link:
|
||||
case EditorEvents.link:
|
||||
if (editorMessage.value.startsWith("nn://")) {
|
||||
openInternalLink(editorMessage.value);
|
||||
console.log(
|
||||
@@ -554,7 +554,7 @@ export const useEditorEvents = (
|
||||
}
|
||||
break;
|
||||
|
||||
case EventTypes.previewAttachment: {
|
||||
case EditorEvents.previewAttachment: {
|
||||
const hash = (editorMessage.value as Attachment)?.hash;
|
||||
const attachment = await db.attachments?.attachment(hash);
|
||||
if (!attachment) return;
|
||||
@@ -565,26 +565,41 @@ export const useEditorEvents = (
|
||||
}
|
||||
break;
|
||||
}
|
||||
case EventTypes.copyToClipboard: {
|
||||
case EditorEvents.copyToClipboard: {
|
||||
Clipboard.setString(editorMessage.value as string);
|
||||
break;
|
||||
}
|
||||
case EventTypes.tabsChanged: {
|
||||
case EditorEvents.saveScroll: {
|
||||
useTabStore.getState().updateTab(editorMessage.tabId, {
|
||||
session: {
|
||||
...editorMessage.value
|
||||
}
|
||||
});
|
||||
break;
|
||||
}
|
||||
case EditorEvents.newNote: {
|
||||
eSendEvent(eOnLoadNote, {
|
||||
tabId: editorMessage.tabId,
|
||||
newNote: true
|
||||
});
|
||||
break;
|
||||
}
|
||||
case EditorEvents.tabsChanged: {
|
||||
// useTabStore.setState({
|
||||
// tabs: (editorMessage.value as any)?.tabs,
|
||||
// currentTab: (editorMessage.value as any)?.currentTab
|
||||
// });
|
||||
// console.log("Tabs updated");
|
||||
//
|
||||
break;
|
||||
}
|
||||
case EventTypes.toc:
|
||||
case EditorEvents.toc:
|
||||
TableOfContents.present(editorMessage.value);
|
||||
break;
|
||||
case EventTypes.showTabs: {
|
||||
case EditorEvents.showTabs: {
|
||||
EditorTabs.present();
|
||||
break;
|
||||
}
|
||||
case EventTypes.error: {
|
||||
case EditorEvents.error: {
|
||||
presentSheet({
|
||||
component: (
|
||||
<Issue
|
||||
@@ -596,27 +611,15 @@ export const useEditorEvents = (
|
||||
});
|
||||
break;
|
||||
}
|
||||
case EventTypes.tabFocused: {
|
||||
console.log(
|
||||
"Focused tab",
|
||||
editorMessage.tabId,
|
||||
editorMessage.noteId,
|
||||
"Content:",
|
||||
editorMessage.value
|
||||
);
|
||||
|
||||
case EditorEvents.tabFocused: {
|
||||
eSendEvent(eEditorTabFocused, editorMessage.tabId);
|
||||
|
||||
if (
|
||||
(!editorMessage.value || editor.currentLoadingNoteId.current) &&
|
||||
editorMessage.noteId
|
||||
) {
|
||||
if (!editor.state.current.initialLoadCalled) break;
|
||||
if (editorMessage.noteId) {
|
||||
if (!useSettingStore.getState().isAppLoading) {
|
||||
const note = await db.notes.note(editorMessage.noteId);
|
||||
if (note) {
|
||||
eSendEvent(eOnLoadNote, {
|
||||
item: note,
|
||||
forced: true,
|
||||
tabId: editorMessage.tabId
|
||||
});
|
||||
}
|
||||
@@ -628,7 +631,6 @@ export const useEditorEvents = (
|
||||
if (note) {
|
||||
eSendEvent(eOnLoadNote, {
|
||||
item: note,
|
||||
forced: true,
|
||||
tabId: editorMessage.tabId
|
||||
});
|
||||
}
|
||||
@@ -639,7 +641,7 @@ export const useEditorEvents = (
|
||||
|
||||
break;
|
||||
}
|
||||
case EventTypes.createInternalLink: {
|
||||
case EditorEvents.createInternalLink: {
|
||||
LinkNote.present(
|
||||
editorMessage.value.attributes,
|
||||
editorMessage.resolverId as string
|
||||
@@ -647,25 +649,37 @@ export const useEditorEvents = (
|
||||
break;
|
||||
}
|
||||
|
||||
case EventTypes.unlock: {
|
||||
case EditorEvents.unlock: {
|
||||
eSendEvent(eUnlockWithPassword, editorMessage.value);
|
||||
break;
|
||||
}
|
||||
|
||||
case EventTypes.unlockWithBiometrics: {
|
||||
case EditorEvents.goBack: {
|
||||
useTabStore.getState().goBack();
|
||||
break;
|
||||
}
|
||||
|
||||
case EditorEvents.goForward: {
|
||||
useTabStore.getState().goForward();
|
||||
break;
|
||||
}
|
||||
|
||||
case EditorEvents.unlockWithBiometrics: {
|
||||
eSendEvent(eUnlockWithBiometrics);
|
||||
break;
|
||||
}
|
||||
|
||||
case EventTypes.disableReadonlyMode: {
|
||||
case EditorEvents.disableReadonlyMode: {
|
||||
const noteId = editorMessage.value;
|
||||
if (noteId) {
|
||||
await db.notes.readonly(false, noteId);
|
||||
editor.note.current[noteId] = await db.notes?.note(noteId);
|
||||
useTabStore
|
||||
.getState()
|
||||
.updateTab(useTabStore.getState().currentTab, {
|
||||
readonly: false
|
||||
.updateTab(useTabStore.getState().currentTab!, {
|
||||
session: {
|
||||
readonly: false
|
||||
}
|
||||
});
|
||||
setTimeout(() => {
|
||||
Navigation.queueRoutesForUpdate();
|
||||
|
||||
@@ -32,8 +32,11 @@ import {
|
||||
isEncryptedContent,
|
||||
isTrashItem
|
||||
} from "@notesnook/core";
|
||||
import { EditorEvents } from "@notesnook/editor-mobile/src/utils/editor-events";
|
||||
import { NativeEvents } from "@notesnook/editor-mobile/src/utils/native-events";
|
||||
import { strings } from "@notesnook/intl";
|
||||
import { useThemeEngineStore } from "@notesnook/theme";
|
||||
import { Mutex } from "async-mutex";
|
||||
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
|
||||
import WebView from "react-native-webview";
|
||||
import { DatabaseLogger, db } from "../../../common/database";
|
||||
@@ -46,6 +49,7 @@ import {
|
||||
eUnSubscribeEvent
|
||||
} from "../../../services/event-manager";
|
||||
import Navigation from "../../../services/navigation";
|
||||
import { NotePreviewWidget } from "../../../services/note-preview-widget";
|
||||
import Notifications from "../../../services/notifications";
|
||||
import SettingsService from "../../../services/settings";
|
||||
import { useSettingStore } from "../../../stores/use-setting-store";
|
||||
@@ -62,12 +66,10 @@ import { sleep } from "../../../utils/time";
|
||||
import { unlockVault } from "../../../utils/unlock-vault";
|
||||
import { onNoteCreated } from "../../notes/common";
|
||||
import Commands from "./commands";
|
||||
import { EventTypes } from "./editor-events";
|
||||
import { SessionHistory } from "./session-history";
|
||||
import { EditorState, SavePayload } from "./types";
|
||||
import { syncTabs, useTabStore } from "./use-tab-store";
|
||||
import { TabSessionItem, syncTabs, useTabStore } from "./use-tab-store";
|
||||
import {
|
||||
EditorEvents,
|
||||
clearAppState,
|
||||
defaultState,
|
||||
getAppState,
|
||||
@@ -75,11 +77,63 @@ import {
|
||||
isEditorLoaded,
|
||||
post
|
||||
} from "./utils";
|
||||
import { Linking } from "react-native";
|
||||
|
||||
const loadNoteMutex = new Mutex();
|
||||
|
||||
type NoteWithContent = Note & {
|
||||
content?: NoteContent<false>;
|
||||
};
|
||||
|
||||
type LocalTabStateT = {
|
||||
editedAt: number;
|
||||
lastFocusedAt: number;
|
||||
};
|
||||
|
||||
class LocalTabState {
|
||||
state: Record<string, LocalTabStateT> = {};
|
||||
noteEditedTime: Record<string, number> = {};
|
||||
|
||||
setEditTime(noteId: string, time: number) {
|
||||
this.noteEditedTime[noteId] = time;
|
||||
}
|
||||
|
||||
get(tabId: string) {
|
||||
return this.state[tabId] || {};
|
||||
}
|
||||
|
||||
set(tabId: string, state: Partial<LocalTabStateT>) {
|
||||
this.state[tabId] = {
|
||||
...this.state[tabId],
|
||||
...state
|
||||
};
|
||||
}
|
||||
|
||||
clear(tabId: string) {
|
||||
delete this.state[tabId];
|
||||
}
|
||||
|
||||
reset() {
|
||||
this.state = {};
|
||||
}
|
||||
|
||||
needsRefresh(tabId: string, locked: boolean, readonly: boolean) {
|
||||
const state = this.get(tabId);
|
||||
const tabSession = useTabStore.getState().getTab(tabId)?.session;
|
||||
const noteId = useTabStore.getState().getNoteIdForTab(tabId);
|
||||
|
||||
if (
|
||||
tabSession?.locked !== locked ||
|
||||
tabSession?.readonly !== readonly ||
|
||||
!noteId
|
||||
) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return !state.editedAt || state.editedAt < this.noteEditedTime[noteId];
|
||||
}
|
||||
}
|
||||
|
||||
export const useEditor = (
|
||||
editorId = "",
|
||||
readonly?: boolean,
|
||||
@@ -98,7 +152,6 @@ export const useEditor = (
|
||||
isPreview?: boolean;
|
||||
};
|
||||
})
|
||||
| null
|
||||
| undefined
|
||||
>
|
||||
>({});
|
||||
@@ -118,15 +171,17 @@ export const useEditor = (
|
||||
const lastContentChangeTime = useRef<Record<string, number>>({});
|
||||
const lock = useRef(false);
|
||||
const currentLoadingNoteId = useRef<string>();
|
||||
const loadingState = useRef<string>();
|
||||
const lastTabFocused = useRef(0);
|
||||
const lastTabFocused = useRef<string>();
|
||||
|
||||
const localTabState = useRef<LocalTabState>(new LocalTabState());
|
||||
|
||||
const blockIdRef = useRef<string>();
|
||||
const postMessage = useCallback(
|
||||
async <T>(type: string, data: T, tabId?: number, waitFor = 300) =>
|
||||
async <T>(type: string, data: T, tabId?: string, waitFor = 300) =>
|
||||
await post(
|
||||
editorRef,
|
||||
sessionIdRef.current,
|
||||
typeof tabId !== "number" ? useTabStore.getState().currentTab : tabId,
|
||||
tabId || useTabStore.getState().currentTab!,
|
||||
type,
|
||||
data,
|
||||
waitFor
|
||||
@@ -141,7 +196,7 @@ export const useEditor = (
|
||||
}, [commands, insets, isDefaultEditor]);
|
||||
|
||||
useEffect(() => {
|
||||
postMessage(EditorEvents.theme, theme);
|
||||
postMessage(NativeEvents.theme, theme);
|
||||
}, [theme, postMessage]);
|
||||
|
||||
useEffect(() => {
|
||||
@@ -151,15 +206,14 @@ export const useEditor = (
|
||||
}, [commands, tags]);
|
||||
|
||||
useEffect(() => {
|
||||
const event = eSubscribeEvent(eEditorTabFocused, (tabId) => {
|
||||
console.log("Editot tab focus changed", lastTabFocused.current, tabId);
|
||||
const event = eSubscribeEvent(eEditorTabFocused, (tabId: string) => {
|
||||
if (lastTabFocused.current !== tabId) lock.current = false;
|
||||
lastTabFocused.current = tabId as number;
|
||||
lastTabFocused.current = tabId;
|
||||
});
|
||||
return () => {
|
||||
event?.unsubscribe();
|
||||
};
|
||||
});
|
||||
}, []);
|
||||
|
||||
const overlay = useCallback(
|
||||
(show: boolean, data = { type: "new" }) => {
|
||||
@@ -188,12 +242,11 @@ export const useEditor = (
|
||||
);
|
||||
|
||||
const reset = useCallback(
|
||||
async (tabId: number, resetState = true, resetContent = true) => {
|
||||
console.log("Resetting tab:", tabId);
|
||||
async (tabId: string, resetState = true, resetContent = true) => {
|
||||
const noteId = useTabStore.getState().getNoteIdForTab(tabId);
|
||||
if (noteId) {
|
||||
currentNotes.current?.id && db.fs().cancel(noteId);
|
||||
currentNotes.current[noteId] = null;
|
||||
currentNotes.current[noteId] = undefined;
|
||||
currentContents.current[noteId] = null;
|
||||
editorSessionHistory.clearSession(noteId);
|
||||
lastContentChangeTime.current[noteId] = 0;
|
||||
@@ -201,18 +254,11 @@ export const useEditor = (
|
||||
}
|
||||
|
||||
saveCount.current = 0;
|
||||
loadingState.current = undefined;
|
||||
currentLoadingNoteId.current = undefined;
|
||||
lock.current = false;
|
||||
resetContent && postMessage(EditorEvents.title, "", tabId);
|
||||
|
||||
resetContent && postMessage(NativeEvents.title, "", tabId);
|
||||
resetContent && (await commands.clearContent(tabId));
|
||||
resetContent && (await commands.clearTags(tabId));
|
||||
useTabStore.getState().updateTab(tabId, {
|
||||
noteId: undefined,
|
||||
locked: false,
|
||||
noteLocked: false,
|
||||
readonly: false
|
||||
});
|
||||
},
|
||||
[commands, editorSessionHistory, postMessage]
|
||||
);
|
||||
@@ -232,6 +278,16 @@ export const useEditor = (
|
||||
try {
|
||||
if (id && !(await db.notes?.note(id))) {
|
||||
await reset(tabId);
|
||||
useTabStore.getState().updateTab(tabId, {
|
||||
session: {
|
||||
noteId: undefined,
|
||||
noteLocked: undefined,
|
||||
locked: undefined,
|
||||
readonly: undefined,
|
||||
scrollTop: undefined,
|
||||
selection: undefined
|
||||
}
|
||||
});
|
||||
return;
|
||||
}
|
||||
let note = id ? await db.notes?.note(id) : undefined;
|
||||
@@ -270,13 +326,6 @@ export const useEditor = (
|
||||
};
|
||||
}
|
||||
|
||||
// If note is edited, the tab becomes a persistent tab automatically.
|
||||
if (useTabStore.getState().getTab(tabId)?.previewTab) {
|
||||
useTabStore.getState().updateTab(tabId, {
|
||||
previewTab: false
|
||||
});
|
||||
}
|
||||
|
||||
let saved = false;
|
||||
setTimeout(() => {
|
||||
if (saved) return;
|
||||
@@ -311,7 +360,9 @@ export const useEditor = (
|
||||
}
|
||||
|
||||
useTabStore.getState().updateTab(tabId, {
|
||||
noteId: id
|
||||
session: {
|
||||
noteId: id
|
||||
}
|
||||
});
|
||||
|
||||
const defaultNotebook = db.settings.getDefaultNotebook();
|
||||
@@ -326,7 +377,7 @@ export const useEditor = (
|
||||
|
||||
if (!noteData.title) {
|
||||
postMessage(
|
||||
EditorEvents.title,
|
||||
NativeEvents.title,
|
||||
currentNotes.current[id]?.title,
|
||||
tabId
|
||||
);
|
||||
@@ -386,12 +437,19 @@ export const useEditor = (
|
||||
id === useTabStore.getState().getCurrentNoteId() &&
|
||||
pendingChanges
|
||||
) {
|
||||
postMessage(EditorEvents.title, title || note?.title, tabId);
|
||||
postMessage(EditorEvents.html, data, tabId);
|
||||
postMessage(NativeEvents.title, title || note?.title, tabId);
|
||||
postMessage(NativeEvents.html, data, tabId);
|
||||
currentNotes.current[id] = note;
|
||||
}
|
||||
|
||||
saveCount.current++;
|
||||
|
||||
clearTimeout(timers.current.onsave);
|
||||
timers.current.onsave = setTimeout(async () => {
|
||||
if (!id || !note) return;
|
||||
NotePreviewWidget.updateNote(id, note);
|
||||
}, 500);
|
||||
|
||||
return id;
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
@@ -429,183 +487,222 @@ export const useEditor = (
|
||||
);
|
||||
|
||||
const loadNote = useCallback(
|
||||
async (event: {
|
||||
(event: {
|
||||
item?: Note;
|
||||
forced?: boolean;
|
||||
newNote?: boolean;
|
||||
tabId?: number;
|
||||
tabId?: string;
|
||||
blockId?: string;
|
||||
presistTab?: boolean;
|
||||
session?: TabSessionItem;
|
||||
newTab?: boolean;
|
||||
refresh?: boolean;
|
||||
}) => {
|
||||
if (!event) return;
|
||||
console.log(event.item?.id, event?.item?.title, "loading note...");
|
||||
|
||||
if (event.blockId) {
|
||||
blockIdRef.current = event.blockId;
|
||||
}
|
||||
state.current.currentlyEditing = true;
|
||||
|
||||
if (
|
||||
!state.current.ready &&
|
||||
(await isEditorLoaded(
|
||||
editorRef,
|
||||
sessionIdRef.current,
|
||||
useTabStore.getState().currentTab
|
||||
))
|
||||
) {
|
||||
state.current.ready = true;
|
||||
}
|
||||
|
||||
if (event.newNote) {
|
||||
useTabStore.getState().focusEmptyTab();
|
||||
const tabId = useTabStore.getState().currentTab;
|
||||
currentNotes.current && (await reset(tabId));
|
||||
setTimeout(() => {
|
||||
if (state.current?.ready && !state.current.movedAway)
|
||||
commands.focus(tabId);
|
||||
});
|
||||
} else {
|
||||
if (!event.item) {
|
||||
overlay(false);
|
||||
return;
|
||||
loadNoteMutex.runExclusive(async () => {
|
||||
if (!event) return;
|
||||
if (event.blockId) {
|
||||
blockIdRef.current = event.blockId;
|
||||
}
|
||||
console.log("LOADING NOTE", event.item.id);
|
||||
const item = event.item;
|
||||
|
||||
const currentTab = useTabStore
|
||||
.getState()
|
||||
.getTab(useTabStore.getState().currentTab);
|
||||
if (currentTab?.previewTab && item.id !== currentTab.noteId) {
|
||||
await commands.setLoading(true, useTabStore.getState().currentTab);
|
||||
}
|
||||
const isLockedNote = await db.vaults.itemExists(
|
||||
event.item as ItemReference
|
||||
);
|
||||
const tabLocked =
|
||||
isLockedNote && !(event.item as NoteWithContent).content;
|
||||
|
||||
// If note was already opened in a tab, focus that tab.
|
||||
if (typeof event.tabId !== "number") {
|
||||
if (useTabStore.getState().hasTabForNote(event.item.id)) {
|
||||
const tabId = useTabStore.getState().getTabForNote(event.item.id);
|
||||
if (typeof tabId === "number") {
|
||||
useTabStore.getState().updateTab(tabId, {
|
||||
readonly: event.item.readonly || readonly,
|
||||
locked: tabLocked,
|
||||
noteLocked: isLockedNote
|
||||
});
|
||||
useTabStore.getState().focusTab(tabId);
|
||||
setTimeout(() => {
|
||||
if (blockIdRef.current) {
|
||||
commands.scrollIntoViewById(blockIdRef.current);
|
||||
blockIdRef.current = undefined;
|
||||
}
|
||||
}, 150);
|
||||
}
|
||||
console.log("Note already loaded, focusing the tab");
|
||||
} else {
|
||||
if (event.presistTab) {
|
||||
// Open note in new tab.
|
||||
useTabStore.getState().newTab({
|
||||
readonly: event.item.readonly || readonly,
|
||||
locked: tabLocked,
|
||||
noteLocked: isLockedNote,
|
||||
noteId: event.item.id,
|
||||
previewTab: false
|
||||
});
|
||||
console.log("Opening note in new tab");
|
||||
} else {
|
||||
console.log("Opening note in preview tab");
|
||||
// Otherwise we focus the preview tab or create one to open the note in.
|
||||
useTabStore.getState().focusPreviewTab(event.item.id, {
|
||||
readonly: event.item.readonly || readonly,
|
||||
locked: tabLocked,
|
||||
noteLocked: isLockedNote
|
||||
});
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (lastTabFocused.current !== event.tabId) {
|
||||
useTabStore.getState().focusTab(event.tabId);
|
||||
}
|
||||
}
|
||||
|
||||
const tabId = event.tabId || useTabStore.getState().currentTab;
|
||||
if (lastTabFocused.current !== tabId) {
|
||||
// if ((await waitForEvent(eEditorTabFocused, 1000)) !== tabId) {
|
||||
// console.log("tab id did not match after focus in 1000ms");
|
||||
// return;
|
||||
// }
|
||||
currentLoadingNoteId.current = item.id;
|
||||
console.log("Waiting for tab to focus");
|
||||
return;
|
||||
}
|
||||
|
||||
state.current.movedAway = false;
|
||||
state.current.currentlyEditing = true;
|
||||
|
||||
if (!tabLocked) {
|
||||
await loadContent(item);
|
||||
}
|
||||
|
||||
if (
|
||||
currentNotes.current[item.id] &&
|
||||
loadingState.current &&
|
||||
currentContents.current[item.id]?.data &&
|
||||
loadingState.current === currentContents.current[item.id]?.data
|
||||
!state.current.ready &&
|
||||
(await isEditorLoaded(
|
||||
editorRef,
|
||||
sessionIdRef.current,
|
||||
useTabStore.getState().currentTab!
|
||||
))
|
||||
) {
|
||||
// If note is already loading, return.
|
||||
console.log("Note is already loading...");
|
||||
return;
|
||||
state.current.ready = true;
|
||||
}
|
||||
if (event.newNote && !currentLoadingNoteId.current) {
|
||||
let tabId;
|
||||
|
||||
if (!state.current.ready) {
|
||||
const currentTab = useTabStore
|
||||
.getState()
|
||||
.getTab(useTabStore.getState().currentTab as string);
|
||||
|
||||
if (useTabStore.getState().tabs.length === 0 || currentTab?.pinned) {
|
||||
tabId = useTabStore.getState().newTab();
|
||||
} else {
|
||||
tabId = useTabStore.getState().currentTab;
|
||||
await reset(tabId!, true, true);
|
||||
if (
|
||||
event.session?.noteId ||
|
||||
useTabStore.getState().getTab(tabId!)?.session?.noteId
|
||||
) {
|
||||
useTabStore.getState().newTabSession(tabId!, {});
|
||||
}
|
||||
}
|
||||
|
||||
setTimeout(() => {
|
||||
if (state.current?.ready && !state.current.movedAway)
|
||||
commands.focus(tabId!);
|
||||
});
|
||||
} else {
|
||||
if (!event.item) {
|
||||
overlay(false);
|
||||
return;
|
||||
}
|
||||
|
||||
const item = event.item;
|
||||
|
||||
const currentTab = useTabStore
|
||||
.getState()
|
||||
.getTab(useTabStore.getState().currentTab as string);
|
||||
|
||||
// If note is already open in a tab, focus that tab.
|
||||
if (useTabStore.getState().hasTabForNote(item.id) && !event.newTab) {
|
||||
const tabId = useTabStore.getState().getTabForNote(item.id);
|
||||
|
||||
if (
|
||||
currentTab?.session?.noteId !== item.id &&
|
||||
tabId !== useTabStore.getState().currentTab
|
||||
) {
|
||||
useTabStore.getState().focusTab(tabId as string);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
const isLockedNote = await db.vaults.itemExists(
|
||||
event.item as ItemReference
|
||||
);
|
||||
|
||||
const tabLocked =
|
||||
isLockedNote && !(event.item as NoteWithContent).content;
|
||||
|
||||
const tabId = event.tabId
|
||||
? event.tabId
|
||||
: useTabStore.getState().currentTab;
|
||||
|
||||
// Check if tab needs to be refreshed.
|
||||
if (!event.newTab) {
|
||||
if (
|
||||
!event.refresh &&
|
||||
tabId &&
|
||||
event.item.id === useTabStore.getState().getNoteIdForTab(tabId) &&
|
||||
!localTabState.current?.needsRefresh(
|
||||
tabId,
|
||||
isLockedNote,
|
||||
item.readonly
|
||||
)
|
||||
) {
|
||||
commands.setLoading(false, tabId);
|
||||
return;
|
||||
} else {
|
||||
localTabState.current?.setEditTime(
|
||||
item.id,
|
||||
localTabState.current?.noteEditedTime[item.id] ||
|
||||
item.dateEdited
|
||||
);
|
||||
localTabState.current?.set(tabId!, {
|
||||
editedAt:
|
||||
localTabState.current?.noteEditedTime[item.id] ||
|
||||
item.dateEdited
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
currentLoadingNoteId.current = item.id;
|
||||
|
||||
// Show loading overlay if note is not already loaded.
|
||||
if (
|
||||
tabId &&
|
||||
(event.item?.id !== useTabStore.getState().getNoteIdForTab(tabId) ||
|
||||
!currentContents.current[event.item.id]?.data)
|
||||
) {
|
||||
await commands.setLoading(true, tabId);
|
||||
}
|
||||
|
||||
const session: Partial<TabSessionItem> = event.session || {
|
||||
noteId: event.item.id
|
||||
};
|
||||
|
||||
session.noteLocked = isLockedNote;
|
||||
session.locked = tabLocked;
|
||||
session.readonly = item.readonly;
|
||||
|
||||
const tab = useTabStore.getState().getTab(tabId!);
|
||||
|
||||
if (
|
||||
useTabStore.getState().tabs.length === 0 ||
|
||||
event.newTab ||
|
||||
(currentTab?.pinned &&
|
||||
event.item.id !== currentTab?.session?.noteId)
|
||||
) {
|
||||
useTabStore.getState().newTab({
|
||||
session: session
|
||||
});
|
||||
return;
|
||||
} else {
|
||||
// A new session is created if the note is changed.
|
||||
// If the note is already opened, the session is updated.
|
||||
if (
|
||||
!tab?.session ||
|
||||
(event.item.id !== tab?.session?.noteId && tab?.session?.noteId)
|
||||
) {
|
||||
useTabStore.getState().newTabSession(tabId!, session);
|
||||
} else {
|
||||
useTabStore.getState().updateTab(tabId!, {
|
||||
session: session
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
if (lastTabFocused.current !== tabId) return;
|
||||
|
||||
if (tabBarRef.current?.page() === 2) {
|
||||
state.current.movedAway = false;
|
||||
}
|
||||
|
||||
state.current.currentlyEditing = true;
|
||||
if (!tabLocked) {
|
||||
await loadContent(item);
|
||||
} else {
|
||||
commands.focus(tabId!);
|
||||
}
|
||||
|
||||
lastContentChangeTime.current[item.id] = item.dateEdited;
|
||||
currentNotes.current[item.id] = item;
|
||||
return;
|
||||
|
||||
if (!currentNotes.current[item.id]) return;
|
||||
|
||||
editorSessionHistory.newSession(item.id);
|
||||
|
||||
await commands.setStatus(
|
||||
getFormattedDate(item.dateEdited, "date-time"),
|
||||
"Saved",
|
||||
tabId!
|
||||
);
|
||||
await postMessage(NativeEvents.title, item.title, tabId);
|
||||
overlay(false);
|
||||
|
||||
await postMessage(
|
||||
NativeEvents.html,
|
||||
{
|
||||
data: currentContents.current[item.id]?.data || "",
|
||||
scrollTop: tab?.session?.scrollTop,
|
||||
selection: tab?.session?.selection
|
||||
},
|
||||
tabId,
|
||||
10000
|
||||
);
|
||||
|
||||
setTimeout(() => {
|
||||
if (blockIdRef.current) {
|
||||
commands.scrollIntoViewById(blockIdRef.current);
|
||||
blockIdRef.current = undefined;
|
||||
}
|
||||
}, 300);
|
||||
|
||||
await commands.setTags(item);
|
||||
commands.setSettings();
|
||||
setTimeout(() => {
|
||||
if (currentLoadingNoteId.current === event.item?.id) {
|
||||
currentLoadingNoteId.current = undefined;
|
||||
}
|
||||
}, 300);
|
||||
}
|
||||
|
||||
lastContentChangeTime.current[item.id] = 0;
|
||||
currentLoadingNoteId.current = item.id;
|
||||
currentNotes.current[item.id] = item;
|
||||
|
||||
if (!currentNotes.current[item.id]) return;
|
||||
|
||||
editorSessionHistory.newSession(item.id);
|
||||
|
||||
await commands.setStatus(
|
||||
getFormattedDate(item.dateEdited, "date-time"),
|
||||
strings.saved(),
|
||||
tabId
|
||||
);
|
||||
|
||||
await postMessage(EditorEvents.title, item.title, tabId);
|
||||
overlay(false);
|
||||
loadingState.current = currentContents.current[item.id]?.data;
|
||||
|
||||
await postMessage(
|
||||
EditorEvents.html,
|
||||
currentContents.current[item.id]?.data || "",
|
||||
tabId,
|
||||
10000
|
||||
);
|
||||
|
||||
setTimeout(() => {
|
||||
if (blockIdRef.current) {
|
||||
commands.scrollIntoViewById(blockIdRef.current);
|
||||
blockIdRef.current = undefined;
|
||||
}
|
||||
}, 300);
|
||||
|
||||
loadingState.current = undefined;
|
||||
await commands.setTags(item);
|
||||
commands.setSettings();
|
||||
setTimeout(() => {
|
||||
if (currentLoadingNoteId.current === event.item?.id) {
|
||||
currentLoadingNoteId.current = undefined;
|
||||
}
|
||||
}, 300);
|
||||
}
|
||||
postMessage(EditorEvents.theme, theme);
|
||||
postMessage(NativeEvents.theme, theme);
|
||||
});
|
||||
},
|
||||
[
|
||||
commands,
|
||||
@@ -613,7 +710,6 @@ export const useEditor = (
|
||||
loadContent,
|
||||
overlay,
|
||||
postMessage,
|
||||
readonly,
|
||||
reset,
|
||||
theme
|
||||
]
|
||||
@@ -625,97 +721,116 @@ export const useEditor = (
|
||||
isLocal?: boolean
|
||||
) => {
|
||||
try {
|
||||
await (async () => {
|
||||
if (SettingsService.get().disableRealtimeSync && !isLocal) return;
|
||||
if (!data) return;
|
||||
if (SettingsService.get().disableRealtimeSync && !isLocal) return;
|
||||
if (!data) return;
|
||||
|
||||
if (isDeleted(data) || isTrashItem(data)) {
|
||||
const tabId = useTabStore.getState().getTabForNote(data.id);
|
||||
if (tabId !== undefined) {
|
||||
console.log("Removing tab");
|
||||
await commands.clearContent(tabId);
|
||||
useTabStore.getState().removeTab(tabId);
|
||||
}
|
||||
return;
|
||||
if (isDeleted(data) || isTrashItem(data)) {
|
||||
const tabId = useTabStore.getState().getTabForNote(data.id);
|
||||
if (tabId !== undefined) {
|
||||
await commands.clearContent(tabId);
|
||||
useTabStore.getState().removeTab(tabId);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
const noteId =
|
||||
(data as ContentItem).type === "tiptap"
|
||||
? (data as ContentItem).noteId
|
||||
: data.id;
|
||||
const noteId =
|
||||
(data as ContentItem).type === "tiptap"
|
||||
? (data as ContentItem).noteId
|
||||
: data.id;
|
||||
|
||||
if (!useTabStore.getState().hasTabForNote(noteId)) return;
|
||||
const tabId = useTabStore.getState().getTabForNote(noteId) as number;
|
||||
const note = data.type === "note" ? data : await db.notes?.note(noteId);
|
||||
|
||||
const tab = useTabStore.getState().getTab(tabId);
|
||||
lock.current = true;
|
||||
|
||||
const note =
|
||||
data.type === "note" ? data : await db.notes?.note(noteId);
|
||||
// Handle this case where note was locked on another device and synced.
|
||||
let locked = note
|
||||
? await db.vaults.itemExists(note as ItemReference)
|
||||
: false;
|
||||
|
||||
lock.current = true;
|
||||
if (data.type === "tiptap") {
|
||||
locked = data.locked;
|
||||
}
|
||||
|
||||
// Handle this case where note was locked on another device and synced.
|
||||
const locked = note
|
||||
? await db.vaults.itemExists(note as ItemReference)
|
||||
: false;
|
||||
useTabStore.getState().forEachNoteTab(noteId, async (tab) => {
|
||||
const tabId = tab.id;
|
||||
|
||||
let didUnlock = false;
|
||||
|
||||
if (note) {
|
||||
if (!locked && tab?.noteLocked) {
|
||||
// Note lock removed.
|
||||
if (tab.locked) {
|
||||
if (useTabStore.getState().currentTab === tabId) {
|
||||
eSendEvent(eOnLoadNote, {
|
||||
item: note,
|
||||
forced: true
|
||||
if (!locked && tab?.session?.noteLocked) {
|
||||
if (tab?.session?.noteLocked || tab?.session?.locked) {
|
||||
if (useTabStore.getState().currentTab !== tabId) {
|
||||
localTabState.current?.set(tabId, {
|
||||
editedAt: 0
|
||||
});
|
||||
} else {
|
||||
useTabStore.getState().updateTab(tabId, {
|
||||
}
|
||||
|
||||
didUnlock = true;
|
||||
useTabStore.getState().updateTab(tabId, {
|
||||
session: {
|
||||
locked: false,
|
||||
noteLocked: false
|
||||
});
|
||||
commands.setLoading(true, tabId);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
} else if (!tab?.noteLocked && locked) {
|
||||
// Note lock added.
|
||||
} else if (!tab?.session?.noteLocked && locked) {
|
||||
useTabStore.getState().updateTab(tabId, {
|
||||
locked: true,
|
||||
noteLocked: true
|
||||
session: {
|
||||
locked: true,
|
||||
noteLocked: true
|
||||
}
|
||||
});
|
||||
commands.clearContent(tabId);
|
||||
if (useTabStore.getState().currentTab !== tabId) {
|
||||
commands.clearContent(tabId);
|
||||
commands.setLoading(true, tabId);
|
||||
}
|
||||
localTabState.current?.set(tabId, {
|
||||
editedAt: 0
|
||||
});
|
||||
}
|
||||
|
||||
if (currentNotes.current[noteId]?.title !== note.title) {
|
||||
postMessage(EditorEvents.title, note.title, tabId);
|
||||
if (
|
||||
currentNotes.current[noteId]?.title !== note.title ||
|
||||
didUnlock
|
||||
) {
|
||||
postMessage(NativeEvents.title, note.title, tabId);
|
||||
}
|
||||
commands.setTags(note);
|
||||
if (currentNotes.current[noteId]?.dateEdited !== note.dateEdited) {
|
||||
if (
|
||||
currentNotes.current[noteId]?.dateEdited !== note.dateEdited ||
|
||||
didUnlock
|
||||
) {
|
||||
commands.setStatus(
|
||||
getFormattedDate(note.dateEdited, "date-time"),
|
||||
strings.saved(),
|
||||
tabId as number
|
||||
tabId as string
|
||||
);
|
||||
}
|
||||
|
||||
useTabStore.getState().updateTab(tabId, {
|
||||
readonly: note.readonly
|
||||
});
|
||||
if (tab.session?.readonly !== note.readonly || didUnlock) {
|
||||
useTabStore.getState().updateTab(tabId, {
|
||||
session: {
|
||||
readonly: note.readonly
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
if (data.type === "tiptap" && note && !isLocal) {
|
||||
if (lastContentChangeTime.current[noteId] >= data.dateModified) {
|
||||
if (
|
||||
lastContentChangeTime.current[noteId] >= data.dateModified &&
|
||||
!didUnlock
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (locked && isEncryptedContent(data)) {
|
||||
const decryptedContent = await db.vault?.decryptContent(data);
|
||||
if (!decryptedContent) {
|
||||
useTabStore.getState().updateTab(tabId, {
|
||||
locked: true,
|
||||
noteLocked: true
|
||||
useTabStore.getState().updateTab(tab.id, {
|
||||
session: {
|
||||
locked: true,
|
||||
noteLocked: true
|
||||
}
|
||||
});
|
||||
if (useTabStore.getState().currentTab !== tabId) {
|
||||
commands.clearContent(tabId);
|
||||
@@ -723,26 +838,43 @@ export const useEditor = (
|
||||
}
|
||||
} else {
|
||||
await postMessage(
|
||||
EditorEvents.updatehtml,
|
||||
decryptedContent.data,
|
||||
NativeEvents.updatehtml,
|
||||
{
|
||||
data: decryptedContent.data,
|
||||
selection: tab.session?.selection,
|
||||
scrollTop: tab.session?.scrollTop
|
||||
},
|
||||
tabId
|
||||
);
|
||||
currentContents.current[note.id] = decryptedContent;
|
||||
}
|
||||
} else {
|
||||
const _nextContent = data.data;
|
||||
if (_nextContent === currentContents.current[note.id]?.data) {
|
||||
if (
|
||||
_nextContent === currentContents.current[note.id]?.data &&
|
||||
!didUnlock
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
lastContentChangeTime.current[note.id] = note.dateEdited;
|
||||
await postMessage(EditorEvents.updatehtml, _nextContent, tabId);
|
||||
console.log(tab.session?.selection);
|
||||
await postMessage(
|
||||
NativeEvents.updatehtml,
|
||||
{
|
||||
data: _nextContent,
|
||||
selection: tab.session?.selection,
|
||||
scrollTop: tab.session?.scrollTop
|
||||
},
|
||||
tabId
|
||||
);
|
||||
if (!isEncryptedContent(data)) {
|
||||
currentContents.current[note.id] =
|
||||
data as UnencryptedContentItem;
|
||||
}
|
||||
}
|
||||
}
|
||||
})();
|
||||
});
|
||||
} catch (e) {
|
||||
DatabaseLogger.error(e as Error, "Error when applying sync changes");
|
||||
} finally {
|
||||
@@ -778,7 +910,7 @@ export const useEditor = (
|
||||
content?: string;
|
||||
type: string;
|
||||
ignoreEdit: boolean;
|
||||
tabId: number;
|
||||
tabId: string;
|
||||
pendingChanges?: boolean;
|
||||
}) => {
|
||||
DatabaseLogger.log(
|
||||
@@ -807,9 +939,13 @@ export const useEditor = (
|
||||
|
||||
if (noteId) {
|
||||
lastContentChangeTime.current[noteId] = Date.now();
|
||||
localTabState.current?.setEditTime(noteId, Date.now());
|
||||
localTabState?.current?.set(tabId, {
|
||||
editedAt: Date.now()
|
||||
});
|
||||
}
|
||||
|
||||
if (type === EventTypes.content && noteId) {
|
||||
if (type === EditorEvents.content && noteId) {
|
||||
currentContents.current[noteId as string] = {
|
||||
data: content,
|
||||
type: "tiptap",
|
||||
@@ -859,7 +995,9 @@ export const useEditor = (
|
||||
if (!appState) return;
|
||||
state.current.isRestoringState = true;
|
||||
state.current.currentlyEditing = true;
|
||||
state.current.movedAway = false;
|
||||
if (tabBarRef.current?.page() === 2) {
|
||||
state.current.movedAway = false;
|
||||
}
|
||||
|
||||
if (!state.current.editorStateRestored) {
|
||||
state.current.isRestoringState = true;
|
||||
@@ -890,9 +1028,12 @@ export const useEditor = (
|
||||
!(await isEditorLoaded(
|
||||
editorRef,
|
||||
sessionIdRef.current,
|
||||
useTabStore.getState().currentTab
|
||||
useTabStore.getState().currentTab!
|
||||
))
|
||||
) {
|
||||
localTabState.current?.set(useTabStore.getState().currentTab!, {
|
||||
editedAt: 0
|
||||
});
|
||||
eSendEvent(eEditorReset, "onReady");
|
||||
return false;
|
||||
} else {
|
||||
@@ -903,36 +1044,63 @@ export const useEditor = (
|
||||
}, [isDefaultEditor, restoreEditorState]);
|
||||
|
||||
const onLoad = useCallback(async () => {
|
||||
const isAppLoading = useSettingStore.getState().isAppLoading;
|
||||
if (isAppLoading) {
|
||||
const sub = useSettingStore.subscribe((state) => {
|
||||
if (!state.isAppLoading) {
|
||||
sub();
|
||||
onLoad();
|
||||
}
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
setTimeout(() => {
|
||||
postMessage(EditorEvents.theme, theme);
|
||||
postMessage(NativeEvents.theme, theme);
|
||||
});
|
||||
commands.setInsets(
|
||||
isDefaultEditor ? insets : { top: 0, left: 0, right: 0, bottom: 0 }
|
||||
);
|
||||
await commands.setSettings();
|
||||
|
||||
localTabState.current?.set(useTabStore.getState().currentTab!, {
|
||||
editedAt: 0
|
||||
});
|
||||
|
||||
if (!state.current.ready) {
|
||||
state.current.ready = true;
|
||||
}
|
||||
|
||||
const noteId = useTabStore.getState().getCurrentNoteId();
|
||||
if (!noteId) {
|
||||
loadNote({ newNote: true });
|
||||
if (tabBarRef.current?.page() === 1) {
|
||||
state.current.currentlyEditing = false;
|
||||
}
|
||||
} else if (state.current?.initialLoadCalled) {
|
||||
const note = currentNotes.current[noteId];
|
||||
if (note) {
|
||||
loadNote({
|
||||
item: note
|
||||
});
|
||||
}
|
||||
}
|
||||
if (!state.current?.initialLoadCalled) {
|
||||
const url = await Linking.getInitialURL();
|
||||
let noteId = url && new URL(url).searchParams.get("id");
|
||||
if (noteId) {
|
||||
const note = await db.notes?.note(noteId);
|
||||
if (note) {
|
||||
loadNote({
|
||||
item: note
|
||||
});
|
||||
}
|
||||
tabBarRef.current?.goToPage(1);
|
||||
} else {
|
||||
noteId = useTabStore.getState().getCurrentNoteId() || null;
|
||||
if (!noteId) {
|
||||
loadNote({ newNote: true });
|
||||
if (tabBarRef.current?.page() === 1) {
|
||||
state.current.currentlyEditing = false;
|
||||
}
|
||||
} else {
|
||||
const note = await db.notes.note(noteId);
|
||||
if (note) {
|
||||
loadNote({
|
||||
item: note
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
state.current.initialLoadCalled = true;
|
||||
overlay(false);
|
||||
}
|
||||
overlay(false);
|
||||
}, [
|
||||
postMessage,
|
||||
theme,
|
||||
|
||||
@@ -16,18 +16,27 @@ GNU General Public License for more details.
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
import {
|
||||
TabHistory as TabHistoryType,
|
||||
TabSessionHistory
|
||||
} from "@notesnook/common";
|
||||
import { getId } from "@notesnook/core";
|
||||
import { MMKVLoader } from "react-native-mmkv-storage";
|
||||
import create from "zustand";
|
||||
import { persist, StateStorage } from "zustand/middleware";
|
||||
import { db } from "../../../common/database";
|
||||
import { MMKV } from "../../../common/database/mmkv";
|
||||
import { eSendEvent } from "../../../services/event-manager";
|
||||
import { eOnLoadNote } from "../../../utils/events";
|
||||
import { editorController } from "./utils";
|
||||
|
||||
class History {
|
||||
history: number[];
|
||||
class TabHistory {
|
||||
history: string[];
|
||||
constructor() {
|
||||
this.history = [0];
|
||||
this.history = [];
|
||||
}
|
||||
|
||||
add(item: number) {
|
||||
add(item: string) {
|
||||
const index = this.history.findIndex((id) => item === id);
|
||||
if (index !== -1) {
|
||||
// Item already exists, move it to the top
|
||||
@@ -36,19 +45,19 @@ class History {
|
||||
this.history.unshift(item); // Add item to the beginning of the array
|
||||
|
||||
useTabStore.setState({
|
||||
tabHistory: this.history.slice()
|
||||
historyNew: this.history.slice()
|
||||
});
|
||||
return true; // Item added successfully
|
||||
}
|
||||
|
||||
remove(id: number) {
|
||||
remove(id: string) {
|
||||
const index = this.history.findIndex((item) => item === id);
|
||||
if (index >= -1 && index < this.history.length) {
|
||||
const removedItem = this.history.splice(index, 1)[0];
|
||||
return removedItem;
|
||||
}
|
||||
useTabStore.setState({
|
||||
tabHistory: this.history.slice()
|
||||
historyNew: this.history.slice()
|
||||
});
|
||||
return null; // Invalid index
|
||||
}
|
||||
@@ -59,7 +68,7 @@ class History {
|
||||
return restoredItem;
|
||||
}
|
||||
useTabStore.setState({
|
||||
tabHistory: this.history.slice()
|
||||
historyNew: this.history.slice()
|
||||
});
|
||||
return null; // History is empty
|
||||
}
|
||||
@@ -69,149 +78,366 @@ class History {
|
||||
}
|
||||
}
|
||||
|
||||
export type TabItem = {
|
||||
id: number;
|
||||
export type TabSessionItem = {
|
||||
id: string;
|
||||
noteId?: string;
|
||||
previewTab?: boolean;
|
||||
readonly?: boolean;
|
||||
locked?: boolean;
|
||||
scrollTop?: number;
|
||||
selection?: { to: number; from: number };
|
||||
noteLocked?: boolean;
|
||||
pinned?: boolean;
|
||||
locked?: boolean;
|
||||
readonly?: boolean;
|
||||
};
|
||||
|
||||
const history = new History();
|
||||
const TabSessionStorageKV = new MMKVLoader()
|
||||
.withInstanceID("tab-session-storage")
|
||||
.disableIndexing()
|
||||
.initialize();
|
||||
|
||||
class TabSessionStorage {
|
||||
static storage: typeof TabSessionStorageKV = TabSessionStorageKV;
|
||||
|
||||
static get(id: string): TabSessionItem | null {
|
||||
if (!id) return null;
|
||||
return TabSessionStorage.storage.getMap(id);
|
||||
}
|
||||
|
||||
static set(id: string, session: TabSessionItem): void {
|
||||
if (!id) return;
|
||||
TabSessionStorage.storage.setMap(id, session);
|
||||
}
|
||||
|
||||
static update(id: string, session: Partial<TabSessionItem>) {
|
||||
const currentSession = TabSessionStorage.get(id);
|
||||
const newSession = {
|
||||
...currentSession,
|
||||
...session,
|
||||
id: currentSession?.id || session.id || id
|
||||
};
|
||||
|
||||
TabSessionStorage.set(id, newSession as TabSessionItem);
|
||||
return newSession;
|
||||
}
|
||||
|
||||
static remove(id: string) {
|
||||
if (!id) return;
|
||||
TabSessionStorageKV.removeItem(id);
|
||||
}
|
||||
}
|
||||
|
||||
export function syncTabs(
|
||||
type: "tabs" | "history" | "biometry" | "all" = "all"
|
||||
) {
|
||||
const data: Partial<TabStore> = {};
|
||||
if (type === "tabs" || type === "all") {
|
||||
data.tabs = useTabStore.getState().tabs;
|
||||
data.currentTab = useTabStore.getState().currentTab;
|
||||
}
|
||||
if (type === "history" || type === "all") {
|
||||
data.canGoBack = useTabStore.getState().canGoBack;
|
||||
data.canGoForward = useTabStore.getState().canGoForward;
|
||||
data.sessionId = useTabStore.getState().sessionId;
|
||||
}
|
||||
|
||||
if (type === "biometry" || type === "all") {
|
||||
data.biometryAvailable = useTabStore.getState().biometryAvailable;
|
||||
data.biometryEnrolled = useTabStore.getState().biometryEnrolled;
|
||||
}
|
||||
|
||||
editorController.current?.commands.doAsync(`
|
||||
globalThis.tabStore?.setState(${JSON.stringify(data)});
|
||||
`);
|
||||
}
|
||||
export const tabSessionHistory = new TabSessionHistory({
|
||||
get() {
|
||||
return useTabStore.getState();
|
||||
},
|
||||
set(state) {
|
||||
useTabStore.setState({
|
||||
...state
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
export type TabItem = {
|
||||
id: string;
|
||||
pinned?: boolean;
|
||||
needsRefresh?: boolean;
|
||||
session?: Partial<TabSessionItem>;
|
||||
};
|
||||
|
||||
const history = new TabHistory();
|
||||
|
||||
export type TabStore = {
|
||||
tabs: TabItem[];
|
||||
currentTab: number;
|
||||
updateTab: (id: number, options: Omit<Partial<TabItem>, "id">) => void;
|
||||
currentTab: string;
|
||||
updateTab: (id: string, options: Omit<Partial<TabItem>, "id">) => void;
|
||||
focusPreviewTab: (
|
||||
noteId: string,
|
||||
options: Omit<Partial<TabItem>, "id">
|
||||
) => void;
|
||||
removeTab: (index: number) => void;
|
||||
removeTab: (index: string) => void;
|
||||
moveTab: (index: number, toIndex: number) => void;
|
||||
newTab: (options?: Omit<Partial<TabItem>, "id">) => void;
|
||||
focusTab: (id: number) => void;
|
||||
getNoteIdForTab: (id: number) => string | undefined;
|
||||
getTabForNote: (noteId: string) => number | undefined;
|
||||
newTab: (options?: Omit<Partial<TabItem>, "id">) => string;
|
||||
focusTab: (id: string) => void;
|
||||
getNoteIdForTab: (id: string) => string | undefined;
|
||||
getTabForNote: (noteId: string) => string | undefined;
|
||||
getTabsForNote: (noteId: string) => TabItem[];
|
||||
forEachNoteTab: (noteId: string, cb: (tab: TabItem) => void) => void;
|
||||
hasTabForNote: (noteId: string) => boolean;
|
||||
focusEmptyTab: () => void;
|
||||
getCurrentNoteId: () => string | undefined;
|
||||
getTab: (tabId: number) => TabItem | undefined;
|
||||
tabHistory: number[];
|
||||
getTab: (tabId: string) => TabItem | undefined;
|
||||
newTabSession: (
|
||||
id: string,
|
||||
options?: Omit<Partial<TabSessionItem>, "id">
|
||||
) => void;
|
||||
historyNew: string[];
|
||||
biometryAvailable?: boolean;
|
||||
biometryEnrolled?: boolean;
|
||||
tabSessionHistory: TabHistoryType;
|
||||
goBack(): void;
|
||||
goForward(): void;
|
||||
loadSession: (id: string) => Promise<boolean>;
|
||||
canGoBack?: boolean;
|
||||
canGoForward?: boolean;
|
||||
sessionId?: string;
|
||||
};
|
||||
|
||||
function getId(id: number, tabs: TabItem[]): number {
|
||||
const exists = tabs.find((t) => t.id === id);
|
||||
if (exists) {
|
||||
return getId(id + 1, tabs);
|
||||
}
|
||||
return id;
|
||||
}
|
||||
const DEFAULT_TABS = {
|
||||
tabs: [
|
||||
{
|
||||
id: "679da59a3924d4bd56d16d3f",
|
||||
session: {
|
||||
id: "679da5a5667a16db2353a062"
|
||||
}
|
||||
}
|
||||
],
|
||||
tabSessionHistory: {
|
||||
"679da59a3924d4bd56d16d3f": {
|
||||
backStack: ["679da5a5667a16db2353a062"],
|
||||
forwardStack: [] as string[]
|
||||
}
|
||||
} as TabHistoryType,
|
||||
historyNew: ["679da59a3924d4bd56d16d3f"],
|
||||
currentTab: "679da59a3924d4bd56d16d3f"
|
||||
} as TabStore;
|
||||
|
||||
export function syncTabs() {
|
||||
editorController.current?.commands.doAsync(`
|
||||
globalThis.tabStore?.setState({
|
||||
tabs: ${JSON.stringify(useTabStore.getState().tabs)},
|
||||
currentTab: ${useTabStore.getState().currentTab},
|
||||
biometryAvailable: ${useTabStore.getState().biometryAvailable},
|
||||
biometryEnrolled: ${useTabStore.getState().biometryEnrolled}
|
||||
});
|
||||
`);
|
||||
export function resetTabStore() {
|
||||
useTabStore.setState({
|
||||
...DEFAULT_TABS
|
||||
});
|
||||
TabSessionStorage.storage.clearStore();
|
||||
}
|
||||
|
||||
export const useTabStore = create<TabStore>(
|
||||
persist(
|
||||
(set, get) => ({
|
||||
tabs: [
|
||||
{
|
||||
id: 0
|
||||
...DEFAULT_TABS,
|
||||
newTabSession: (
|
||||
_id?: string,
|
||||
options?: Omit<Partial<TabSessionItem>, "id">
|
||||
) => {
|
||||
const tabId = _id || (get().currentTab as string);
|
||||
|
||||
const sessionHistory = get().tabSessionHistory[tabId];
|
||||
|
||||
let oldSessionId: string | undefined = undefined;
|
||||
if (sessionHistory) {
|
||||
const allSessions = sessionHistory.backStack.concat(
|
||||
sessionHistory.forwardStack
|
||||
);
|
||||
allSessions.forEach((id) => {
|
||||
if (TabSessionStorage.get(id)?.noteId === options?.noteId) {
|
||||
oldSessionId = id;
|
||||
}
|
||||
});
|
||||
}
|
||||
],
|
||||
tabHistory: [0],
|
||||
history: new History(),
|
||||
currentTab: 0,
|
||||
updateTab: (id: number, options: Omit<Partial<TabItem>, "id">) => {
|
||||
if (!options) return;
|
||||
const index = get().tabs.findIndex((t) => t.id === id);
|
||||
|
||||
const sessionId =
|
||||
oldSessionId &&
|
||||
tabSessionHistory.currentSessionId(tabId) === oldSessionId
|
||||
? oldSessionId
|
||||
: tabSessionHistory.add(tabId, oldSessionId);
|
||||
|
||||
let session: Partial<TabSessionItem>;
|
||||
|
||||
if (!oldSessionId) {
|
||||
session = {
|
||||
id: sessionId,
|
||||
...options
|
||||
};
|
||||
TabSessionStorage.set(sessionId, session as TabSessionItem);
|
||||
} else {
|
||||
session = {
|
||||
id: sessionId,
|
||||
...TabSessionStorage.get(oldSessionId),
|
||||
...options
|
||||
};
|
||||
}
|
||||
|
||||
const index = get().tabs.findIndex((t) => t.id === tabId);
|
||||
if (index == -1) return;
|
||||
const tabs = [...get().tabs];
|
||||
tabs[index] = {
|
||||
...tabs[index],
|
||||
...options
|
||||
};
|
||||
session: session
|
||||
} as TabItem;
|
||||
|
||||
set({
|
||||
tabs: tabs
|
||||
});
|
||||
syncTabs();
|
||||
},
|
||||
focusPreviewTab: (
|
||||
noteId: string,
|
||||
options: Omit<Partial<TabItem>, "id" | "noteId">
|
||||
) => {
|
||||
const index = get().tabs.findIndex((t) => t.previewTab);
|
||||
if (index === -1)
|
||||
return get().newTab({
|
||||
noteId,
|
||||
previewTab: true,
|
||||
...options
|
||||
});
|
||||
updateTab: (id: string, options: Omit<Partial<TabItem>, "id">) => {
|
||||
if (!options) return;
|
||||
const index = get().tabs.findIndex((t) => t.id === id);
|
||||
if (index == -1) return;
|
||||
const tabs = [...get().tabs];
|
||||
const sessionId =
|
||||
options.session?.id || (tabs[index].session?.id as string);
|
||||
|
||||
const updatedSession = !options.session
|
||||
? tabs[index].session
|
||||
: TabSessionStorage.update(sessionId, options.session);
|
||||
|
||||
tabs[index] = {
|
||||
...tabs[index],
|
||||
...options,
|
||||
previewTab: true,
|
||||
noteId: noteId
|
||||
};
|
||||
console.log("focus preview", noteId);
|
||||
session: updatedSession
|
||||
} as TabItem;
|
||||
|
||||
set({
|
||||
tabs: tabs
|
||||
});
|
||||
get().focusTab(tabs[index].id);
|
||||
syncTabs();
|
||||
},
|
||||
removeTab: (id: number) => {
|
||||
const index = get().tabs.findIndex((t) => t.id === id);
|
||||
goBack: async () => {
|
||||
const currentTab = get().currentTab;
|
||||
if (!currentTab) return;
|
||||
if (!tabSessionHistory.canGoBack(currentTab)) return;
|
||||
|
||||
const id = tabSessionHistory.back(currentTab) as string;
|
||||
const sessionLoaded = await get().loadSession(id);
|
||||
|
||||
if (!sessionLoaded) {
|
||||
const canGoBack = tabSessionHistory.canGoBack(currentTab);
|
||||
if (!canGoBack) {
|
||||
tabSessionHistory.forward(currentTab);
|
||||
syncTabs();
|
||||
} else {
|
||||
get().goBack();
|
||||
tabSessionHistory.remove(currentTab, id);
|
||||
TabSessionStorage.remove(id);
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
syncTabs();
|
||||
}
|
||||
},
|
||||
goForward: async () => {
|
||||
const currentTab = get().currentTab;
|
||||
if (!currentTab) return;
|
||||
|
||||
if (!tabSessionHistory.canGoForward(currentTab)) return;
|
||||
const id = tabSessionHistory.forward(currentTab) as string;
|
||||
if (!(await get().loadSession(id))) {
|
||||
const canGoForward = tabSessionHistory.canGoForward(currentTab);
|
||||
if (!canGoForward) {
|
||||
tabSessionHistory.back(currentTab);
|
||||
syncTabs();
|
||||
} else {
|
||||
get().goForward();
|
||||
tabSessionHistory.remove(currentTab, id);
|
||||
TabSessionStorage.remove(id);
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
syncTabs();
|
||||
}
|
||||
},
|
||||
loadSession: async (id: string) => {
|
||||
const session = TabSessionStorage.get(id);
|
||||
if (!session) return false;
|
||||
|
||||
const note = session?.noteId
|
||||
? await db.notes.note(session?.noteId)
|
||||
: undefined;
|
||||
|
||||
if (note) {
|
||||
const isLocked = await db.vaults.itemExists(note);
|
||||
session.noteLocked = isLocked;
|
||||
session.locked = isLocked;
|
||||
|
||||
session.readonly = note.readonly;
|
||||
} else if (session.noteId) {
|
||||
console.log("Failed to load session...");
|
||||
return false;
|
||||
}
|
||||
|
||||
eSendEvent(eOnLoadNote, {
|
||||
item: note,
|
||||
newNote: !note,
|
||||
tabId: get().currentTab,
|
||||
session: session
|
||||
});
|
||||
|
||||
return true;
|
||||
},
|
||||
focusPreviewTab: (
|
||||
noteId: string,
|
||||
options: Omit<Partial<TabItem>, "id" | "noteId">
|
||||
) => {},
|
||||
|
||||
removeTab: (id: string) => {
|
||||
const index = get().tabs.findIndex((t) => t.id === id);
|
||||
if (index > -1) {
|
||||
const isFocused = id === get().currentTab;
|
||||
const nextTabs = get().tabs.slice();
|
||||
nextTabs.splice(index, 1);
|
||||
history.remove(id);
|
||||
|
||||
const tabSessions = tabSessionHistory.getTabHistory(id);
|
||||
tabSessions.back.forEach((id) => TabSessionStorage.remove(id));
|
||||
tabSessions.forward.forEach((id) => TabSessionStorage.remove(id));
|
||||
tabSessionHistory.clearStackForTab(id);
|
||||
|
||||
if (nextTabs.length === 0) {
|
||||
nextTabs.push({
|
||||
id: 0
|
||||
const id = getId();
|
||||
set({
|
||||
tabs: [{ id: id }]
|
||||
});
|
||||
get().newTabSession(id);
|
||||
get().focusTab(id);
|
||||
} else {
|
||||
set({
|
||||
tabs: nextTabs
|
||||
});
|
||||
if (isFocused) {
|
||||
const lastTab = history.restoreLast();
|
||||
if (lastTab) get().focusTab(lastTab);
|
||||
}
|
||||
}
|
||||
set({
|
||||
tabs: nextTabs
|
||||
});
|
||||
get().focusTab(
|
||||
isFocused ? history.restoreLast() || 0 : get().currentTab
|
||||
);
|
||||
syncTabs();
|
||||
}
|
||||
},
|
||||
newTab: (options) => {
|
||||
const id = getId(get().tabs.length, get().tabs);
|
||||
const nextTabs = [
|
||||
...get().tabs,
|
||||
{
|
||||
id: id,
|
||||
...options
|
||||
}
|
||||
];
|
||||
const id = getId();
|
||||
set({
|
||||
tabs: nextTabs
|
||||
tabs: [
|
||||
...get().tabs,
|
||||
{
|
||||
id: id,
|
||||
...options
|
||||
}
|
||||
]
|
||||
});
|
||||
get().newTabSession(id, options?.session || {});
|
||||
get().focusTab(id);
|
||||
return id;
|
||||
},
|
||||
focusEmptyTab: () => {
|
||||
const index = get().tabs.findIndex((t) => !t.noteId);
|
||||
const index = get().tabs.findIndex((t) => !t.session?.noteId);
|
||||
if (index === -1) return get().newTab();
|
||||
console.log("focus empty tab", get().tabs[index]);
|
||||
|
||||
get().focusTab(get().tabs[index].id);
|
||||
},
|
||||
@@ -224,38 +450,46 @@ export const useTabStore = create<TabStore>(
|
||||
syncTabs();
|
||||
},
|
||||
|
||||
focusTab: (id: number) => {
|
||||
console.log(history.getHistory(), id);
|
||||
focusTab: (id: string) => {
|
||||
history.add(id);
|
||||
set({
|
||||
currentTab: id
|
||||
currentTab: id,
|
||||
canGoBack: tabSessionHistory.canGoBack(id),
|
||||
canGoForward: tabSessionHistory.canGoForward(id),
|
||||
sessionId: tabSessionHistory.currentSessionId(id)
|
||||
});
|
||||
syncTabs();
|
||||
},
|
||||
getNoteIdForTab: (id: number) => {
|
||||
return get().tabs.find((t) => t.id === id)?.noteId;
|
||||
getNoteIdForTab: (id: string) => {
|
||||
return get().tabs.find((t) => t.id === id)?.session?.noteId;
|
||||
},
|
||||
hasTabForNote: (noteId: string) => {
|
||||
return (
|
||||
typeof get().tabs.find((t) => t.noteId === noteId)?.id === "number"
|
||||
);
|
||||
return !!get().tabs.find((t) => t.session?.noteId === noteId);
|
||||
},
|
||||
getTabForNote: (noteId: string) => {
|
||||
return get().tabs.find((t) => t.noteId === noteId)?.id;
|
||||
return get().tabs.find((t) => t.session?.noteId === noteId)?.id;
|
||||
},
|
||||
getTabsForNote(noteId: string) {
|
||||
return get().tabs.filter((t) => t.session?.noteId === noteId);
|
||||
},
|
||||
forEachNoteTab: (noteId: string, cb: (tab: TabItem) => void) => {
|
||||
const tabs = get().tabs.filter((t) => t.session?.noteId === noteId);
|
||||
tabs.forEach(cb);
|
||||
},
|
||||
getCurrentNoteId: () => {
|
||||
return get().tabs.find((t) => t.id === get().currentTab)?.noteId;
|
||||
return get().tabs.find((t) => t.id === get().currentTab)?.session
|
||||
?.noteId;
|
||||
},
|
||||
getTab: (tabId) => {
|
||||
return get().tabs.find((t) => t.id === tabId);
|
||||
}
|
||||
}),
|
||||
{
|
||||
name: "tabs-storage",
|
||||
name: "tabs-storage-v5",
|
||||
getStorage: () => MMKV as unknown as StateStorage,
|
||||
onRehydrateStorage: () => {
|
||||
return (state) => {
|
||||
history.history = state?.tabHistory.slice() || [];
|
||||
history.history = state?.historyNew || [];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,6 +31,8 @@ import { eOnLoadNote } from "../../../utils/events";
|
||||
import { NotesnookModule } from "../../../utils/notesnook-module";
|
||||
import { AppState, EditorState, useEditorType } from "./types";
|
||||
import { useTabStore } from "./use-tab-store";
|
||||
import { NativeEvents } from "@notesnook/editor-mobile/src/utils/native-events";
|
||||
|
||||
export const textInput = createRef<TextInput>();
|
||||
export const editorController =
|
||||
createRef<useEditorType>() as MutableRefObject<useEditorType>;
|
||||
@@ -46,19 +48,6 @@ export function editorState() {
|
||||
return editorController.current?.state.current || defaultState;
|
||||
}
|
||||
|
||||
export const EditorEvents = {
|
||||
html: "native:html",
|
||||
updatehtml: "native:updatehtml",
|
||||
title: "native:title",
|
||||
theme: "native:theme",
|
||||
titleplaceholder: "native:titleplaceholder",
|
||||
logger: "native:logger",
|
||||
status: "native:status",
|
||||
keyboardShown: "native:keyboardShown",
|
||||
attachmentData: "native:attachment-data",
|
||||
resolve: "native:resolve"
|
||||
};
|
||||
|
||||
export function randId(prefix: string) {
|
||||
return Math.random()
|
||||
.toString(36)
|
||||
@@ -72,15 +61,15 @@ export function makeSessionId(id?: string) {
|
||||
export async function isEditorLoaded(
|
||||
ref: RefObject<WebView>,
|
||||
sessionId: string,
|
||||
tabId: number
|
||||
tabId: string
|
||||
) {
|
||||
return await post(ref, sessionId, tabId, EditorEvents.status);
|
||||
return await post(ref, sessionId, tabId, NativeEvents.status);
|
||||
}
|
||||
|
||||
export async function post<T>(
|
||||
ref: RefObject<WebView>,
|
||||
sessionId: string,
|
||||
tabId: number,
|
||||
tabId: string,
|
||||
type: string,
|
||||
value: T | null = null,
|
||||
waitFor = 300
|
||||
@@ -135,7 +124,6 @@ export const waitForEvent = async (
|
||||
};
|
||||
eSubscribeEvent(type, callback);
|
||||
setTimeout(() => {
|
||||
console.log("return..");
|
||||
eUnSubscribeEvent(type, callback);
|
||||
resolve(false);
|
||||
}, waitFor);
|
||||
@@ -158,6 +146,9 @@ const canRestoreAppState = (appState: AppState) => {
|
||||
};
|
||||
|
||||
let appState: AppState | undefined;
|
||||
export function setAppState(state: AppState) {
|
||||
appState = state;
|
||||
}
|
||||
export function getAppState() {
|
||||
if (appState && canRestoreAppState(appState)) return appState as AppState;
|
||||
const json = NotesnookModule.getAppState();
|
||||
@@ -183,7 +174,7 @@ export async function openInternalLink(url: string) {
|
||||
if (!data?.id) return false;
|
||||
if (
|
||||
data.id ===
|
||||
useTabStore.getState().getNoteIdForTab(useTabStore.getState().currentTab)
|
||||
useTabStore.getState().getNoteIdForTab(useTabStore.getState().currentTab!)
|
||||
) {
|
||||
if (data.params?.blockId) {
|
||||
setTimeout(() => {
|
||||
|
||||
169
apps/mobile/app/screens/note-preview-configure/index.tsx
Normal file
169
apps/mobile/app/screens/note-preview-configure/index.tsx
Normal file
@@ -0,0 +1,169 @@
|
||||
/*
|
||||
This file is part of the Notesnook project (https://notesnook.com/)
|
||||
|
||||
Copyright (C) 2023 Streetwriters (Private) Limited
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
import { Note, VirtualizedGrouping } from "@notesnook/core";
|
||||
import { useThemeColors } from "@notesnook/theme";
|
||||
import React, { useEffect, useState } from "react";
|
||||
import { FlatList, TouchableOpacity, View } from "react-native";
|
||||
import { db } from "../../common/database";
|
||||
import { Header } from "../../components/header";
|
||||
import Input from "../../components/ui/input";
|
||||
import Paragraph from "../../components/ui/typography/paragraph";
|
||||
import { useDBItem } from "../../hooks/use-db-item";
|
||||
import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
|
||||
import { useSettingStore } from "../../stores/use-setting-store";
|
||||
import { NotesnookModule } from "../../utils/notesnook-module";
|
||||
|
||||
const NoteItem = (props: {
|
||||
id: string | number;
|
||||
items?: VirtualizedGrouping<Note>;
|
||||
}) => {
|
||||
const { colors } = useThemeColors();
|
||||
const [item] = useDBItem(props.id, "note", props.items);
|
||||
|
||||
return (
|
||||
<TouchableOpacity
|
||||
activeOpacity={0.7}
|
||||
onPress={() => {
|
||||
const widgetId = NotesnookModule.getWidgetId();
|
||||
NotesnookModule.setString(
|
||||
"appPreview",
|
||||
String(widgetId),
|
||||
JSON.stringify(item)
|
||||
);
|
||||
setTimeout(() => {
|
||||
NotesnookModule.saveAndFinish();
|
||||
});
|
||||
}}
|
||||
style={{
|
||||
flexDirection: "column",
|
||||
borderBottomWidth: 1,
|
||||
borderBottomColor: colors.primary.border,
|
||||
justifyContent: "center",
|
||||
paddingVertical: 12,
|
||||
minHeight: 45
|
||||
}}
|
||||
>
|
||||
{!item ? null : (
|
||||
<View
|
||||
style={{
|
||||
flexDirection: "row",
|
||||
paddingHorizontal: 12
|
||||
}}
|
||||
>
|
||||
<View
|
||||
style={{
|
||||
flexDirection: "column"
|
||||
}}
|
||||
>
|
||||
<Paragraph
|
||||
numberOfLines={1}
|
||||
style={{
|
||||
color: colors.primary.paragraph,
|
||||
fontSize: 15
|
||||
}}
|
||||
>
|
||||
{item.title}
|
||||
</Paragraph>
|
||||
</View>
|
||||
</View>
|
||||
)}
|
||||
</TouchableOpacity>
|
||||
);
|
||||
};
|
||||
|
||||
export const NotePreviewConfigure = () => {
|
||||
const [items, setItems] = useState<VirtualizedGrouping<Note>>();
|
||||
const loading = useSettingStore((state) => state.isAppLoading);
|
||||
const bounceRef = React.useRef<NodeJS.Timeout>();
|
||||
const { colors } = useThemeColors();
|
||||
const insets = useGlobalSafeAreaInsets();
|
||||
|
||||
useEffect(() => {
|
||||
useSettingStore.getState().setDeviceMode("mobile");
|
||||
if (loading) return;
|
||||
db.notes.all.sorted(db.settings.getGroupOptions("notes")).then((notes) => {
|
||||
setItems(notes);
|
||||
});
|
||||
}, [loading]);
|
||||
|
||||
const renderItem = React.useCallback(
|
||||
({ index }: { item: boolean; index: number }) => {
|
||||
return <NoteItem id={index} items={items} />;
|
||||
},
|
||||
[items]
|
||||
);
|
||||
|
||||
return (
|
||||
<View
|
||||
style={{
|
||||
backgroundColor: colors.primary.background,
|
||||
flex: 1
|
||||
}}
|
||||
>
|
||||
<Header
|
||||
canGoBack
|
||||
title="Select a note"
|
||||
onLeftMenuButtonPress={() => {
|
||||
NotesnookModule.cancelAndFinish();
|
||||
}}
|
||||
/>
|
||||
|
||||
<View
|
||||
style={{
|
||||
paddingHorizontal: 12,
|
||||
paddingTop: 6
|
||||
}}
|
||||
>
|
||||
<Input
|
||||
placeholder="Search for notes"
|
||||
containerStyle={{
|
||||
height: 50
|
||||
}}
|
||||
onChangeText={(value) => {
|
||||
bounceRef.current = setTimeout(() => {
|
||||
if (!value) {
|
||||
db.notes.all
|
||||
.sorted(db.settings.getGroupOptions("notes"))
|
||||
.then((notes) => {
|
||||
setItems(notes);
|
||||
});
|
||||
return;
|
||||
}
|
||||
db.lookup
|
||||
.notes(value)
|
||||
.sorted()
|
||||
.then((notes) => {
|
||||
setItems(notes);
|
||||
});
|
||||
}, 500);
|
||||
}}
|
||||
/>
|
||||
|
||||
<FlatList
|
||||
data={items?.placeholders}
|
||||
keyboardShouldPersistTaps="handled"
|
||||
keyboardDismissMode="interactive"
|
||||
renderItem={renderItem}
|
||||
windowSize={1}
|
||||
ListFooterComponent={<View style={{ height: 200 }} />}
|
||||
/>
|
||||
</View>
|
||||
</View>
|
||||
);
|
||||
};
|
||||
@@ -284,14 +284,13 @@ NotebookScreen.navigate = async (item: Notebook, canGoBack?: boolean) => {
|
||||
focusedRouteId == item?.id
|
||||
) {
|
||||
// Update the route in place instead
|
||||
console.log("Updating existing route in place");
|
||||
|
||||
eSendEvent(eUpdateNotebookRoute, {
|
||||
item: item,
|
||||
title: item.title,
|
||||
canGoBack: canGoBack
|
||||
});
|
||||
} else {
|
||||
console.log("Pushing new notebook route");
|
||||
// Push a new route
|
||||
Navigation.push("Notebook", {
|
||||
title: item.title,
|
||||
|
||||
@@ -59,7 +59,6 @@ ColoredNotes.navigate = (item: Color, canGoBack: boolean) => {
|
||||
const { focusedRouteId } = useNavigationStore.getState();
|
||||
|
||||
if (focusedRouteId === item.id) {
|
||||
console.log("ColoredNotes.navigate: route already focused for color");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -171,7 +171,6 @@ const NotesPage = ({
|
||||
setLoadingNotes(false);
|
||||
})
|
||||
.catch((e) => {
|
||||
console.log("Error loading notes", params.current?.title, e, e.stack);
|
||||
setLoadingNotes(false);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -60,7 +60,6 @@ TaggedNotes.navigate = (item: Tag, canGoBack?: boolean) => {
|
||||
const { focusedRouteId } = useNavigationStore.getState();
|
||||
|
||||
if (focusedRouteId === item.id) {
|
||||
console.log("TaggedNotes.navigate: route already focused for tag");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -160,9 +160,7 @@ export default function DebugLogs() {
|
||||
type: "success"
|
||||
});
|
||||
}
|
||||
} catch (e) {
|
||||
console.log(e);
|
||||
}
|
||||
} catch (e) {}
|
||||
}, [currentLog?.logs]);
|
||||
|
||||
const copyLogs = React.useCallback(() => {
|
||||
|
||||
@@ -54,7 +54,9 @@ export const Licenses = () => {
|
||||
}}
|
||||
onPress={() => {
|
||||
if (!item.link) return;
|
||||
Linking.openURL(item.link).catch(console.log);
|
||||
Linking.openURL(item.link).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
}}
|
||||
>
|
||||
<Heading size={SIZE.sm}>{item.name}</Heading>
|
||||
|
||||
@@ -33,7 +33,6 @@ import { strings } from "@notesnook/intl";
|
||||
export const FontPicker = createSettingsPicker({
|
||||
getValue: () => useSettingStore.getState().settings.defaultFontFamily,
|
||||
updateValue: (item) => {
|
||||
console.log(item.id);
|
||||
SettingsService.set({
|
||||
defaultFontFamily: item.id
|
||||
});
|
||||
@@ -75,7 +74,7 @@ export const TrashIntervalPicker = createSettingsPicker({
|
||||
? strings.never()
|
||||
: item === 1
|
||||
? strings.reminderRecurringMode.day()
|
||||
: item + " " + strings.days();
|
||||
: strings.days(item);
|
||||
},
|
||||
getItemKey: (item) => item.toString(),
|
||||
options: [-1, 1, 7, 30, 365],
|
||||
|
||||
@@ -148,7 +148,7 @@ const restoreBackup = async (options: {
|
||||
|
||||
let count = 0;
|
||||
await db.transaction(async () => {
|
||||
let passwordOrKey: PasswordOrKey;
|
||||
let passwordOrKey: PasswordOrKey | undefined = undefined;
|
||||
for (const path of extractedBackupFiles) {
|
||||
if (path === ".nnbackup" || path === "attachments") continue;
|
||||
|
||||
@@ -166,7 +166,7 @@ const restoreBackup = async (options: {
|
||||
|
||||
passwordOrKey = !isEncryptedBackup
|
||||
? ({} as PasswordOrKey)
|
||||
: await withPassword();
|
||||
: passwordOrKey || (await withPassword());
|
||||
|
||||
if (
|
||||
isEncryptedBackup &&
|
||||
@@ -197,7 +197,6 @@ const restoreBackup = async (options: {
|
||||
const attachment = await db.attachments.attachment(hash as string);
|
||||
if (!attachment) continue;
|
||||
|
||||
console.log("Saving attachment file", hash);
|
||||
await deleteCacheFileByName(hash);
|
||||
await RNFetchBlob.fs.cp(
|
||||
`${zipOutputFolder}/attachments/${hash}`,
|
||||
@@ -208,9 +207,13 @@ const restoreBackup = async (options: {
|
||||
progress: strings.cleaningUp()
|
||||
});
|
||||
// Remove files from cache
|
||||
RNFetchBlob.fs.unlink(zipOutputFolder).catch(console.log);
|
||||
RNFetchBlob.fs.unlink(zipOutputFolder).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
if (Platform.OS === "android" || deleteBackupFile) {
|
||||
RNFetchBlob.fs.unlink(filePath).catch(console.log);
|
||||
RNFetchBlob.fs.unlink(filePath).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
}
|
||||
} else {
|
||||
updateProgress({
|
||||
|
||||
@@ -23,7 +23,7 @@ import {
|
||||
StackActions,
|
||||
useNavigation
|
||||
} from "@react-navigation/native";
|
||||
import React, { useRef, useState } from "react";
|
||||
import React, { useEffect, useRef, useState } from "react";
|
||||
import { ActivityIndicator, TextInput, View } from "react-native";
|
||||
import Icon from "react-native-vector-icons/MaterialCommunityIcons";
|
||||
import ToggleSwitch from "toggle-switch-react-native";
|
||||
@@ -41,10 +41,18 @@ import { RouteParams, SettingSection } from "./types";
|
||||
|
||||
const _SectionItem = ({ item }: { item: SettingSection }) => {
|
||||
const { colors } = useThemeColors();
|
||||
const settings = useSettingStore((state) => state.settings);
|
||||
const [settings, itemProperty] = useSettingStore((state) => [
|
||||
state.settings,
|
||||
item.property ? state.settings[item.property] : null
|
||||
]);
|
||||
const navigation = useNavigation<NavigationProp<RouteParams>>();
|
||||
const current = item.useHook && item.useHook(item);
|
||||
const isHidden = item.hidden && item.hidden(item.property || current);
|
||||
const [isHidden, setIsHidden] = useState(
|
||||
item.hidden && item.hidden(item.property || current)
|
||||
);
|
||||
const [isDisabled, setIsDisabled] = useState(
|
||||
item.disabled && item.disabled(item.property || current)
|
||||
);
|
||||
const inputRef = useRef<TextInput>(null);
|
||||
const [loading, setLoading] = useState(false);
|
||||
|
||||
@@ -62,7 +70,13 @@ const _SectionItem = ({ item }: { item: SettingSection }) => {
|
||||
SettingsService.set({
|
||||
[item.property]: nextValue
|
||||
});
|
||||
setImmediate(() => item.onChange?.(nextValue));
|
||||
setImmediate(() => {
|
||||
item.onChange?.(nextValue);
|
||||
item.hidden &&
|
||||
setIsHidden(item.hidden && item.hidden(item.property || current));
|
||||
item.disabled &&
|
||||
setIsDisabled(item.disabled && item.disabled(item.property || current));
|
||||
});
|
||||
};
|
||||
|
||||
const styles =
|
||||
@@ -92,9 +106,14 @@ const _SectionItem = ({ item }: { item: SettingSection }) => {
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
setIsHidden(item.hidden && item.hidden(item.property || current));
|
||||
setIsDisabled(item.disabled && item.disabled(item.property || current));
|
||||
}, [current, item, itemProperty]);
|
||||
|
||||
return isHidden ? null : (
|
||||
<Pressable
|
||||
disabled={item.type === "component"}
|
||||
disabled={item.type === "component" || isDisabled}
|
||||
style={{
|
||||
width: "100%",
|
||||
alignItems: "center",
|
||||
@@ -102,10 +121,12 @@ const _SectionItem = ({ item }: { item: SettingSection }) => {
|
||||
flexDirection: "row",
|
||||
justifyContent: "space-between",
|
||||
paddingVertical: 20,
|
||||
opacity: isDisabled ? 0.5 : 1,
|
||||
borderRadius: 0,
|
||||
...styles
|
||||
}}
|
||||
onPress={async () => {
|
||||
if (isDisabled) return;
|
||||
switch (item.type) {
|
||||
case "screen":
|
||||
{
|
||||
@@ -208,6 +229,7 @@ const _SectionItem = ({ item }: { item: SettingSection }) => {
|
||||
});
|
||||
item.inputProperties?.onSubmitEditing?.(e);
|
||||
}}
|
||||
editable={!isDisabled}
|
||||
onChangeText={(text) => {
|
||||
SettingsService.set({
|
||||
[item.property as string]: text
|
||||
@@ -240,6 +262,7 @@ const _SectionItem = ({ item }: { item: SettingSection }) => {
|
||||
name="minus"
|
||||
color={colors.primary.icon}
|
||||
onPress={() => {
|
||||
if (isDisabled) return;
|
||||
const rawValue = SettingsService.get()[
|
||||
item.property as keyof SettingStore["settings"]
|
||||
] as string;
|
||||
@@ -262,6 +285,7 @@ const _SectionItem = ({ item }: { item: SettingSection }) => {
|
||||
onChangeInputSelectorValue(e.nativeEvent.text);
|
||||
item.inputProperties?.onSubmitEditing?.(e);
|
||||
}}
|
||||
editable={!isDisabled}
|
||||
onChangeText={(text) => {
|
||||
onChangeInputSelectorValue(text);
|
||||
item.inputProperties?.onSubmitEditing?.(text as any);
|
||||
@@ -287,6 +311,7 @@ const _SectionItem = ({ item }: { item: SettingSection }) => {
|
||||
name="plus"
|
||||
color={colors.primary.icon}
|
||||
onPress={() => {
|
||||
if (isDisabled) return;
|
||||
const rawValue = SettingsService.get()[
|
||||
item.property as keyof SettingStore["settings"]
|
||||
] as string;
|
||||
|
||||
@@ -389,7 +389,12 @@ export const settingsGroups: SettingSection[] = [
|
||||
useHook: () => {
|
||||
const [cacheSize, setCacheSize] = React.useState(0);
|
||||
React.useEffect(() => {
|
||||
filesystem.getCacheSize().then(setCacheSize).catch(console.log);
|
||||
filesystem
|
||||
.getCacheSize()
|
||||
.then(setCacheSize)
|
||||
.catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
const sub = eSubscribeEvent("cache-cleared", () => {
|
||||
setCacheSize(0);
|
||||
});
|
||||
@@ -446,7 +451,7 @@ export const settingsGroups: SettingSection[] = [
|
||||
"local",
|
||||
"partial"
|
||||
);
|
||||
if (result.error) throw result.error as Error;
|
||||
if (result?.error) throw result.error as Error;
|
||||
} catch (e) {
|
||||
DatabaseLogger.error(e);
|
||||
const error = e;
|
||||
@@ -532,7 +537,7 @@ export const settingsGroups: SettingSection[] = [
|
||||
endProgress();
|
||||
} catch (e) {
|
||||
endProgress();
|
||||
console.log(e);
|
||||
|
||||
ToastManager.error(
|
||||
e as Error,
|
||||
strings.failedToDeleteAccount(),
|
||||
@@ -568,7 +573,9 @@ export const settingsGroups: SettingSection[] = [
|
||||
}
|
||||
PremiumService.verify(() => {
|
||||
SettingsService.setProperty("offlineMode", true);
|
||||
db.attachments.cacheAttachments().catch(console.log);
|
||||
db.attachments.cacheAttachments().catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
});
|
||||
}
|
||||
},
|
||||
@@ -744,8 +751,12 @@ export const settingsGroups: SettingSection[] = [
|
||||
description: strings.clearDefaultNotebookDesc(),
|
||||
modifer: () => {
|
||||
db.settings.setDefaultNotebook(undefined);
|
||||
ToastManager.show({
|
||||
heading: strings.defaultNotebookCleared(),
|
||||
type: "success"
|
||||
});
|
||||
},
|
||||
hidden: () => !db.settings.getDefaultNotebook()
|
||||
disabled: () => !db.settings.getDefaultNotebook()
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -769,6 +780,10 @@ export const settingsGroups: SettingSection[] = [
|
||||
description: strings.resetToolbarDesc(),
|
||||
modifer: () => {
|
||||
useDragState.getState().setPreset("default");
|
||||
ToastManager.show({
|
||||
heading: strings.toolbarReset(),
|
||||
type: "success"
|
||||
});
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -1459,7 +1474,9 @@ export const settingsGroups: SettingSection[] = [
|
||||
name: strings.joinTelegram(),
|
||||
description: strings.joinTelegramDesc(),
|
||||
modifer: () => {
|
||||
Linking.openURL("https://t.me/notesnook").catch(console.log);
|
||||
Linking.openURL("https://t.me/notesnook").catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -1479,7 +1496,9 @@ export const settingsGroups: SettingSection[] = [
|
||||
description: strings.followOnXDesc(),
|
||||
icon: "twitter",
|
||||
modifer: () => {
|
||||
Linking.openURL("https://twitter.com/notesnook").catch(console.log);
|
||||
Linking.openURL("https://twitter.com/notesnook").catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -1487,7 +1506,9 @@ export const settingsGroups: SettingSection[] = [
|
||||
name: strings.joinDiscord(),
|
||||
icon: "discord",
|
||||
modifer: async () => {
|
||||
Linking.openURL("https://discord.gg/zQBK97EE22").catch(console.log);
|
||||
Linking.openURL("https://discord.gg/zQBK97EE22").catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
},
|
||||
description: strings.joinDiscordDesc()
|
||||
}
|
||||
|
||||
@@ -47,6 +47,7 @@ export type SettingSection = {
|
||||
maxInputValue?: number;
|
||||
onVerify?: () => Promise<boolean>;
|
||||
hideHeader?: boolean;
|
||||
disabled?: (current: unknown) => boolean;
|
||||
};
|
||||
|
||||
export type SettingsGroup = {
|
||||
|
||||
@@ -25,6 +25,7 @@ import {
|
||||
import { DatabaseLogger, db, setupDatabase } from "../common/database";
|
||||
import { deleteDCacheFiles } from "../common/filesystem/io";
|
||||
import { useUserStore } from "../stores/use-user-store";
|
||||
import { NotePreviewWidget } from "./note-preview-widget";
|
||||
import Notifications from "./notifications";
|
||||
import SettingsService from "./settings";
|
||||
|
||||
@@ -85,7 +86,6 @@ const task = async (event: { taskId: string; timeout: boolean }) => {
|
||||
const taskId = event.taskId;
|
||||
const isTimeout = event.timeout; // <-- true when your background-time has expired.
|
||||
if (isTimeout) {
|
||||
console.log(`BACKGROUND FETCH TIMEOUT: ${taskId}`);
|
||||
BackgroundFetch.finish(taskId);
|
||||
return;
|
||||
}
|
||||
@@ -112,12 +112,13 @@ async function onBackgroundSyncStarted() {
|
||||
useUserStore.getState().setSyncing(false);
|
||||
}
|
||||
await Notifications.setupReminders();
|
||||
|
||||
NotePreviewWidget.updateNotes();
|
||||
deleteDCacheFiles();
|
||||
DatabaseLogger.info("BACKGROUND SYNC COMPLETE");
|
||||
} catch (e) {
|
||||
useUserStore.getState().setSyncing(false);
|
||||
DatabaseLogger.error(e as Error);
|
||||
console.log("BACKGROUND SYNC ERROR", (e as Error).message);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -142,7 +143,6 @@ const onBoot = async () => {
|
||||
DatabaseLogger.info("BOOT TASK COMPLETE");
|
||||
} catch (e) {
|
||||
DatabaseLogger.error(e as Error);
|
||||
console.log(e);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -30,7 +30,11 @@ import { DatabaseLogger, db } from "../common/database";
|
||||
import filesystem, { FileStorage } from "../common/filesystem";
|
||||
import { cacheDir, copyFileAsync } from "../common/filesystem/utils";
|
||||
import { presentDialog } from "../components/dialog/functions";
|
||||
import { endProgress, updateProgress } from "../components/dialogs/progress";
|
||||
import {
|
||||
endProgress,
|
||||
startProgress,
|
||||
updateProgress
|
||||
} from "../components/dialogs/progress";
|
||||
import { eCloseSheet } from "../utils/events";
|
||||
import { sleep } from "../utils/time";
|
||||
import { ToastManager, eSendEvent, presentSheet } from "./event-manager";
|
||||
@@ -120,13 +124,17 @@ async function presentBackupCompleteSheet(backupFilePath: string) {
|
||||
Share.open({
|
||||
url: backupFilePath,
|
||||
failOnCancel: false
|
||||
}).catch(console.log);
|
||||
}).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
} else {
|
||||
FileViewer.open(backupFilePath, {
|
||||
showOpenWithDialog: true,
|
||||
showAppsSuggestions: true,
|
||||
shareFile: true
|
||||
} as any).catch(console.log);
|
||||
} as any).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
}
|
||||
},
|
||||
actionText: strings.share()
|
||||
@@ -151,6 +159,7 @@ async function updateNextBackupTime(type: "full" | "partial") {
|
||||
[type === "full" ? "lastFullBackupDate" : "lastBackupDate"]: Date.now()
|
||||
});
|
||||
}
|
||||
let backupRunning = false;
|
||||
/**
|
||||
* @param {boolean=} progress
|
||||
* @param {string=} context
|
||||
@@ -160,9 +169,23 @@ async function run(
|
||||
progress = false,
|
||||
context?: string,
|
||||
backupType: "full" | "partial" = "partial"
|
||||
) {
|
||||
console.log("Creating backup:", backupType, progress, context);
|
||||
|
||||
): Promise<{
|
||||
path?: string;
|
||||
error?: Error;
|
||||
report?: boolean;
|
||||
}> {
|
||||
if (backupRunning) {
|
||||
if (progress) {
|
||||
startProgress({
|
||||
title: strings.backingUpData(backupType),
|
||||
paragraph: strings.backupDataDesc(),
|
||||
progress: "Backup in progress...",
|
||||
canHideProgress: true
|
||||
});
|
||||
}
|
||||
return {};
|
||||
}
|
||||
backupRunning = true;
|
||||
const androidBackupDirectory = (await checkBackupDirExists(
|
||||
false,
|
||||
context
|
||||
@@ -190,10 +213,11 @@ async function run(
|
||||
);
|
||||
|
||||
if (progress) {
|
||||
presentSheet({
|
||||
startProgress({
|
||||
title: strings.backingUpData(backupType),
|
||||
paragraph: strings.backupDataDesc(),
|
||||
progress: true
|
||||
progress: "Preparing backup...",
|
||||
canHideProgress: true
|
||||
});
|
||||
}
|
||||
|
||||
@@ -203,7 +227,9 @@ async function run(
|
||||
? `${path}/${backupFileName}.nnbackupz`
|
||||
: `${cacheDir}/${backupFileName}.nnbackupz`;
|
||||
|
||||
await RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
|
||||
await RNFetchBlob.fs.unlink(zipSourceFolder).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
await RNFetchBlob.fs.mkdir(zipSourceFolder);
|
||||
|
||||
const attachmentsDir = zipSourceFolder + "/attachments";
|
||||
@@ -213,6 +239,7 @@ async function run(
|
||||
|
||||
try {
|
||||
const user = await db.user.getUser();
|
||||
DatabaseLogger.info(`Backup started: ${backupType}`);
|
||||
for await (const file of db.backup.export({
|
||||
type: "mobile",
|
||||
encrypt: SettingsService.get().encryptedBackup && !!user,
|
||||
@@ -240,12 +267,16 @@ async function run(
|
||||
}
|
||||
}
|
||||
|
||||
DatabaseLogger.info(`Backup complete: ${backupType}. Creating zip file...`);
|
||||
|
||||
updateProgress({
|
||||
progress: "Creating backup zip file..."
|
||||
});
|
||||
|
||||
await zip(zipSourceFolder, zipOutputFile);
|
||||
|
||||
DatabaseLogger.info(`Backup zip file created: ${zipOutputFile}`);
|
||||
|
||||
if (Platform.OS === "android") {
|
||||
// Move the zip to user selected directory.
|
||||
const file = await ScopedStorage.createFile(
|
||||
@@ -253,19 +284,18 @@ async function run(
|
||||
`${backupFileName}.nnbackupz`,
|
||||
"application/nnbackupz"
|
||||
);
|
||||
console.log("Copying zip file...");
|
||||
await copyFileAsync(`file://${zipOutputFile}`, file.uri);
|
||||
|
||||
console.log("Copied zip file...");
|
||||
DatabaseLogger.info("Copying backup file to user selected directory...");
|
||||
|
||||
await copyFileAsync(`file://${zipOutputFile}`, file.uri);
|
||||
DatabaseLogger.info("Backup saved to user selected directory.");
|
||||
|
||||
path = file.uri;
|
||||
} else {
|
||||
path = zipOutputFile;
|
||||
}
|
||||
|
||||
RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
|
||||
if (Platform.OS === "android") {
|
||||
RNFetchBlob.fs.unlink(zipOutputFile).catch(console.log);
|
||||
}
|
||||
cleanupAfterBackup(zipSourceFolder, zipOutputFile);
|
||||
|
||||
updateNextBackupTime(backupType || "partial");
|
||||
|
||||
@@ -276,6 +306,8 @@ async function run(
|
||||
const canShowCompletionStatus =
|
||||
progress && SettingsService.get().showBackupCompleteSheet;
|
||||
|
||||
backupRunning = false;
|
||||
|
||||
if (context) {
|
||||
return {
|
||||
path: path
|
||||
@@ -293,11 +325,11 @@ async function run(
|
||||
type: "success",
|
||||
context: "global"
|
||||
});
|
||||
|
||||
return {
|
||||
path: path
|
||||
};
|
||||
} catch (e) {
|
||||
backupRunning = false;
|
||||
ToastManager.error(e as Error, strings.backupFailed(), context || "global");
|
||||
|
||||
if (
|
||||
@@ -308,28 +340,34 @@ async function run(
|
||||
return run(progress, context, backupType);
|
||||
}
|
||||
|
||||
RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
|
||||
if (Platform.OS === "android") {
|
||||
RNFetchBlob.fs.unlink(zipOutputFile).catch(console.log);
|
||||
}
|
||||
cleanupAfterBackup(zipSourceFolder, zipOutputFile);
|
||||
|
||||
DatabaseLogger.error(e);
|
||||
await sleep(300);
|
||||
if (progress) {
|
||||
endProgress();
|
||||
}
|
||||
return {
|
||||
error: e,
|
||||
error: e as Error,
|
||||
report: true
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
function cleanupAfterBackup(zipSourceFolder: string, zipOutputFile: string) {
|
||||
RNFetchBlob.fs.unlink(zipSourceFolder).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
if (Platform.OS === "android") {
|
||||
RNFetchBlob.fs.unlink(zipOutputFile).catch(() => {
|
||||
/* empty */
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
async function checkBackupRequired(
|
||||
type: "daily" | "off" | "useroff" | "weekly" | "monthly" | "never",
|
||||
lastBackupDateType: "lastBackupDate" | "lastFullBackupDate" = "lastBackupDate"
|
||||
) {
|
||||
console.log(lastBackupDateType, type);
|
||||
if (type === "off" || type === "useroff" || type === "never" || !type) return;
|
||||
const now = Date.now();
|
||||
const lastBackupDate = SettingsService.getProperty(lastBackupDateType) as
|
||||
@@ -362,9 +400,7 @@ const checkAndRun = async () => {
|
||||
if (await checkBackupRequired(settings?.reminder)) {
|
||||
try {
|
||||
await run();
|
||||
} catch (e) {
|
||||
console.log(e);
|
||||
}
|
||||
} catch (e) {}
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -123,7 +123,6 @@ export type PresentSheetOptions = {
|
||||
};
|
||||
|
||||
export function presentSheet(data: Partial<PresentSheetOptions>) {
|
||||
console.log("PRESENTING...");
|
||||
eSendEvent(eOpenSheet, data);
|
||||
}
|
||||
|
||||
|
||||
@@ -85,7 +85,7 @@ async function resolveFileFunctions(
|
||||
`/export_${Date.now()}`
|
||||
);
|
||||
|
||||
await RNFetchBlob.fs.mkdir(exportCacheFolder).catch((e) => console.log(e));
|
||||
await RNFetchBlob.fs.mkdir(exportCacheFolder).catch((e) => {});
|
||||
|
||||
const mkdir = async (dir: string) => {
|
||||
const folder = join(exportCacheFolder, dir);
|
||||
@@ -96,7 +96,7 @@ async function resolveFileFunctions(
|
||||
|
||||
const writeFile = async (path: string, result: string) => {
|
||||
const cacheFilePath = join(exportCacheFolder, path);
|
||||
console.log(cacheFilePath, result.length);
|
||||
|
||||
await RNFetchBlob.fs.writeFile(
|
||||
cacheFilePath,
|
||||
result,
|
||||
@@ -194,7 +194,7 @@ async function bulkExport(
|
||||
try {
|
||||
await exportNoteToFile(item, type, mkdir, writeFile);
|
||||
} catch (e) {
|
||||
console.log(item.type, e);
|
||||
/* empty */
|
||||
}
|
||||
} else if (item.type === "attachment") {
|
||||
currentAttachmentProgress += 1;
|
||||
@@ -202,11 +202,11 @@ async function bulkExport(
|
||||
try {
|
||||
await exportAttachmentToFile(item, mkdir, cacheFolder);
|
||||
} catch (e) {
|
||||
console.log(item.path, e);
|
||||
/* empty */
|
||||
}
|
||||
}
|
||||
}
|
||||
console.log(cacheFolder);
|
||||
|
||||
return createZip(totalNotes, cacheFolder, type, path, callback);
|
||||
}
|
||||
|
||||
@@ -240,7 +240,7 @@ async function exportNote(
|
||||
noteItem = item;
|
||||
await exportNoteToFile(item, type, mkdir, writeFile);
|
||||
} catch (e) {
|
||||
console.log("exportNoteToFile", item.type, e);
|
||||
/* empty */
|
||||
}
|
||||
} else if (item.type === "attachment") {
|
||||
currentAttachmentProgress += 1;
|
||||
@@ -249,13 +249,12 @@ async function exportNote(
|
||||
hasAttachments = true;
|
||||
await exportAttachmentToFile(item, mkdir, cacheFolder);
|
||||
} catch (e) {
|
||||
console.log("exportAttachmentToFile", item.path, e);
|
||||
/* empty */
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!hasAttachments) {
|
||||
console.log("creating file...");
|
||||
return createFile(noteItem as ExportableNote, type, path, cacheFolder);
|
||||
} else {
|
||||
return createZip(1, cacheFolder, type, path, callback);
|
||||
@@ -333,10 +332,10 @@ async function createFile(
|
||||
filePath = originalPath.replace(`${ext}`, "") + "_" + id + ext;
|
||||
id++;
|
||||
}
|
||||
console.log("path", filePath);
|
||||
|
||||
await RNFetchBlob.fs.mv(exportedFile, filePath);
|
||||
}
|
||||
console.log("file moved...");
|
||||
|
||||
return {
|
||||
filePath: filePath,
|
||||
fileDir: path,
|
||||
|
||||
76
apps/mobile/app/services/intent.ts
Normal file
76
apps/mobile/app/services/intent.ts
Normal file
@@ -0,0 +1,76 @@
|
||||
/*
|
||||
This file is part of the Notesnook project (https://notesnook.com/)
|
||||
|
||||
Copyright (C) 2023 Streetwriters (Private) Limited
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
import { Platform } from "react-native";
|
||||
import { db } from "../common/database";
|
||||
import ReminderSheet from "../components/sheets/reminder";
|
||||
import { setAppState } from "../screens/editor/tiptap/utils";
|
||||
import { eOnLoadNote } from "../utils/events";
|
||||
import { tabBarRef } from "../utils/global-refs";
|
||||
import { NotesnookModule } from "../utils/notesnook-module";
|
||||
import { eSendEvent } from "./event-manager";
|
||||
|
||||
const launchIntent = Platform.OS === "ios" ? {} : NotesnookModule.getIntent();
|
||||
let used = false;
|
||||
let launched = false;
|
||||
export const IntentService = {
|
||||
getLaunchIntent() {
|
||||
if (used || Platform.OS === "ios") return null;
|
||||
used = true;
|
||||
return launchIntent;
|
||||
},
|
||||
onLaunch() {
|
||||
if (launched || Platform.OS === "ios") return;
|
||||
launched = true;
|
||||
if (launchIntent["com.streetwriters.notesnook.OpenNoteId"]) {
|
||||
setAppState({
|
||||
movedAway: false,
|
||||
editing: true,
|
||||
timestamp: Date.now(),
|
||||
noteId: launchIntent["com.streetwriters.notesnook.OpenNoteId"]
|
||||
});
|
||||
}
|
||||
},
|
||||
async onAppStateChanged() {
|
||||
if (Platform.OS === "ios") return;
|
||||
try {
|
||||
const intent = NotesnookModule.getIntent();
|
||||
|
||||
if (intent["com.streetwriters.notesnook.OpenNoteId"]) {
|
||||
const note = await db.notes.note(
|
||||
intent["com.streetwriters.notesnook.OpenNoteId"]
|
||||
);
|
||||
if (note) {
|
||||
eSendEvent(eOnLoadNote, {
|
||||
item: note
|
||||
});
|
||||
tabBarRef.current?.goToPage(1, false);
|
||||
}
|
||||
} else if (intent["com.streetwriters.notesnook.OpenReminderId"]) {
|
||||
const reminder = await db.reminders.reminder(
|
||||
intent["com.streetwriters.notesnook.OpenReminderId"]
|
||||
);
|
||||
if (reminder) ReminderSheet.present(reminder);
|
||||
} else if (intent["com.streetwriters.notesnook.NewReminder"]) {
|
||||
ReminderSheet.present();
|
||||
}
|
||||
} catch (e) {
|
||||
/* empty */
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -122,7 +122,6 @@ function queueRoutesForUpdate(...routesToUpdate: RouteName[]) {
|
||||
}
|
||||
|
||||
function navigate<T extends RouteName>(screen: T, params?: RouteParams[T]) {
|
||||
console.log(`Navigation.navigate ${screen} route`);
|
||||
rootNavigatorRef.current?.navigate(screen as any, params);
|
||||
}
|
||||
|
||||
@@ -131,17 +130,14 @@ function goBack() {
|
||||
}
|
||||
|
||||
function push<T extends RouteName>(screen: T, params: RouteParams[T]) {
|
||||
console.log(`Navigation.push ${screen} route`);
|
||||
rootNavigatorRef.current?.dispatch(StackActions.push(screen as any, params));
|
||||
}
|
||||
|
||||
function replace<T extends RouteName>(screen: T, params: RouteParams[T]) {
|
||||
console.log(`Navigation.replace ${screen} route`);
|
||||
rootNavigatorRef.current?.dispatch(StackActions.replace(screen, params));
|
||||
}
|
||||
|
||||
function popToTop() {
|
||||
console.log(`Navigation.popToTop`);
|
||||
rootNavigatorRef.current?.dispatch(StackActions.popToTop());
|
||||
}
|
||||
|
||||
|
||||
45
apps/mobile/app/services/note-preview-widget.ts
Normal file
45
apps/mobile/app/services/note-preview-widget.ts
Normal file
@@ -0,0 +1,45 @@
|
||||
/*
|
||||
This file is part of the Notesnook project (https://notesnook.com/)
|
||||
|
||||
Copyright (C) 2023 Streetwriters (Private) Limited
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
import { Note } from "@notesnook/core";
|
||||
import { db } from "../common/database";
|
||||
import { NotesnookModule } from "../utils/notesnook-module";
|
||||
import { Platform } from "react-native";
|
||||
|
||||
let timer: NodeJS.Timeout;
|
||||
export const NotePreviewWidget = {
|
||||
updateNotes: () => {
|
||||
if (Platform.OS !== "android") return;
|
||||
clearTimeout(timer);
|
||||
timer = setTimeout(async () => {
|
||||
const noteIds = await NotesnookModule.getWidgetNotes();
|
||||
for (const id of noteIds) {
|
||||
const newNote = await db.notes.note(id);
|
||||
if (!newNote) continue;
|
||||
|
||||
NotesnookModule.updateWidgetNote(id, JSON.stringify(newNote));
|
||||
}
|
||||
}, 500);
|
||||
},
|
||||
updateNote: async (id: string, note: Note) => {
|
||||
if (Platform.OS !== "android") return;
|
||||
if (id && (await NotesnookModule.hasWidgetNote(id))) {
|
||||
NotesnookModule.updateWidgetNote(id, JSON.stringify(note));
|
||||
}
|
||||
}
|
||||
};
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user