Add back Rose Pine themes

https://feedback.yaak.app/p/app-bar-icons-not-aligned-correctly-when-fullscreen

package.json

@@ -57,6 +57,9 @@
     "migration": "node scripts/create-migration.cjs",
     "build": "npm run --workspaces --if-present build",
     "build-plugins": "npm run --workspaces --if-present build",
+    "icons": "run-p icons:*",
+    "icons:dev": "tauri icon src-tauri/icons/icon.png --output src-tauri/icons/release",
+    "icons:release": "tauri icon src-tauri/icons/icon-dev.png --output src-tauri/icons/dev",
     "bootstrap": "run-p bootstrap:* && npm run --workspaces --if-present bootstrap",
     "bootstrap:vendor-node": "node scripts/vendor-node.cjs",
     "bootstrap:vendor-plugins": "node scripts/vendor-plugins.cjs",

plugins/themes-yaak/src/index.ts

@@ -595,5 +595,112 @@ export const plugin: PluginDefinition = {
         danger: 'hsl(343,81%,75%)',
       },
     },
+    {
+      id: 'rose-pine',
+      label: 'Rosé Pine',
+      dark: true,
+      base: {
+        surface: 'hsl(249,22%,12%)',
+        text: 'hsl(245,50%,91%)',
+        textSubtle: 'hsl(248,15%,61%)',
+        textSubtlest: 'hsl(249,12%,47%)',
+        primary: 'hsl(267,57%,78%)',
+        secondary: 'hsl(249,12%,47%)',
+        info: 'hsl(199,49%,60%)',
+        success: 'hsl(180,43%,73%)',
+        notice: 'hsl(35,88%,72%)',
+        warning: 'hsl(1,74%,79%)',
+        danger: 'hsl(343,76%,68%)',
+      },
+      components: {
+        responsePane: {
+          surface: 'hsl(247,23%,15%)',
+        },
+        sidebar: {
+          surface: 'hsl(247,23%,15%)',
+        },
+        menu: {
+          surface: 'hsl(248,21%,26%)',
+          textSubtle: 'hsl(248,15%,66%)',
+          textSubtlest: 'hsl(249,12%,52%)',
+          border: 'hsl(248,21%,35%)',
+          borderSubtle: 'hsl(248,21%,33%)',
+        },
+      },
+    },
+    {
+      id: 'rose-pine-moon',
+      label: 'Rosé Pine Moon',
+      dark: true,
+      base: {
+        surface: 'hsl(246,24%,17%)',
+        text: 'hsl(245,50%,91%)',
+        textSubtle: 'hsl(248,15%,61%)',
+        textSubtlest: 'hsl(249,12%,47%)',
+        primary: 'hsl(267,57%,78%)',
+        secondary: 'hsl(248,15%,61%)',
+        info: 'hsl(197,48%,60%)',
+        success: 'hsl(197,48%,60%)',
+        notice: 'hsl(35,88%,72%)',
+        warning: 'hsl(2,66%,75%)',
+        danger: 'hsl(343,76%,68%)',
+      },
+      components: {
+        responsePane: {
+          surface: 'hsl(247,24%,20%)',
+        },
+        sidebar: {
+          surface: 'hsl(247,24%,20%)',
+        },
+        menu: {
+          surface: 'hsl(248,21%,26%)',
+          textSubtle: 'hsl(248,15%,61%)',
+          textSubtlest: 'hsl(249,12%,55%)',
+          border: 'hsl(248,21%,35%)',
+          borderSubtle: 'hsl(248,21%,31%)',
+        },
+      },
+    },
+    {
+      id: 'rose-pine-dawn',
+      label: 'Rosé Pine Dawn',
+      dark: false,
+      base: {
+        surface: 'hsl(32,57%,95%)',
+        border: 'hsl(10,9%,86%)',
+        surfaceHighlight: 'hsl(25,35%,93%)',
+        text: 'hsl(248,19%,40%)',
+        textSubtle: 'hsl(248,12%,52%)',
+        textSubtlest: 'hsl(257,9%,61%)',
+        primary: 'hsl(271,27%,56%)',
+        secondary: 'hsl(249,12%,47%)',
+        info: 'hsl(197,52%,36%)',
+        success: 'hsl(188,31%,45%)',
+        notice: 'hsl(34,64%,49%)',
+        warning: 'hsl(2,47%,64%)',
+        danger: 'hsl(343,35%,55%)',
+      },
+      components: {
+        responsePane: {
+          border: 'hsl(20,12%,90%)',
+        },
+        sidebar: {
+          border: 'hsl(20,12%,90%)',
+        },
+        appHeader: {
+          border: 'hsl(20,12%,90%)',
+        },
+        input: {
+          border: 'hsl(10,9%,86%)',
+        },
+        dialog: {
+          border: 'hsl(20,12%,90%)',
+        },
+        menu: {
+          surface: 'hsl(28,40%,92%)',
+          border: 'hsl(10,9%,86%)',
+        },
+      },
+    },
   ],
 };

