Update dependencies

Update versions of various dependencies. Notably electron from 32 to 34 since 34 improves wayland IME support.
zulip · Mar 7, 2025 · 28e8038 · 28e8038
1 parent 13f3818
commit 28e8038
Show file tree

Hide file tree

Showing 4 changed files with 4,786 additions and 2,277 deletions.
diff --git a/app/main/menu.ts b/app/main/menu.ts
@@ -94,7 +94,7 @@ function getToolsSubmenu(): MenuItemConstructorOptions[] {
       accelerator:
         process.platform === "darwin" ? "Alt+Command+I" : "Ctrl+Shift+I",
       click(_item, focusedWindow) {
-        if (focusedWindow) {
+        if (focusedWindow && focusedWindow instanceof BrowserWindow) {
           focusedWindow.webContents.openDevTools({mode: "undocked"});
         }
       },
@@ -222,7 +222,7 @@ function getViewSubmenu(): MenuItemConstructorOptions[] {
     {
       label: t.__("Toggle Tray Icon"),
       click(_item, focusedWindow) {
-        if (focusedWindow) {
+        if (focusedWindow && focusedWindow instanceof BrowserWindow) {
           send(focusedWindow.webContents, "toggletray");
         }
       },
@@ -231,7 +231,7 @@ function getViewSubmenu(): MenuItemConstructorOptions[] {
       label: t.__("Toggle Sidebar"),
       accelerator: "CommandOrControl+Shift+S",
       click(_item, focusedWindow) {
-        if (focusedWindow) {
+        if (focusedWindow && focusedWindow instanceof BrowserWindow) {
           const newValue = !ConfigUtil.getConfigItem("showSidebar", true);
           send(focusedWindow.webContents, "toggle-sidebar", newValue);
           ConfigUtil.setConfigItem("showSidebar", newValue);
@@ -243,7 +243,7 @@ function getViewSubmenu(): MenuItemConstructorOptions[] {
       checked: ConfigUtil.getConfigItem("autoHideMenubar", false),
       visible: process.platform !== "darwin",
       click(_item, focusedWindow) {
-        if (focusedWindow) {
+        if (focusedWindow && focusedWindow instanceof BrowserWindow) {
           const newValue = !ConfigUtil.getConfigItem("autoHideMenubar", false);
           focusedWindow.autoHideMenuBar = newValue;
           focusedWindow.setMenuBarVisibility(!newValue);

diff --git a/app/renderer/js/components/webview.ts b/app/renderer/js/components/webview.ts
@@ -184,8 +184,8 @@ export default class WebView {
   }
 
   back(): void {
-    if (this.getWebContents().canGoBack()) {
-      this.getWebContents().goBack();
+    if (this.getWebContents().navigationHistory.canGoBack()) {
+      this.getWebContents().navigationHistory.goBack();
       this.focus();
     }
   }
@@ -194,12 +194,15 @@ export default class WebView {
     const $backButton = document.querySelector(
       "#actions-container #back-action",
     )!;
-    $backButton.classList.toggle("disable", !this.getWebContents().canGoBack());
+    $backButton.classList.toggle(
+      "disable",
+      !this.getWebContents().navigationHistory.canGoBack(),
+    );
   }
 
   forward(): void {
-    if (this.getWebContents().canGoForward()) {
-      this.getWebContents().goForward();
+    if (this.getWebContents().navigationHistory.canGoForward()) {
+      this.getWebContents().navigationHistory.goForward();
     }
   }