Merge pull request #113 from MicroPad/next-dev

v3.13.0

app/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "micropad",
-	"version": "3.12.6",
+	"version": "3.13.0",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/MicroPad/Web.git"

app/src/actions.ts → app/src/core/actions.ts

@@ -51,6 +51,8 @@ export const actions = {
 	restoreJsonNotepadAndLoadNote: actionCreator<RestoreJsonNotepadAndLoadNoteAction>('PARSE_JSON_NOTEPAD_AND_LOAD_NOTE'),
 	newNotepad: actionCreator<FlatNotepad>('NEW_NOTEPAD'),
 	flipFullScreenState: actionCreator<void>('FLIP_FULL_SCREEN'),
+	exitFullScreen: actionCreator<void>('EXIT_FULL_SCREEN'),
+	openBreadcrumb: actionCreator<string>('OPEN_BREADCRUMB'),
 	deleteNotepad: actionCreator<string>('DELETE_NOTEPAD'),
 	exportNotepad: actionCreator<void>('EXPORT_NOTEPAD'),
 	expandSection: actionCreator<string>('OPEN_SECTION'),
@@ -91,5 +93,6 @@ export const actions = {
 	selectTheme: actionCreator<ThemeName>('SELECT_THEME'),
 	moveNotepadObject: actionCreator<MoveNotepadObjectAction>('MOVE_NOTEPAD_OBJECT'),
 	quickMarkdownInsert: actionCreator<void>('QUICK_MARKDOWN_INSERT'),
-	quickNotepad: actionCreator<void>('QUICK_NOTEPAD')
+	quickNotepad: actionCreator<void>('QUICK_NOTEPAD'),
+	flashExplorer: actionCreator<void>('FLASH_EXPLORER')
 };

app/src/core/epics/ExplorerEpics.ts

@@ -0,0 +1,87 @@
+import { combineEpics } from 'redux-observable';
+import { concatMap, filter, map, startWith, tap } from 'rxjs/operators';
+import { Action, isType } from 'redux-typescript-actions';
+import { actions } from '../actions';
+import { INotepadStoreState } from '../types/NotepadTypes';
+import { isAction } from '../../react-web/util';
+import { NewNotepadObjectAction } from '../types/ActionTypes';
+import { IStoreState } from '../types';
+import { FlatNotepad, Note } from 'upad-parse/dist';
+import { FlatSection } from 'upad-parse/dist/FlatNotepad';
+import { Observable } from 'rxjs';
+import { Store } from 'redux';
+import { ThemeValues } from '../../react-web/ThemeValues';
+
+export namespace ExplorerEpics {
+	export const expandAll$ = (action$, store) =>
+		action$.pipe(
+			filter((action: Action<void>) => isType(action, actions.expandAllExplorer.started)),
+			map(() => (store.getState().notepads.notepad || <INotepadStoreState> {}).item),
+			filter(Boolean),
+			map((notepad: FlatNotepad) => [
+				...Object.keys(notepad.sections),
+				...Object.keys(notepad.notes)
+			]),
+			map((allRefs: string[]) => actions.expandAllExplorer.done({ params: undefined, result: allRefs }))
+		);
+
+	export const autoLoadNewSection$ = (action$, store) =>
+		action$.pipe(
+			isAction(actions.newSection),
+			map((action: Action<NewNotepadObjectAction>) => [action.payload, (<IStoreState> store.getState()).notepads.notepad!.item]),
+			filter(([insertAction, notepad]: [NewNotepadObjectAction, FlatNotepad]) => !!insertAction && !!notepad),
+			map(([insertAction, notepad]: [NewNotepadObjectAction, FlatNotepad]) => {
+				const parentRef = insertAction.parent || undefined;
+
+				return Object.values((notepad as FlatNotepad).sections).find(s => s.title === insertAction.title && s.parentRef === parentRef);
+			}),
+			filter(Boolean),
+			map((newSection: FlatSection) => actions.expandSection(newSection.internalRef))
+		);
+
+	export const openBreadcrumb$ = (action$: Observable<Action<string>>, store: Store<IStoreState>) =>
+		action$.pipe(
+			isAction(actions.openBreadcrumb),
+			map(action => action.payload),
+			filter(() => !!store.getState().notepads.notepad && !!store.getState().notepads.notepad!.item),
+			map((ref: string) =>
+				store.getState().notepads.notepad!.item!.notes[ref]
+				|| store.getState().notepads.notepad!.item!.sections[ref]
+			),
+			map((notepadObj: FlatSection | Note) => {
+				const notepad = store.getState().notepads.notepad!.item!;
+				return [...notepad.pathFrom(notepadObj).slice(1), notepadObj];
+			}),
+			concatMap((path: Array<FlatSection | Note>) =>
+				[
+					actions.exitFullScreen(),
+					actions.collapseAllExplorer(),
+					...path
+						.filter(obj => !(obj as Note).parent)
+						.map(section => actions.expandSection(section.internalRef)),
+					actions.flashExplorer()
+				]
+			),
+			tap(a => console.log(a))
+		);
+
+	export const flashExplorer$ = (action$: Observable<Action<void>>, store: Store<IStoreState>) =>
+		action$.pipe(
+			isAction(actions.flashExplorer),
+			tap(() => {
+				const theme = ThemeValues[store.getState().app.theme];
+				const explorer = document.getElementById('notepad-explorer')!;
+
+				explorer.style.backgroundColor = theme.accent;
+				setTimeout(() => explorer.style.backgroundColor = theme.chrome, 150);
+			}),
+			filter(() => false)
+		);
+
+	export const explorerEpics$ = combineEpics(
+		expandAll$,
+		autoLoadNewSection$,
+		openBreadcrumb$,
+		flashExplorer$
+	);
+}

app/src/epics/SearchEpics.ts → app/src/core/epics/SearchEpics.ts

@@ -9,11 +9,11 @@ import { HashTagSearchResult, HashTagSearchResults } from '../reducers/SearchRed
 import { IStoreState } from '../types';
 import { Store } from 'redux';
 import { SearchIndices } from '../types/ActionTypes';
-import { isAction } from '../util';
-import { indexNotepads } from '../SearchWorker';
+import { isAction } from '../../react-web/util';
+import { indexNotepads } from '../../react-web/SearchWorker';
 
 export namespace SearchEpics {
-	export const refreshIndices = action$ =>
+	export const refreshIndices$ = action$ =>
 		action$.pipe(
 			isAction(actions.saveNotepad.done),
 			map(() => actions.indexNotepads.started(undefined))
@@ -62,7 +62,7 @@ export namespace SearchEpics {
 		);
 
 	export const searchEpics$ = combineEpics(
-		refreshIndices,
+		refreshIndices$,
 		indexNotepads$,
 		search$
 	);

app/src/reducers/AppReducer.ts → app/src/core/reducers/AppReducer.ts

@@ -1,5 +1,5 @@
 // @ts-ignore
-import { version } from '../../package.json';
+import { version } from '../../../package.json';
 
 import { Action } from 'redux';
 import { MicroPadReducer } from '../types/ReducerType';
@@ -48,6 +48,11 @@ export class AppReducer extends MicroPadReducer<IAppStoreState> {
 				...state,
 				isFullScreen: !state.isFullScreen
 			};
+		} else if (isType(action, actions.exitFullScreen)) {
+			return {
+				...state,
+				isFullScreen: false
+			};
 		} else if (isType(action, actions.updateDefaultFontSize)) {
 			return {
 				...state,

app/src/reducers/BaseReducer.ts → app/src/core/reducers/BaseReducer.ts

@@ -1,7 +1,7 @@
 import { MicroPadReducer } from '../types/ReducerType';
 import { IStoreState } from '../types';
 import * as deepFreeze from 'deep-freeze';
-import { isDev } from '../util';
+import { isDev } from '../../react-web/util';
 import { Action } from 'redux-typescript-actions';
 import { NotepadsReducer } from './NotepadsReducer';
 import { NoteReducer } from './NoteReducer';

app/src/types/ReducerType.ts → app/src/core/types/ReducerType.ts

@@ -1,5 +1,5 @@
 import { Action, ActionCreator } from 'redux-typescript-actions';
-import { IStoreState } from './index';
+import { IStoreState } from '.';
 
 export type ReducerHandler<S, A> = (state: S, action: Action<A>) => S;