separate RCSS types from Preferences

navigator/src/epub/css/Properties.ts

@@ -1,4 +1,12 @@
-import { BodyHyphens, BoxSizing, FontOpticalSizing, FontWidth, Ligatures, TextAlignment, Theme, TypeScale, View } from "../../preferences/Types";
+import { TextAlignment, Theme } from "../../preferences/Types";
+
+export type BodyHyphens = "auto" | "none";
+export type BoxSizing = "content-box" | "border-box";
+export type FontOpticalSizing = "auto" | "none";
+export type FontWidth = "ultra-condensed" | "extra-condensed" | "condensed" | "semi-condensed" | "normal" | "semi-expanded" | "expanded" | "extra-expanded" | "ultra-expanded" | number;
+export type Ligatures = "common-ligatures" | "none";
+export type TypeScale = 1 | 1.067 | 1.125 | 1.2 | 1.25 | 1.333 | 1.414 | 1.5 | 1.618;
+export type View = "paged" | "scroll";
 
 abstract class Properties {
   constructor() {}

navigator/src/epub/preferences/EpubDefaults.ts

@@ -1,4 +1,4 @@
-import { FontOpticalSizing, FontWidth, TextAlignment, Theme } from "../../preferences/Types";
+import { TextAlignment, Theme } from "../../preferences/Types";
 
 // Expose everything available in Preferences except blend and gaiji filters ATM
 export interface IEpubDefaults {
@@ -8,9 +8,9 @@ export interface IEpubDefaults {
   darkenFilter?: boolean | number | null,
   fontFamily?: string | null,
   fontSize?: number | null,
-  fontOpticalSizing?: FontOpticalSizing | null,
+  fontOpticalSizing?: boolean | null,
   fontWeight?: number | null,
-  fontWidth?: FontWidth | null,
+  fontWidth?: number | null,
   hyphens?: boolean | null,
   invertFilter?: boolean | number | null,
   invertGaijiFilter?: boolean | number | null,
@@ -44,9 +44,9 @@ export class EpubDefaults {
   darkenFilter: boolean | number | null;
   fontFamily: string | null;
   fontSize: number | null;
-  fontOpticalSizing: FontOpticalSizing | null;
+  fontOpticalSizing: boolean | null;
   fontWeight: number | null;
-  fontWidth: FontWidth | null;
+  fontWidth: number | null;
   hyphens: boolean | null;
   invertFilter: boolean | number | null;
   invertGaijiFilter: boolean | number | null;

navigator/src/epub/preferences/EpubPreferences.ts

@@ -1,4 +1,4 @@
-import { FontOpticalSizing, FontWidth, TextAlignment, Theme } from "../../preferences/Types";
+import { TextAlignment, Theme } from "../../preferences/Types";
 import { ConfigurablePreferences } from "../../preferences/Configurable";
 
 export interface IEpubPreferences {
@@ -8,9 +8,9 @@ export interface IEpubPreferences {
   darkenFilter?: boolean | number | null,
   fontFamily?: string | null,
   fontSize?: number | null,
-  fontOpticalSizing?: FontOpticalSizing | null,
+  fontOpticalSizing?: boolean | null,
   fontWeight?: number | null,
-  fontWidth?: FontWidth | null,
+  fontWidth?: number | null,
   hyphens?: boolean | null,
   invertFilter?: boolean | number | null,
   invertGaijiFilter?: boolean | number | null,
@@ -44,9 +44,9 @@ export class EpubPreferences implements ConfigurablePreferences {
   darkenFilter: boolean | number | null;
   fontFamily: string | null;
   fontSize: number | null;
-  fontOpticalSizing: FontOpticalSizing | null;
+  fontOpticalSizing: boolean | null;
   fontWeight: number | null;
-  fontWidth: FontWidth | null;
+  fontWidth: number | null;
   hyphens: boolean | null;
   invertFilter: boolean | number | null;
   invertGaijiFilter: boolean | number | null;

navigator/src/epub/preferences/EpubPreferencesEditor.ts

@@ -3,7 +3,7 @@ import { IPreferencesEditor } from "../../preferences/PreferencesEditor";
 import { EpubDefaults } from "./EpubDefaults";
 import { EpubPreferences } from "./EpubPreferences";
 import { EpubSettings } from "./EpubSettings";
-import { FontOpticalSizing, TextAlignment, Theme } from "../../preferences/Types";
+import { TextAlignment, Theme } from "../../preferences/Types";
 import { BooleanPreference, EnumPreference, Preference, RangePreference } from "../../preferences/Preference";
 
 // WIP: will change cos’ of all the missing pieces
@@ -84,10 +84,10 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     });
   }
 
-  get fontOpticalSizing(): Preference<FontOpticalSizing> | null {
-    return new Preference<FontOpticalSizing>({
+  get fontOpticalSizing(): BooleanPreference | null {
+    return new BooleanPreference({
       initialValue: this.preferences.fontOpticalSizing,
-      effectiveValue: this.settings.fontOpticalSizing || "auto",
+      effectiveValue: this.settings.fontOpticalSizing || true,
       isEffective: this.layout === EPUBLayout.reflowable && !this.settings.publisherStyles && this.preferences.fontOpticalSizing !== null
     });
   }
@@ -102,13 +102,12 @@ export class EpubPreferencesEditor implements IPreferencesEditor {
     });
   }
 
-  // TODO: support keywords
   get fontWidth(): RangePreference<number> | null {
     return new RangePreference<number>({
       initialValue: this.preferences.fontWidth,
       effectiveValue: this.settings.fontWidth || 100,
       isEffective: this.layout === EPUBLayout.reflowable && !this.settings.publisherStyles && this.preferences.fontWidth !== null,
-      supportedRange: [70, 200],
+      supportedRange: [50, 250],
       step: 10
     });
   }

navigator/src/epub/preferences/EpubSettings.ts

@@ -1,5 +1,5 @@
 import { ConfigurableSettings } from "../../preferences/Configurable";
-import { FontOpticalSizing, FontWidth, TextAlignment, Theme } from "../../preferences/Types";
+import { TextAlignment, Theme } from "../../preferences/Types";
 
 // Expose everything available in Preferences except blend and gaiji filters ATM
 export interface IEpubSettings {
@@ -9,9 +9,9 @@ export interface IEpubSettings {
   darkenFilter?: boolean | number | null,
   fontFamily?: string | null,
   fontSize?: number | null,
-  fontOpticalSizing?: FontOpticalSizing | null,
+  fontOpticalSizing?: boolean | null,
   fontWeight?: number | null,
-  fontWidth?: FontWidth | null,
+  fontWidth?: number | null,
   hyphens?: boolean | null,
   invertFilter?: boolean | number | null,
   letterSpacing?: number | null,
@@ -37,9 +37,9 @@ export class EpubSettings implements ConfigurableSettings {
   darkenFilter: boolean | number | null;
   fontFamily: string | null;
   fontSize: number | null;
-  fontOpticalSizing: FontOpticalSizing | null;
+  fontOpticalSizing: boolean | null;
   fontWeight: number | null;
-  fontWidth: FontWidth | null;
+  fontWidth: number | null;
   hyphens: boolean | null;
   invertFilter: boolean | number | null;
   letterSpacing: number | null;

navigator/src/preferences/Types.ts

@@ -9,18 +9,4 @@ export enum Theme {
   light = "day",
   sepia = "sepia",
   night = "night"
-}
-
-export type BodyHyphens = "auto" | "none";
-
-export type BoxSizing = "content-box" | "border-box";
-
-export type FontOpticalSizing = "auto" | "none";
-
-export type FontWidth = /* "ultra-condensed" | "extra-condensed" | "condensed" | "semi-condensed" | "normal" | "semi-expanded" | "expanded" | "extra-expanded" | "ultra-expanded" | */ number;
-
-export type Ligatures = "common-ligatures" | "none";
-
-export type TypeScale = 1 | 1.067 | 1.125 | 1.2 | 1.25 | 1.333 | 1.414 | 1.5 | 1.618;
-
-export type View = "paged" | "scroll";
+}