diff --git a/apps/mobile/src/components/ActionSheetComponent/index.js b/apps/mobile/src/components/ActionSheetComponent/index.js index ee645b0d6..84106d9fd 100644 --- a/apps/mobile/src/components/ActionSheetComponent/index.js +++ b/apps/mobile/src/components/ActionSheetComponent/index.js @@ -27,7 +27,7 @@ import { import {useTracked} from '../../provider'; import {ACTIONS} from '../../provider/actions'; import {eSendEvent, openVault} from '../../services/eventManager'; -import {eOpenLoginDialog, refreshNotesPage} from '../../services/events'; +import {eOpenLoginDialog, eOpenMoveNoteDialog, refreshNotesPage} from '../../services/events'; import NavigationService from '../../services/NavigationService'; import {MMKV} from '../../utils/storage'; import { @@ -211,8 +211,11 @@ export const ActionSheetComponent = ({ func: () => { dispatch({type: ACTIONS.MODAL_NAVIGATOR, enabled: true}); dispatch({type: ACTIONS.SELECTED_ITEMS, item: note}); - - close('movenote'); + close(); + setTimeout(() => { + eSendEvent(eOpenMoveNoteDialog); + },400) + }, }, { diff --git a/apps/mobile/src/components/DialogManager/index.js b/apps/mobile/src/components/DialogManager/index.js index a63c8549c..a09bff34b 100644 --- a/apps/mobile/src/components/DialogManager/index.js +++ b/apps/mobile/src/components/DialogManager/index.js @@ -87,11 +87,13 @@ export class DialogManager extends Component { }; _showMoveNote = () => { - this.moveNoteDialog.open(); + + ///this.moveNoteDialog.open(); }; _hideMoveNote = () => { - this.moveNoteDialog.close(); + //eSendEvent(eCloseMoveNoteDialog) + // this.moveNoteDialog.close(); }; loadNote = i => { @@ -189,17 +191,17 @@ export class DialogManager extends Component { }; showAddNotebook = data => { - /* this.setState( + this.setState( { item: data.item ? data.item : {}, }, () => { this.addNotebooksDialog.open(); }, - ); */ + ); }; hideAddNotebook = () => { - //this.addNotebooksDialog.close(); + this.addNotebooksDialog.close(); }; _showSimpleDialog = data => { @@ -252,7 +254,7 @@ export class DialogManager extends Component { break; } case 'movenote': { - moveNoteEvent(); + // this._showMoveNote(); break; } case "premium": { diff --git a/apps/mobile/src/components/MoveNoteDialog/index.js b/apps/mobile/src/components/MoveNoteDialog/index.js index ddce91cf6..fb4116fae 100644 --- a/apps/mobile/src/components/MoveNoteDialog/index.js +++ b/apps/mobile/src/components/MoveNoteDialog/index.js @@ -1,26 +1,26 @@ -import React, { createRef, useEffect, useState } from 'react'; +import React, {createRef, useEffect, useState} from 'react'; import { FlatList, Modal, Text, TextInput, TouchableOpacity, - View + View, } from 'react-native'; -import { useSafeAreaInsets } from 'react-native-safe-area-context'; +import {useSafeAreaInsets} from 'react-native-safe-area-context'; import Icon from 'react-native-vector-icons/MaterialCommunityIcons'; -import { pv, SIZE, WEIGHT } from '../../common/common'; -import { useTracked } from '../../provider'; -import { ACTIONS } from '../../provider/actions'; -import { eSubscribeEvent, eUnSubscribeEvent } from '../../services/eventManager'; -import { eOpenMoveNoteDialog } from '../../services/events'; -import { db, DDS, getElevation, ToastEvent } from '../../utils/utils'; -import { PressableButton } from '../PressableButton'; -import { Toast } from '../Toast'; +import {pv, SIZE, WEIGHT} from '../../common/common'; +import {useTracked} from '../../provider'; +import {ACTIONS} from '../../provider/actions'; +import {eSubscribeEvent, eUnSubscribeEvent} from '../../services/eventManager'; +import {eOpenMoveNoteDialog} from '../../services/events'; +import {db, DDS, getElevation, ToastEvent} from '../../utils/utils'; +import {PressableButton} from '../PressableButton'; +import {Toast} from '../Toast'; const MoveNoteDialog = () => { const [state, dispatch] = useTracked(); const {notebooks, colors, selectedItemsList} = state; - const [visible, setVisible] = useState(true); + const [visible, setVisible] = useState(false); const [animated, setAnimated] = useState(false); const [expanded, setExpanded] = useState(''); const [notebookInputFocused, setNotebookInputFocused] = useState(false); @@ -40,7 +40,6 @@ const MoveNoteDialog = () => { }; useEffect(() => { - console.log(notebooks); eSubscribeEvent(eOpenMoveNoteDialog, open); return () => { eUnSubscribeEvent(eOpenMoveNoteDialog, open); diff --git a/apps/mobile/src/components/NotebookItem/index.js b/apps/mobile/src/components/NotebookItem/index.js index ced2560f4..3fe3f0d2e 100644 --- a/apps/mobile/src/components/NotebookItem/index.js +++ b/apps/mobile/src/components/NotebookItem/index.js @@ -25,7 +25,7 @@ export const NotebookItem = ({ @@ -76,6 +76,7 @@ export const NotebookItem = ({ width: '80%', maxWidth: '80%', flexWrap: 'wrap', + paddingVertical: item.description ? 0 : 5, }}> {item && item.topics ? ( item.topics.slice(1, 4).map((topic) => ( @@ -180,8 +181,7 @@ export const NotebookItem = ({ - {hideMore || - (item.title === 'General' && item.type === 'topic') ? null : ( + {item.title === 'General' && item.type === 'topic' ? null : ( )} - - {hideMore && isTopic ? ( -