Merge remote-tracking branch 'origin/main' into sawka/mock-for-block

Author: sawka

frontend/app/waveenv/waveenv.ts

@@ -24,7 +24,10 @@ export type SettingsKeyAtomFnType<Keys extends keyof SettingsType = keyof Settin
 export type WaveEnv = {
     electron: ElectronApi;
     rpc: RpcApiType;
+    platform: NodeJS.Platform;
     isDev: () => boolean;
+    isWindows: () => boolean;
+    isMacOS: () => boolean;
     atoms: GlobalAtomsType;
     createBlock: (blockDef: BlockDef, magnified?: boolean, ephemeral?: boolean) => Promise<string>;
     showContextMenu: (menu: ContextMenuItem[], e: React.MouseEvent) => void;

frontend/app/waveenv/waveenvimpl.ts

@@ -15,13 +15,17 @@ import {
 } from "@/app/store/global";
 import { RpcApi } from "@/app/store/wshclientapi";
 import { WaveEnv } from "@/app/waveenv/waveenv";
+import { isMacOS, isWindows, PLATFORM } from "@/util/platformutil";
 
 export function makeWaveEnvImpl(): WaveEnv {
     return {
         electron: (window as any).api,
         rpc: RpcApi,
         getSettingsKeyAtom,
+        platform: PLATFORM,
         isDev,
+        isWindows,
+        isMacOS,
         atoms,
         createBlock,
         showContextMenu: (menu: ContextMenuItem[], e: React.MouseEvent) => {

frontend/preview/mock/mockwaveenv.ts

@@ -5,6 +5,7 @@ import { makeDefaultConnStatus } from "@/app/store/global";
 import { TabModel } from "@/app/store/tab-model";
 import { RpcApiType } from "@/app/store/wshclientapi";
 import { WaveEnv } from "@/app/waveenv/waveenv";
+import { PlatformMacOS, PlatformWindows } from "@/util/platformutil";
 import { Atom, atom, PrimitiveAtom } from "jotai";
 import { DefaultFullConfig } from "./defaultconfig";
 import { previewElectronApi } from "./preview-electron-api";
@@ -16,6 +17,7 @@ type RpcOverrides = {
 export type MockEnv = {
     isDev?: boolean;
     tabId?: string;
+    platform?: NodeJS.Platform;
     settings?: Partial<SettingsType>;
     rpc?: RpcOverrides;
     atoms?: Partial<GlobalAtomsType>;
@@ -39,6 +41,7 @@ export function mergeMockEnv(base: MockEnv, overrides: MockEnv): MockEnv {
     return {
         isDev: overrides.isDev ?? base.isDev,
         tabId: overrides.tabId ?? base.tabId,
+        platform: overrides.platform ?? base.platform,
         settings: mergeRecords(base.settings, overrides.settings),
         rpc: mergeRecords(base.rpc as any, overrides.rpc as any) as RpcOverrides,
         atoms: overrides.atoms != null || base.atoms != null ? { ...base.atoms, ...overrides.atoms } : undefined,
@@ -149,18 +152,26 @@ export function applyMockEnvOverrides(env: WaveEnv, newOverrides: MockEnv): Mock
 
 export function makeMockWaveEnv(mockEnv?: MockEnv): MockWaveEnv {
     const overrides: MockEnv = mockEnv ?? {};
+    const platform = overrides.platform ?? PlatformMacOS;
     const connStatusAtomCache = new Map<string, PrimitiveAtom<ConnStatus>>();
     const waveObjectAtomCache = new Map<string, Atom<any>>();
     const blockMetaKeyAtomCache = new Map<string, Atom<any>>();
     const connConfigKeyAtomCache = new Map<string, Atom<any>>();
     const atoms = makeMockGlobalAtoms(overrides.settings, overrides.atoms, overrides.tabId);
     const env = {
         mockEnv: overrides,
-        electron: overrides.electron ? { ...previewElectronApi, ...overrides.electron } : previewElectronApi,
+        electron: {
+            ...previewElectronApi,
+            getPlatform: () => platform,
+            ...overrides.electron,
+        },
         rpc: makeMockRpc(overrides.rpc),
         atoms,
         getSettingsKeyAtom: makeMockSettingsKeyAtom(atoms.settingsAtom, overrides.settings),
+        platform,
         isDev: () => overrides.isDev ?? true,
+        isWindows: () => platform === PlatformWindows,
+        isMacOS: () => platform === PlatformMacOS,
         createBlock:
             overrides.createBlock ??
             ((blockDef: BlockDef, magnified?: boolean, ephemeral?: boolean) => {

pkg/wconfig/defaultconfig/settings.json

@@ -29,7 +29,7 @@
     "window:savelastwindow": true,
     "telemetry:enabled": true,
     "term:bellsound": false,
-    "term:bellindicator": false,
+    "term:bellindicator": true,
     "term:osc52": "always",
     "term:cursor": "block",
     "term:cursorblink": false,