Skip to content

TagSpaces is an offline, open source, document manager with tagging support

fix: https://github.com/tagspaces/tagspaces/issues/1990

sytolkfc7c8bcace87
diff --git a/app/components/EntryContainer.tsx b/app/components/EntryContainer.tsx
index ad330a8ef..5756970ba 100644
--- a/app/components/EntryContainer.tsx
+++ b/app/components/EntryContainer.tsx
@@ -336,7 +336,8 @@ function EntryContainer() {
}
textFilePath = openedFile.path;
- /*if (
+ // TODO setTheme in milkdown v6 editor only
+ if (
fileViewer &&
fileViewer.current &&
fileViewer.current.contentWindow &&
@@ -344,8 +345,8 @@ function EntryContainer() {
fileViewer.current.contentWindow.setTheme
) {
// @ts-ignore call setContent from iframe
- fileViewer.current.contentWindow.setTheme(settings.currentTheme);
- }*/
+ fileViewer.current.contentWindow.setTheme(theme.palette.mode);
+ }
// TODO make loading index.html for folders configurable
// if (!this.state.currentEntry.isFile) {
// textFilePath += '/index.html';
diff --git a/app/reducers/app.ts b/app/reducers/app.ts
index dda272271..b1bb9d7df 100644
--- a/app/reducers/app.ts
+++ b/app/reducers/app.ts
@@ -1583,7 +1583,7 @@ export const actions = {
getState: () => any
): Promise<string | null> => {
const { currentLocationId } = getState().app;
- if (location.uuid !== currentLocationId) {
+ if (location && location.uuid !== currentLocationId) {
const currentLocation: TS.Location = getLocation(
getState(),
currentLocationId