diff --git a/apps/mobile/src/components/ActionSheetComponent/index.js b/apps/mobile/src/components/ActionSheetComponent/index.js index 1093c7208..707622e1c 100644 --- a/apps/mobile/src/components/ActionSheetComponent/index.js +++ b/apps/mobile/src/components/ActionSheetComponent/index.js @@ -26,7 +26,7 @@ import {useTracked} from '../../provider'; import {ACTIONS} from '../../provider/actions'; import {moveNoteEvent} from '../DialogManager'; import Share from 'react-native-share'; -import {timeConverter} from '../../utils/utils'; +import {timeConverter, ToastEvent} from '../../utils/utils'; const w = Dimensions.get('window').width; const h = Dimensions.get('window').height; @@ -127,11 +127,32 @@ export const ActionSheetComponent = ({ switch (type) { case 'note': { - toAdd = db.notes.note(note.id).data; + toAdd = db.notes.note(note.id); + if (toAdd) { + toAdd = toAdd.data; + } else { + setTimeout(() => { + toAdd = db.notes.note(note.id); + if (toAdd) { + toAdd = toAdd.data; + } + }, 500); + } + break; } case 'notebook': { - toAdd = db.notebooks.notebook(note.id).data; + toAdd = db.notebooks.notebook(note.id); + if (toAdd) { + toAdd = toAdd.data; + } else { + setTimeout(() => { + toAdd = db.notebooks.notebook(note.id); + if (toAdd) { + toAdd = toAdd.data; + } + }, 500); + } break; } case 'topic': { @@ -213,9 +234,10 @@ export const ActionSheetComponent = ({ { name: 'Restore', icon: 'trash', - func: () => { - // TODO - //db.restoreItem(item.dateCreated); + func: async () => { + await db.trash.restore(note.id); + dispatch({type: ACTIONS.TRASH}); + localRefresh(note.type); ToastEvent.show( item.type === 'note' ? 'Note restored' : 'Notebook restored', 'success', diff --git a/apps/mobile/src/components/SearchInput/index.js b/apps/mobile/src/components/SearchInput/index.js index 1d8e5a21f..e5583c864 100644 --- a/apps/mobile/src/components/SearchInput/index.js +++ b/apps/mobile/src/components/SearchInput/index.js @@ -1,11 +1,10 @@ -import React, {createRef, useState, useEffect} from 'react'; +import React, {createRef, useEffect, useState} from 'react'; import {TextInput} from 'react-native'; -import * as Animatable from 'react-native-animatable'; +import Animated, {Easing} from 'react-native-reanimated'; import Icon from 'react-native-vector-icons/Feather'; import {DDS} from '../../../App'; import {br, SIZE, WEIGHT} from '../../common/common'; import {useTracked} from '../../provider'; -import Animated, {Easing} from 'react-native-reanimated'; const {Value, timing, block} = Animated; diff --git a/apps/mobile/src/views/Editor/index.js b/apps/mobile/src/views/Editor/index.js index 26ac68303..8bf572eb3 100755 --- a/apps/mobile/src/views/Editor/index.js +++ b/apps/mobile/src/views/Editor/index.js @@ -174,8 +174,17 @@ const Editor = ({navigation, noMenu}) => { if (id !== rId) { id = rId; - note = db.notes.note(id); + if (note) { + note = note.data; + } else { + setTimeout(() => { + note = db.notes.note(id); + if (note) { + note = note.data; + } + }, 500); + } if (DDS.isTab) { dispatch({ diff --git a/apps/mobile/src/views/Trash/index.js b/apps/mobile/src/views/Trash/index.js index 672ea0882..14e36d6be 100644 --- a/apps/mobile/src/views/Trash/index.js +++ b/apps/mobile/src/views/Trash/index.js @@ -22,6 +22,7 @@ export const Trash = ({navigation}) => { dispatch({ type: ACTIONS.TRASH, }); + console.log(trash); }, []); const _renderItem = ({item, index}) => (