self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-16 00:14:34 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/release-3.0' into dev

Browse Source
This commit is contained in:
Henry Heino
2024-07-25 08:10:48 -07:00
parent f7a970f466 8fdccd287e
commit db2a194b69
4 changed files with 51 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
packages/app-mobile/components/screens/Note.tsx
View File

@ -574,18 +574,10 @@ class NoteScreenComponent extends BaseScreenComponent<Props, State> implements B
this.props.dispatch({
type: 'NAV_GO',
routeName: 'Notes',
folderId: this.state.note.parent_id,
routeName: 'Note',
noteId: noteId,
noteHash: noteHash,
});
shim.setTimeout(() => {
this.props.dispatch({
type: 'NAV_GO',
routeName: 'Note',
noteId: noteId,
noteHash: noteHash,
});
}, 5);
}
}
@ -1665,6 +1657,16 @@ class NoteScreenComponent extends BaseScreenComponent<Props, State> implements B
}
}
// We added this change to reset the component state when the props.noteId is changed.
// NoteScreenComponent original implementation assumed that noteId would never change,
// which can cause some bugs where previously set state to another note would interfere
// how the new note should be rendered
const NoteScreenWrapper = (props: Props) => {
return (
<NoteScreenComponent key={props.noteId} {...props} />
);
};
const NoteScreen = connect((state: AppState) => {
return {
noteId: state.selectedNoteIds.length ? state.selectedNoteIds[0] : null,
@ -1688,6 +1690,6 @@ const NoteScreen = connect((state: AppState) => {
// confusing.
useEditorBeta: !state.settings['editor.usePlainText'],
};
})(NoteScreenComponent);
})(NoteScreenWrapper);
export default NoteScreen;