A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
mobile: refactor zustand stores
Ammar Ahmedc444f7ddb8b6
diff --git a/apps/mobile/app/common/database/index.js b/apps/mobile/app/common/database/index.jsindex 1160372ad..2816f9f67 100644--- a/apps/mobile/app/common/database/index.js+++ b/apps/mobile/app/common/database/index.js@@ -31,16 +31,16 @@ import { RNSqliteDriver } from "./sqlite.kysely";database.host(__DEV__? {- API_HOST: "https://api.notesnook.com",- AUTH_HOST: "https://auth.streetwriters.co",- SSE_HOST: "https://events.streetwriters.co",- SUBSCRIPTIONS_HOST: "https://subscriptions.streetwriters.co",- ISSUES_HOST: "https://issues.streetwriters.co"- // API_HOST: "http://192.168.43.5:5264",- // AUTH_HOST: "http://192.168.43.5:8264",- // SSE_HOST: "http://192.168.43.5:7264",- // SUBSCRIPTIONS_HOST: "http://192.168.43.5:9264",- // ISSUES_HOST: "http://192.168.43.5:2624"+ // API_HOST: "https://api.notesnook.com",+ // AUTH_HOST: "https://auth.streetwriters.co",+ // SSE_HOST: "https://events.streetwriters.co",+ // SUBSCRIPTIONS_HOST: "https://subscriptions.streetwriters.co",+ // ISSUES_HOST: "https://issues.streetwriters.co"+ API_HOST: "http://192.168.43.5:5264",+ AUTH_HOST: "http://192.168.43.5:8264",+ SSE_HOST: "http://192.168.43.5:7264",+ SUBSCRIPTIONS_HOST: "http://192.168.43.5:9264",+ ISSUES_HOST: "http://192.168.43.5:2624"}: {API_HOST: "https://api.notesnook.com",@@ -59,7 +59,7 @@ database.setup({compress: Gzip.deflate,decompress: Gzip.inflate},- batchSize: 500,+ batchSize: 100,sqliteOptions: {dialect: (name) => ({createDriver: () => {diff --git a/apps/mobile/app/components/dialog-provider/index.js b/apps/mobile/app/components/dialog-provider/index.jsindex 2863aedd9..d1a7c018f 100644--- a/apps/mobile/app/components/dialog-provider/index.js+++ b/apps/mobile/app/components/dialog-provider/index.js@@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.import { useThemeColors } from "@notesnook/theme";import React from "react";-import { useNoteStore } from "../../stores/use-notes-store";import { AnnouncementDialog } from "../announcements";import AuthModal from "../auth/auth-modal";import { SessionExpired } from "../auth/session-expired";@@ -40,7 +39,6 @@ import RestoreDataSheet from "../sheets/restore-data";const DialogProvider = () => {const { colors } = useThemeColors();- const loading = useNoteStore((state) => state.loading);return (<>@@ -57,7 +55,7 @@ const DialogProvider = () => {<VaultDialog colors={colors} /><RateAppSheet /><ImagePreview />- {loading ? null : <Expiring />}+ <Expiring /><AnnouncementDialog /><SessionExpired /><PDFPreview />diff --git a/apps/mobile/app/components/list-items/notebook/wrapper.tsx b/apps/mobile/app/components/list-items/notebook/wrapper.tsxindex 6e9859d23..840099c63 100644--- a/apps/mobile/app/components/list-items/notebook/wrapper.tsx+++ b/apps/mobile/app/components/list-items/notebook/wrapper.tsx@@ -57,7 +57,7 @@ export const openNotebook = (item: Notebook | BaseTrashItem<Notebook>) => {},onClose: async () => {await db.trash.delete(item.id);- useTrashStore.getState().setTrash();+ useTrashStore.getState().refresh();useSelectionStore.getState().setSelectionMode(undefined);ToastManager.show({heading: "Permanently deleted items",diff --git a/apps/mobile/app/components/list/list-item.wrapper.tsx b/apps/mobile/app/components/list/list-item.wrapper.tsxindex 78e36bdea..2da9c1da0 100644--- a/apps/mobile/app/components/list/list-item.wrapper.tsx+++ b/apps/mobile/app/components/list/list-item.wrapper.tsx@@ -35,6 +35,12 @@ import React, { useCallback, useEffect, useRef, useState } from "react";import { View } from "react-native";import { db } from "../../common/database";import { eSendEvent } from "../../services/event-manager";+import {+ NotebooksWithDateEdited,+ TagsWithDateEdited,+ isNoteResolvedData,+ resolveItems+} from "../../stores/resolve-items";import { RouteName } from "../../stores/use-navigation-store";import { eOpenJumpToDialog } from "../../utils/events";import { SectionHeader } from "../list-items/headers/section-header";@@ -43,10 +49,6 @@ import { NotebookWrapper } from "../list-items/notebook/wrapper";import ReminderItem from "../list-items/reminder";import TagItem from "../list-items/tag";-export type WithDateEdited<T> = { items: T[]; dateEdited: number };-export type NotebooksWithDateEdited = WithDateEdited<Notebook>;-export type TagsWithDateEdited = WithDateEdited<Tag>;-type ListItemWrapperProps<TItem = Item> = {group?: GroupingKey;items: VirtualizedGrouping<TItem> | undefined;@@ -279,137 +281,3 @@ function getDate(item: Item, groupType?: GroupingKey): number {) || 0);}--function withDateEdited<- T extends { dateEdited: number } | { dateModified: number }->(items: T[]): WithDateEdited<T> {- let latestDateEdited = 0;- items.forEach((item) => {- const date = "dateEdited" in item ? item.dateEdited : item.dateModified;- if (latestDateEdited < date) latestDateEdited = date;- });- return { dateEdited: latestDateEdited, items };-}--export async function resolveItems(ids: string[], items: Item[]) {- if (!ids.length || !items.length) return [];-- const { type } = items[0];- if (type === "note") return resolveNotes(ids);- else if (type === "notebook") {- return Promise.all(ids.map((id) => db.notebooks.totalNotes(id)));- } else if (type === "tag") {- return Promise.all(- ids.map((id) => db.relations.from({ id, type: "tag" }, "note").count())- );- }- return [];-}--type NoteResolvedData = {- notebooks?: NotebooksWithDateEdited;- reminder?: Reminder;- color?: Color;- tags?: TagsWithDateEdited;- attachmentsCount?: number;-};-async function resolveNotes(ids: string[]) {- console.time("relations");- const relations = [- ...(await db.relations- .to({ type: "note", ids }, ["notebook", "tag", "color"])- .get()),- ...(await db.relations.from({ type: "note", ids }, "reminder").get())- ];- console.timeEnd("relations");- const relationIds: {- notebooks: Set<string>;- colors: Set<string>;- tags: Set<string>;- reminders: Set<string>;- } = {- colors: new Set(),- notebooks: new Set(),- tags: new Set(),- reminders: new Set()- };-- const grouped: Record<- string,- {- notebooks: string[];- color?: string;- tags: string[];- reminder?: string;- }- > = {};- for (const relation of relations) {- const noteId =- relation.toType === "reminder" ? relation.fromId : relation.toId;- const data = grouped[noteId] || {- notebooks: [],- tags: []- };-- if (relation.toType === "reminder" && !data.reminder) {- data.reminder = relation.toId;- relationIds.reminders.add(relation.toId);- } else if (relation.fromType === "notebook" && data.notebooks.length < 2) {- data.notebooks.push(relation.fromId);- relationIds.notebooks.add(relation.fromId);- } else if (relation.fromType === "tag" && data.tags.length < 3) {- data.tags.push(relation.fromId);- relationIds.tags.add(relation.fromId);- } else if (relation.fromType === "color" && !data.color) {- data.color = relation.fromId;- relationIds.colors.add(relation.fromId);- }- grouped[noteId] = data;- }-- console.time("resolve");- const resolved = {- notebooks: await db.notebooks.all.records(- Array.from(relationIds.notebooks)- ),- tags: await db.tags.all.records(Array.from(relationIds.tags)),- colors: await db.colors.all.records(Array.from(relationIds.colors)),- reminders: await db.reminders.all.records(Array.from(relationIds.reminders))- };- console.timeEnd("resolve");-- const data: NoteResolvedData[] = [];- for (const noteId of ids) {- const group = grouped[noteId];- if (!group) {- data.push({});- continue;- }-- data.push({- color: group.color ? resolved.colors[group.color] : undefined,- reminder: group.reminder ? resolved.reminders[group.reminder] : undefined,- tags: withDateEdited(- group.tags.map((id) => resolved.tags[id]).filter(Boolean)- ),- notebooks: withDateEdited(- group.notebooks.map((id) => resolved.notebooks[id]).filter(Boolean)- ),- attachmentsCount:- (await db.attachments?.ofNote(noteId, "all").ids())?.length || 0- });- }-- return data;-}--export function isNoteResolvedData(data: unknown): data is NoteResolvedData {- return (- typeof data === "object" &&- !!data &&- "notebooks" in data &&- "reminder" in data &&- "color" in data &&- "tags" in data- );-}diff --git a/apps/mobile/app/components/note-history/preview.js b/apps/mobile/app/components/note-history/preview.jsindex fea62e84d..27b759718 100644--- a/apps/mobile/app/components/note-history/preview.js+++ b/apps/mobile/app/components/note-history/preview.js@@ -84,7 +84,7 @@ export default function NotePreview({ session, content, note }) {context: "local",positivePress: async () => {await db.trash.delete(note.id);- useTrashStore.getState().setTrash();+ useTrashStore.getState().refresh();useSelectionStore.getState().setSelectionMode(false);ToastManager.show({heading: "Permanently deleted items",diff --git a/apps/mobile/app/components/sheets/add-to/index.tsx b/apps/mobile/app/components/sheets/add-to/index.tsxindex 9de5afe20..88e508ef9 100644--- a/apps/mobile/app/components/sheets/add-to/index.tsx+++ b/apps/mobile/app/components/sheets/add-to/index.tsx@@ -20,13 +20,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.import { Note } from "@notesnook/core";import { useThemeColors } from "@notesnook/theme";import React, { RefObject, useCallback, useEffect } from "react";-import { Keyboard, TouchableOpacity, View } from "react-native";+import {+ ActivityIndicator,+ Keyboard,+ TouchableOpacity,+ View+} from "react-native";import { ActionSheetRef, FlashList } from "react-native-actions-sheet";import { db } from "../../../common/database";import { presentSheet } from "../../../services/event-manager";import Navigation from "../../../services/navigation";import { ItemSelection } from "../../../stores/item-selection-store";-import { useNotebookStore } from "../../../stores/use-notebook-store";+import {+ useNotebookStore,+ useNotebooks+} from "../../../stores/use-notebook-store";import { useRelationStore } from "../../../stores/use-relation-store";import { useSelectionStore } from "../../../stores/use-selection-store";import { useSettingStore } from "../../../stores/use-setting-store";@@ -39,6 +47,7 @@ import { IconButton } from "../../ui/icon-button";import Paragraph from "../../ui/typography/paragraph";import { NotebookItem } from "./notebook-item";import { useNotebookItemSelectionStore } from "./store";+import { SIZE } from "../../../utils/size";async function updateInitialSelectionState(items: string[]) {const relations = await db.relations@@ -85,7 +94,7 @@ const MoveNoteSheet = ({actionSheetRef: RefObject<ActionSheetRef>;}) => {const { colors } = useThemeColors();- const notebooks = useNotebookStore((state) => state.notebooks);+ const [notebooks, loading] = useNotebooks();const dimensions = useSettingStore((state) => state.dimensions);const selectedItemsList = useSelectionStore((state) => state.selectedItemsList@@ -234,7 +243,16 @@ const MoveNoteSheet = ({height: 200}}>- <Paragraph color={colors.primary.icon}>No notebooks</Paragraph>+ {loading ? (+ <ActivityIndicator+ size={SIZE.lg}+ color={colors.primary.accent}+ />+ ) : (+ <Paragraph color={colors.primary.icon}>+ No notebooks+ </Paragraph>+ )}</View>}ListFooterComponent={<View style={{ height: 50 }} />}diff --git a/apps/mobile/app/components/sheets/manage-tags/index.tsx b/apps/mobile/app/components/sheets/manage-tags/index.tsxindex d6dd466e6..996a9bced 100644--- a/apps/mobile/app/components/sheets/manage-tags/index.tsx+++ b/apps/mobile/app/components/sheets/manage-tags/index.tsx@@ -177,7 +177,7 @@ const ManageTagsSheet = (props: {}useRelationStore.getState().update();- useTagStore.getState().setTags();+ useTagStore.getState().refresh();setQuery(undefined);} catch (e) {ToastManager.show({@@ -225,7 +225,7 @@ const ManageTagsSheet = (props: {console.error(e);}}- useTagStore.getState().setTags();+ useTagStore.getState().refresh();useRelationStore.getState().update();refreshTags();setTimeout(() => {diff --git a/apps/mobile/app/components/side-menu/color-section.tsx b/apps/mobile/app/components/side-menu/color-section.tsxindex f3076719a..af3081866 100644--- a/apps/mobile/app/components/side-menu/color-section.tsx+++ b/apps/mobile/app/components/side-menu/color-section.tsx@@ -26,7 +26,7 @@ import { ColoredNotes } from "../../screens/notes/colored";import Navigation from "../../services/navigation";import { useMenuStore } from "../../stores/use-menu-store";import useNavigationStore from "../../stores/use-navigation-store";-import { useNoteStore } from "../../stores/use-notes-store";+import { useSettingStore } from "../../stores/use-setting-store";import { SIZE, normalize } from "../../utils/size";import { presentDialog } from "../dialog/functions";import { PressableButton } from "../ui/pressable";@@ -35,8 +35,11 @@ import Paragraph from "../ui/typography/paragraph";export const ColorSection = React.memo(function ColorSection() {- const colorNotes = useMenuStore((state) => state.colorNotes);- const loading = useNoteStore((state) => state.loading);+ const [colorNotes, loadingColors] = useMenuStore((state) => [+ state.colorNotes,+ state.loadingColors+ ]);+ const loading = useSettingStore((state) => state.isAppLoading);const setColorNotes = useMenuStore((state) => state.setColorNotes);useEffect(() => {@@ -45,9 +48,11 @@ export const ColorSection = React.memo(}}, [loading, setColorNotes]);- return colorNotes.map((item) => {- return <ColorItem key={item.id} item={item} />;- });+ return !loadingColors+ ? colorNotes.map((item) => {+ return <ColorItem key={item.id} item={item} />;+ })+ : null;},() => true);diff --git a/apps/mobile/app/components/side-menu/index.js b/apps/mobile/app/components/side-menu/index.jsindex bdf212e93..a5a600ef0 100644--- a/apps/mobile/app/components/side-menu/index.js+++ b/apps/mobile/app/components/side-menu/index.js@@ -17,6 +17,7 @@ You should have received a copy of the GNU General Public Licensealong with this program. If not, see <http://www.gnu.org/licenses/>.*/+import { useThemeColors } from "@notesnook/theme";import React, { useCallback } from "react";import { FlatList, View } from "react-native";import { notesnook } from "../../../e2e/test.ids";@@ -24,18 +25,16 @@ import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";import { DDS } from "../../services/device-detection";import { eSendEvent } from "../../services/event-manager";import Navigation from "../../services/navigation";-import { useNoteStore } from "../../stores/use-notes-store";import { useSettingStore } from "../../stores/use-setting-store";-import { useThemeColors } from "@notesnook/theme";+import { useThemeStore } from "../../stores/use-theme-store";import { useUserStore } from "../../stores/use-user-store";-import { MenuItemsList } from "../../utils/menu-items";import { SUBSCRIPTION_STATUS } from "../../utils/constants";import { eOpenPremiumDialog } from "../../utils/events";+import { MenuItemsList } from "../../utils/menu-items";import { ColorSection } from "./color-section";import { MenuItem } from "./menu-item";import { TagsSection } from "./pinned-section";import { UserStatus } from "./user-status";-import { useThemeStore } from "../../stores/use-theme-store";export const SideMenu = React.memo(function SideMenu() {@@ -44,7 +43,8 @@ export const SideMenu = React.memo(const subscriptionType = useUserStore((state) => state.user?.subscription?.type);- const loading = useNoteStore((state) => state.loading);+ const isAppLoading = useSettingStore((state) => state.isAppLoading);+const introCompleted = useSettingStore((state) => state.settings.introCompleted);@@ -96,7 +96,7 @@ export const SideMenu = React.memo([noTextMode]);- return !loading && introCompleted ? (+ return !isAppLoading && introCompleted ? (<Viewstyle={{height: "100%",diff --git a/apps/mobile/app/components/side-menu/pinned-section.tsx b/apps/mobile/app/components/side-menu/pinned-section.tsxindex b41b239d8..bf4ce38ab 100644--- a/apps/mobile/app/components/side-menu/pinned-section.tsx+++ b/apps/mobile/app/components/side-menu/pinned-section.tsx@@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.import { Notebook, Tag } from "@notesnook/core";import { useThemeColors } from "@notesnook/theme";-import React, { useCallback, useEffect, useRef, useState } from "react";+import React, { useEffect, useRef, useState } from "react";import { FlatList, View } from "react-native";import Icon from "react-native-vector-icons/MaterialCommunityIcons";import { db } from "../../common/database";@@ -28,7 +28,7 @@ import { TaggedNotes } from "../../screens/notes/tagged";import Navigation from "../../services/navigation";import { useMenuStore } from "../../stores/use-menu-store";import useNavigationStore from "../../stores/use-navigation-store";-import { useNoteStore } from "../../stores/use-notes-store";+import { useSettingStore } from "../../stores/use-setting-store";import { SIZE, normalize } from "../../utils/size";import { Properties } from "../properties";import { Button } from "../ui/button";@@ -41,8 +41,8 @@ import Paragraph from "../ui/typography/paragraph";export const TagsSection = React.memo(function TagsSection() {- const menuPins = useMenuStore((state) => state.menuPins);- const loading = useNoteStore((state) => state.loading);+ const [menuPins] = useMenuStore((state) => [state.menuPins]);+ const loading = useSettingStore((state) => state.isAppLoading);const setMenuPins = useMenuStore((state) => state.setMenuPins);useEffect(() => {diff --git a/apps/mobile/app/hooks/use-actions.tsx b/apps/mobile/app/hooks/use-actions.tsxindex 23d865dba..6c0d09815 100644--- a/apps/mobile/app/hooks/use-actions.tsx+++ b/apps/mobile/app/hooks/use-actions.tsx@@ -192,7 +192,7 @@ export const useActions = ({});InteractionManager.runAfterInteractions(() => {- useTagStore.getState().setTags();+ useTagStore.getState().refresh();useMenuStore.getState().setMenuPins();Navigation.queueRoutesForUpdate();useRelationStore.getState().update();@@ -223,7 +223,7 @@ export const useActions = ({await db.tags.remove(item.id);}setImmediate(() => {- useTagStore.getState().setTags();+ useTagStore.getState().refresh();Navigation.queueRoutesForUpdate();useRelationStore.getState().update();});diff --git a/apps/mobile/app/hooks/use-app-events.tsx b/apps/mobile/app/hooks/use-app-events.tsxindex 354094ffc..158438519 100644--- a/apps/mobile/app/hooks/use-app-events.tsx+++ b/apps/mobile/app/hooks/use-app-events.tsx@@ -78,11 +78,10 @@ import {import PremiumService from "../services/premium";import SettingsService from "../services/settings";import Sync from "../services/sync";-import { initAfterSync, initialize } from "../stores";+import { initAfterSync } from "../stores";import { useAttachmentStore } from "../stores/use-attachment-store";import { useEditorStore } from "../stores/use-editor-store";import { useMessageStore } from "../stores/use-message-store";-import { useNoteStore } from "../stores/use-notes-store";import { useSettingStore } from "../stores/use-setting-store";import { SyncStatus, useUserStore } from "../stores/use-user-store";import { updateStatusBarColor } from "../utils/colors";@@ -278,7 +277,7 @@ const onSubscriptionError = async (error: RNIap.PurchaseError) => {const SodiumEventEmitter = new NativeEventEmitter(NativeModules.Sodium);export const useAppEvents = () => {- const loading = useNoteStore((state) => state.loading);+ const loading = useSettingStore((state) => state.isAppLoading);const [setLastSynced, setUser, appLocked, syncing] = useUserStore((state) => [state.setLastSynced,state.setUser,@@ -628,8 +627,7 @@ export const useAppEvents = () => {if (!db.isInitialized) {await db.init();}- await initialize();- useNoteStore.getState().setLoading(false);+ useSettingStore.getState().setAppLoading(false);},disableClosing: true});@@ -657,9 +655,8 @@ export const useAppEvents = () => {}}if (IsDatabaseMigrationRequired()) return;- initialize();setImmediate(() => {- useNoteStore.getState().setLoading(false);+ useSettingStore.getState().setAppLoading(false);});Walkthrough.init();} catch (e) {@@ -675,7 +672,7 @@ export const useAppEvents = () => {if (!state.appLocked &&db.isInitialized &&- useNoteStore.getState().loading+ useSettingStore.getState().isAppLoading) {initializeDatabase();sub();diff --git a/apps/mobile/app/navigation/navigation-stack.js b/apps/mobile/app/navigation/navigation-stack.jsindex 741a72c5b..852d578c9 100644--- a/apps/mobile/app/navigation/navigation-stack.js+++ b/apps/mobile/app/navigation/navigation-stack.js@@ -132,7 +132,7 @@ const Tabs = React.memo(_Tabs, () => true);const _NavigationStack = () => {const clearSelection = useSelectionStore((state) => state.clearSelection);- const loading = useNoteStore((state) => state.loading);+ const loading = useSettingStore((state) => state.isAppLoading);const onStateChange = React.useCallback(() => {if (useSelectionStore.getState().selectionMode) {clearSelection(true);diff --git a/apps/mobile/app/screens/editor/tiptap/use-editor-events.ts b/apps/mobile/app/screens/editor/tiptap/use-editor-events.tsindex eb66cd7ab..29817da01 100644--- a/apps/mobile/app/screens/editor/tiptap/use-editor-events.ts+++ b/apps/mobile/app/screens/editor/tiptap/use-editor-events.ts@@ -138,7 +138,7 @@ export const useEditorEvents = (const deviceMode = useSettingStore((state) => state.deviceMode);const fullscreen = useSettingStore((state) => state.fullscreen);const corsProxy = useSettingStore((state) => state.settings.corsProxy);- const loading = useNoteStore((state) => state.loading);+ const loading = useSettingStore((state) => state.isAppLoading);const [dateFormat, timeFormat] = useSettingStore((state) => [state.dateFormat,state.timeFormat@@ -405,7 +405,7 @@ export const useEditorEvents = (db.relations.unlink(editorMessage.value as ItemReference, editor.note.current).then(async () => {- useTagStore.getState().setTags();+ useTagStore.getState().refresh();useRelationStore.getState().update();await editor.commands.setTags(editor.note.current);Navigation.queueRoutesForUpdate();diff --git a/apps/mobile/app/screens/editor/tiptap/use-editor.ts b/apps/mobile/app/screens/editor/tiptap/use-editor.tsindex 9f5f22f96..b38676a7f 100644--- a/apps/mobile/app/screens/editor/tiptap/use-editor.ts+++ b/apps/mobile/app/screens/editor/tiptap/use-editor.ts@@ -48,7 +48,7 @@ import Notifications from "../../../services/notifications";import SettingsService from "../../../services/settings";import { TipManager } from "../../../services/tip-manager";import { useEditorStore } from "../../../stores/use-editor-store";-import { useNoteStore } from "../../../stores/use-notes-store";+import { useSettingStore } from "../../../stores/use-setting-store";import { useTagStore } from "../../../stores/use-tag-store";import { eClearEditor, eOnLoadNote } from "../../../utils/events";import { tabBarRef } from "../../../utils/global-refs";@@ -90,7 +90,7 @@ export const useEditor = (const sessionHistoryId = useRef<number>();const state = useRef<Partial<EditorState>>(defaultState);const placeholderTip = useRef(TipManager.placeholderTip());- const tags = useTagStore((state) => state.tags);+ const tags = useTagStore((state) => state.items);const insets = useGlobalSafeAreaInsets();const isDefaultEditor = editorId === "";const saveCount = useRef(0);@@ -585,9 +585,9 @@ export const useEditor = (tabBarRef.current?.goToPage(1, false);}if (appState.note) {- if (useNoteStore.getState().loading) {- const remove = useNoteStore.subscribe((state) => {- if (!state.loading && appState.note) {+ if (useSettingStore.getState().isAppLoading) {+ const remove = useSettingStore.subscribe((state) => {+ if (!state.isAppLoading && appState.note) {loadNote({item: appState.note});diff --git a/apps/mobile/app/screens/favorites/index.tsx b/apps/mobile/app/screens/favorites/index.tsxindex 840281958..b1895de30 100644--- a/apps/mobile/app/screens/favorites/index.tsx+++ b/apps/mobile/app/screens/favorites/index.tsx@@ -21,21 +21,18 @@ import React from "react";import DelayLayout from "../../components/delay-layout";import { Header } from "../../components/header";import List from "../../components/list";+import SelectionHeader from "../../components/selection-header";import { useNavigationFocus } from "../../hooks/use-navigation-focus";import Navigation, { NavigationProps } from "../../services/navigation";import SettingsService from "../../services/settings";-import { useFavoriteStore } from "../../stores/use-favorite-store";+import { useFavorites } from "../../stores/use-favorite-store";import useNavigationStore from "../../stores/use-navigation-store";-import { useNoteStore } from "../../stores/use-notes-store";-import SelectionHeader from "../../components/selection-header";export const Favorites = ({navigation,route}: NavigationProps<"Favorites">) => {- const favorites = useFavoriteStore((state) => state.favorites);- const setFavorites = useFavoriteStore((state) => state.setFavorites);- const loading = useNoteStore((state) => state.loading);+ const [favorites, loading, refresh] = useFavorites();const isFocused = useNavigationFocus(navigation, {onFocus: (prev) => {Navigation.routeNeedsUpdate(@@ -43,7 +40,7 @@ export const Favorites = ({Navigation.routeUpdateFunctions[route.name]);useNavigationStore.getState().setFocusedRouteId(route?.name);- return !prev?.current;+ return false;},onBlur: () => false,delay: SettingsService.get().homepage === route.name ? 1 : -1@@ -75,10 +72,10 @@ export const Favorites = ({data={favorites}dataType="note"onRefresh={() => {- setFavorites();+ refresh();}}renderedInRoute="Favorites"- loading={loading || !isFocused}+ loading={loading}placeholder={{title: "Your favorites",paragraph: "You have not added any notes to favorites yet.",diff --git a/apps/mobile/app/screens/home/index.tsx b/apps/mobile/app/screens/home/index.tsxindex f4bc455d0..7fa56aa5a 100755--- a/apps/mobile/app/screens/home/index.tsx+++ b/apps/mobile/app/screens/home/index.tsx@@ -22,17 +22,16 @@ import { FloatingButton } from "../../components/container/floating-button";import DelayLayout from "../../components/delay-layout";import { Header } from "../../components/header";import List from "../../components/list";+import SelectionHeader from "../../components/selection-header";import { useNavigationFocus } from "../../hooks/use-navigation-focus";import Navigation, { NavigationProps } from "../../services/navigation";import SettingsService from "../../services/settings";-import { useNoteStore } from "../../stores/use-notes-store";-import { openEditor } from "../notes/common";import useNavigationStore from "../../stores/use-navigation-store";-import SelectionHeader from "../../components/selection-header";+import { useNotes } from "../../stores/use-notes-store";+import { openEditor } from "../notes/common";export const Home = ({ navigation, route }: NavigationProps<"Notes">) => {- const notes = useNoteStore((state) => state.notes);- const loading = useNoteStore((state) => state.loading);+ const [notes, loading] = useNotes();const isFocused = useNavigationFocus(navigation, {onFocus: (prev) => {Navigation.routeNeedsUpdate(diff --git a/apps/mobile/app/screens/notebook/index.tsx b/apps/mobile/app/screens/notebook/index.tsxindex 7e160fed1..ed8ef7dbf 100644--- a/apps/mobile/app/screens/notebook/index.tsx+++ b/apps/mobile/app/screens/notebook/index.tsx@@ -39,12 +39,12 @@ import { eUpdateNotebookRoute } from "../../utils/events";import { findRootNotebookId } from "../../utils/notebooks";import { openEditor, setOnFirstSave } from "../notes/common";import SelectionHeader from "../../components/selection-header";-import { resolveItems } from "../../components/list/list-item.wrapper";import Paragraph from "../../components/ui/typography/paragraph";import { View } from "react-native";import { SIZE } from "../../utils/size";import { IconButton } from "../../components/ui/icon-button";import { PressableButton } from "../../components/ui/pressable";+import { resolveItems } from "../../stores/resolve-items";const NotebookScreen = ({ route, navigation }: NavigationProps<"Notebook">) => {const [notes, setNotes] = useState<VirtualizedGrouping<Note>>();diff --git a/apps/mobile/app/screens/notebooks/index.tsx b/apps/mobile/app/screens/notebooks/index.tsxindex f2bb46b7e..e130c8d1d 100644--- a/apps/mobile/app/screens/notebooks/index.tsx+++ b/apps/mobile/app/screens/notebooks/index.tsx@@ -23,14 +23,14 @@ import { FloatingButton } from "../../components/container/floating-button";import DelayLayout from "../../components/delay-layout";import { Header } from "../../components/header";import List from "../../components/list";+import SelectionHeader from "../../components/selection-header";import { AddNotebookSheet } from "../../components/sheets/add-notebook";import { Walkthrough } from "../../components/walkthroughs";import { useNavigationFocus } from "../../hooks/use-navigation-focus";import Navigation, { NavigationProps } from "../../services/navigation";import SettingsService from "../../services/settings";import useNavigationStore from "../../stores/use-navigation-store";-import { useNotebookStore } from "../../stores/use-notebook-store";-import SelectionHeader from "../../components/selection-header";+import { useNotebooks } from "../../stores/use-notebook-store";const onButtonPress = () => {AddNotebookSheet.present();@@ -40,7 +40,8 @@ export const Notebooks = ({navigation,route}: NavigationProps<"Notebooks">) => {- const notebooks = useNotebookStore((state) => state.notebooks);+ const [notebooks, loading] = useNotebooks();+const isFocused = useNavigationFocus(navigation, {onFocus: (prev) => {Navigation.routeNeedsUpdate(@@ -48,7 +49,7 @@ export const Notebooks = ({Navigation.routeUpdateFunctions[route.name]);useNavigationStore.getState().setFocusedRouteId(route.name);- return !prev?.current;+ return false;},onBlur: () => false,delay: SettingsService.get().homepage === route.name ? 1 : -1@@ -83,12 +84,11 @@ export const Notebooks = ({}}onPressDefaultRightButton={onButtonPress}/>- <DelayLayout>+ <DelayLayout wait={loading}><Listdata={notebooks}dataType="notebook"renderedInRoute="Notebooks"- loading={!isFocused}placeholder={{title: "Your notebooks",paragraph: "You have not added any notebooks yet.",diff --git a/apps/mobile/app/screens/notes/common.ts b/apps/mobile/app/screens/notes/common.tsindex 0293a6596..bb0c881d9 100644--- a/apps/mobile/app/screens/notes/common.ts+++ b/apps/mobile/app/screens/notes/common.ts@@ -107,7 +107,7 @@ export async function onNoteCreated(noteId: string, data: FirstSaveData) {}editorState().onNoteCreated = null;- useTagStore.getState().setTags();+ useTagStore.getState().refresh();useRelationStore.getState().update();break;}diff --git a/apps/mobile/app/screens/notes/index.tsx b/apps/mobile/app/screens/notes/index.tsxindex 1cda89800..53b109f15 100644--- a/apps/mobile/app/screens/notes/index.tsx+++ b/apps/mobile/app/screens/notes/index.tsx@@ -38,7 +38,7 @@ import useNavigationStore, {} from "../../stores/use-navigation-store";import { useNoteStore } from "../../stores/use-notes-store";import { setOnFirstSave } from "./common";-import { resolveItems } from "../../components/list/list-item.wrapper";+import { resolveItems } from "../../stores/resolve-items";export const WARNING_DATA = {title: "Some notes in this topic are not synced"};@@ -75,7 +75,6 @@ const NotesPage = ({>) => {const params = useRef<NotesScreenParams>(route?.params);const [notes, setNotes] = useState<VirtualizedGrouping<Note>>();- const loading = useNoteStore((state) => state.loading);const [loadingNotes, setLoadingNotes] = useState(true);const isMonograph = route.name === "Monographs";const title =@@ -140,7 +139,7 @@ const NotesPage = ({);useEffect(() => {- if (loadingNotes && !loading) {+ if (loadingNotes) {get(params.current, true).then(async (items) => {setNotes(items as VirtualizedGrouping<Note>);@@ -152,7 +151,7 @@ const NotesPage = ({setLoadingNotes(false);});}- }, [loadingNotes, loading, get]);+ }, [loadingNotes, get]);useEffect(() => {eSubscribeEvent(route.name, onRequestUpdate);@@ -186,12 +185,12 @@ const NotesPage = ({headerRightButtons={rightButtons?.(params?.current)}/>- <DelayLayout color={accentColor} wait={loading || loadingNotes}>+ <DelayLayout color={accentColor} wait={loadingNotes}><Listdata={notes}dataType="note"onRefresh={onRequestUpdate}- loading={loading || !isFocused}+ loading={!isFocused}renderedInRoute={route.name}id={params.current.item?.id}headerTitle={title}diff --git a/apps/mobile/app/screens/reminders/index.tsx b/apps/mobile/app/screens/reminders/index.tsxindex 8fe968111..37cad7f89 100644--- a/apps/mobile/app/screens/reminders/index.tsx+++ b/apps/mobile/app/screens/reminders/index.tsx@@ -22,19 +22,19 @@ import { FloatingButton } from "../../components/container/floating-button";import DelayLayout from "../../components/delay-layout";import { Header } from "../../components/header";import List from "../../components/list";+import SelectionHeader from "../../components/selection-header";import ReminderSheet from "../../components/sheets/reminder";import { useNavigationFocus } from "../../hooks/use-navigation-focus";import Navigation, { NavigationProps } from "../../services/navigation";import SettingsService from "../../services/settings";import useNavigationStore from "../../stores/use-navigation-store";-import { useReminderStore } from "../../stores/use-reminder-store";-import SelectionHeader from "../../components/selection-header";+import { useReminders } from "../../stores/use-reminder-store";export const Reminders = ({navigation,route}: NavigationProps<"Reminders">) => {- const reminders = useReminderStore((state) => state.reminders);+ const [reminders, loading] = useReminders();const isFocused = useNavigationFocus(navigation, {onFocus: (prev) => {Navigation.routeNeedsUpdate(@@ -43,7 +43,7 @@ export const Reminders = ({);useNavigationStore.getState().setFocusedRouteId(route.name);- return !prev?.current;+ return false;},onBlur: () => false,delay: SettingsService.get().homepage === route.name ? 1 : -1@@ -72,13 +72,13 @@ export const Reminders = ({}}/>- <DelayLayout>+ <DelayLayout wait={loading}><Listdata={reminders}dataType="reminder"headerTitle="Reminders"renderedInRoute="Reminders"- loading={!isFocused}+ loading={loading}placeholder={{title: "Your reminders",paragraph: "You have not set any reminders yet.",diff --git a/apps/mobile/app/screens/settings/editor/state.ts b/apps/mobile/app/screens/settings/editor/state.tsindex 2de429f18..b02bd4041 100644--- a/apps/mobile/app/screens/settings/editor/state.ts+++ b/apps/mobile/app/screens/settings/editor/state.ts@@ -22,7 +22,6 @@ import create, { State } from "zustand";import { persist, StateStorage } from "zustand/middleware";import { db } from "../../../common/database";import { MMKV } from "../../../common/database/mmkv";-import { useNoteStore } from "../../../stores/use-notes-store";import { useSettingStore } from "../../../stores/use-setting-store";import { presets } from "./toolbar-definition";export type ToolDefinition = string | string[];@@ -124,7 +123,7 @@ export const useDragState = create<DragState>(getStorage: () => MMKV as unknown as StateStorage,onRehydrateStorage: () => {return () => {- if (!useNoteStore.getState().loading) {+ if (!useSettingStore.getState().isAppLoading) {useDragState.getState().init();} else {setTimeout(() => {diff --git a/apps/mobile/app/screens/settings/settings-data.tsx b/apps/mobile/app/screens/settings/settings-data.tsxindex 4d3b6a093..4938625b9 100644--- a/apps/mobile/app/screens/settings/settings-data.tsx+++ b/apps/mobile/app/screens/settings/settings-data.tsx@@ -297,6 +297,7 @@ export const settingsGroups: SettingSection[] = [await BiometicService.resetCredentials();MMKV.clearStore();clearAllStores();+ Navigation.queueRoutesForUpdate();SettingsService.resetSettings();useUserStore.getState().setUser(null);useUserStore.getState().setSyncing(false);@@ -304,7 +305,7 @@ export const settingsGroups: SettingSection[] = [Navigation.popToTop();setTimeout(() => {eSendEvent("settings-loading", false);- }, 2000);+ }, 3000);}, 300);} catch (e) {ToastManager.error(e as Error, "Error logging out");diff --git a/apps/mobile/app/screens/tags/index.tsx b/apps/mobile/app/screens/tags/index.tsxindex 9c5951c41..30334017f 100644--- a/apps/mobile/app/screens/tags/index.tsx+++ b/apps/mobile/app/screens/tags/index.tsx@@ -21,16 +21,15 @@ import React from "react";import DelayLayout from "../../components/delay-layout";import { Header } from "../../components/header";import List from "../../components/list";+import SelectionHeader from "../../components/selection-header";import { useNavigationFocus } from "../../hooks/use-navigation-focus";import Navigation, { NavigationProps } from "../../services/navigation";import SettingsService from "../../services/settings";import useNavigationStore from "../../stores/use-navigation-store";-import { useTagStore } from "../../stores/use-tag-store";-import { db } from "../../common/database";-import SelectionHeader from "../../components/selection-header";+import { useTags } from "../../stores/use-tag-store";export const Tags = ({ navigation, route }: NavigationProps<"Tags">) => {- const tags = useTagStore((state) => state.tags);+ const [tags, loading] = useTags();const isFocused = useNavigationFocus(navigation, {onFocus: (prev) => {Navigation.routeNeedsUpdate(@@ -61,7 +60,7 @@ export const Tags = ({ navigation, route }: NavigationProps<"Tags">) => {});}}/>- <DelayLayout>+ <DelayLayout wait={loading}><Listdata={tags}dataType="tag"diff --git a/apps/mobile/app/screens/trash/index.tsx b/apps/mobile/app/screens/trash/index.tsxindex 9bf5df959..1557502ed 100644--- a/apps/mobile/app/screens/trash/index.tsx+++ b/apps/mobile/app/screens/trash/index.tsx@@ -29,7 +29,7 @@ import { ToastManager } from "../../services/event-manager";import Navigation, { NavigationProps } from "../../services/navigation";import useNavigationStore from "../../stores/use-navigation-store";import { useSelectionStore } from "../../stores/use-selection-store";-import { useTrashStore } from "../../stores/use-trash-store";+import { useTrash, useTrashStore } from "../../stores/use-trash-store";import SelectionHeader from "../../components/selection-header";const onPressFloatingButton = () => {@@ -40,7 +40,7 @@ const onPressFloatingButton = () => {negativeText: "Cancel",positivePress: async () => {await db.trash?.clear();- useTrashStore.getState().setTrash();+ useTrashStore.getState().refresh();useSelectionStore.getState().clearSelection();ToastManager.show({heading: "Trash cleared",@@ -67,7 +67,7 @@ const PLACEHOLDER_DATA = (trashCleanupInterval = 7) => ({});export const Trash = ({ navigation, route }: NavigationProps<"Trash">) => {- const trash = useTrashStore((state) => state.trash);+ const [trash, loading] = useTrash();const isFocused = useNavigationFocus(navigation, {onFocus: () => {Navigation.routeNeedsUpdate(@@ -75,12 +75,6 @@ export const Trash = ({ navigation, route }: NavigationProps<"Trash">) => {Navigation.routeUpdateFunctions[route.name]);useNavigationStore.getState().setFocusedRouteId(route.name);- if (- !useTrashStore.getState().trash ||- useTrashStore.getState().trash?.ids?.length === 0- ) {- useTrashStore.getState().setTrash();- }return false;},onBlur: () => false@@ -103,7 +97,7 @@ export const Trash = ({ navigation, route }: NavigationProps<"Trash">) => {});}}/>- <DelayLayout>+ <DelayLayout wait={loading}><Listdata={trash}dataType="trash"diff --git a/apps/mobile/app/services/navigation.ts b/apps/mobile/app/services/navigation.tsindex cc0a211be..a578f358e 100755--- a/apps/mobile/app/services/navigation.ts+++ b/apps/mobile/app/services/navigation.ts@@ -73,18 +73,18 @@ export type NavigationProps<T extends RouteName> = NativeStackScreenProps<const routeUpdateFunctions: {[name: string]: (...params: GenericRouteParam[]) => void;} = {- Notes: () => useNoteStore.getState().setNotes(),- Notebooks: () => useNotebookStore.getState().setNotebooks(),- Tags: () => useTagStore.getState().setTags(),- Favorites: () => useFavoriteStore.getState().setFavorites(),- Trash: () => useTrashStore.getState().setTrash(),+ Notes: () => useNoteStore.getState().refresh(),+ Notebooks: () => useNotebookStore.getState().refresh(),+ Tags: () => useTagStore.getState().refresh(),+ Favorites: () => useFavoriteStore.getState().refresh(),+ Trash: () => useTrashStore.getState().refresh(),Notebook: (params) => eSendEvent(eUpdateNotebookRoute, params),NotesPage: (params) => eSendEvent("NotesPage", params),TaggedNotes: (params) => eSendEvent("TaggedNotes", params),ColoredNotes: (params) => eSendEvent("ColoredNotes", params),TopicNotes: (params) => eSendEvent("TopicNotes", params),Monographs: (params) => eSendEvent("Monographs", params),- Reminders: () => useReminderStore.getState().setReminders(),+ Reminders: () => useReminderStore.getState().refresh(),Search: () => eSendEvent(eOnRefreshSearch)};diff --git a/apps/mobile/app/services/notifications.ts b/apps/mobile/app/services/notifications.tsindex 821300f77..29ed8c6f9 100644--- a/apps/mobile/app/services/notifications.ts+++ b/apps/mobile/app/services/notifications.ts@@ -17,38 +17,38 @@ You should have received a copy of the GNU General Public Licensealong with this program. If not, see <http://www.gnu.org/licenses/>.*/+import { Reminder } from "@notesnook/core/dist/types";import notifee, {AndroidStyle,AuthorizationStatus,DisplayedNotification,+ Event,EventType,RepeatFrequency,+ TimestampTrigger,Trigger,- TriggerType,- Event,TriggerNotification,- TimestampTrigger+ TriggerType} from "@notifee/react-native";+import NetInfo from "@react-native-community/netinfo";import dayjs, { Dayjs } from "dayjs";+import { encodeNonAsciiHTML } from "entities";import { Platform } from "react-native";import { db } from "../common/database";import { MMKV } from "../common/database/mmkv";+import { presentDialog } from "../components/dialog/functions";import { editorState } from "../screens/editor/tiptap/utils";-import { useNoteStore } from "../stores/use-notes-store";+import { useRelationStore } from "../stores/use-relation-store";+import { useReminderStore } from "../stores/use-reminder-store";+import { useSettingStore } from "../stores/use-setting-store";import { eOnLoadNote } from "../utils/events";import { tabBarRef } from "../utils/global-refs";+import { convertNoteToText } from "../utils/note-to-text";+import { sleep } from "../utils/time";import { DDS } from "./device-detection";import { eSendEvent } from "./event-manager";+import Navigation from "./navigation";import SettingsService from "./settings";-import { useSettingStore } from "../stores/use-setting-store";-import { sleep } from "../utils/time";-import { useRelationStore } from "../stores/use-relation-store";-import { useReminderStore } from "../stores/use-reminder-store";-import { presentDialog } from "../components/dialog/functions";-import NetInfo from "@react-native-community/netinfo";-import { encodeNonAsciiHTML } from "entities";-import { convertNoteToText } from "../utils/note-to-text";-import { Reminder } from "@notesnook/core/dist/types";let pinned: DisplayedNotification[] = [];@@ -136,19 +136,7 @@ const onEvent = async ({ type, detail }: Event) => {}editorState().movedAway = false;const noteId = notification?.id;- if (useNoteStore?.getState()?.loading === false) {- loadNote(noteId as string, false);- return;- }- const unsub = useNoteStore.subscribe(- (loading) => {- if (loading === false) {- loadNote(noteId as string, true);- }- unsub();- },- (state) => state.loading- );+ loadNote(noteId as string, true);}if (type === EventType.ACTION_PRESS) {@@ -173,7 +161,7 @@ const onEvent = async ({ type, detail }: Event) => {await db.reminders?.reminder(reminder?.id));useRelationStore.getState().update();- useReminderStore.getState().setReminders();+ useReminderStore.getState().refresh();break;}case "REMINDER_DISABLE": {@@ -191,7 +179,7 @@ const onEvent = async ({ type, detail }: Event) => {await db.reminders?.reminder(reminder?.id));useRelationStore.getState().update();- useReminderStore.getState().setReminders();+ useReminderStore.getState().refresh();break;}case "UNPIN": {@@ -207,7 +195,7 @@ const onEvent = async ({ type, detail }: Event) => {disabled: true});useRelationStore.getState().update();- useReminderStore.getState().setReminders();+ useReminderStore.getState().refresh();}break;}@@ -253,7 +241,7 @@ const onEvent = async ({ type, detail }: Event) => {console.log(e, (e as Error).stack);}}- useNoteStore.getState().setNotes();+ Navigation.queueRoutesForUpdate();break;}}@@ -422,14 +410,17 @@ async function loadNote(id: string, jump: boolean) {tabBarRef.current?.goToPage(1);}eSendEvent("loadingNote", note);- setTimeout(() => {- eSendEvent(eOnLoadNote, {- item: note- });- if (!jump && !DDS.isTab) {- tabBarRef.current?.goToPage(1);- }- }, 2000);+ setTimeout(+ () => {+ eSendEvent(eOnLoadNote, {+ item: note+ });+ if (!jump && !DDS.isTab) {+ tabBarRef.current?.goToPage(1);+ }+ },+ tabBarRef?.current ? 0 : 2000+ );}async function getChannelId(id: "silent" | "vibrate" | "urgent" | "default") {diff --git a/apps/mobile/app/stores/create-db-collection-store.ts b/apps/mobile/app/stores/create-db-collection-store.tsnew file mode 100644index 000000000..1efe49f6b--- /dev/null+++ b/apps/mobile/app/stores/create-db-collection-store.ts@@ -0,0 +1,93 @@+/*+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 { Item, VirtualizedGrouping } from "@notesnook/core";+import create, { State, StoreApi, UseBoundStore } from "zustand";+import { resolveItems } from "./resolve-items";+import { useSettingStore } from "./use-setting-store";++export interface DBCollectionStore<Type extends Item> extends State {+ items: VirtualizedGrouping<Type> | undefined;+ loading: boolean;+ refresh: () => Promise<void>;+ clear: () => void;+}++const ALL_STORES: UseBoundStore<+ DBCollectionStore<Item>,+ StoreApi<DBCollectionStore<Item>>+>[] = [];++export function clearAllStores() {+ ALL_STORES.forEach((store) => {+ store?.getState().clear();+ });+}++export function refreshAllStores() {+ ALL_STORES.forEach((store) => store?.getState().refresh());+}++export default function createDBCollectionStore<Type extends Item>({+ getCollection,+ eagerlyFetchFirstBatch+}: {+ getCollection: () => Promise<VirtualizedGrouping<Type>>;+ eagerlyFetchFirstBatch?: boolean;+}) {+ const useDBCollectionStore = create<DBCollectionStore<Type>>((set, get) => ({+ items: undefined,+ loading: true,+ refresh: async () => {+ const items = await getCollection();+ if (get().loading && eagerlyFetchFirstBatch) {+ await items.item(0, resolveItems);+ }+ set({+ items,+ loading: false+ });+ },+ clear: () => set({ items: undefined, loading: true })+ }));++ const useStoreHook = (): [+ VirtualizedGrouping<Type> | undefined,+ boolean,+ () => Promise<void>+ ] => {+ const isAppLoading = useSettingStore((state) => state.isAppLoading);+ const [items, loading] = useDBCollectionStore((state) => [+ state.items,+ state.loading+ ]);++ if (!items && !isAppLoading) {+ useDBCollectionStore.getState().refresh();+ }++ return [items, loading, useDBCollectionStore.getState().refresh];+ };++ ALL_STORES.push(useDBCollectionStore as any);+ return {+ useStore: useDBCollectionStore,+ useCollection: useStoreHook+ };+}diff --git a/apps/mobile/app/stores/index.ts b/apps/mobile/app/stores/index.tsindex 31102bce5..616e7df54 100644--- a/apps/mobile/app/stores/index.ts+++ b/apps/mobile/app/stores/index.ts@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public Licensealong with this program. If not, see <http://www.gnu.org/licenses/>.*/-import { db } from "../common/database";import Navigation from "../services/navigation";import Notifications from "../services/notifications";import { useFavoriteStore } from "./use-favorite-store";@@ -28,36 +27,26 @@ import { useRelationStore } from "./use-relation-store";import { useReminderStore } from "./use-reminder-store";import { useTagStore } from "./use-tag-store";import { useTrashStore } from "./use-trash-store";+export function initAfterSync() {- useMenuStore.getState().setColorNotes();- useMenuStore.getState().setMenuPins();Navigation.queueRoutesForUpdate();// Whenever sync completes, try to reschedule// any new/updated reminders.Notifications.setupReminders(true);useRelationStore.getState().update();-}--export async function initialize() {- if (!db) return;useMenuStore.getState().setColorNotes();useMenuStore.getState().setMenuPins();- useNotebookStore.getState().setNotebooks();- useTrashStore.getState().setTrash();- useTagStore.getState().setTags();- useFavoriteStore.getState().setFavorites();- await useNoteStore.getState().setNotes();- useReminderStore.getState().setReminders();- Notifications.setupReminders();}+export async function initialize() {}+export function clearAllStores() {- useNotebookStore.getState().clearNotebooks();- useTagStore.getState().clearTags();- useFavoriteStore.getState().clearFavorites();+ useNotebookStore.getState().clear();+ useTagStore.getState().clear();+ useFavoriteStore.getState().clear();useMenuStore.getState().clearAll();- useNoteStore.getState().clearNotes();+ useNoteStore.getState().clear();useMenuStore.getState().clearAll();- useTrashStore.getState().clearTrash();- useReminderStore.getState().cleareReminders();+ useTrashStore.getState().clear();+ useReminderStore.getState().clear();}diff --git a/apps/mobile/app/stores/resolve-items.ts b/apps/mobile/app/stores/resolve-items.tsnew file mode 100644index 000000000..391604d44--- /dev/null+++ b/apps/mobile/app/stores/resolve-items.ts@@ -0,0 +1,158 @@+/*+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 { Color, Item, Notebook, Reminder, Tag } from "@notesnook/core";+import { db } from "../common/database";++export type WithDateEdited<T> = { items: T[]; dateEdited: number };+export type NotebooksWithDateEdited = WithDateEdited<Notebook>;+export type TagsWithDateEdited = WithDateEdited<Tag>;++function withDateEdited<+ T extends { dateEdited: number } | { dateModified: number }+>(items: T[]): WithDateEdited<T> {+ let latestDateEdited = 0;+ items.forEach((item) => {+ const date = "dateEdited" in item ? item.dateEdited : item.dateModified;+ if (latestDateEdited < date) latestDateEdited = date;+ });+ return { dateEdited: latestDateEdited, items };+}++export async function resolveItems(ids: string[], items: Item[]) {+ if (!ids.length || !items.length) return [];++ const { type } = items[0];+ if (type === "note") return resolveNotes(ids);+ else if (type === "notebook") {+ return Promise.all(ids.map((id) => db.notebooks.totalNotes(id)));+ } else if (type === "tag") {+ return Promise.all(+ ids.map((id) => db.relations.from({ id, type: "tag" }, "note").count())+ );+ }+ return [];+}++type NoteResolvedData = {+ notebooks?: NotebooksWithDateEdited;+ reminder?: Reminder;+ color?: Color;+ tags?: TagsWithDateEdited;+ attachmentsCount?: number;+};+async function resolveNotes(ids: string[]) {+ console.time("relations");+ const relations = [+ ...(await db.relations+ .to({ type: "note", ids }, ["notebook", "tag", "color"])+ .get()),+ ...(await db.relations.from({ type: "note", ids }, "reminder").get())+ ];+ console.timeEnd("relations");+ const relationIds: {+ notebooks: Set<string>;+ colors: Set<string>;+ tags: Set<string>;+ reminders: Set<string>;+ } = {+ colors: new Set(),+ notebooks: new Set(),+ tags: new Set(),+ reminders: new Set()+ };++ const grouped: Record<+ string,+ {+ notebooks: string[];+ color?: string;+ tags: string[];+ reminder?: string;+ }+ > = {};+ for (const relation of relations) {+ const noteId =+ relation.toType === "reminder" ? relation.fromId : relation.toId;+ const data = grouped[noteId] || {+ notebooks: [],+ tags: []+ };++ if (relation.toType === "reminder" && !data.reminder) {+ data.reminder = relation.toId;+ relationIds.reminders.add(relation.toId);+ } else if (relation.fromType === "notebook" && data.notebooks.length < 2) {+ data.notebooks.push(relation.fromId);+ relationIds.notebooks.add(relation.fromId);+ } else if (relation.fromType === "tag" && data.tags.length < 3) {+ data.tags.push(relation.fromId);+ relationIds.tags.add(relation.fromId);+ } else if (relation.fromType === "color" && !data.color) {+ data.color = relation.fromId;+ relationIds.colors.add(relation.fromId);+ }+ grouped[noteId] = data;+ }++ console.time("resolve");+ const resolved = {+ notebooks: await db.notebooks.all.records(+ Array.from(relationIds.notebooks)+ ),+ tags: await db.tags.all.records(Array.from(relationIds.tags)),+ colors: await db.colors.all.records(Array.from(relationIds.colors)),+ reminders: await db.reminders.all.records(Array.from(relationIds.reminders))+ };+ console.timeEnd("resolve");++ const data: NoteResolvedData[] = [];+ for (const noteId of ids) {+ const group = grouped[noteId];+ if (!group) {+ data.push({});+ continue;+ }++ data.push({+ color: group.color ? resolved.colors[group.color] : undefined,+ reminder: group.reminder ? resolved.reminders[group.reminder] : undefined,+ tags: withDateEdited(+ group.tags.map((id) => resolved.tags[id]).filter(Boolean)+ ),+ notebooks: withDateEdited(+ group.notebooks.map((id) => resolved.notebooks[id]).filter(Boolean)+ ),+ attachmentsCount:+ (await db.attachments?.ofNote(noteId, "all").ids())?.length || 0+ });+ }++ return data;+}++export function isNoteResolvedData(data: unknown): data is NoteResolvedData {+ return (+ typeof data === "object" &&+ !!data &&+ "notebooks" in data &&+ "reminder" in data &&+ "color" in data &&+ "tags" in data+ );+}diff --git a/apps/mobile/app/stores/use-favorite-store.ts b/apps/mobile/app/stores/use-favorite-store.tsindex 58661c35e..1b3c329fa 100644--- a/apps/mobile/app/stores/use-favorite-store.ts+++ b/apps/mobile/app/stores/use-favorite-store.ts@@ -17,26 +17,14 @@ You should have received a copy of the GNU General Public Licensealong with this program. If not, see <http://www.gnu.org/licenses/>.*/-import create, { State } from "zustand";import { db } from "../common/database";-import { Note, VirtualizedGrouping } from "@notesnook/core";+import createDBCollectionStore from "./create-db-collection-store";-export interface FavoriteStore extends State {- favorites: VirtualizedGrouping<Note> | undefined;- setFavorites: (items?: Note[]) => void;- clearFavorites: () => void;-}+const { useStore: useFavoriteStore, useCollection: useFavorites } =+ createDBCollectionStore({+ getCollection: () =>+ db.notes.favorites.grouped(db.settings.getGroupOptions("favorites")),+ eagerlyFetchFirstBatch: true+ });-export const useFavoriteStore = create<FavoriteStore>((set) => ({- favorites: undefined,- setFavorites: () => {- db.notes.favorites- .grouped(db.settings.getGroupOptions("favorites"))- .then((notes) => {- set({- favorites: notes- });- });- },- clearFavorites: () => set({ favorites: undefined })-}));+export { useFavoriteStore, useFavorites };diff --git a/apps/mobile/app/stores/use-menu-store.ts b/apps/mobile/app/stores/use-menu-store.tsindex 681d97713..b2b108a3f 100644--- a/apps/mobile/app/stores/use-menu-store.ts+++ b/apps/mobile/app/stores/use-menu-store.ts@@ -27,20 +27,25 @@ export interface MenuStore extends State {setMenuPins: () => void;setColorNotes: () => void;clearAll: () => void;+ loadingShortcuts: boolean;+ loadingColors: boolean;}export const useMenuStore = create<MenuStore>((set) => ({menuPins: [],colorNotes: [],+ loadingShortcuts: true,+ loadingColors: true,setMenuPins: () => {db.shortcuts.resolved().then((shortcuts) => {- set({ menuPins: [...(shortcuts as [])] });+ set({ menuPins: [...(shortcuts as [])], loadingShortcuts: false });});},setColorNotes: () => {db.colors?.all.items().then((colors) => {set({- colorNotes: colors+ colorNotes: colors,+ loadingColors: false});});},diff --git a/apps/mobile/app/stores/use-notebook-store.ts b/apps/mobile/app/stores/use-notebook-store.tsindex 170ed0ac0..ced0eba4d 100644--- a/apps/mobile/app/stores/use-notebook-store.ts+++ b/apps/mobile/app/stores/use-notebook-store.ts@@ -17,26 +17,14 @@ You should have received a copy of the GNU General Public Licensealong with this program. If not, see <http://www.gnu.org/licenses/>.*/-import create, { State } from "zustand";import { db } from "../common/database";-import { VirtualizedGrouping, Notebook } from "@notesnook/core";+import createDBCollectionStore from "./create-db-collection-store";-export interface NotebookStore extends State {- notebooks: VirtualizedGrouping<Notebook> | undefined;- setNotebooks: (items?: Notebook[]) => void;- clearNotebooks: () => void;-}+const { useStore: useNotebookStore, useCollection: useNotebooks } =+ createDBCollectionStore({+ getCollection: () =>+ db.notebooks.roots.grouped(db.settings.getGroupOptions("notebooks")),+ eagerlyFetchFirstBatch: true+ });-export const useNotebookStore = create<NotebookStore>((set) => ({- notebooks: undefined,- setNotebooks: () => {- db.notebooks.roots- .grouped(db.settings.getGroupOptions("notebooks"))- .then((notebooks) => {- set({- notebooks: notebooks- });- });- },- clearNotebooks: () => set({ notebooks: undefined })-}));+export { useNotebookStore, useNotebooks };diff --git a/apps/mobile/app/stores/use-notes-store.ts b/apps/mobile/app/stores/use-notes-store.tsindex 587278d83..2586946fe 100644--- a/apps/mobile/app/stores/use-notes-store.ts+++ b/apps/mobile/app/stores/use-notes-store.ts@@ -17,30 +17,14 @@ You should have received a copy of the GNU General Public Licensealong with this program. If not, see <http://www.gnu.org/licenses/>.*/-import { Note, VirtualizedGrouping } from "@notesnook/core";-import create, { State } from "zustand";import { db } from "../common/database";+import createDBCollectionStore from "./create-db-collection-store";-export interface NoteStore extends State {- notes: VirtualizedGrouping<Note> | undefined;- loading: boolean;- setLoading: (loading: boolean) => void;- setNotes: () => void;- clearNotes: () => void;-}+const { useStore: useNoteStore, useCollection: useNotes } =+ createDBCollectionStore({+ getCollection: () =>+ db.notes.all.grouped(db.settings.getGroupOptions("home")),+ eagerlyFetchFirstBatch: true+ });-export const useNoteStore = create<NoteStore>((set) => ({- notes: undefined,- loading: true,- setLoading: (loading) => set({ loading: loading }),- setNotes: async () => {- const notes = await db.notes.all.grouped(- db.settings.getGroupOptions("home")- );- await notes.item(0);- set({- notes: notes- });- },- clearNotes: () => set({ notes: undefined })-}));+export { useNoteStore, useNotes };diff --git a/apps/mobile/app/stores/use-reminder-store.ts b/apps/mobile/app/stores/use-reminder-store.tsindex ae33a8050..54bbc7847 100644--- a/apps/mobile/app/stores/use-reminder-store.ts+++ b/apps/mobile/app/stores/use-reminder-store.ts@@ -17,26 +17,14 @@ You should have received a copy of the GNU General Public Licensealong with this program. If not, see <http://www.gnu.org/licenses/>.*/-import create, { State } from "zustand";import { db } from "../common/database";-import { Reminder, VirtualizedGrouping } from "@notesnook/core";+import createDBCollectionStore from "./create-db-collection-store";-export interface ReminderStore extends State {- reminders: VirtualizedGrouping<Reminder> | undefined;- setReminders: (items?: Reminder[]) => void;- cleareReminders: () => void;-}+const { useStore: useReminderStore, useCollection: useReminders } =+ createDBCollectionStore({+ getCollection: () =>+ db.reminders.all.grouped(db.settings.getGroupOptions("reminders")),+ eagerlyFetchFirstBatch: true+ });-export const useReminderStore = create<ReminderStore>((set) => ({- reminders: undefined,- setReminders: () => {- db.reminders.all- .grouped(db.settings.getGroupOptions("reminders"))- .then((reminders) => {- set({- reminders: reminders- });- });- },- cleareReminders: () => set({ reminders: undefined })-}));+export { useReminderStore, useReminders };diff --git a/apps/mobile/app/stores/use-setting-store.ts b/apps/mobile/app/stores/use-setting-store.tsindex adf0280f3..6dcdc802d 100644--- a/apps/mobile/app/stores/use-setting-store.ts+++ b/apps/mobile/app/stores/use-setting-store.ts@@ -98,8 +98,8 @@ export interface SettingStore extends State {setFullscreen: (fullscreen: boolean) => void;setDeviceMode: (mode: string) => void;setDimensions: (dimensions: DimensionsType) => void;- appLoading: boolean;- setAppLoading: (appLoading: boolean) => void;+ isAppLoading: boolean;+ setAppLoading: (isAppLoading: boolean) => void;setSheetKeyboardHandler: (sheetKeyboardHandler: boolean) => void;sheetKeyboardHandler: boolean;requestBiometrics: boolean;@@ -165,12 +165,12 @@ export const useSettingStore = create<SettingStore>((set, get) => ({fullscreen: false,deviceMode: null,dimensions: { width, height },- appLoading: true,+ isAppLoading: true,setSettings: (settings) => set({ settings }),setFullscreen: (fullscreen) => set({ fullscreen }),setDeviceMode: (mode) => set({ deviceMode: mode }),setDimensions: (dimensions) => set({ dimensions: dimensions }),- setAppLoading: (appLoading) => set({ appLoading }),+ setAppLoading: (isAppLoading) => set({ isAppLoading }),setSheetKeyboardHandler: (sheetKeyboardHandler) =>set({ sheetKeyboardHandler }),requestBiometrics: false,diff --git a/apps/mobile/app/stores/use-tag-store.ts b/apps/mobile/app/stores/use-tag-store.tsindex 47e4481a7..010d2c39e 100644--- a/apps/mobile/app/stores/use-tag-store.ts+++ b/apps/mobile/app/stores/use-tag-store.ts@@ -17,24 +17,14 @@ You should have received a copy of the GNU General Public Licensealong with this program. If not, see <http://www.gnu.org/licenses/>.*/-import create, { State } from "zustand";import { db } from "../common/database";-import { Tag, VirtualizedGrouping } from "@notesnook/core";+import createDBCollectionStore from "./create-db-collection-store";-export interface TagStore extends State {- tags: VirtualizedGrouping<Tag> | undefined;- setTags: (items?: Tag[]) => void;- clearTags: () => void;-}+const { useStore: useTagStore, useCollection: useTags } =+ createDBCollectionStore({+ getCollection: () =>+ db.tags.all.grouped(db.settings.getGroupOptions("tags")),+ eagerlyFetchFirstBatch: true+ });-export const useTagStore = create<TagStore>((set) => ({- tags: undefined,- setTags: () => {- db.tags.all.grouped(db.settings.getGroupOptions("tags")).then((tags) => {- set({- tags: tags- });- });- },- clearTags: () => set({ tags: undefined })-}));+export { useTagStore, useTags };diff --git a/apps/mobile/app/stores/use-trash-store.ts b/apps/mobile/app/stores/use-trash-store.tsindex a808c4a09..8495e25fe 100644--- a/apps/mobile/app/stores/use-trash-store.ts+++ b/apps/mobile/app/stores/use-trash-store.ts@@ -17,25 +17,13 @@ You should have received a copy of the GNU General Public Licensealong with this program. If not, see <http://www.gnu.org/licenses/>.*/-import create, { State } from "zustand";import { db } from "../common/database";-import { GroupedItems, TrashItem } from "@notesnook/core/dist/types";-import { VirtualizedGrouping } from "@notesnook/core";+import createDBCollectionStore from "./create-db-collection-store";-export interface TrashStore extends State {- trash: VirtualizedGrouping<TrashItem> | undefined;- setTrash: (items?: GroupedItems<TrashItem>) => void;- clearTrash: () => void;-}+const { useStore: useTrashStore, useCollection: useTrash } =+ createDBCollectionStore({+ getCollection: () => db.trash.grouped(db.settings.getGroupOptions("trash")),+ eagerlyFetchFirstBatch: true+ });-export const useTrashStore = create<TrashStore>((set, get) => ({- trash: undefined,- setTrash: () => {- db.trash.grouped(db.settings.getGroupOptions("trash")).then((trash) => {- set({- trash: trash- });- });- },- clearTrash: () => set({ trash: undefined })-}));+export { useTrashStore, useTrash };diff --git a/apps/mobile/package-lock.json b/apps/mobile/package-lock.jsonindex e69de6f21..74ce5aec9 100644--- a/apps/mobile/package-lock.json+++ b/apps/mobile/package-lock.json@@ -29,7 +29,8 @@"kysely": "^0.26.3","react": "18.2.0","react-native": "0.72.0",- "react-native-quick-sqlite": "^8.0.6"+ "react-native-quick-sqlite": "^8.0.6",+ "tinycolor2": "1.6.0"},"devDependencies": {"fonteditor-core": "^2.1.11",@@ -158,7 +159,7 @@"@types/spark-md5": "^3.0.2","@types/streetwriters__showdown": "npm:@types/showdown@^2.0.6","@types/ws": "^8.5.5",- "@vitest/coverage-v8": "^0.34.1",+ "@vitest/coverage-v8": "^1.0.1","abortcontroller-polyfill": "^1.7.3","better-sqlite3": "^8.6.0","bson-objectid": "^2.0.4",@@ -173,7 +174,7 @@"nanoid": "^5.0.1","otplib": "^12.0.1","refractor": "^4.8.1",- "vitest": "^0.34.1",+ "vitest": "^1.0.1","vitest-fetch-mock": "^0.2.2","ws": "^8.13.0"}@@ -3044,6 +3045,7 @@"mdi-react": "9.1.0","react": "^18.2.0","react-dom": "^18.2.0",+ "tinycolor2": "1.6.0","zustand": "^4.4.7"},"devDependencies": {@@ -22101,7 +22103,6 @@},"../../packages/editor/node_modules/js-tokens": {"version": "4.0.0",- "dev": true,"license": "MIT"},"../../packages/editor/node_modules/json-parse-even-better-errors": {@@ -22157,7 +22158,6 @@},"../../packages/editor/node_modules/loose-envify": {"version": "1.4.0",- "dev": true,"license": "MIT","dependencies": {"js-tokens": "^3.0.0 || ^4.0.0"@@ -22264,7 +22264,6 @@},"../../packages/editor/node_modules/object-assign": {"version": "4.1.1",- "dev": true,"license": "MIT","engines": {"node": ">=0.10.0"@@ -22690,7 +22689,6 @@},"../../packages/editor/node_modules/react": {"version": "17.0.2",- "dev": true,"license": "MIT","dependencies": {"loose-envify": "^1.1.0",@@ -22710,7 +22708,6 @@},"../../packages/editor/node_modules/react-dom": {"version": "17.0.2",- "dev": true,"license": "MIT","dependencies": {"loose-envify": "^1.1.0",@@ -22842,7 +22839,6 @@},"../../packages/editor/node_modules/scheduler": {"version": "0.20.2",- "dev": true,"license": "MIT","dependencies": {"loose-envify": "^1.1.0",@@ -24805,6 +24801,7 @@"version": "1.2.0","license": "GPL-3.0-or-later","devDependencies": {+ "@emotion/react": "11.11.1","@theme-ui/color": "^0.16.1","@theme-ui/components": "^0.16.1","@theme-ui/core": "^0.16.1",@@ -30106,7 +30103,6 @@},"node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5"@@ -30120,7 +30116,6 @@},"node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5",@@ -30267,7 +30262,6 @@},"node_modules/@babel/plugin-proposal-private-property-in-object": {"version": "7.21.0-placeholder-for-preset-env.2",- "dev": true,"license": "MIT","engines": {"node": ">=6.9.0"@@ -30278,7 +30272,6 @@},"node_modules/@babel/plugin-proposal-unicode-property-regex": {"version": "7.18.6",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-create-regexp-features-plugin": "^7.18.6",@@ -30324,7 +30317,6 @@},"node_modules/@babel/plugin-syntax-class-static-block": {"version": "7.14.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.14.5"@@ -30361,7 +30353,6 @@},"node_modules/@babel/plugin-syntax-export-namespace-from": {"version": "7.8.3",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.8.3"@@ -30385,7 +30376,6 @@},"node_modules/@babel/plugin-syntax-import-assertions": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5"@@ -30399,7 +30389,6 @@},"node_modules/@babel/plugin-syntax-import-attributes": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5"@@ -30413,7 +30402,6 @@},"node_modules/@babel/plugin-syntax-import-meta": {"version": "7.10.4",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.10.4"@@ -30424,7 +30412,6 @@},"node_modules/@babel/plugin-syntax-json-strings": {"version": "7.8.3",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.8.0"@@ -30448,7 +30435,6 @@},"node_modules/@babel/plugin-syntax-logical-assignment-operators": {"version": "7.10.4",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.10.4"@@ -30509,7 +30495,6 @@},"node_modules/@babel/plugin-syntax-private-property-in-object": {"version": "7.14.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.14.5"@@ -30523,7 +30508,6 @@},"node_modules/@babel/plugin-syntax-top-level-await": {"version": "7.14.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.14.5"@@ -30550,7 +30534,6 @@},"node_modules/@babel/plugin-syntax-unicode-sets-regex": {"version": "7.18.6",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-create-regexp-features-plugin": "^7.18.6",@@ -30578,7 +30561,6 @@},"node_modules/@babel/plugin-transform-async-generator-functions": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-environment-visitor": "^7.22.5",@@ -30636,7 +30618,6 @@},"node_modules/@babel/plugin-transform-class-properties": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-create-class-features-plugin": "^7.22.5",@@ -30651,7 +30632,6 @@},"node_modules/@babel/plugin-transform-class-static-block": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-create-class-features-plugin": "^7.22.5",@@ -30715,7 +30695,6 @@},"node_modules/@babel/plugin-transform-dotall-regex": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-create-regexp-features-plugin": "^7.22.5",@@ -30730,7 +30709,6 @@},"node_modules/@babel/plugin-transform-duplicate-keys": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5"@@ -30744,7 +30722,6 @@},"node_modules/@babel/plugin-transform-dynamic-import": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5",@@ -30773,7 +30750,6 @@},"node_modules/@babel/plugin-transform-export-namespace-from": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5",@@ -30830,7 +30806,6 @@},"node_modules/@babel/plugin-transform-json-strings": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5",@@ -30858,7 +30833,6 @@},"node_modules/@babel/plugin-transform-logical-assignment-operators": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5",@@ -30886,7 +30860,6 @@},"node_modules/@babel/plugin-transform-modules-amd": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-module-transforms": "^7.22.5",@@ -30916,7 +30889,6 @@},"node_modules/@babel/plugin-transform-modules-systemjs": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-hoist-variables": "^7.22.5",@@ -30933,7 +30905,6 @@},"node_modules/@babel/plugin-transform-modules-umd": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-module-transforms": "^7.22.5",@@ -30962,7 +30933,6 @@},"node_modules/@babel/plugin-transform-new-target": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5"@@ -30976,7 +30946,6 @@},"node_modules/@babel/plugin-transform-nullish-coalescing-operator": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5",@@ -30991,7 +30960,6 @@},"node_modules/@babel/plugin-transform-numeric-separator": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5",@@ -31019,7 +30987,6 @@},"node_modules/@babel/plugin-transform-object-rest-spread": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/compat-data": "^7.22.5",@@ -31051,7 +31018,6 @@},"node_modules/@babel/plugin-transform-optional-catch-binding": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5",@@ -31066,7 +31032,6 @@},"node_modules/@babel/plugin-transform-optional-chaining": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5",@@ -31109,7 +31074,6 @@},"node_modules/@babel/plugin-transform-private-property-in-object": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-annotate-as-pure": "^7.22.5",@@ -31209,7 +31173,6 @@},"node_modules/@babel/plugin-transform-reserved-words": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5"@@ -31301,7 +31264,6 @@},"node_modules/@babel/plugin-transform-typeof-symbol": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5"@@ -31331,7 +31293,6 @@},"node_modules/@babel/plugin-transform-unicode-escapes": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5"@@ -31345,7 +31306,6 @@},"node_modules/@babel/plugin-transform-unicode-property-regex": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-create-regexp-features-plugin": "^7.22.5",@@ -31374,7 +31334,6 @@},"node_modules/@babel/plugin-transform-unicode-sets-regex": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-create-regexp-features-plugin": "^7.22.5",@@ -31389,7 +31348,6 @@},"node_modules/@babel/preset-env": {"version": "7.22.5",- "dev": true,"license": "MIT","dependencies": {"@babel/compat-data": "^7.22.5",@@ -31482,7 +31440,6 @@},"node_modules/@babel/preset-env/node_modules/semver": {"version": "6.3.0",- "dev": true,"license": "ISC","bin": {"semver": "bin/semver.js"@@ -31505,7 +31462,6 @@},"node_modules/@babel/preset-modules": {"version": "0.1.5",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.0.0",@@ -34118,7 +34074,6 @@},"node_modules/@types/eslint": {"version": "8.40.2",- "dev": true,"license": "MIT","dependencies": {"@types/estree": "*",@@ -34127,7 +34082,6 @@},"node_modules/@types/eslint-scope": {"version": "3.7.4",- "dev": true,"license": "MIT","dependencies": {"@types/eslint": "*",@@ -34136,7 +34090,6 @@},"node_modules/@types/estree": {"version": "1.0.1",- "dev": true,"license": "MIT"},"node_modules/@types/graceful-fs": {@@ -34585,7 +34538,6 @@},"node_modules/@webassemblyjs/ast": {"version": "1.11.6",- "dev": true,"license": "MIT","dependencies": {"@webassemblyjs/helper-numbers": "1.11.6",@@ -34594,22 +34546,18 @@},"node_modules/@webassemblyjs/floating-point-hex-parser": {"version": "1.11.6",- "dev": true,"license": "MIT"},"node_modules/@webassemblyjs/helper-api-error": {"version": "1.11.6",- "dev": true,"license": "MIT"},"node_modules/@webassemblyjs/helper-buffer": {"version": "1.11.6",- "dev": true,"license": "MIT"},"node_modules/@webassemblyjs/helper-numbers": {"version": "1.11.6",- "dev": true,"license": "MIT","dependencies": {"@webassemblyjs/floating-point-hex-parser": "1.11.6",@@ -34619,12 +34567,10 @@},"node_modules/@webassemblyjs/helper-wasm-bytecode": {"version": "1.11.6",- "dev": true,"license": "MIT"},"node_modules/@webassemblyjs/helper-wasm-section": {"version": "1.11.6",- "dev": true,"license": "MIT","dependencies": {"@webassemblyjs/ast": "1.11.6",@@ -34635,7 +34581,6 @@},"node_modules/@webassemblyjs/ieee754": {"version": "1.11.6",- "dev": true,"license": "MIT","dependencies": {"@xtuc/ieee754": "^1.2.0"@@ -34643,7 +34588,6 @@},"node_modules/@webassemblyjs/leb128": {"version": "1.11.6",- "dev": true,"license": "Apache-2.0","dependencies": {"@xtuc/long": "4.2.2"@@ -34651,12 +34595,10 @@},"node_modules/@webassemblyjs/utf8": {"version": "1.11.6",- "dev": true,"license": "MIT"},"node_modules/@webassemblyjs/wasm-edit": {"version": "1.11.6",- "dev": true,"license": "MIT","dependencies": {"@webassemblyjs/ast": "1.11.6",@@ -34671,7 +34613,6 @@},"node_modules/@webassemblyjs/wasm-gen": {"version": "1.11.6",- "dev": true,"license": "MIT","dependencies": {"@webassemblyjs/ast": "1.11.6",@@ -34683,7 +34624,6 @@},"node_modules/@webassemblyjs/wasm-opt": {"version": "1.11.6",- "dev": true,"license": "MIT","dependencies": {"@webassemblyjs/ast": "1.11.6",@@ -34694,7 +34634,6 @@},"node_modules/@webassemblyjs/wasm-parser": {"version": "1.11.6",- "dev": true,"license": "MIT","dependencies": {"@webassemblyjs/ast": "1.11.6",@@ -34707,7 +34646,6 @@},"node_modules/@webassemblyjs/wast-printer": {"version": "1.11.6",- "dev": true,"license": "MIT","dependencies": {"@webassemblyjs/ast": "1.11.6",@@ -34765,12 +34703,10 @@},"node_modules/@xtuc/ieee754": {"version": "1.2.0",- "dev": true,"license": "BSD-3-Clause"},"node_modules/@xtuc/long": {"version": "4.2.2",- "dev": true,"license": "Apache-2.0"},"node_modules/@yarnpkg/lockfile": {@@ -34826,7 +34762,6 @@},"node_modules/acorn-import-assertions": {"version": "1.9.0",- "dev": true,"license": "MIT","peerDependencies": {"acorn": "^8"@@ -35928,7 +35863,6 @@},"node_modules/chrome-trace-event": {"version": "1.0.3",- "dev": true,"license": "MIT","engines": {"node": ">=6.0"@@ -36990,7 +36924,6 @@},"node_modules/enhanced-resolve": {"version": "5.15.0",- "dev": true,"license": "MIT","dependencies": {"graceful-fs": "^4.2.4",@@ -37103,7 +37036,6 @@},"node_modules/es-module-lexer": {"version": "1.3.0",- "dev": true,"license": "MIT"},"node_modules/es-set-tostringtag": {@@ -37434,7 +37366,6 @@},"node_modules/eslint-scope": {"version": "5.1.1",- "dev": true,"license": "BSD-2-Clause","dependencies": {"esrecurse": "^4.3.0",@@ -37446,7 +37377,6 @@},"node_modules/eslint-scope/node_modules/estraverse": {"version": "4.3.0",- "dev": true,"license": "BSD-2-Clause","engines": {"node": ">=4.0"@@ -37632,7 +37562,6 @@},"node_modules/esrecurse": {"version": "4.3.0",- "dev": true,"license": "BSD-2-Clause","dependencies": {"estraverse": "^5.2.0"@@ -37643,7 +37572,6 @@},"node_modules/estraverse": {"version": "5.3.0",- "dev": true,"license": "BSD-2-Clause","engines": {"node": ">=4.0"@@ -37651,7 +37579,6 @@},"node_modules/esutils": {"version": "2.0.3",- "dev": true,"license": "BSD-2-Clause","engines": {"node": ">=0.10.0"@@ -38704,7 +38631,6 @@},"node_modules/glob-to-regexp": {"version": "0.4.1",- "dev": true,"license": "BSD-2-Clause"},"node_modules/global": {@@ -40942,7 +40868,6 @@},"node_modules/json-parse-even-better-errors": {"version": "2.3.1",- "dev": true,"license": "MIT"},"node_modules/json-schema-traverse": {@@ -41209,7 +41134,6 @@},"node_modules/loader-runner": {"version": "4.3.0",- "dev": true,"license": "MIT","engines": {"node": ">=6.11.5"@@ -43832,7 +43756,6 @@},"node_modules/randombytes": {"version": "2.1.0",- "dev": true,"license": "MIT","dependencies": {"safe-buffer": "^5.1.0"@@ -43882,6 +43805,28 @@}}},+ "node_modules/react-dom": {+ "version": "18.2.0",+ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",+ "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",+ "peer": true,+ "dependencies": {+ "loose-envify": "^1.1.0",+ "scheduler": "^0.23.0"+ },+ "peerDependencies": {+ "react": "^18.2.0"+ }+ },+ "node_modules/react-dom/node_modules/scheduler": {+ "version": "0.23.0",+ "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",+ "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",+ "peer": true,+ "dependencies": {+ "loose-envify": "^1.1.0"+ }+ },"node_modules/react-freeze": {"version": "1.0.3","license": "MIT",@@ -44568,7 +44513,6 @@},"node_modules/react-test-renderer": {"version": "18.2.0",- "dev": true,"license": "MIT","dependencies": {"react-is": "^18.2.0",@@ -44581,12 +44525,10 @@},"node_modules/react-test-renderer/node_modules/react-is": {"version": "18.2.0",- "dev": true,"license": "MIT"},"node_modules/react-test-renderer/node_modules/scheduler": {"version": "0.23.0",- "dev": true,"license": "MIT","dependencies": {"loose-envify": "^1.1.0"@@ -45421,7 +45363,6 @@},"node_modules/serialize-javascript": {"version": "6.0.1",- "dev": true,"license": "BSD-3-Clause","dependencies": {"randombytes": "^2.1.0"@@ -46476,7 +46417,6 @@},"node_modules/terser-webpack-plugin": {"version": "5.3.9",- "dev": true,"license": "MIT","dependencies": {"@jridgewell/trace-mapping": "^0.3.17",@@ -46509,7 +46449,6 @@},"node_modules/terser-webpack-plugin/node_modules/jest-worker": {"version": "27.5.1",- "dev": true,"license": "MIT","dependencies": {"@types/node": "*",@@ -46522,7 +46461,6 @@},"node_modules/terser-webpack-plugin/node_modules/supports-color": {"version": "8.1.1",- "dev": true,"license": "MIT","dependencies": {"has-flag": "^4.0.0"@@ -47276,7 +47214,6 @@},"node_modules/watchpack": {"version": "2.4.0",- "dev": true,"license": "MIT","dependencies": {"glob-to-regexp": "^0.4.1",@@ -47299,7 +47236,6 @@},"node_modules/webpack": {"version": "5.88.2",- "dev": true,"license": "MIT","dependencies": {"@types/eslint-scope": "^3.7.3",@@ -47414,7 +47350,6 @@},"node_modules/webpack-sources": {"version": "3.2.3",- "dev": true,"license": "MIT","engines": {"node": ">=10.13.0"@@ -47708,10 +47643,12 @@},"dependencies": {"@ammarahmed/notifee-react-native": {- "version": "7.4.4"+ "version": "7.4.4",+ "requires": {}},"@ammarahmed/react-native-eventsource": {- "version": "1.1.0"+ "version": "1.1.0",+ "requires": {}},"@ammarahmed/react-native-share-extension": {"version": "2.5.6",@@ -49296,14 +49233,12 @@},"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {"version": "7.22.5",- "dev": true,"requires": {"@babel/helper-plugin-utils": "^7.22.5"}},"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {"version": "7.22.5",- "dev": true,"requires": {"@babel/helper-plugin-utils": "^7.22.5","@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",@@ -49380,11 +49315,10 @@},"@babel/plugin-proposal-private-property-in-object": {"version": "7.21.0-placeholder-for-preset-env.2",- "dev": true+ "requires": {}},"@babel/plugin-proposal-unicode-property-regex": {"version": "7.18.6",- "dev": true,"requires": {"@babel/helper-create-regexp-features-plugin": "^7.18.6","@babel/helper-plugin-utils": "^7.18.6"@@ -49411,7 +49345,6 @@},"@babel/plugin-syntax-class-static-block": {"version": "7.14.5",- "dev": true,"requires": {"@babel/helper-plugin-utils": "^7.14.5"}@@ -49430,7 +49363,6 @@},"@babel/plugin-syntax-export-namespace-from": {"version": "7.8.3",- "dev": true,"requires": {"@babel/helper-plugin-utils": "^7.8.3"}@@ -49443,28 +49375,24 @@},"@babel/plugin-syntax-import-assertions": {"version": "7.22.5",- "dev": true,"requires": {"@babel/helper-plugin-utils": "^7.22.5"}},"@babel/plugin-syntax-import-attributes": {"version": "7.22.5",- "dev": true,"requires": {"@babel/helper-plugin-utils": "^7.22.5"}},"@babel/plugin-syntax-import-meta": {"version": "7.10.4",- "dev": true,"requires": {"@babel/helper-plugin-utils": "^7.10.4"}},"@babel/plugin-syntax-json-strings": {"version": "7.8.3",- "dev": true,"requires": {"@babel/helper-plugin-utils": "^7.8.0"}@@ -49477,7 +49405,6 @@},"@babel/plugin-syntax-logical-assignment-operators": {"version": "7.10.4",- "dev": true,"requires": {"@babel/helper-plugin-utils": "^7.10.4"}@@ -49514,14 +49441,12 @@},"@babel/plugin-syntax-private-property-in-object": {"version": "7.14.5",- "dev": true,"requires": {"@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-syntax-top-level-await": {"version": "7.14.5",- "dev": true,"requires": {"@babel/helper-plugin-utils": "^7.14.5"}@@ -49534,7 +49459,6 @@},"@babel/plugin-syntax-unicode-sets-regex": {"version": "7.18.6",- "dev": true,"requires": {"@babel/helper-create-regexp-features-plugin": "^7.18.6","@babel/helper-plugin-utils": "^7.18.6"@@ -49548,7 +49472,6 @@},"@babel/plugin-transform-async-generator-functions": {"version": "7.22.5",- "dev": true,"requires": {"@babel/helper-environment-visitor": "^7.22.5","@babel/helper-plugin-utils": "^7.22.5",@@ -49578,7 +49501,6 @@},"@babel/plugin-transform-class-properties": {"version": "7.22.5",- "dev": true,"requires": {"@babel/helper-create-class-features-plugin": "^7.22.5","@babel/helper-plugin-utils": "^7.22.5"@@ -49586,7 +49508,6 @@},"@babel/plugin-transform-class-static-block": {"version": "7.22.5",- "dev": true,"requires": {"@babel/helper-create-class-features-plugin": "^7.22.5","@babel/helper-plugin-utils": "^7.22.5",@@ -49622,7 +49543,6 @@},"@babel/plugin-transform-dotall-regex": {"version": "7.22.5",- "dev": true,"requires": {"@babel/helper-create-regexp-features-plugin": "^7.22.5","@babel/helper-plugin-utils": "^7.22.5"@@ -49630,14 +49550,12 @@},"@babel/plugin-transform-duplicate-keys": {"version": "7.22.5",- "dev": true,"requires": {"@babel/helper-plugin-utils": "^7.22.5"}},"@babel/plugin-transform-dynamic-import": {"version": "7.22.5",- "dev": true,"requires": {"@babel/helper-plugin-utils": "^7.22.5","@babel/plugin-syntax-dynamic-import": "^7.8.3"@@ -49652,7 +49570,6 @@},"@babel/plugin-transform-export-namespace-from": {"version": "7.22.5",- "dev": true,"requires": {"@babel/helper-plugin-utils": "^7.22.5","@babel/plugin-syntax-export-namespace-from": "^7.8.3"@@ -49681,7 +49598,6 @@},"@babel/plugin-transform-json-strings": {"version": "7.22.5",- "dev": true,"requires": {"@babel/helper-plugin-utils": "^7.22.5","@babel/plugin-syntax-json-strings": "^7.8.3"@@ -49695,7 +49611,6 @@},"@babel/plugin-transform-logical-assignment-operators": {"version": "7.22.5",- "dev": true,"requires": {"@babel/helper-plugin-utils": "^7.22.5","@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"@@ -49709,7 +49624,6 @@},"@babel/plugin-transform-modules-amd": {"version": "7.22.5",- "dev": true,"requires": {"@babel/helper-module-transforms": "^7.22.5","@babel/helper-plugin-utils": "^7.22.5"@@ -49725,7 +49639,6 @@},"@babel/plugin-transform-modules-systemjs": {"version": "7.22.5",- "dev": true,"requires": {"@babel/helper-hoist-variables": "^7.22.5","@babel/helper-module-transforms": "^7.22.5",@@ -49735,7 +49648,6 @@},"@babel/plugin-transform-modules-umd": {"version": "7.22.5",- "dev": true,"requires": {"@babel/helper-module-transforms": "^7.22.5","@babel/helper-plugin-utils": "^7.22.5"@@ -49750,14 +49662,12 @@},"@babel/plugin-transform-new-target": {"version": "7.22.5",- "dev": true,"requires": {"@babel/helper-plugin-utils": "^7.22.5"}},"@babel/plugin-transform-nullish-coalescing-operator": {"version": "7.22.5",- "dev": true,"requires": {"@babel/helper-plugin-utils": "^7.22.5","@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"@@ -49765,7 +49675,6 @@},"@babel/plugin-transform-numeric-separator": {"version": "7.22.5",- "dev": true,"requires": {"@babel/helper-plugin-utils": "^7.22.5","@babel/plugin-syntax-numeric-separator": "^7.10.4"@@ -49779,7 +49688,6 @@},"@babel/plugin-transform-object-rest-spread": {"version": "7.22.5",- "dev": true,"requires": {"@babel/compat-data": "^7.22.5","@babel/helper-compilation-targets": "^7.22.5",@@ -49797,7 +49705,6 @@},"@babel/plugin-transform-optional-catch-binding": {"version": "7.22.5",- "dev": true,"requires": {"@babel/helper-plugin-utils": "^7.22.5","@babel/plugin-syntax-optional-catch-binding": "^7.8.3"@@ -49805,7 +49712,6 @@},"@babel/plugin-transform-optional-chaining": {"version": "7.22.5",- "dev": true,"requires": {"@babel/helper-plugin-utils": "^7.22.5","@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",@@ -49827,7 +49733,6 @@},"@babel/plugin-transform-private-property-in-object": {"version": "7.22.5",- "dev": true,"requires": {"@babel/helper-annotate-as-pure": "^7.22.5","@babel/helper-create-class-features-plugin": "^7.22.5",@@ -49878,7 +49783,6 @@},"@babel/plugin-transform-reserved-words": {"version": "7.22.5",- "dev": true,"requires": {"@babel/helper-plugin-utils": "^7.22.5"}@@ -49926,7 +49830,6 @@},"@babel/plugin-transform-typeof-symbol": {"version": "7.22.5",- "dev": true,"requires": {"@babel/helper-plugin-utils": "^7.22.5"}@@ -49942,14 +49845,12 @@},"@babel/plugin-transform-unicode-escapes": {"version": "7.22.5",- "dev": true,"requires": {"@babel/helper-plugin-utils": "^7.22.5"}},"@babel/plugin-transform-unicode-property-regex": {"version": "7.22.5",- "dev": true,"requires": {"@babel/helper-create-regexp-features-plugin": "^7.22.5","@babel/helper-plugin-utils": "^7.22.5"@@ -49964,7 +49865,6 @@},"@babel/plugin-transform-unicode-sets-regex": {"version": "7.22.5",- "dev": true,"requires": {"@babel/helper-create-regexp-features-plugin": "^7.22.5","@babel/helper-plugin-utils": "^7.22.5"@@ -49972,7 +49872,6 @@},"@babel/preset-env": {"version": "7.22.5",- "dev": true,"requires": {"@babel/compat-data": "^7.22.5","@babel/helper-compilation-targets": "^7.22.5",@@ -50057,8 +49956,7 @@},"dependencies": {"semver": {- "version": "6.3.0",- "dev": true+ "version": "6.3.0"}}},@@ -50072,7 +49970,6 @@},"@babel/preset-modules": {"version": "0.1.5",- "dev": true,"requires": {"@babel/helper-plugin-utils": "^7.0.0","@babel/plugin-proposal-unicode-property-regex": "^7.4.4",@@ -50200,7 +50097,8 @@}},"@bam.tech/react-native-image-resizer": {- "version": "3.0.5"+ "version": "3.0.5",+ "requires": {}},"@bcoe/v8-coverage": {"version": "0.2.3",@@ -50297,7 +50195,8 @@"version": "18.2.0"},"ws": {- "version": "8.13.0"+ "version": "8.13.0",+ "requires": {}}}},@@ -51298,7 +51197,7 @@"@types/spark-md5": "^3.0.2","@types/streetwriters__showdown": "npm:@types/showdown@^2.0.6","@types/ws": "^8.5.5",- "@vitest/coverage-v8": "^0.34.1",+ "@vitest/coverage-v8": "^1.0.1","abortcontroller-polyfill": "^1.7.3","async-mutex": "^0.3.2","better-sqlite3": "^8.6.0",@@ -51328,7 +51227,7 @@"refractor": "^4.8.1","rfdc": "^1.3.0","spark-md5": "^3.0.2",- "vitest": "^0.34.1",+ "vitest": "^1.0.1","vitest-fetch-mock": "^0.2.2","ws": "^8.13.0"},@@ -51397,7 +51296,8 @@},"dependencies": {"ws": {- "version": "7.5.9"+ "version": "7.5.9",+ "requires": {}}}},@@ -53791,7 +53691,8 @@},"ws": {"version": "8.13.0",- "dev": true+ "dev": true,+ "requires": {}},"xml-name-validator": {"version": "4.0.0",@@ -53869,7 +53770,7 @@"@types/spark-md5": "^3.0.2","@types/streetwriters__showdown": "npm:@types/showdown@^2.0.6","@types/ws": "^8.5.5",- "@vitest/coverage-v8": "^0.34.1",+ "@vitest/coverage-v8": "^1.0.1","abortcontroller-polyfill": "^1.7.3","async-mutex": "^0.3.2","better-sqlite3": "^8.6.0",@@ -53899,7 +53800,7 @@"refractor": "^4.8.1","rfdc": "^1.3.0","spark-md5": "^3.0.2",- "vitest": "^0.34.1",+ "vitest": "^1.0.1","vitest-fetch-mock": "^0.2.2","ws": "^8.13.0"},@@ -53968,7 +53869,8 @@},"dependencies": {"ws": {- "version": "7.5.9"+ "version": "7.5.9",+ "requires": {}}}},@@ -56362,7 +56264,8 @@},"ws": {"version": "8.13.0",- "dev": true+ "dev": true,+ "requires": {}},"xml-name-validator": {"version": "4.0.0",@@ -56595,7 +56498,8 @@},"@emotion/use-insertion-effect-with-fallbacks": {"version": "1.0.1",- "dev": true+ "dev": true,+ "requires": {}},"@emotion/utils": {"version": "1.2.1",@@ -56694,7 +56598,7 @@"@types/spark-md5": "^3.0.2","@types/streetwriters__showdown": "npm:@types/showdown@^2.0.6","@types/ws": "^8.5.5",- "@vitest/coverage-v8": "^0.34.1",+ "@vitest/coverage-v8": "^1.0.1","abortcontroller-polyfill": "^1.7.3","async-mutex": "^0.3.2","better-sqlite3": "^8.6.0",@@ -56724,7 +56628,7 @@"refractor": "^4.8.1","rfdc": "^1.3.0","spark-md5": "^3.0.2",- "vitest": "^0.34.1",+ "vitest": "^1.0.1","vitest-fetch-mock": "^0.2.2","ws": "^8.13.0"},@@ -56793,7 +56697,8 @@},"dependencies": {"ws": {- "version": "7.5.9"+ "version": "7.5.9",+ "requires": {}}}},@@ -59187,7 +59092,8 @@},"ws": {"version": "8.13.0",- "dev": true+ "dev": true,+ "requires": {}},"xml-name-validator": {"version": "4.0.0",@@ -59206,6 +59112,7 @@"@notesnook/theme": {"version": "file:../../packages/theme","requires": {+ "@emotion/react": "11.11.1","@theme-ui/color": "^0.16.1","@theme-ui/components": "^0.16.1","@theme-ui/core": "^0.16.1",@@ -59593,7 +59500,8 @@},"use-sync-external-store": {"version": "1.2.0",- "dev": true+ "dev": true,+ "requires": {}},"webidl-conversions": {"version": "3.0.1",@@ -59774,7 +59682,8 @@},"@emotion/use-insertion-effect-with-fallbacks": {"version": "1.0.1",- "dev": true+ "dev": true,+ "requires": {}},"@emotion/utils": {"version": "1.2.1",@@ -59850,6 +59759,7 @@"@notesnook/theme": {"version": "file:../../packages/theme","requires": {+ "@emotion/react": "11.11.1","@theme-ui/color": "^0.16.1","@theme-ui/components": "^0.16.1","@theme-ui/core": "^0.16.1",@@ -60237,7 +60147,8 @@},"use-sync-external-store": {"version": "1.2.0",- "dev": true+ "dev": true,+ "requires": {}},"webidl-conversions": {"version": "3.0.1",@@ -60962,55 +60873,72 @@}},"@tiptap/core": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-blockquote": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-bold": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-bullet-list": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-character-count": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-code": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-code-block": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-color": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-document": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-dropcursor": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-font-family": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-gapcursor": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-hard-break": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-heading": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-history": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-horizontal-rule": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-italic": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-link": {"version": "2.1.12",@@ -61019,58 +60947,76 @@}},"@tiptap/extension-list-item": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-list-keymap": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-ordered-list": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-paragraph": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-placeholder": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-strike": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-subscript": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-superscript": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-table": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-table-cell": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-table-header": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-table-row": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-task-item": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-task-list": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-text": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-text-align": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-text-style": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-underline": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/pm": {"version": "2.1.12",@@ -61725,8 +61671,7 @@}},"js-tokens": {- "version": "4.0.0",- "dev": true+ "version": "4.0.0"},"json-parse-even-better-errors": {"version": "2.3.1",@@ -61761,7 +61706,6 @@},"loose-envify": {"version": "1.4.0",- "dev": true,"requires": {"js-tokens": "^3.0.0 || ^4.0.0"}@@ -61820,8 +61764,7 @@}},"object-assign": {- "version": "4.1.1",- "dev": true+ "version": "4.1.1"},"object.omit": {"version": "3.0.0",@@ -61970,7 +61913,8 @@}},"prosemirror-codemark": {- "version": "0.4.2"+ "version": "0.4.2",+ "requires": {}},"prosemirror-collab": {"version": "1.3.0",@@ -62112,22 +62056,22 @@}},"re-resizable": {- "version": "6.9.9"+ "version": "6.9.9",+ "requires": {}},"react": {"version": "17.0.2",- "dev": true,"requires": {"loose-envify": "^1.1.0","object-assign": "^4.1.1"}},"react-colorful": {- "version": "5.6.1"+ "version": "5.6.1",+ "requires": {}},"react-dom": {"version": "17.0.2",- "dev": true,"requires": {"loose-envify": "^1.1.0","object-assign": "^4.1.1",@@ -62207,7 +62151,6 @@},"scheduler": {"version": "0.20.2",- "dev": true,"requires": {"loose-envify": "^1.1.0","object-assign": "^4.1.1"@@ -62380,7 +62323,8 @@},"use-sync-external-store": {"version": "1.2.0",- "dev": true+ "dev": true,+ "requires": {}},"util-deprecate": {"version": "1.0.2"@@ -62558,6 +62502,7 @@"react": "^18.2.0","react-dom": "^18.2.0","react-scripts": "^5.0.1",+ "tinycolor2": "1.6.0","zustand": "^4.4.7"},"dependencies": {@@ -63804,11 +63749,13 @@},"@csstools/postcss-unset-value": {"version": "1.0.2",- "dev": true+ "dev": true,+ "requires": {}},"@csstools/selector-specificity": {"version": "2.1.1",- "dev": true+ "dev": true,+ "requires": {}},"@emotion/babel-plugin": {"version": "11.11.0",@@ -63898,7 +63845,8 @@"version": "0.8.1"},"@emotion/use-insertion-effect-with-fallbacks": {- "version": "1.0.1"+ "version": "1.0.1",+ "requires": {}},"@emotion/utils": {"version": "1.2.1"@@ -64806,7 +64754,8 @@},"@emotion/use-insertion-effect-with-fallbacks": {"version": "1.0.1",- "dev": true+ "dev": true,+ "requires": {}},"@emotion/utils": {"version": "1.2.1",@@ -64905,7 +64854,7 @@"@types/spark-md5": "^3.0.2","@types/streetwriters__showdown": "npm:@types/showdown@^2.0.6","@types/ws": "^8.5.5",- "@vitest/coverage-v8": "^0.34.1",+ "@vitest/coverage-v8": "^1.0.1","abortcontroller-polyfill": "^1.7.3","async-mutex": "^0.3.2","better-sqlite3": "^8.6.0",@@ -64935,7 +64884,7 @@"refractor": "^4.8.1","rfdc": "^1.3.0","spark-md5": "^3.0.2",- "vitest": "^0.34.1",+ "vitest": "^1.0.1","vitest-fetch-mock": "^0.2.2","ws": "^8.13.0"},@@ -65004,7 +64953,8 @@},"dependencies": {"ws": {- "version": "7.5.9"+ "version": "7.5.9",+ "requires": {}}}},@@ -67398,7 +67348,8 @@},"ws": {"version": "8.13.0",- "dev": true+ "dev": true,+ "requires": {}},"xml-name-validator": {"version": "4.0.0",@@ -67417,6 +67368,7 @@"@notesnook/theme": {"version": "file:../../packages/theme","requires": {+ "@emotion/react": "11.11.1","@theme-ui/color": "^0.16.1","@theme-ui/components": "^0.16.1","@theme-ui/core": "^0.16.1",@@ -67804,7 +67756,8 @@},"use-sync-external-store": {"version": "1.2.0",- "dev": true+ "dev": true,+ "requires": {}},"webidl-conversions": {"version": "3.0.1",@@ -67985,7 +67938,8 @@},"@emotion/use-insertion-effect-with-fallbacks": {"version": "1.0.1",- "dev": true+ "dev": true,+ "requires": {}},"@emotion/utils": {"version": "1.2.1",@@ -68061,6 +68015,7 @@"@notesnook/theme": {"version": "file:../../packages/theme","requires": {+ "@emotion/react": "11.11.1","@theme-ui/color": "^0.16.1","@theme-ui/components": "^0.16.1","@theme-ui/core": "^0.16.1",@@ -68448,7 +68403,8 @@},"use-sync-external-store": {"version": "1.2.0",- "dev": true+ "dev": true,+ "requires": {}},"webidl-conversions": {"version": "3.0.1",@@ -69173,55 +69129,72 @@}},"@tiptap/core": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-blockquote": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-bold": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-bullet-list": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-character-count": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-code": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-code-block": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-color": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-document": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-dropcursor": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-font-family": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-gapcursor": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-hard-break": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-heading": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-history": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-horizontal-rule": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-italic": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-link": {"version": "2.1.12",@@ -69230,58 +69203,76 @@}},"@tiptap/extension-list-item": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-list-keymap": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-ordered-list": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-paragraph": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-placeholder": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-strike": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-subscript": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-superscript": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-table": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-table-cell": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-table-header": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-table-row": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-task-item": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-task-list": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-text": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-text-align": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-text-style": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/extension-underline": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"@tiptap/pm": {"version": "2.1.12",@@ -69936,8 +69927,7 @@}},"js-tokens": {- "version": "4.0.0",- "dev": true+ "version": "4.0.0"},"json-parse-even-better-errors": {"version": "2.3.1",@@ -69972,7 +69962,6 @@},"loose-envify": {"version": "1.4.0",- "dev": true,"requires": {"js-tokens": "^3.0.0 || ^4.0.0"}@@ -70031,8 +70020,7 @@}},"object-assign": {- "version": "4.1.1",- "dev": true+ "version": "4.1.1"},"object.omit": {"version": "3.0.0",@@ -70181,7 +70169,8 @@}},"prosemirror-codemark": {- "version": "0.4.2"+ "version": "0.4.2",+ "requires": {}},"prosemirror-collab": {"version": "1.3.0",@@ -70323,22 +70312,22 @@}},"re-resizable": {- "version": "6.9.9"+ "version": "6.9.9",+ "requires": {}},"react": {"version": "17.0.2",- "dev": true,"requires": {"loose-envify": "^1.1.0","object-assign": "^4.1.1"}},"react-colorful": {- "version": "5.6.1"+ "version": "5.6.1",+ "requires": {}},"react-dom": {"version": "17.0.2",- "dev": true,"requires": {"loose-envify": "^1.1.0","object-assign": "^4.1.1",@@ -70418,7 +70407,6 @@},"scheduler": {"version": "0.20.2",- "dev": true,"requires": {"loose-envify": "^1.1.0","object-assign": "^4.1.1"@@ -70591,7 +70579,8 @@},"use-sync-external-store": {"version": "1.2.0",- "dev": true+ "dev": true,+ "requires": {}},"util-deprecate": {"version": "1.0.2"@@ -70754,6 +70743,7 @@"@notesnook/theme": {"version": "file:../../packages/theme","requires": {+ "@emotion/react": "11.11.1","@theme-ui/color": "^0.16.1","@theme-ui/components": "^0.16.1","@theme-ui/core": "^0.16.1",@@ -71141,7 +71131,8 @@},"use-sync-external-store": {"version": "1.2.0",- "dev": true+ "dev": true,+ "requires": {}},"webidl-conversions": {"version": "3.0.1",@@ -71956,11 +71947,13 @@},"acorn-import-assertions": {"version": "1.8.0",- "dev": true+ "dev": true,+ "requires": {}},"acorn-jsx": {"version": "5.3.2",- "dev": true+ "dev": true,+ "requires": {}},"acorn-node": {"version": "1.8.2",@@ -72241,7 +72234,8 @@},"ajv-keywords": {"version": "3.5.2",- "dev": true+ "dev": true,+ "requires": {}},"json-schema-traverse": {"version": "0.4.1",@@ -72296,7 +72290,8 @@},"babel-plugin-named-asset-import": {"version": "0.3.8",- "dev": true+ "dev": true,+ "requires": {}},"babel-plugin-polyfill-corejs2": {"version": "0.3.3",@@ -72846,7 +72841,8 @@},"css-declaration-sorter": {"version": "6.3.1",- "dev": true+ "dev": true,+ "requires": {}},"css-has-pseudo": {"version": "3.0.4",@@ -72926,7 +72922,8 @@},"css-prefers-color-scheme": {"version": "6.0.3",- "dev": true+ "dev": true,+ "requires": {}},"css-select": {"version": "4.3.0",@@ -73015,7 +73012,8 @@},"cssnano-utils": {"version": "3.1.0",- "dev": true+ "dev": true,+ "requires": {}},"csso": {"version": "4.2.0",@@ -73835,7 +73833,8 @@},"eslint-plugin-react-hooks": {"version": "4.6.0",- "dev": true+ "dev": true,+ "requires": {}},"eslint-plugin-testing-library": {"version": "5.10.2",@@ -74321,7 +74320,8 @@},"ajv-keywords": {"version": "3.5.2",- "dev": true+ "dev": true,+ "requires": {}},"chalk": {"version": "4.1.2",@@ -74805,7 +74805,8 @@},"icss-utils": {"version": "5.1.0",- "dev": true+ "dev": true,+ "requires": {}},"idb": {"version": "7.1.1",@@ -75867,7 +75868,8 @@},"jest-pnp-resolver": {"version": "1.2.3",- "dev": true+ "dev": true,+ "requires": {}},"jest-regex-util": {"version": "27.5.1",@@ -76742,7 +76744,8 @@}},"mdi-react": {- "version": "9.1.0"+ "version": "9.1.0",+ "requires": {}},"mdn-data": {"version": "2.0.4",@@ -77271,7 +77274,8 @@},"postcss-browser-comments": {"version": "4.0.0",- "dev": true+ "dev": true,+ "requires": {}},"postcss-calc": {"version": "8.2.4",@@ -77357,19 +77361,23 @@},"postcss-discard-comments": {"version": "5.1.2",- "dev": true+ "dev": true,+ "requires": {}},"postcss-discard-duplicates": {"version": "5.1.0",- "dev": true+ "dev": true,+ "requires": {}},"postcss-discard-empty": {"version": "5.1.1",- "dev": true+ "dev": true,+ "requires": {}},"postcss-discard-overridden": {"version": "5.1.0",- "dev": true+ "dev": true,+ "requires": {}},"postcss-double-position-gradients": {"version": "3.1.2",@@ -77388,7 +77396,8 @@},"postcss-flexbugs-fixes": {"version": "5.0.2",- "dev": true+ "dev": true,+ "requires": {}},"postcss-focus-visible": {"version": "6.0.4",@@ -77406,11 +77415,13 @@},"postcss-font-variant": {"version": "5.0.0",- "dev": true+ "dev": true,+ "requires": {}},"postcss-gap-properties": {"version": "3.0.5",- "dev": true+ "dev": true,+ "requires": {}},"postcss-image-set-function": {"version": "4.0.7",@@ -77430,7 +77441,8 @@},"postcss-initial": {"version": "4.0.1",- "dev": true+ "dev": true,+ "requires": {}},"postcss-js": {"version": "4.0.1",@@ -77486,11 +77498,13 @@},"postcss-logical": {"version": "5.0.4",- "dev": true+ "dev": true,+ "requires": {}},"postcss-media-minmax": {"version": "5.0.0",- "dev": true+ "dev": true,+ "requires": {}},"postcss-merge-longhand": {"version": "5.1.7",@@ -77544,7 +77558,8 @@},"postcss-modules-extract-imports": {"version": "3.0.0",- "dev": true+ "dev": true,+ "requires": {}},"postcss-modules-local-by-default": {"version": "4.0.0",@@ -77595,7 +77610,8 @@},"postcss-normalize-charset": {"version": "5.1.0",- "dev": true+ "dev": true,+ "requires": {}},"postcss-normalize-display-values": {"version": "5.1.0",@@ -77657,7 +77673,8 @@},"postcss-opacity-percentage": {"version": "1.1.3",- "dev": true+ "dev": true,+ "requires": {}},"postcss-ordered-values": {"version": "5.1.3",@@ -77676,7 +77693,8 @@},"postcss-page-break": {"version": "3.0.4",- "dev": true+ "dev": true,+ "requires": {}},"postcss-place": {"version": "7.0.5",@@ -77764,7 +77782,8 @@},"postcss-replace-overflow-wrap": {"version": "4.0.0",- "dev": true+ "dev": true,+ "requires": {}},"postcss-selector-not": {"version": "6.0.1",@@ -78481,7 +78500,8 @@},"ajv-keywords": {"version": "3.5.2",- "dev": true+ "dev": true,+ "requires": {}},"json-schema-traverse": {"version": "0.4.1",@@ -78839,7 +78859,8 @@},"style-loader": {"version": "3.3.1",- "dev": true+ "dev": true,+ "requires": {}},"style-value-types": {"version": "5.0.0",@@ -79511,7 +79532,8 @@},"ws": {"version": "8.12.1",- "dev": true+ "dev": true,+ "requires": {}}}},@@ -79888,7 +79910,8 @@},"ws": {"version": "7.5.9",- "dev": true+ "dev": true,+ "requires": {}},"xml-name-validator": {"version": "3.0.0",@@ -79935,7 +79958,8 @@"dev": true},"zustand": {- "version": "3.7.2"+ "version": "3.7.2",+ "requires": {}}}},@@ -80353,6 +80377,7 @@"@notesnook/theme": {"version": "file:../../packages/theme","requires": {+ "@emotion/react": "11.11.1","@theme-ui/color": "^0.16.1","@theme-ui/components": "^0.16.1","@theme-ui/core": "^0.16.1",@@ -80740,7 +80765,8 @@},"use-sync-external-store": {"version": "1.2.0",- "dev": true+ "dev": true,+ "requires": {}},"webidl-conversions": {"version": "3.0.1",@@ -81245,10 +81271,12 @@}},"@react-native-clipboard/clipboard": {- "version": "1.11.2"+ "version": "1.11.2",+ "requires": {}},"@react-native-community/checkbox": {- "version": "0.5.15"+ "version": "0.5.15",+ "requires": {}},"@react-native-community/cli": {"version": "11.3.2",@@ -81438,7 +81466,8 @@},"dependencies": {"ws": {- "version": "7.5.9"+ "version": "7.5.9",+ "requires": {}}}},@@ -81483,13 +81512,16 @@}},"@react-native-community/netinfo": {- "version": "9.3.10"+ "version": "9.3.10",+ "requires": {}},"@react-native-community/toolbar-android": {- "version": "0.2.1"+ "version": "0.2.1",+ "requires": {}},"@react-native-masked-view/masked-view": {- "version": "0.2.9"+ "version": "0.2.9",+ "requires": {}},"@react-native/assets-registry": {"version": "0.72.0"@@ -81567,7 +81599,8 @@}},"@react-navigation/elements": {- "version": "1.3.17"+ "version": "1.3.17",+ "requires": {}},"@react-navigation/native": {"version": "6.1.6",@@ -81657,10 +81690,12 @@"version": "0.3.0"},"@trpc/client": {- "version": "10.38.3"+ "version": "10.38.3",+ "requires": {}},"@trpc/react-query": {- "version": "10.38.3"+ "version": "10.38.3",+ "requires": {}},"@trpc/server": {"version": "10.38.3"@@ -81704,7 +81739,6 @@},"@types/eslint": {"version": "8.40.2",- "dev": true,"requires": {"@types/estree": "*","@types/json-schema": "*"@@ -81712,15 +81746,13 @@},"@types/eslint-scope": {"version": "3.7.4",- "dev": true,"requires": {"@types/eslint": "*","@types/estree": "*"}},"@types/estree": {- "version": "1.0.1",- "dev": true+ "version": "1.0.1"},"@types/graceful-fs": {"version": "4.1.6",@@ -82006,27 +82038,22 @@},"@webassemblyjs/ast": {"version": "1.11.6",- "dev": true,"requires": {"@webassemblyjs/helper-numbers": "1.11.6","@webassemblyjs/helper-wasm-bytecode": "1.11.6"}},"@webassemblyjs/floating-point-hex-parser": {- "version": "1.11.6",- "dev": true+ "version": "1.11.6"},"@webassemblyjs/helper-api-error": {- "version": "1.11.6",- "dev": true+ "version": "1.11.6"},"@webassemblyjs/helper-buffer": {- "version": "1.11.6",- "dev": true+ "version": "1.11.6"},"@webassemblyjs/helper-numbers": {"version": "1.11.6",- "dev": true,"requires": {"@webassemblyjs/floating-point-hex-parser": "1.11.6","@webassemblyjs/helper-api-error": "1.11.6",@@ -82034,12 +82061,10 @@}},"@webassemblyjs/helper-wasm-bytecode": {- "version": "1.11.6",- "dev": true+ "version": "1.11.6"},"@webassemblyjs/helper-wasm-section": {"version": "1.11.6",- "dev": true,"requires": {"@webassemblyjs/ast": "1.11.6","@webassemblyjs/helper-buffer": "1.11.6",@@ -82049,25 +82074,21 @@},"@webassemblyjs/ieee754": {"version": "1.11.6",- "dev": true,"requires": {"@xtuc/ieee754": "^1.2.0"}},"@webassemblyjs/leb128": {"version": "1.11.6",- "dev": true,"requires": {"@xtuc/long": "4.2.2"}},"@webassemblyjs/utf8": {- "version": "1.11.6",- "dev": true+ "version": "1.11.6"},"@webassemblyjs/wasm-edit": {"version": "1.11.6",- "dev": true,"requires": {"@webassemblyjs/ast": "1.11.6","@webassemblyjs/helper-buffer": "1.11.6",@@ -82081,7 +82102,6 @@},"@webassemblyjs/wasm-gen": {"version": "1.11.6",- "dev": true,"requires": {"@webassemblyjs/ast": "1.11.6","@webassemblyjs/helper-wasm-bytecode": "1.11.6",@@ -82092,7 +82112,6 @@},"@webassemblyjs/wasm-opt": {"version": "1.11.6",- "dev": true,"requires": {"@webassemblyjs/ast": "1.11.6","@webassemblyjs/helper-buffer": "1.11.6",@@ -82102,7 +82121,6 @@},"@webassemblyjs/wasm-parser": {"version": "1.11.6",- "dev": true,"requires": {"@webassemblyjs/ast": "1.11.6","@webassemblyjs/helper-api-error": "1.11.6",@@ -82114,7 +82132,6 @@},"@webassemblyjs/wast-printer": {"version": "1.11.6",- "dev": true,"requires": {"@webassemblyjs/ast": "1.11.6","@xtuc/long": "4.2.2"@@ -82122,27 +82139,28 @@},"@webpack-cli/configtest": {"version": "2.1.1",- "dev": true+ "dev": true,+ "requires": {}},"@webpack-cli/info": {"version": "2.0.2",- "dev": true+ "dev": true,+ "requires": {}},"@webpack-cli/serve": {"version": "2.0.5",- "dev": true+ "dev": true,+ "requires": {}},"@xmldom/xmldom": {"version": "0.8.10","dev": true},"@xtuc/ieee754": {- "version": "1.2.0",- "dev": true+ "version": "1.2.0"},"@xtuc/long": {- "version": "4.2.2",- "dev": true+ "version": "4.2.2"},"@yarnpkg/lockfile": {"version": "1.1.0",@@ -82175,11 +82193,12 @@},"acorn-import-assertions": {"version": "1.9.0",- "dev": true+ "requires": {}},"acorn-jsx": {"version": "5.3.2",- "dev": true+ "dev": true,+ "requires": {}},"ajv": {"version": "8.12.0",@@ -82191,7 +82210,8 @@}},"ajv-keywords": {- "version": "3.5.2"+ "version": "3.5.2",+ "requires": {}},"anser": {"version": "1.4.10"@@ -82393,7 +82413,8 @@}},"babel-core": {- "version": "7.0.0-bridge.0"+ "version": "7.0.0-bridge.0",+ "requires": {}},"babel-jest": {"version": "29.6.2",@@ -82839,8 +82860,7 @@}},"chrome-trace-event": {- "version": "1.0.3",- "dev": true+ "version": "1.0.3"},"ci-info": {"version": "3.8.0"@@ -83336,7 +83356,8 @@},"ws": {"version": "7.5.9",- "dev": true+ "dev": true,+ "requires": {}},"yallist": {"version": "4.0.0",@@ -83507,7 +83528,6 @@},"enhanced-resolve": {"version": "5.15.0",- "dev": true,"requires": {"graceful-fs": "^4.2.4","tapable": "^2.2.0"@@ -83581,8 +83601,7 @@}},"es-module-lexer": {- "version": "1.3.0",- "dev": true+ "version": "1.3.0"},"es-set-tostringtag": {"version": "2.0.1",@@ -83732,7 +83751,8 @@},"eslint-config-prettier": {"version": "8.8.0",- "dev": true+ "dev": true,+ "requires": {}},"eslint-plugin-eslint-comments": {"version": "3.2.0",@@ -83815,7 +83835,8 @@},"eslint-plugin-react-hooks": {"version": "4.6.0",- "dev": true+ "dev": true,+ "requires": {}},"eslint-plugin-react-native": {"version": "4.0.0",@@ -83842,15 +83863,13 @@},"eslint-scope": {"version": "5.1.1",- "dev": true,"requires": {"esrecurse": "^4.3.0","estraverse": "^4.1.1"},"dependencies": {"estraverse": {- "version": "4.3.0",- "dev": true+ "version": "4.3.0"}}},@@ -83885,18 +83904,15 @@},"esrecurse": {"version": "4.3.0",- "dev": true,"requires": {"estraverse": "^5.2.0"}},"estraverse": {- "version": "5.3.0",- "dev": true+ "version": "5.3.0"},"esutils": {- "version": "2.0.3",- "dev": true+ "version": "2.0.3"},"etag": {"version": "1.8.1"@@ -84597,8 +84613,7 @@}},"glob-to-regexp": {- "version": "0.4.1",- "dev": true+ "version": "0.4.1"},"global": {"version": "4.4.0",@@ -85353,7 +85368,8 @@},"dedent": {"version": "1.5.1",- "dev": true+ "dev": true,+ "requires": {}},"pretty-format": {"version": "29.6.2",@@ -85664,7 +85680,8 @@},"jest-pnp-resolver": {"version": "1.2.3",- "dev": true+ "dev": true,+ "requires": {}},"jest-regex-util": {"version": "29.4.3",@@ -85998,8 +86015,7 @@"version": "1.0.2"},"json-parse-even-better-errors": {- "version": "2.3.1",- "dev": true+ "version": "2.3.1"},"json-schema-traverse": {"version": "1.0.0"@@ -86168,8 +86184,7 @@}},"loader-runner": {- "version": "4.3.0",- "dev": true+ "version": "4.3.0"},"loader-utils": {"version": "2.0.4",@@ -86481,7 +86496,8 @@}},"ws": {- "version": "7.5.9"+ "version": "7.5.9",+ "requires": {}}}},@@ -86693,7 +86709,8 @@}},"ws": {- "version": "7.5.9"+ "version": "7.5.9",+ "requires": {}},"y18n": {"version": "4.0.3"@@ -87817,7 +87834,6 @@},"randombytes": {"version": "2.1.0",- "dev": true,"requires": {"safe-buffer": "^5.1.0"}@@ -87839,12 +87855,35 @@},"dependencies": {"ws": {- "version": "7.5.9"+ "version": "7.5.9",+ "requires": {}+ }+ }+ },+ "react-dom": {+ "version": "18.2.0",+ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",+ "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",+ "peer": true,+ "requires": {+ "loose-envify": "^1.1.0",+ "scheduler": "^0.23.0"+ },+ "dependencies": {+ "scheduler": {+ "version": "0.23.0",+ "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",+ "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",+ "peer": true,+ "requires": {+ "loose-envify": "^1.1.0"+ }}}},"react-freeze": {- "version": "1.0.3"+ "version": "1.0.3",+ "requires": {}},"react-is": {"version": "16.13.1"@@ -87896,11 +87935,13 @@}},"react-native-actions-sheet": {- "version": "0.9.0-alpha.24"+ "version": "0.9.0-alpha.24",+ "requires": {}},"react-native-actions-shortcuts": {"version": "1.0.1",- "dev": true+ "dev": true,+ "requires": {}},"react-native-background-actions": {"version": "2.6.7",@@ -87910,7 +87951,8 @@},"react-native-begin-background-task": {"version": "git+ssh://[email protected]/blockfirm/react-native-begin-background-task.git#c2aa793249db6cc6298a812905f955a99b864e78",- "from": "react-native-begin-background-task@https://github.com/blockfirm/react-native-begin-background-task.git"+ "from": "react-native-begin-background-task@https://github.com/blockfirm/react-native-begin-background-task.git",+ "requires": {}},"react-native-blob-util": {"version": "0.18.3",@@ -87971,14 +88013,16 @@},"react-native-check-version": {"version": "git+ssh://[email protected]/flexible-agency/react-native-check-version.git#030a2be31d7d2cdce95c78c4528a29e377c9e6ac",- "from": "react-native-check-version@https://github.com/flexible-agency/react-native-check-version"+ "from": "react-native-check-version@https://github.com/flexible-agency/react-native-check-version",+ "requires": {}},"react-native-cli-bump-version": {"version": "1.5.0","dev": true},"react-native-config": {- "version": "1.5.1"+ "version": "1.5.1",+ "requires": {}},"react-native-date-picker": {"version": "4.2.6",@@ -87987,7 +88031,8 @@}},"react-native-device-info": {- "version": "8.7.1"+ "version": "8.7.1",+ "requires": {}},"react-native-document-picker": {"version": "7.1.3",@@ -88008,11 +88053,13 @@"from": "react-native-exit-app@https://github.com/ammarahm-ed/react-native-exit-app.git"},"react-native-file-viewer": {- "version": "2.1.5"+ "version": "2.1.5",+ "requires": {}},"react-native-fingerprint-scanner": {"version": "git+ssh://[email protected]/ammarahm-ed/react-native-fingerprint-scanner.git#7beac32968684b13948f141d84b48e700c838591",- "from": "react-native-fingerprint-scanner@https://github.com/ammarahm-ed/react-native-fingerprint-scanner.git"+ "from": "react-native-fingerprint-scanner@https://github.com/ammarahm-ed/react-native-fingerprint-scanner.git",+ "requires": {}},"react-native-gesture-handler": {"version": "2.12.0",@@ -88031,7 +88078,8 @@}},"react-native-gzip": {- "version": "1.1.0"+ "version": "1.1.0",+ "requires": {}},"react-native-html-to-pdf-lite": {"version": "0.9.1"@@ -88043,10 +88091,12 @@}},"react-native-image-pan-zoom": {- "version": "2.1.12"+ "version": "2.1.12",+ "requires": {}},"react-native-image-picker": {- "version": "4.1.2"+ "version": "4.1.2",+ "requires": {}},"react-native-image-zoom-viewer": {"version": "3.0.1",@@ -88058,7 +88108,8 @@"version": "4.3.3"},"react-native-iphone-x-helper": {- "version": "1.3.1"+ "version": "1.3.1",+ "requires": {}},"react-native-keyboard-aware-scroll-view": {"version": "0.9.5",@@ -88073,7 +88124,8 @@"react-native-mmkv-storage": {"version": "0.10.0-alpha.11","resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-0.10.0-alpha.11.tgz",- "integrity": "sha512-rr5i7v9aOgMHZ3a7LjpwCrHd2ULdCX2Q+n+zlDOEgfXV0P+4EloptE39Z4iOQhQPyr3b/s3q9gj+4sS1QCPkHw=="+ "integrity": "sha512-rr5i7v9aOgMHZ3a7LjpwCrHd2ULdCX2Q+n+zlDOEgfXV0P+4EloptE39Z4iOQhQPyr3b/s3q9gj+4sS1QCPkHw==",+ "requires": {}},"react-native-modal-datetime-picker": {"version": "14.0.0",@@ -88085,11 +88137,13 @@"version": "2.0.2"},"react-native-notification-sounds": {- "version": "0.5.5"+ "version": "0.5.5",+ "requires": {}},"react-native-orientation": {"version": "git+ssh://[email protected]/yamill/react-native-orientation.git#b45830cce0837fa668838554e023979497673c82",- "from": "react-native-orientation@https://github.com/yamill/react-native-orientation.git"+ "from": "react-native-orientation@https://github.com/yamill/react-native-orientation.git",+ "requires": {}},"react-native-pdf": {"version": "6.6.2",@@ -88110,7 +88164,8 @@},"react-native-privacy-snapshot": {"version": "git+ssh://[email protected]/standardnotes/react-native-privacy-snapshot.git#653e904c90fc6f2b578da59138f2bfe5d7f942fe",- "from": "react-native-privacy-snapshot@https://github.com/standardnotes/react-native-privacy-snapshot.git"+ "from": "react-native-privacy-snapshot@https://github.com/standardnotes/react-native-privacy-snapshot.git",+ "requires": {}},"react-native-progress": {"version": "5.0.0",@@ -88128,7 +88183,8 @@"react-native-quick-sqlite": {"version": "8.0.6","resolved": "https://registry.npmjs.org/react-native-quick-sqlite/-/react-native-quick-sqlite-8.0.6.tgz",- "integrity": "sha512-XtwXnfZ1a6zRzAHoWFyVJsP3p8etx3/xww1oFKGdiOSj054PdYIeup9A53rtQ6ENyg+aqSKOgmxoN/PetulGOQ=="+ "integrity": "sha512-XtwXnfZ1a6zRzAHoWFyVJsP3p8etx3/xww1oFKGdiOSj054PdYIeup9A53rtQ6ENyg+aqSKOgmxoN/PetulGOQ==",+ "requires": {}},"react-native-reanimated": {"version": "3.3.0",@@ -88146,16 +88202,20 @@},"react-native-reanimated-material-menu": {"version": "git+ssh://[email protected]/ammarahm-ed/react-native-reanimated-material-menu.git#b1b19ba9e87333c76eb8abc3dc8377fe3ddd8bfc",- "from": "react-native-reanimated-material-menu@github:ammarahm-ed/react-native-reanimated-material-menu"+ "from": "react-native-reanimated-material-menu@github:ammarahm-ed/react-native-reanimated-material-menu",+ "requires": {}},"react-native-reanimated-progress-bar": {- "version": "1.0.1"+ "version": "1.0.1",+ "requires": {}},"react-native-safe-area-context": {- "version": "4.6.3"+ "version": "4.6.3",+ "requires": {}},"react-native-scoped-storage": {- "version": "1.9.5"+ "version": "1.9.5",+ "requires": {}},"react-native-screens": {"version": "3.21.1",@@ -88181,7 +88241,8 @@}},"react-native-swiper-flatlist": {- "version": "3.2.2"+ "version": "3.2.2",+ "requires": {}},"react-native-tooltips": {"version": "1.0.3"@@ -88234,7 +88295,8 @@}},"react-native-zip-archive": {- "version": "6.0.9"+ "version": "6.0.9",+ "requires": {}},"react-refresh": {"version": "0.14.0"@@ -88248,7 +88310,6 @@},"react-test-renderer": {"version": "18.2.0",- "dev": true,"requires": {"react-is": "^18.2.0","react-shallow-renderer": "^16.15.0",@@ -88256,12 +88317,10 @@},"dependencies": {"react-is": {- "version": "18.2.0",- "dev": true+ "version": "18.2.0"},"scheduler": {"version": "0.23.0",- "dev": true,"requires": {"loose-envify": "^1.1.0"}@@ -88803,7 +88862,6 @@},"serialize-javascript": {"version": "6.0.1",- "dev": true,"requires": {"randombytes": "^2.1.0"}@@ -89515,7 +89573,6 @@},"terser-webpack-plugin": {"version": "5.3.9",- "dev": true,"requires": {"@jridgewell/trace-mapping": "^0.3.17","jest-worker": "^27.4.5",@@ -89526,7 +89583,6 @@"dependencies": {"jest-worker": {"version": "27.5.1",- "dev": true,"requires": {"@types/node": "*","merge-stream": "^2.0.0",@@ -89535,7 +89591,6 @@},"supports-color": {"version": "8.1.1",- "dev": true,"requires": {"has-flag": "^4.0.0"}@@ -89914,7 +89969,8 @@"version": "3.1.1"},"use-latest-callback": {- "version": "0.1.6"+ "version": "0.1.6",+ "requires": {}},"use-subscription": {"version": "1.8.0",@@ -89923,7 +89979,8 @@}},"use-sync-external-store": {- "version": "1.2.0"+ "version": "1.2.0",+ "requires": {}},"utf8-byte-length": {"version": "1.0.4",@@ -89973,7 +90030,6 @@},"watchpack": {"version": "2.4.0",- "dev": true,"requires": {"glob-to-regexp": "^0.4.1","graceful-fs": "^4.1.2"@@ -89990,7 +90046,6 @@},"webpack": {"version": "5.88.2",- "dev": true,"requires": {"@types/eslint-scope": "^3.7.3","@types/estree": "^1.0.0",@@ -90056,8 +90111,7 @@}},"webpack-sources": {- "version": "3.2.3",- "dev": true+ "version": "3.2.3"},"whatwg-fetch": {"version": "3.6.2"@@ -90233,7 +90287,8 @@"version": "0.1.0"},"zustand": {- "version": "3.7.2"+ "version": "3.7.2",+ "requires": {}}}}diff --git a/apps/mobile/package.json b/apps/mobile/package.jsonindex fdf5190d7..bb3916242 100644--- a/apps/mobile/package.json+++ b/apps/mobile/package.json@@ -45,6 +45,7 @@"kysely": "^0.26.3","react": "18.2.0","react-native": "0.72.0",- "react-native-quick-sqlite": "^8.0.6"+ "react-native-quick-sqlite": "^8.0.6",+ "tinycolor2": "1.6.0"}}\ No newline at end of file