@newtonedev/configurator 0.1.3 → 0.1.5

package/src/state/reducer.ts

@@ -208,75 +208,42 @@ export function configuratorReducer(
       };
 
     // Typography actions
-    case 'SET_TYPOGRAPHY_BASE_SIZE': {
+    case 'SET_FONT': {
       const defaultTypography = DEFAULT_CONFIGURATOR_STATE.typography!;
+      const currentFonts = state.typography?.fonts ?? defaultTypography.fonts;
       return {
         ...state,
         typography: {
-          fonts: state.typography?.fonts ?? defaultTypography.fonts,
-          scale: {
-            baseSize: clamp(action.baseSize, 12, 24),
-            ratio: state.typography?.scale.ratio ?? defaultTypography.scale.ratio,
-          },
-        },
-      };
-    }
-
-    case 'SET_TYPOGRAPHY_RATIO': {
-      const defaultTypography = DEFAULT_CONFIGURATOR_STATE.typography!;
-      return {
-        ...state,
-        typography: {
-          fonts: state.typography?.fonts ?? defaultTypography.fonts,
-          scale: {
-            baseSize: state.typography?.scale.baseSize ?? defaultTypography.scale.baseSize,
-            ratio: clamp(action.ratio, 1.1, 1.5),
-          },
-        },
-      };
-    }
-
-    case 'SET_FONT_MONO': {
-      const defaultTypography = DEFAULT_CONFIGURATOR_STATE.typography!;
-      return {
-        ...state,
-        typography: {
-          fonts: {
-            mono: action.font,
-            display: state.typography?.fonts.display ?? defaultTypography.fonts.display,
-            default: state.typography?.fonts.default ?? defaultTypography.fonts.default,
-          },
-          scale: state.typography?.scale ?? defaultTypography.scale,
+          fonts: { ...currentFonts, [action.scope]: action.font },
         },
       };
     }
 
-    case 'SET_FONT_DISPLAY': {
+    case 'SET_TYPE_SCALE_OFFSET': {
       const defaultTypography = DEFAULT_CONFIGURATOR_STATE.typography!;
+      const currentFonts = state.typography?.fonts ?? defaultTypography.fonts;
       return {
         ...state,
         typography: {
-          fonts: {
-            mono: state.typography?.fonts.mono ?? defaultTypography.fonts.mono,
-            display: action.font,
-            default: state.typography?.fonts.default ?? defaultTypography.fonts.default,
-          },
-          scale: state.typography?.scale ?? defaultTypography.scale,
+          ...state.typography,
+          fonts: currentFonts,
+          typeScaleOffset: clamp(action.offset, 0, 1),
         },
       };
     }
 
-    case 'SET_FONT_DEFAULT': {
+    case 'SET_ROLE_WEIGHT': {
       const defaultTypography = DEFAULT_CONFIGURATOR_STATE.typography!;
+      const currentFonts = state.typography?.fonts ?? defaultTypography.fonts;
       return {
         ...state,
         typography: {
-          fonts: {
-            mono: state.typography?.fonts.mono ?? defaultTypography.fonts.mono,
-            display: state.typography?.fonts.display ?? defaultTypography.fonts.display,
-            default: action.font,
+          ...state.typography,
+          fonts: currentFonts,
+          roleWeights: {
+            ...state.typography?.roleWeights,
+            [action.role]: clamp(action.weight, 100, 900),
           },
-          scale: state.typography?.scale ?? defaultTypography.scale,
         },
       };
     }
@@ -325,12 +292,6 @@ export function configuratorReducer(
         preview: { ...state.preview, mode: action.mode },
       };
 
-    case 'SET_PREVIEW_THEME':
-      return {
-        ...state,
-        preview: { ...state.preview, theme: action.theme },
-      };
-
     // Control actions
     case 'RESET':
       return DEFAULT_CONFIGURATOR_STATE;

package/src/types.ts

@@ -1,5 +1,11 @@
 import type { DesaturationStrength, HueGradingStrength } from 'newtone';
-import type { ColorMode, ThemeName } from '@newtonedev/components';
+import type { ColorMode } from '@newtonedev/components';
+
+// Re-export font types from @newtonedev/fonts (canonical source)
+export type { FontConfig, FontScope } from '@newtonedev/fonts';
+// Backward-compatible alias: configurator historically used this name
+export type { FontSlot as FontSlotConfig } from '@newtonedev/fonts';
+import type { FontSlot, TextRole } from '@newtonedev/fonts';
 
 /** Spacing preset options */
 export type SpacingPreset = 'xs' | 'sm' | 'md' | 'lg' | 'xl';
@@ -24,14 +30,6 @@ export interface HueGradingEndpointState {
   readonly hue: number;                                   // Traditional HSL hue [0, 359]
 }
 
-/** Font configuration for a single font slot */
-export interface FontConfig {
-  readonly type: 'system' | 'google' | 'custom';
-  readonly family: string;       // 'ui-monospace' | 'Roboto' | custom name
-  readonly customUrl?: string;   // Supabase Storage URL for custom fonts
-  readonly fallback: string;     // CSS fallback stack
-}
-
 /** Complete configurator state */
 export interface ConfiguratorState {
   readonly palettes: readonly PaletteState[];
@@ -45,7 +43,6 @@ export interface ConfiguratorState {
   };
   readonly preview: {
     readonly mode: ColorMode;
-    readonly theme: ThemeName;
   };
   readonly spacing?: {
     readonly preset: SpacingPreset;                        // xs=6px, sm=7px, md=8px, lg=9px, xl=10px base
@@ -55,14 +52,13 @@ export interface ConfiguratorState {
   };
   readonly typography?: {
     readonly fonts: {
-      readonly mono: FontConfig;      // currencies, code, amounts
-      readonly display: FontConfig;   // headlines
-      readonly default: FontConfig;   // fallback
-    };
-    readonly scale: {
-      readonly baseSize: number;  // px (default: 16)
-      readonly ratio: number;     // scale ratio (default: 1.25)
+      readonly main: FontSlot;       // Body/default font
+      readonly display: FontSlot;    // Headlines, titles
+      readonly mono: FontSlot;       // Code, technical content
+      readonly currency: FontSlot;   // Monetary amounts, financial data
     };
+    readonly typeScaleOffset?: number;  // [0, 1], 0.5 = identity (default)
+    readonly roleWeights?: Partial<Record<TextRole, number>>;  // CSS font-weight per role (100-900)
   };
   readonly icons?: {
     readonly variant: 'outlined' | 'rounded' | 'sharp';