fix: readerDefaultConfig locally and across the app

disable ttsVoice global readerConfig persistence I also create a fresh copy of annotation_defaultColor on READER_DEFAULT_CONFIG_SET_REQUEST action
edrlab · Dec 3, 2024 · 6570a30 · 6570a30
1 parent 815077d
commit 6570a30
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/src/common/redux/actions/reader/configSetDefault.ts b/src/common/redux/actions/reader/configSetDefault.ts
@@ -8,6 +8,7 @@
 import { ReaderConfig } from "readium-desktop/common/models/reader";
 import { Action } from "readium-desktop/common/models/redux";
 import { readerConfigInitialState } from "../../states/reader";
+import { isNotNil } from "readium-desktop/utils/nil";
 
 export const ID = "READER_DEFAULT_CONFIG_SET_REQUEST";
 
@@ -18,6 +19,15 @@ export interface Payload {
 export function build(config: ReaderConfig = readerConfigInitialState):
     Action<typeof ID, Payload> {
 
+    const configCopy = {
+        ...config,
+    };
+    if (isNotNil(configCopy["ttsVoice"])) {
+        configCopy["ttsVoice"] = null;
+    }
+    if (isNotNil(configCopy["annotation_defaultColor"])) {
+        configCopy["annotation_defaultColor"] = { ...configCopy["annotation_defaultColor"] };
+    }
     return {
         type: ID,
         payload: {

diff --git a/src/main/redux/sagas/win/reader.ts b/src/main/redux/sagas/win/reader.ts
@@ -65,7 +65,10 @@ function* winOpen(action: winActions.reader.openSucess.TAction) {
             reader: {
                 ...reader?.reduxState || {},
                 // see issue https://github.com/edrlab/thorium-reader/issues/2532
-                defaultConfig: readerDefaultConfig,
+                defaultConfig: {
+                    ...readerDefaultConfig,
+                    ttsVoice: null, // disable ttsVoice global preference for readium/speech lib
+                },
                 transientConfig: {
                     font: transientConfigMerge.font,
                     fontSize: transientConfigMerge.fontSize,

diff --git a/src/renderer/common/hooks/useReaderConfig.ts b/src/renderer/common/hooks/useReaderConfig.ts
@@ -84,6 +84,11 @@ export const useDiffBoolBetweenReaderConfigAndDefaultConfig = () => {
     const diff = React.useMemo(() => {
 
         for (const v of ObjectKeys(config)) {
+
+            if (v === "ttsVoice") {
+                // skip ttsVoice with readium/speech 
+                continue ;
+            }
             if (!equals(config[v], defaultConfig[v])) {
                 return true;
             }

diff --git a/src/renderer/reader/components/ReaderSettings.tsx b/src/renderer/reader/components/ReaderSettings.tsx
@@ -1051,7 +1051,8 @@ const SaveResetApplyPreset = () => {
 
     const cb = React.useCallback(() => {
 
-        setReaderConfig(readerDefaultConfig);
+        const { ttsVoice: __ttsVoice, ...readerDefaultConfigCopy} = readerDefaultConfig;
+        setReaderConfig(readerDefaultConfigCopy);
 
         if (allowCustomCheckboxChecked) {
             if (publisherConfigOverrided) {