support letter spacing and line height config (#5)

atinylittleshell · Apr 30, 2023 · ff415d4 · ff415d4
1 parent 84d5f56
commit ff415d4
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/apps/app/src/nativeBridge/modules/configModule.ts b/apps/app/src/nativeBridge/modules/configModule.ts
@@ -40,6 +40,8 @@ export class ConfigModule extends NativeBridgeModule {
         throw new Error('Invalid config: `module.exports` not set');
       }
 
+      Logger.getInstance().log('info', `Loaded config from ${configPath}}: ${JSON.stringify(mod.exports)}`);
+
       const resolved = resolveConfig(mod.exports);
       this.config = resolved;
     } catch (err: any) {

diff --git a/apps/terminal/components/Terminal/index.tsx b/apps/terminal/components/Terminal/index.tsx
@@ -29,7 +29,9 @@ const Terminal = ({ active, shellName }: { active: boolean; shellName: string })
 
     // TODO: refactor this into multiple effects
     const xterm = new XTerm();
-    xterm.loadAddon(new WebglAddon());
+
+    const webglAddon = new WebglAddon();
+    xterm.loadAddon(webglAddon);
 
     const fitAddon = new FitAddon();
     xterm.loadAddon(fitAddon);
@@ -50,6 +52,8 @@ const Terminal = ({ active, shellName }: { active: boolean; shellName: string })
     xterm.options.fontFamily = config.fontFamily;
     xterm.options.fontWeight = config.fontWeight;
     xterm.options.fontWeightBold = config.fontWeightBold;
+    xterm.options.letterSpacing = config.letterSpacing;
+    xterm.options.lineHeight = config.lineHeight;
     xterm.options.theme = theme;
 
     window.TerminalOne?.terminal

diff --git a/packages/types/config.ts b/packages/types/config.ts
@@ -62,6 +62,8 @@ const ConfigTypeContent = {
   fontFamily: t.string,
   fontWeight: t.number,
   fontWeightBold: t.number,
+  letterSpacing: t.number,
+  lineHeight: t.number,
   tabContentPadding: PaddingType,
   themes: t.array(ThemeConfigType),
   shells: t.array(ShellConfigType),
@@ -90,6 +92,12 @@ export const validateConfig = (config: unknown): Config => {
   if (result.fontWeightBold !== undefined && (result.fontWeightBold <= 0 || result.fontWeightBold > 1000)) {
     throw Error(`Invalid font weight bold: ${result.fontWeightBold}`);
   }
+  if (result.letterSpacing !== undefined && (result.letterSpacing < 0 || result.letterSpacing > 2)) {
+    throw Error(`Invalid letter spacing: ${result.letterSpacing}`);
+  }
+  if (result.lineHeight !== undefined && (result.lineHeight <= 0 || result.lineHeight > 4)) {
+    throw Error(`Invalid line height: ${result.lineHeight}`);
+  }
   if (result.tabContentPadding !== undefined) {
     if (result.tabContentPadding.top < 0 || result.tabContentPadding.top > 128) {
       throw Error(`Invalid tab content padding top: ${result.tabContentPadding.top}`);
@@ -119,10 +127,12 @@ export const DEFAULT_CONFIG: ResolvedConfig = {
   cursorBlink: false,
   cursorStyle: 'block',
   cursorWidth: 1,
-  fontSize: 15,
+  fontSize: 16,
   fontFamily: 'Consolas, Menlo, monospace',
-  fontWeight: 500,
+  fontWeight: 400,
   fontWeightBold: 700,
+  letterSpacing: 1,
+  lineHeight: 1,
   tabContentPadding: {
     top: 8,
     right: 8,

diff --git a/turbo.json b/turbo.json
@@ -16,15 +16,17 @@
       ]
     },
     "build:app": {
-      "outputs": [
-        "dist/**"
-      ]
+      "cache": false
     },
     "dev:terminal": {
       "cache": false,
       "persistent": true
     },
     "lint": {},
-    "test": {}
+    "test": {
+      "outputs": [
+        "coverage/**"
+      ]
+    }
   }
 }