@rlabs-inc/tui 0.3.2 → 0.6.0

package/src/state/index.ts

@@ -72,6 +72,15 @@ export {
 export * from './scroll'
 export * from './cursor'
 
+// Drawn cursor - for input components (style, blink, colors)
+export {
+  createCursor,
+  disposeCursor,
+  getCursorCharCode,
+  hasCursor,
+} from './drawnCursor'
+export type { DrawnCursorStyle, DrawnCursorConfig, DrawnCursor } from './drawnCursor'
+
 // Global keys - all shortcuts wired together
 export { globalKeys } from './global-keys'
 

package/src/state/keyboard.ts

@@ -66,8 +66,13 @@ const focusedHandlers = new Map<number, Set<KeyHandler>>()
  * Returns true if any handler consumed the event.
  */
 export function dispatch(event: KeyboardEvent): boolean {
+  // Always update reactive state (for monitoring)
   lastEvent.value = event
 
+  // Only dispatch press events to handlers
+  // (Kitty protocol sends press/repeat/release - we only want press)
+  if (event.state !== 'press') return false
+
   // Dispatch to key-specific handlers
   const handlers = keyHandlers.get(event.key)
   if (handlers) {
@@ -90,6 +95,7 @@ export function dispatch(event: KeyboardEvent): boolean {
  */
 export function dispatchFocused(focusedIndex: number, event: KeyboardEvent): boolean {
   if (focusedIndex < 0) return false
+  if (event.state !== 'press') return false
 
   const handlers = focusedHandlers.get(focusedIndex)
   if (!handlers) return false

package/src/state/theme.ts

@@ -17,7 +17,13 @@
 
 import { state, derived } from '@rlabs-inc/signals'
 import type { RGBA } from '../types'
-import { parseColor, TERMINAL_DEFAULT, ansiColor } from '../types/color'
+import {
+  parseColor,
+  TERMINAL_DEFAULT,
+  ansiColor,
+  isAnsiColor,
+  adjustLightnessForContrast,
+} from '../types/color'
 
 // =============================================================================
 // THEME COLOR TYPE
@@ -270,6 +276,222 @@ export const themes = {
     border: 0x586e75,
     borderFocus: 0x268bd2,
   },
+
+  /**
+   * Catppuccin Mocha - soothing pastel theme (most popular variant).
+   */
+  catppuccin: {
+    name: 'catppuccin',
+    description: 'Catppuccin Mocha theme',
+    primary: 0x89b4fa, // blue
+    secondary: 0xcba6f7, // mauve
+    tertiary: 0x94e2d5, // teal
+    accent: 0xf9e2af, // yellow
+    success: 0xa6e3a1, // green
+    warning: 0xf9e2af, // yellow
+    error: 0xf38ba8, // red
+    info: 0x89dceb, // sky
+    text: 0xcdd6f4, // text
+    textMuted: 0x6c7086, // overlay0
+    textDim: 0x585b70, // surface2
+    textDisabled: 0x45475a, // surface0
+    textBright: 0xffffff,
+    background: 0x1e1e2e, // base
+    backgroundMuted: 0x313244, // surface0
+    surface: 0x45475a, // surface1
+    overlay: 0x181825, // mantle
+    border: 0x6c7086, // overlay0
+    borderFocus: 0x89b4fa, // blue
+  },
+
+  /**
+   * Gruvbox Dark - retro groove color scheme.
+   */
+  gruvbox: {
+    name: 'gruvbox',
+    description: 'Gruvbox Dark theme',
+    primary: 0x458588, // blue
+    secondary: 0xb16286, // purple
+    tertiary: 0x689d6a, // aqua
+    accent: 0xd79921, // yellow
+    success: 0x98971a, // green
+    warning: 0xd79921, // yellow
+    error: 0xcc241d, // red
+    info: 0x458588, // blue
+    text: 0xebdbb2, // fg
+    textMuted: 0xa89984, // gray
+    textDim: 0x928374, // gray
+    textDisabled: 0x665c54, // bg3
+    textBright: 0xfbf1c7, // fg0
+    background: 0x282828, // bg
+    backgroundMuted: 0x3c3836, // bg1
+    surface: 0x504945, // bg2
+    overlay: 0x1d2021, // bg0_h
+    border: 0x665c54, // bg3
+    borderFocus: 0xfe8019, // orange
+  },
+
+  /**
+   * Tokyo Night - clean, dark theme inspired by Tokyo city lights.
+   */
+  tokyoNight: {
+    name: 'tokyoNight',
+    description: 'Tokyo Night theme',
+    primary: 0x7aa2f7, // blue
+    secondary: 0xbb9af7, // purple
+    tertiary: 0x7dcfff, // cyan
+    accent: 0xe0af68, // yellow
+    success: 0x9ece6a, // green
+    warning: 0xe0af68, // yellow
+    error: 0xf7768e, // red
+    info: 0x7dcfff, // cyan
+    text: 0xa9b1d6, // fg
+    textMuted: 0x565f89, // comment
+    textDim: 0x414868, // dark3
+    textDisabled: 0x3b4261, // dark2
+    textBright: 0xc0caf5, // fg_bright
+    background: 0x1a1b26, // bg
+    backgroundMuted: 0x24283b, // bg_highlight
+    surface: 0x414868, // dark3
+    overlay: 0x16161e, // bg_dark
+    border: 0x414868, // dark3
+    borderFocus: 0x7aa2f7, // blue
+  },
+
+  /**
+   * One Dark - Atom's iconic dark theme.
+   */
+  oneDark: {
+    name: 'oneDark',
+    description: 'One Dark (Atom) theme',
+    primary: 0x61afef, // blue
+    secondary: 0xc678dd, // purple
+    tertiary: 0x56b6c2, // cyan
+    accent: 0xe5c07b, // yellow
+    success: 0x98c379, // green
+    warning: 0xe5c07b, // yellow
+    error: 0xe06c75, // red
+    info: 0x56b6c2, // cyan
+    text: 0xabb2bf, // fg
+    textMuted: 0x5c6370, // comment
+    textDim: 0x4b5263, // gutter
+    textDisabled: 0x3e4451, // guide
+    textBright: 0xffffff,
+    background: 0x282c34, // bg
+    backgroundMuted: 0x21252b, // bg_dark
+    surface: 0x3e4451, // guide
+    overlay: 0x1e2127, // bg_darker
+    border: 0x3e4451, // guide
+    borderFocus: 0x61afef, // blue
+  },
+
+  /**
+   * Rosé Pine - all natural pine, faux fur and a bit of soho vibes.
+   */
+  rosePine: {
+    name: 'rosePine',
+    description: 'Rosé Pine theme',
+    primary: 0x9ccfd8, // foam
+    secondary: 0xc4a7e7, // iris
+    tertiary: 0x31748f, // pine
+    accent: 0xf6c177, // gold
+    success: 0x31748f, // pine
+    warning: 0xf6c177, // gold
+    error: 0xeb6f92, // love
+    info: 0x9ccfd8, // foam
+    text: 0xe0def4, // text
+    textMuted: 0x908caa, // subtle
+    textDim: 0x6e6a86, // muted
+    textDisabled: 0x524f67, // highlight_med
+    textBright: 0xffffff,
+    background: 0x191724, // base
+    backgroundMuted: 0x1f1d2e, // surface
+    surface: 0x26233a, // overlay
+    overlay: 0x16141f, // nc
+    border: 0x524f67, // highlight_med
+    borderFocus: 0xebbcba, // rose
+  },
+
+  /**
+   * Kanagawa - theme inspired by Katsushika Hokusai's famous wave painting.
+   */
+  kanagawa: {
+    name: 'kanagawa',
+    description: 'Kanagawa wave theme',
+    primary: 0x7e9cd8, // crystalBlue
+    secondary: 0x957fb8, // oniViolet
+    tertiary: 0x7aa89f, // waveAqua2
+    accent: 0xdca561, // carpYellow
+    success: 0x98bb6c, // springGreen
+    warning: 0xdca561, // carpYellow
+    error: 0xc34043, // autumnRed
+    info: 0x7fb4ca, // springBlue
+    text: 0xdcd7ba, // fujiWhite
+    textMuted: 0x727169, // fujiGray
+    textDim: 0x54546d, // sumiInk4
+    textDisabled: 0x363646, // sumiInk3
+    textBright: 0xffffff,
+    background: 0x1f1f28, // sumiInk1
+    backgroundMuted: 0x2a2a37, // sumiInk2
+    surface: 0x363646, // sumiInk3
+    overlay: 0x16161d, // sumiInk0
+    border: 0x54546d, // sumiInk4
+    borderFocus: 0x7e9cd8, // crystalBlue
+  },
+
+  /**
+   * Everforest - comfortable green-tinted theme.
+   */
+  everforest: {
+    name: 'everforest',
+    description: 'Everforest theme',
+    primary: 0x7fbbb3, // aqua
+    secondary: 0xd699b6, // purple
+    tertiary: 0x83c092, // green
+    accent: 0xdbbc7f, // yellow
+    success: 0xa7c080, // green
+    warning: 0xdbbc7f, // yellow
+    error: 0xe67e80, // red
+    info: 0x7fbbb3, // aqua
+    text: 0xd3c6aa, // fg
+    textMuted: 0x9da9a0, // grey1
+    textDim: 0x859289, // grey0
+    textDisabled: 0x5c6a72, // bg5
+    textBright: 0xfdf6e3,
+    background: 0x2d353b, // bg_dim
+    backgroundMuted: 0x343f44, // bg1
+    surface: 0x3d484d, // bg3
+    overlay: 0x272e33, // bg0
+    border: 0x5c6a72, // bg5
+    borderFocus: 0xa7c080, // green
+  },
+
+  /**
+   * Night Owl - designed with accessibility in mind.
+   */
+  nightOwl: {
+    name: 'nightOwl',
+    description: 'Night Owl theme',
+    primary: 0x82aaff, // blue
+    secondary: 0xc792ea, // purple
+    tertiary: 0x7fdbca, // cyan
+    accent: 0xffcb6b, // yellow
+    success: 0xaddb67, // green
+    warning: 0xffcb6b, // yellow
+    error: 0xef5350, // red
+    info: 0x7fdbca, // cyan
+    text: 0xd6deeb, // fg
+    textMuted: 0x637777, // comment
+    textDim: 0x5f7e97, // lineHighlight
+    textDisabled: 0x3b4252, // guide
+    textBright: 0xffffff,
+    background: 0x011627, // bg
+    backgroundMuted: 0x0b2942, // bg_light
+    surface: 0x1d3b53, // selection
+    overlay: 0x010e1a, // bg_dark
+    border: 0x5f7e97, // lineHighlight
+    borderFocus: 0x82aaff, // blue
+  },
 }
 
 // =============================================================================
@@ -568,9 +790,37 @@ export interface VariantStyle {
   borderFocus: RGBA
 }
 
+/**
+ * Get a foreground color with proper contrast against the background.
+ *
+ * For ANSI colors (terminal theme): Returns the desired fg as-is, trusting
+ * the standard ANSI color pairings and terminal's contrast handling.
+ *
+ * For RGB colors (custom themes): Adjusts the fg lightness using OKLCH
+ * to ensure WCAG AA contrast (4.5:1 ratio).
+ */
+function getContrastFg(desiredFg: RGBA, bg: RGBA): RGBA {
+  // If background is ANSI, trust terminal's color handling
+  if (isAnsiColor(bg)) {
+    return desiredFg
+  }
+
+  // If foreground is ANSI but background is RGB, also trust it
+  // (mixed case, probably intentional)
+  if (isAnsiColor(desiredFg)) {
+    return desiredFg
+  }
+
+  // Both are RGB - ensure proper contrast using OKLCH
+  return adjustLightnessForContrast(desiredFg, bg, 4.5)
+}
+
 /**
  * Get variant styles resolved to RGBA.
  * Returns colors based on variant name and current theme.
+ *
+ * For terminal theme (ANSI colors): Uses standard ANSI pairings.
+ * For custom themes (RGB colors): Calculates proper OKLCH contrast.
  */
 export function getVariantStyle(variant: Variant): VariantStyle {
   const resolved = resolvedTheme.value
@@ -578,56 +828,56 @@ export function getVariantStyle(variant: Variant): VariantStyle {
   switch (variant) {
     case 'primary':
       return {
-        fg: resolved.textBright,
+        fg: getContrastFg(resolved.textBright, resolved.primary),
         bg: resolved.primary,
         border: resolved.primary,
         borderFocus: resolved.accent,
       }
     case 'secondary':
       return {
-        fg: resolved.textBright,
+        fg: getContrastFg(resolved.textBright, resolved.secondary),
         bg: resolved.secondary,
         border: resolved.secondary,
         borderFocus: resolved.accent,
       }
     case 'tertiary':
       return {
-        fg: resolved.textBright,
+        fg: getContrastFg(resolved.textBright, resolved.tertiary),
         bg: resolved.tertiary,
         border: resolved.tertiary,
         borderFocus: resolved.accent,
       }
     case 'accent':
       return {
-        fg: { r: 0, g: 0, b: 0, a: 255 }, // Dark text on accent (usually bright)
+        fg: getContrastFg({ r: 0, g: 0, b: 0, a: 255 }, resolved.accent),
         bg: resolved.accent,
         border: resolved.accent,
         borderFocus: resolved.primary,
       }
     case 'success':
       return {
-        fg: resolved.textBright,
+        fg: getContrastFg(resolved.textBright, resolved.success),
         bg: resolved.success,
         border: resolved.success,
         borderFocus: resolved.accent,
       }
     case 'warning':
       return {
-        fg: { r: 0, g: 0, b: 0, a: 255 }, // Dark text on warning
+        fg: getContrastFg({ r: 0, g: 0, b: 0, a: 255 }, resolved.warning),
         bg: resolved.warning,
         border: resolved.warning,
         borderFocus: resolved.accent,
       }
     case 'error':
       return {
-        fg: resolved.textBright,
+        fg: getContrastFg(resolved.textBright, resolved.error),
         bg: resolved.error,
         border: resolved.error,
         borderFocus: resolved.accent,
       }
     case 'info':
       return {
-        fg: resolved.textBright,
+        fg: getContrastFg(resolved.textBright, resolved.info),
         bg: resolved.info,
         border: resolved.info,
         borderFocus: resolved.accent,
@@ -648,7 +898,7 @@ export function getVariantStyle(variant: Variant): VariantStyle {
       }
     case 'elevated':
       return {
-        fg: resolved.textBright,
+        fg: getContrastFg(resolved.textBright, resolved.surface),
         bg: resolved.surface,
         border: resolved.primary,
         borderFocus: resolved.borderFocus,

package/src/types/color.ts

@@ -232,6 +232,121 @@ function oklchToRgb(l: number, c: number, h: number): { r: number; g: number; b:
   }
 }
 
+/**
+ * Convert RGB to OKLCH.
+ * Inverse of oklchToRgb. Used for color manipulation while preserving perceptual uniformity.
+ *
+ * @returns { l: lightness (0-1), c: chroma (0-~0.4), h: hue (0-360) }
+ */
+export function rgbToOklch(color: RGBA): { l: number; c: number; h: number } {
+  // sRGB to linear sRGB (inverse gamma)
+  const toLinear = (x: number) => {
+    const s = x / 255
+    return s <= 0.04045 ? s / 12.92 : Math.pow((s + 0.055) / 1.055, 2.4)
+  }
+
+  const rLinear = toLinear(color.r)
+  const gLinear = toLinear(color.g)
+  const bLinear = toLinear(color.b)
+
+  // Linear sRGB to LMS (cone responses)
+  const l = 0.4122214708 * rLinear + 0.5363325363 * gLinear + 0.0514459929 * bLinear
+  const m = 0.2119034982 * rLinear + 0.6806995451 * gLinear + 0.1073969566 * bLinear
+  const s = 0.0883024619 * rLinear + 0.2817188376 * gLinear + 0.6299787005 * bLinear
+
+  // LMS to OKLab (cube root for perceptual linearity)
+  const l_ = Math.cbrt(l)
+  const m_ = Math.cbrt(m)
+  const s_ = Math.cbrt(s)
+
+  const L = 0.2104542553 * l_ + 0.7936177850 * m_ - 0.0040720468 * s_
+  const a = 1.9779984951 * l_ - 2.4285922050 * m_ + 0.4505937099 * s_
+  const b = 0.0259040371 * l_ + 0.7827717662 * m_ - 0.8086757660 * s_
+
+  // OKLab to OKLCH (polar coordinates)
+  const c = Math.sqrt(a * a + b * b)
+  let h = Math.atan2(b, a) * (180 / Math.PI)
+  if (h < 0) h += 360
+
+  return { l: L, c, h }
+}
+
+/**
+ * Adjust OKLCH lightness to achieve minimum contrast ratio against a background.
+ * Preserves hue and chroma while adjusting only lightness.
+ *
+ * @param fg Foreground color to adjust
+ * @param bg Background color
+ * @param minRatio Minimum contrast ratio (WCAG AA = 4.5, AAA = 7)
+ * @returns Adjusted foreground color as RGBA
+ */
+export function adjustLightnessForContrast(fg: RGBA, bg: RGBA, minRatio: number = 4.5): RGBA {
+  const bgOklch = rgbToOklch(bg)
+  let fgOklch = rgbToOklch(fg)
+
+  // Calculate current contrast
+  const getContrast = (fgL: number): number => {
+    const fgRgb = oklchToRgb(fgL, fgOklch.c, fgOklch.h)
+    const fgRgba = { ...fgRgb, a: 255 }
+    return contrastRatio(fgRgba, bg)
+  }
+
+  let currentRatio = getContrast(fgOklch.l)
+
+  // If already sufficient, return original
+  if (currentRatio >= minRatio) {
+    return fg
+  }
+
+  // Determine direction: if bg is dark, go lighter; if bg is light, go darker
+  const direction = bgOklch.l > 0.5 ? -1 : 1
+  let newL = fgOklch.l
+
+  // Binary search for the right lightness
+  let step = 0.25
+  for (let i = 0; i < 20 && currentRatio < minRatio; i++) {
+    newL = Math.max(0, Math.min(1, newL + direction * step))
+    currentRatio = getContrast(newL)
+
+    // If we overshot, reverse and halve step
+    if (currentRatio >= minRatio) {
+      // Found a valid lightness, but let's fine-tune to not over-adjust
+      const testL = newL - direction * step * 0.5
+      if (getContrast(testL) >= minRatio) {
+        newL = testL
+        currentRatio = getContrast(newL)
+      }
+    }
+    step *= 0.6
+  }
+
+  // Convert back to RGB
+  const adjusted = oklchToRgb(newL, fgOklch.c, fgOklch.h)
+  return { ...adjusted, a: fg.a }
+}
+
+/**
+ * Calculate contrast ratio between two colors (WCAG formula).
+ */
+function contrastRatio(fg: RGBA, bg: RGBA): number {
+  const lumFg = relativeLuminance(fg)
+  const lumBg = relativeLuminance(bg)
+  const lighter = Math.max(lumFg, lumBg)
+  const darker = Math.min(lumFg, lumBg)
+  return (lighter + 0.05) / (darker + 0.05)
+}
+
+/**
+ * Calculate relative luminance per WCAG 2.1.
+ */
+function relativeLuminance(color: RGBA): number {
+  const toLinear = (c: number) => {
+    const s = c / 255
+    return s <= 0.03928 ? s / 12.92 : Math.pow((s + 0.055) / 1.055, 2.4)
+  }
+  return 0.2126 * toLinear(color.r) + 0.7152 * toLinear(color.g) + 0.0722 * toLinear(color.b)
+}
+
 // =============================================================================
 // Color Comparison
 // =============================================================================