src-tauri/tauri.linux.conf.json

@@ -1,3 +1,13 @@
 {
-  "productName": "yaak"
+  "productName": "yaak",
+  "bundle": {
+    "linux": {
+      "deb": {
+        "desktopTemplate": "./template.desktop"
+      },
+      "rpm": {
+        "desktopTemplate": "./template.desktop"
+      }
+    }
+  }
 }

src-tauri/template.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Categories={{categories}}
+Comment={{comment}}
+Exec={{exec}}
+Icon={{icon}}
+Name={{name}}
+StartupWMClass={{exec}}
+Terminal=false
+Type=Application

src-web/components/HeaderSize.tsx

@@ -1,9 +1,10 @@
+import { type } from '@tauri-apps/plugin-os';
 import { settingsAtom } from '@yaakapp-internal/models';
 import classNames from 'classnames';
 import { useAtomValue } from 'jotai';
 import type { CSSProperties, HTMLAttributes, ReactNode } from 'react';
 import React, { useMemo } from 'react';
-import { useStoplightsVisible } from '../hooks/useStoplightsVisible';
+import { useIsFullscreen } from '../hooks/useIsFullscreen';
 import { HEADER_SIZE_LG, HEADER_SIZE_MD, WINDOW_CONTROLS_WIDTH } from '../lib/constants';
 import { WindowControls } from './WindowControls';
 
@@ -23,7 +24,7 @@ export function HeaderSize({
   children,
 }: HeaderSizeProps) {
   const settings = useAtomValue(settingsAtom);
-  const stoplightsVisible = useStoplightsVisible();
+  const isFullscreen = useIsFullscreen();
   const finalStyle = useMemo<CSSProperties>(() => {
     const s = { ...style };
 
@@ -31,20 +32,22 @@ export function HeaderSize({
     if (size === 'md') s.minHeight = HEADER_SIZE_MD;
     if (size === 'lg') s.minHeight = HEADER_SIZE_LG;
 
-    // Add large padding for window controls
-    if (stoplightsVisible && !ignoreControlsSpacing) {
-      s.paddingLeft = 72 / settings.interfaceScale;
-    } else if (!stoplightsVisible && !ignoreControlsSpacing && !settings.hideWindowControls) {
+    if (type() === 'macos') {
+      if (!isFullscreen) {
+        // Add large padding for window controls
+        s.paddingLeft = 72 / settings.interfaceScale;
+      }
+    } else if (!ignoreControlsSpacing && !settings.hideWindowControls) {
       s.paddingRight = WINDOW_CONTROLS_WIDTH;
     }
 
     return s;
   }, [
     ignoreControlsSpacing,
+    isFullscreen,
     settings.hideWindowControls,
     settings.interfaceScale,
     size,
-    stoplightsVisible,
     style,
   ]);
 

src-web/hooks/useHotKey.ts

@@ -26,8 +26,8 @@ export type HotkeyAction =
   | 'workspace_settings.show';
 
 const hotkeys: Record<HotkeyAction, string[]> = {
-  'app.zoom_in': ['CmdCtrl+='],
-  'app.zoom_out': ['CmdCtrl+-'],
+  'app.zoom_in': ['CmdCtrl+Equal'],
+  'app.zoom_out': ['CmdCtrl+Minus'],
   'app.zoom_reset': ['CmdCtrl+0'],
   'command_palette.toggle': ['CmdCtrl+k'],
   'environmentEditor.toggle': ['CmdCtrl+Shift+E', 'CmdCtrl+Shift+e'],
@@ -67,6 +67,8 @@ const hotkeyLabels: Record<HotkeyAction, string> = {
   'workspace_settings.show': 'Open Workspace Settings',
 };
 
+const layoutInsensitiveKeys = ['Equal', 'Minus', 'BracketLeft', 'BracketRight', 'Backquote'];
+
 export const hotkeyActions: HotkeyAction[] = Object.keys(hotkeys) as (keyof typeof hotkeys)[];
 
 interface Options {
@@ -106,7 +108,8 @@ export function useHotKey(
         return;
       }
 
-      currentKeys.current.add(e.key);
+      const keyToAdd = layoutInsensitiveKeys.includes(e.code) ? e.code : e.key;
+      currentKeys.current.add(keyToAdd);
 
       const currentKeysWithModifiers = new Set(currentKeys.current);
       if (e.altKey) currentKeysWithModifiers.add('Alt');
@@ -150,7 +153,9 @@ export function useHotKey(
       if (options.enable === false) {
         return;
       }
-      currentKeys.current.delete(e.key);
+
+      const keyToRemove = layoutInsensitiveKeys.includes(e.code) ? e.code : e.key;
+      currentKeys.current.delete(keyToRemove);
 
       // Clear all keys if no longer holding modifier
       // HACK: This is to get around the case of DOWN SHIFT -> DOWN : -> UP SHIFT -> UP ;