Chore: Moved app state to separate file

packages/app-desktop/app.reducer.test.ts

@@ -1,4 +1,4 @@
-import { AppState } from './app';
+import { AppState } from './app.reducer';
 import appReducer, { createAppDefaultState } from './app.reducer';
 
 describe('app.reducer', function() {

packages/app-desktop/app.reducer.ts

@@ -1,11 +1,44 @@
 import produce from 'immer';
 import Setting from '@joplin/lib/models/Setting';
-import { defaultState } from '@joplin/lib/reducer';
+import { defaultState, State } from '@joplin/lib/reducer';
-import { AppState } from './app';
 import iterateItems from './gui/ResizableLayout/utils/iterateItems';
 import { LayoutItem } from './gui/ResizableLayout/utils/types';
 import validateLayout from './gui/ResizableLayout/utils/validateLayout';
 
+export interface AppStateRoute {
+	type: string;
+	routeName: string;
+	props: any;
+}
+
+export enum AppStateDialogName {
+	SyncWizard = 'syncWizard',
+	MasterPassword = 'masterPassword',
+}
+
+export interface AppStateDialog {
+	name: AppStateDialogName;
+}
+
+export interface AppState extends State {
+	route: AppStateRoute;
+	navHistory: any[];
+	noteVisiblePanes: string[];
+	windowContentSize: any;
+	watchedNoteFiles: string[];
+	lastEditorScrollPercents: any;
+	devToolsVisible: boolean;
+	visibleDialogs: any; // empty object if no dialog is visible. Otherwise contains the list of visible dialogs.
+	focusedField: string;
+	layoutMoveMode: boolean;
+	startupPluginsLoaded: boolean;
+
+	// Extra reducer keys go here
+	watchedResources: any;
+	mainLayout: LayoutItem;
+	dialogs: AppStateDialog[];
+}
+
 export function createAppDefaultState(windowContentSize: any, resourceEditWatcherDefaultState: any): AppState {
 	return {
 		...defaultState,

packages/app-desktop/app.ts

@@ -3,7 +3,6 @@ import CommandService from '@joplin/lib/services/CommandService';
 import KeymapService from '@joplin/lib/services/KeymapService';
 import PluginService, { PluginSettings } from '@joplin/lib/services/plugins/PluginService';
 import resourceEditWatcherReducer, { defaultState as resourceEditWatcherDefaultState } from '@joplin/lib/services/ResourceEditWatcher/reducer';
-import { State } from '@joplin/lib/reducer';
 import PluginRunner from './services/plugins/PluginRunner';
 import PlatformImplementation from './services/plugins/PlatformImplementation';
 import shim from '@joplin/lib/shim';
@@ -19,7 +18,6 @@ import SpellCheckerService from '@joplin/lib/services/spellChecker/SpellCheckerS
 import SpellCheckerServiceDriverNative from './services/spellChecker/SpellCheckerServiceDriverNative';
 import bridge from './services/bridge';
 import menuCommandNames from './gui/menuCommandNames';
-import { LayoutItem } from './gui/ResizableLayout/utils/types';
 import stateToWhenClauseContext from './services/commands/stateToWhenClauseContext';
 import ResourceService from '@joplin/lib/services/ResourceService';
 import ExternalEditWatcher from '@joplin/lib/services/ExternalEditWatcher';
@@ -60,40 +58,12 @@ const globalCommands = appCommands.concat(libCommands);
 import editorCommandDeclarations from './gui/NoteEditor/editorCommandDeclarations';
 import ShareService from '@joplin/lib/services/share/ShareService';
 import checkForUpdates from './checkForUpdates';
+import { AppState } from './app.reducer';
 
 const pluginClasses = [
 	require('./plugins/GotoAnything').default,
 ];
 
-interface AppStateRoute {
-	type: string;
-	routeName: string;
-	props: any;
-}
-
-export interface AppStateDialog {
-	name: string;
-}
-
-export interface AppState extends State {
-	route: AppStateRoute;
-	navHistory: any[];
-	noteVisiblePanes: string[];
-	windowContentSize: any;
-	watchedNoteFiles: string[];
-	lastEditorScrollPercents: any;
-	devToolsVisible: boolean;
-	visibleDialogs: any; // empty object if no dialog is visible. Otherwise contains the list of visible dialogs.
-	focusedField: string;
-	layoutMoveMode: boolean;
-	startupPluginsLoaded: boolean;
-
-	// Extra reducer keys go here
-	watchedResources: any;
-	mainLayout: LayoutItem;
-	dialogs: AppStateDialog[];
-}
-
 const appDefaultState = createAppDefaultState(
 	bridge().windowContentSize(),
 	resourceEditWatcherDefaultState

packages/app-desktop/commands/replaceMisspelling.ts

@@ -1,5 +1,5 @@
 import CommandService, { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService';
-import { AppState } from '../app';
+import { AppState } from '../app.reducer';
 import bridge from '../services/bridge';
 
 export const declaration: CommandDeclaration = {

packages/app-desktop/gui/ClipperConfigScreen.tsx

@@ -8,7 +8,7 @@ import { _ } from '@joplin/lib/locale';
 import ClipperServer from '@joplin/lib/ClipperServer';
 import Setting from '@joplin/lib/models/Setting';
 import EncryptionService from '@joplin/lib/services/e2ee/EncryptionService';
-import { AppState } from '../app';
+import { AppState } from '../app.reducer';
 
 class ClipperConfigScreenComponent extends React.Component {
 	constructor() {

packages/app-desktop/gui/MainScreen/MainScreen.tsx

@@ -17,7 +17,7 @@ import { stateUtils } from '@joplin/lib/reducer';
 import InteropServiceHelper from '../../InteropServiceHelper';
 import { _ } from '@joplin/lib/locale';
 import NoteListWrapper from '../NoteListWrapper/NoteListWrapper';
-import { AppState } from '../../app';
+import { AppState } from '../../app.reducer';
 import { saveLayout, loadLayout } from '../ResizableLayout/utils/persist';
 import Setting from '@joplin/lib/models/Setting';
 import produce from 'immer';

packages/app-desktop/gui/MainScreen/commands/showSpellCheckerMenu.ts

@@ -2,7 +2,7 @@ import { CommandContext, CommandDeclaration, CommandRuntime } from '@joplin/lib/
 import { _ } from '@joplin/lib/locale';
 import bridge from '../../../services/bridge';
 import SpellCheckerService from '@joplin/lib/services/spellChecker/SpellCheckerService';
-import { AppState } from '../../../app';
+import { AppState } from '../../../app.reducer';
 
 const Menu = bridge().Menu;
 

packages/app-desktop/gui/MainScreen/commands/toggleLayoutMoveMode.ts

@@ -1,6 +1,6 @@
 import { CommandDeclaration, CommandRuntime, CommandContext } from '@joplin/lib/services/CommandService';
 import { _ } from '@joplin/lib/locale';
-import { AppState } from '../../../app';
+import { AppState } from '../../../app.reducer';
 
 export const declaration: CommandDeclaration = {
 	name: 'toggleLayoutMoveMode',

packages/app-desktop/gui/MainScreen/commands/toggleNoteList.ts

@@ -2,7 +2,7 @@ import { CommandContext, CommandDeclaration, CommandRuntime } from '@joplin/lib/
 import { _ } from '@joplin/lib/locale';
 import setLayoutItemProps from '../../ResizableLayout/utils/setLayoutItemProps';
 import layoutItemProp from '../../ResizableLayout/utils/layoutItemProp';
-import { AppState } from '../../../app';
+import { AppState } from '../../../app.reducer';
 
 export const declaration: CommandDeclaration = {
 	name: 'toggleNoteList',

packages/app-desktop/gui/MainScreen/commands/toggleSideBar.ts

@@ -2,7 +2,7 @@ import { CommandContext, CommandDeclaration, CommandRuntime } from '@joplin/lib/
 import { _ } from '@joplin/lib/locale';
 import setLayoutItemProps from '../../ResizableLayout/utils/setLayoutItemProps';
 import layoutItemProp from '../../ResizableLayout/utils/layoutItemProp';
-import { AppState } from '../../../app';
+import { AppState } from '../../../app.reducer';
 
 export const declaration: CommandDeclaration = {
 	name: 'toggleSideBar',

packages/app-desktop/gui/MenuBar.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useState, useRef, useCallback } from 'react';
-import { AppState } from '../app';
+import { AppState } from '../app.reducer';
 import InteropService from '@joplin/lib/services/interop/InteropService';
 import { stateUtils } from '@joplin/lib/reducer';
 import CommandService from '@joplin/lib/services/CommandService';

packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/Toolbar.tsx

@@ -3,7 +3,7 @@ import CommandService from '@joplin/lib/services/CommandService';
 import ToolbarBase from '../../../ToolbarBase';
 import { utils as pluginUtils } from '@joplin/lib/services/plugins/reducer';
 import { connect } from 'react-redux';
-import { AppState } from '../../../../app';
+import { AppState } from '../../../../app.reducer';
 import ToolbarButtonUtils, { ToolbarButtonInfo } from '@joplin/lib/services/commands/ToolbarButtonUtils';
 import stateToWhenClauseContext from '../../../../services/commands/stateToWhenClauseContext';
 const { buildStyle } = require('@joplin/lib/theme');

packages/app-desktop/gui/NoteEditor/NoteEditor.tsx

@@ -20,7 +20,7 @@ import CommandService from '@joplin/lib/services/CommandService';
 import ToolbarButton from '../ToolbarButton/ToolbarButton';
 import Button, { ButtonLevel } from '../Button/Button';
 import eventManager from '@joplin/lib/eventManager';
-import { AppState } from '../../app';
+import { AppState } from '../../app.reducer';
 import ToolbarButtonUtils from '@joplin/lib/services/commands/ToolbarButtonUtils';
 import { _ } from '@joplin/lib/locale';
 import TagList from '../TagList';

packages/app-desktop/gui/NoteList/NoteList.tsx

@@ -1,4 +1,4 @@
-import { AppState } from '../../app';
+import { AppState } from '../../app.reducer';
 import eventManager from '@joplin/lib/eventManager';
 import NoteListUtils from '../utils/NoteListUtils';
 import { _ } from '@joplin/lib/locale';

packages/app-desktop/gui/Root.tsx

@@ -1,4 +1,5 @@
-import app, { AppState, AppStateDialog } from '../app';
+import app from '../app';
+import { AppState, AppStateDialog } from '../app.reducer';
 import MainScreen from './MainScreen/MainScreen';
 import ConfigScreen from './ConfigScreen/ConfigScreen';
 import StatusScreen from './StatusScreen/StatusScreen';

packages/app-desktop/gui/ShareNoteDialog.tsx

@@ -13,7 +13,7 @@ import { StateShare } from '@joplin/lib/services/share/reducer';
 import { NoteEntity } from '@joplin/lib/services/database/types';
 import Button from './Button/Button';
 import { connect } from 'react-redux';
-import { AppState } from '../app';
+import { AppState } from '../app.reducer';
 import { getEncryptionEnabled } from '@joplin/lib/services/synchronizer/syncInfoUtils';
 const { clipboard } = require('electron');
 

packages/app-desktop/gui/Sidebar/Sidebar.tsx

@@ -10,7 +10,7 @@ import InteropServiceHelper from '../../InteropServiceHelper';
 import { _ } from '@joplin/lib/locale';
 import { PluginStates, utils as pluginUtils } from '@joplin/lib/services/plugins/reducer';
 import { MenuItemLocation } from '@joplin/lib/services/plugins/api/types';
-import { AppState } from '../../app';
+import { AppState } from '../../app.reducer';
 import { ModelType } from '@joplin/lib/BaseModel';
 import BaseModel from '@joplin/lib/BaseModel';
 import Folder from '@joplin/lib/models/Folder';

packages/app-desktop/gui/Sidebar/commands/focusElementSideBar.ts

@@ -1,7 +1,7 @@
 import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService';
 import { _ } from '@joplin/lib/locale';
 import layoutItemProp from '../../ResizableLayout/utils/layoutItemProp';
-import { AppState } from '../../../app';
+import { AppState } from '../../../app.reducer';
 
 export const declaration: CommandDeclaration = {
 	name: 'focusElementSideBar',

packages/app-desktop/gui/TagList.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { useMemo } from 'react';
-import { AppState } from '../app';
+import { AppState } from '../app.reducer';
 
 const { connect } = require('react-redux');
 const { themeStyle } = require('@joplin/lib/theme');

packages/app-desktop/plugins/GotoAnything.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { AppState } from '../app';
+import { AppState } from '../app.reducer';
 import CommandService, { SearchResult as CommandSearchResult } from '@joplin/lib/services/CommandService';
 import KeymapService from '@joplin/lib/services/KeymapService';
 import shim from '@joplin/lib/shim';

packages/app-desktop/services/commands/stateToWhenClauseContext.ts

@@ -3,7 +3,7 @@
 // general, any desktop component should import this file, and not the lib
 // one.
 
-import { AppState } from '../../app';
+import { AppState } from '../../app.reducer';
 import libStateToWhenClauseContext, { WhenClauseContextOptions } from '@joplin/lib/services/commands/stateToWhenClauseContext';
 import layoutItemProp from '../../gui/ResizableLayout/utils/layoutItemProp';
 

packages/app-desktop/services/commands/types.ts

@@ -1,4 +1,4 @@
-import { AppState } from '../../app';
+import { AppState } from '../../app.reducer';
 
 export interface DesktopCommandContext {
 	state: AppState;