@tilde-nlp/ngx-common 8.1.61 → 8.1.63

package/fesm2022/tilde-nlp-ngx-common.mjs

@@ -1848,7 +1848,7 @@ class LanguageTranslateService {
         return languageTranslate.transform(code, hideRegion);
     }
     removeRegionFromLanguageCode(code) {
-        return code.split('-')[0];
+        return code?.split('-')[0];
     }
     static { this.ɵfac = function LanguageTranslateService_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || LanguageTranslateService)(i0.ɵɵinject(i1.TranslateService)); }; }
     static { this.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: LanguageTranslateService, factory: LanguageTranslateService.ɵfac, providedIn: 'root' }); }
@@ -8715,12 +8715,12 @@ class AccessibilityService {
         this.#screenMask = inject(AccessibilityScreenMaskService);
         this.#storage = inject(USER_CONFIG_STORAGE, { optional: true });
         this.preferences = signal(DEFAULT_ACCESSIBILITY_PREFERENCES, ...(ngDevMode ? [{ debugName: "preferences" }] : []));
-        this.#readStorage();
+        this.#updateValuesFromStorage();
     }
     toggleScreenMask() {
         const updatedStatus = !this.preferences().screenMaskEnabled;
         this.#screenMask.toggleScreenMask(updatedStatus);
-        this.#updateConfig({ screenMaskEnabled: updatedStatus });
+        this.#updatePreferencesAndStorage({ screenMaskEnabled: updatedStatus });
     }
     closeFocusBar() {
         this.#screenMask.closeFocusBar();
@@ -8728,17 +8728,43 @@ class AccessibilityService {
     toggleTextMagnifier() {
         const updatedStatus = !this.preferences().textMagnifierEnabled;
         this.#textMagnifier.toggleTextMagnifier(updatedStatus);
-        this.#updateConfig({ textMagnifierEnabled: updatedStatus });
+        this.#updatePreferencesAndStorage({ textMagnifierEnabled: updatedStatus });
     }
     setSavedTextMagnifierStatus() {
-        const currnetStatus = this.preferences().textMagnifierEnabled;
-        this.#textMagnifier.toggleTextMagnifier(currnetStatus);
+        this.#updateMagnifierFromPreferences();
     }
     setSavedScreenMaskStatus() {
-        const currnetStatus = this.preferences().screenMaskEnabled;
-        this.#screenMask.toggleScreenMask(currnetStatus);
+        this.#updateScreenMaskFromPreferences();
     }
     setFontSize(fontSizeIx) {
+        this.#updatePreferencesAndStorage({ fontSizeIndex: fontSizeIx });
+    }
+    setContrast(contrast) {
+        this.#updatePreferencesAndStorage({ contrast: contrast });
+    }
+    reset() {
+        this.#updatePreferencesAndStorage({ ...DEFAULT_ACCESSIBILITY_PREFERENCES });
+    }
+    #updatePreferencesAndStorage(updates) {
+        this.#updatePreferences(updates);
+        this.#storage?.write({ accessibility: this.preferences() }).subscribe();
+    }
+    #updatePreferences(updates) {
+        this.preferences.set({ ...this.preferences(), ...updates });
+        this.#updateContrastFromPreferences();
+        this.#updateFontSizeFromPreferences();
+        this.#updateScreenMaskFromPreferences();
+        this.#updateMagnifierFromPreferences();
+    }
+    #updateValuesFromStorage() {
+        this.#storage?.read().subscribe(config => {
+            if (config?.accessibility) {
+                this.#updatePreferences({ ...config.accessibility });
+            }
+        });
+    }
+    #updateFontSizeFromPreferences() {
+        const fontSizeIx = this.preferences().fontSizeIndex;
         const sizes = Object.values(AccessibilityFontSizes);
         if (fontSizeIx > 0) {
             this.sizeIncreaseSubject.next(true);
@@ -8747,26 +8773,18 @@ class AccessibilityService {
             this.sizeIncreaseSubject.next(false);
         }
         document.querySelector('html').style.fontSize = sizes[fontSizeIx];
-        this.#updateConfig({ fontSizeIndex: fontSizeIx });
     }
-    setContrast(contrast) {
-        this.contrastSubject.next(contrast);
+    #updateContrastFromPreferences() {
+        const contrast = this.preferences().contrast;
         document.querySelector('html').className = contrast;
-        this.#updateConfig({ contrast: contrast });
     }
-    reset() {
-        this.#updateConfig({ ...DEFAULT_ACCESSIBILITY_PREFERENCES });
+    #updateMagnifierFromPreferences() {
+        const isEnabled = this.preferences().textMagnifierEnabled;
+        this.#textMagnifier.toggleTextMagnifier(isEnabled);
     }
-    #updateConfig(updates) {
-        this.preferences.set({ ...this.preferences(), ...updates });
-        this.#storage?.write({ accessibility: this.preferences() }).subscribe();
-    }
-    #readStorage() {
-        this.#storage?.read().subscribe(config => {
-            if (config?.accessibility) {
-                this.preferences.set({ ...config.accessibility });
-            }
-        });
+    #updateScreenMaskFromPreferences() {
+        const isEnabled = this.preferences().screenMaskEnabled;
+        this.#screenMask.toggleScreenMask(isEnabled);
     }
     static { this.ɵfac = function AccessibilityService_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || AccessibilityService)(); }; }
     static { this.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: AccessibilityService, factory: AccessibilityService.ɵfac, providedIn: 'root' }); }