From 6e717781a92d847189731aea5b44994e08b4578e Mon Sep 17 00:00:00 2001
From: beyondkmp <beyondkmp@gmail.com>
Date: Fri, 23 May 2025 15:29:13 +0800
Subject: [PATCH] feat: add navigation buttons for webview history in MinApp
 popup (#6342)

* feat: add navigation buttons for webview history in MinApp popup

- Implemented 'Go Back' and 'Go Forward' functionality in the MinApp popup.
- Added corresponding translations for English, Japanese, Russian, and Chinese locales.
- Included icons for navigation buttons to enhance user experience.

* fix: update Russian and Traditional Chinese translations for UI elements

- Revised translations for "rightclick_copyurl", "close", and "minimize" to improve clarity and consistency in the Russian and Traditional Chinese locales.
- Ensured that the translations align better with user expectations and common usage.

* fix: update Russian translations for MinApp popup UI elements

- Revised translations for "close" and "minimize" to specify their context within the MinApp, enhancing clarity for users.
- Ensured consistency with existing translations and improved user understanding of the interface.

---------

Co-authored-by: beyondkmp <beyondkmkp@gmail.com>
---
 .../MinApp/MinappPopupContainer.tsx           | 28 +++++++++++++++++++
 src/renderer/src/i18n/locales/en-us.json      |  2 ++
 src/renderer/src/i18n/locales/ja-jp.json      |  2 ++
 src/renderer/src/i18n/locales/ru-ru.json      |  2 ++
 src/renderer/src/i18n/locales/zh-cn.json      |  2 ++
 src/renderer/src/i18n/locales/zh-tw.json      |  2 ++
 6 files changed, 38 insertions(+)

diff --git a/src/renderer/src/components/MinApp/MinappPopupContainer.tsx b/src/renderer/src/components/MinApp/MinappPopupContainer.tsx
index a2dd31cfab..bd360c8a30 100644
--- a/src/renderer/src/components/MinApp/MinappPopupContainer.tsx
+++ b/src/renderer/src/components/MinApp/MinappPopupContainer.tsx
@@ -1,4 +1,6 @@
 import {
+  ArrowLeftOutlined,
+  ArrowRightOutlined,
   CloseOutlined,
   CodeOutlined,
   CopyOutlined,
@@ -241,6 +243,22 @@ const MinappPopupContainer: React.FC = () => {
     dispatch(setMinappsOpenLinkExternal(!minappsOpenLinkExternal))
   }
 
+  /** navigate back in webview history */
+  const handleGoBack = (appid: string) => {
+    const webview = webviewRefs.current.get(appid)
+    if (webview && webview.canGoBack()) {
+      webview.goBack()
+    }
+  }
+
+  /** navigate forward in webview history */
+  const handleGoForward = (appid: string) => {
+    const webview = webviewRefs.current.get(appid)
+    if (webview && webview.canGoForward()) {
+      webview.goForward()
+    }
+  }
+
   /** Title bar of the popup */
   const Title = ({ appInfo, url }: { appInfo: AppInfo | null; url: string | null }) => {
     if (!appInfo) return null
@@ -286,6 +304,16 @@ const MinappPopupContainer: React.FC = () => {
         )}
         <Spacer />
         <ButtonsGroup className={isWindows || isLinux ? 'windows' : ''}>
+          <Tooltip title={t('minapp.popup.goBack')} mouseEnterDelay={0.8} placement="bottom">
+            <Button onClick={() => handleGoBack(appInfo.id)}>
+              <ArrowLeftOutlined />
+            </Button>
+          </Tooltip>
+          <Tooltip title={t('minapp.popup.goForward')} mouseEnterDelay={0.8} placement="bottom">
+            <Button onClick={() => handleGoForward(appInfo.id)}>
+              <ArrowRightOutlined />
+            </Button>
+          </Tooltip>
           <Tooltip title={t('minapp.popup.refresh')} mouseEnterDelay={0.8} placement="bottom">
             <Button onClick={() => handleReload(appInfo.id)}>
               <ReloadOutlined />
diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json
index 578032003c..cdd373decc 100644
--- a/src/renderer/src/i18n/locales/en-us.json
+++ b/src/renderer/src/i18n/locales/en-us.json
@@ -681,6 +681,8 @@
     "minapp": {
       "popup": {
         "refresh": "Refresh",
+        "goBack": "Go Back",
+        "goForward": "Go Forward",
         "close": "Close MinApp",
         "minimize": "Minimize MinApp",
         "devtools": "Developer Tools",
diff --git a/src/renderer/src/i18n/locales/ja-jp.json b/src/renderer/src/i18n/locales/ja-jp.json
index 38abc69bc3..4288692c09 100644
--- a/src/renderer/src/i18n/locales/ja-jp.json
+++ b/src/renderer/src/i18n/locales/ja-jp.json
@@ -682,6 +682,8 @@
     "minapp": {
       "popup": {
         "refresh": "更新",
+        "goBack": "戻る",
+        "goForward": "進む",
         "close": "ミニアプリを閉じる",
         "minimize": "ミニアプリを最小化",
         "devtools": "開発者ツール",
diff --git a/src/renderer/src/i18n/locales/ru-ru.json b/src/renderer/src/i18n/locales/ru-ru.json
index 2ca59e4007..40297a0edc 100644
--- a/src/renderer/src/i18n/locales/ru-ru.json
+++ b/src/renderer/src/i18n/locales/ru-ru.json
@@ -683,6 +683,8 @@
         "refresh": "Обновить",
         "close": "Закрыть встроенное приложение",
         "minimize": "Свернуть встроенное приложение",
+        "goBack": "Назад",
+        "goForward": "Вперед",
         "devtools": "Инструменты разработчика",
         "openExternal": "Открыть в браузере",
         "rightclick_copyurl": "ПКМ → Копировать URL",
diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json
index 782c4943b4..6be1edec07 100644
--- a/src/renderer/src/i18n/locales/zh-cn.json
+++ b/src/renderer/src/i18n/locales/zh-cn.json
@@ -681,6 +681,8 @@
     "minapp": {
       "popup": {
         "refresh": "刷新",
+        "goBack": "后退",
+        "goForward": "前进",
         "close": "关闭小程序",
         "minimize": "最小化小程序",
         "devtools": "开发者工具",
diff --git a/src/renderer/src/i18n/locales/zh-tw.json b/src/renderer/src/i18n/locales/zh-tw.json
index 9f1a30675e..88b7145435 100644
--- a/src/renderer/src/i18n/locales/zh-tw.json
+++ b/src/renderer/src/i18n/locales/zh-tw.json
@@ -682,6 +682,8 @@
     "minapp": {
       "popup": {
         "refresh": "重新整理",
+        "goBack": "上一頁",
+        "goForward": "下一頁",
         "close": "關閉小工具",
         "minimize": "最小化小工具",
         "devtools": "開發者工具",