self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-23 22:36:32 +02:00
Code Issues Releases Activity

Desktop: Multiple window support (#11181)

Browse Source 
Co-authored-by: Laurent Cozic <laurent22@users.noreply.github.com>
This commit is contained in:
Henry Heino
2024-11-08 07:32:05 -08:00
committed by GitHub
parent cbef725cc8
commit 4a88d6ff7a
163 changed files with 3303 additions and 1475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/lib/BaseApplication.ts
View File

@@ -11,7 +11,7 @@ import KvStore from './services/KvStore';
import SyncTargetJoplinServer from './SyncTargetJoplinServer';
import SyncTargetOneDrive from './SyncTargetOneDrive';
import { createStore, applyMiddleware, Store } from 'redux';
const { defaultState, stateUtils } = require('./reducer');
import { defaultState, stateUtils } from './reducer';
import JoplinDatabase from './JoplinDatabase';
import { cancelTimers as folderScreenUtilsCancelTimers, refreshFolders, scheduleRefreshFolders } from './folders-screen-utils';
const { DatabaseDriverNode } = require('./database-driver-node.js');
@@ -64,6 +64,7 @@ import { join } from 'path';
import processStartFlags from './utils/processStartFlags';
import { setupAutoDeletion } from './services/trash/permanentlyDeleteOldItems';
import determineProfileAndBaseDir from './determineBaseAppDirs';
import NavService from './services/NavService';
const appLogger: LoggerWrapper = Logger.create('App');
@@ -98,8 +99,7 @@ export default class BaseApplication {
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
protected currentFolder_: any = null;
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
protected store_: Store<any> = null;
protected store_: Store<State> = null;
private rotatingLogs: RotatingLogs;
@@ -511,6 +511,14 @@ export default class BaseApplication {
refreshNotesUseSelectedNoteId = true;
}
// Switching windows can also change which note(s) and which note parent type is selected.
// Refreshing notes after switching windows helps ensure that the selected note/tags/other state
// is correct for the current window.
if (action.type === 'WINDOW_FOCUS' && action.lastWindowId !== action.windowId) {
refreshNotes = true;
refreshNotesUseSelectedNoteId = true;
}
// Should refresh the notes when:
// - A tag is selected, to show the notes for that tag
// - When a tag is updated so that when searching by tags, the search results are updated
@@ -610,6 +618,7 @@ export default class BaseApplication {
BaseModel.dispatch = this.store().dispatch;
BaseSyncTarget.dispatch = this.store().dispatch;
NavService.dispatch = this.store().dispatch;
DecryptionWorker.instance().dispatch = this.store().dispatch;
ResourceFetcher.instance().dispatch = this.store().dispatch;
ShareService.instance().initialize(this.store(), EncryptionService.instance());