feat(toolbar): simply default entry tool commands

Innei · Innei · commit 85122fba5bd3 · 2025-06-05T22:44:46.000+08:00
- Updated entry command labels to include titles and descriptions for better clarity.
- Modified the main actions in the toolbar to reflect the new command structure.
- Improved the DroppableContainer component by removing unnecessary props.
- Added new localization strings for image gallery and view source content actions.

Signed-off-by: Innei &lt;tukon479@gmail.com&gt;
diff --git a/apps/desktop/layer/renderer/src/modules/command/commands/entry.tsx b/apps/desktop/layer/renderer/src/modules/command/commands/entry.tsx
@@ -244,7 +244,10 @@ export const useRegisterEntryCommands = () => {
       },
       {
         id: COMMAND_ID.entry.viewSourceContent,
-        label: t("entry_actions.view_source_content"),
+        label: {
+          title: t("entry_actions.view_source_content"),
+          description: t("entry_actions.view_source_content_description"),
+        },
         icon: <i className="i-mgc-web-cute-re" />,
         category,
         run: ({ entryId, siteUrl }) => {
@@ -341,7 +344,10 @@ export const useRegisterEntryCommands = () => {
       },
       {
         id: COMMAND_ID.entry.imageGallery,
-        label: t("entry_actions.image_gallery"),
+        label: {
+          title: t("entry_actions.image_gallery"),
+          description: t("entry_actions.image_gallery_description"),
+        },
         icon: <i className="i-mgc-pic-cute-fi" />,
         category,
         run: ({ entryId }) => {
@@ -350,7 +356,10 @@ export const useRegisterEntryCommands = () => {
       },
       {
         id: COMMAND_ID.entry.tts,
-        label: t("entry_content.header.play_tts"),
+        label: {
+          title: t("entry_content.header.play_tts"),
+          description: t("entry_content.header.play_tts_description"),
+        },
         category,
         icon: <i className="i-mgc-voice-cute-re" />,
         run: async ({ entryId }) => {
diff --git a/apps/desktop/layer/renderer/src/modules/customize-toolbar/constant.ts b/apps/desktop/layer/renderer/src/modules/customize-toolbar/constant.ts
@@ -13,14 +13,13 @@ export const ENTRY_ITEM_HIDE_IN_HEADER = new Set<UniqueIdentifier>([
 ])
 
 const MAIN_ACTIONS = [
-  COMMAND_ID.entry.readability,
-  COMMAND_ID.entry.tts,
+  COMMAND_ID.entry.read,
   COMMAND_ID.entry.star,
 
   COMMAND_ID.entry.toggleAISummary,
-  COMMAND_ID.entry.toggleAITranslation,
+  COMMAND_ID.entry.readability,
 
-  COMMAND_ID.entry.imageGallery,
+  COMMAND_ID.entry.viewSourceContent,
   COMMAND_ID.entry.share,
 ]
 const MAIN_ACTIONS_SET = new Set<UniqueIdentifier>(MAIN_ACTIONS)
diff --git a/apps/desktop/layer/renderer/src/modules/customize-toolbar/dnd.tsx b/apps/desktop/layer/renderer/src/modules/customize-toolbar/dnd.tsx
@@ -93,28 +93,9 @@ export const SortableActionButton = ({ id }: { id: UniqueIdentifier }) => {
   )
 }
 
-export function DroppableContainer({
-  id,
-  children,
-}: {
-  children: ReactNode
-  id: UniqueIdentifier
-}) {
-  const { attributes, isDragging, listeners, setNodeRef, transition, transform } = useSortable({
-    id,
-  })
+export function DroppableContainer({ children }: { children: ReactNode }) {
   return (
-    <div
-      className="border-border bg-material-ultra-thin flex min-h-[120px] w-full flex-wrap items-center justify-center rounded-lg border p-2 pb-6 shadow-sm"
-      ref={setNodeRef}
-      style={{
-        transition,
-        transform: CSS.Translate.toString(transform),
-        opacity: isDragging ? 0.5 : undefined,
-      }}
-      {...attributes}
-      {...listeners}
-    >
+    <div className="border-border bg-material-ultra-thin flex min-h-[120px] w-full flex-wrap items-center justify-center rounded-lg border p-2 pb-6 shadow-sm">
       {children}
     </div>
   )
diff --git a/apps/desktop/layer/renderer/src/modules/customize-toolbar/modal.tsx b/apps/desktop/layer/renderer/src/modules/customize-toolbar/modal.tsx
@@ -96,7 +96,7 @@ const CustomizeToolbar = () => {
         <div className="space-y-4">
           {/* Main toolbar */}
 
-          <DroppableContainer id="container-main">
+          <DroppableContainer>
             <SortableContext
               items={actionOrder.main.map((item) => item)}
               strategy={verticalListSortingStrategy}
@@ -117,7 +117,7 @@ const CustomizeToolbar = () => {
             </p>
           </div>
 
-          <DroppableContainer id="container-more">
+          <DroppableContainer>
             <SortableContext
               items={actionOrder.more.map((item) => item)}
               strategy={verticalListSortingStrategy}
diff --git a/locales/app/en.json b/locales/app/en.json
@@ -124,6 +124,7 @@
   "entry_actions.failed_to_save_to_readwise": "Failed to save to Readwise.",
   "entry_actions.failed_to_save_to_zotero": "Failed to save to Zotero.",
   "entry_actions.image_gallery": "Image Gallery",
+  "entry_actions.image_gallery_description": "When there are multiple large images in the article, you can browse all images in the article in Gallery Modal",
   "entry_actions.mark_above_as_read": "Mark Above as Read",
   "entry_actions.mark_as_read": "Mark as Read / UnRead",
   "entry_actions.mark_as_unread": "Mark as Unread",
@@ -155,6 +156,7 @@
   "entry_actions.unstar": "Unstar",
   "entry_actions.unstarred": "Unstarred.",
   "entry_actions.view_source_content": "View Source Content",
+  "entry_actions.view_source_content_description": "Try to read this article's content in the style of the source website",
   "entry_actions.warn_info_for_desktop": "This feature is only available in the desktop app",
   "entry_column.filtered_content_tip": "You have filtered content hidden.",
   "entry_column.filtered_content_tip_2": "In addition to the entries shown above, there is also filtered content.",
@@ -163,6 +165,7 @@
   "entry_content.fetching_content": "Fetching original content and processing...",
   "entry_content.fetching_content_failed": "Readability: Failed to fetch original content, try again later or back to the RSS content.",
   "entry_content.header.play_tts": "Play TTS",
+  "entry_content.header.play_tts_description": "Select a TTS voice in settings and start TTS to convert to audio content",
   "entry_content.header.readability": "Readability",
   "entry_content.header.readability_description": "Using readability's ability to obtain the original website content and parse it may allow for more readable content. Recommended to use it when the RSS content is not available or incomplete.",
   "entry_content.no_content": "No media available",
diff --git a/locales/app/ja.json b/locales/app/ja.json
@@ -105,6 +105,8 @@
   "entry_actions.failed_to_save_to_outline": "Outline への保存に失敗しました。",
   "entry_actions.failed_to_save_to_readeck": "Readeck への保存に失敗しました。",
   "entry_actions.failed_to_save_to_readwise": "Readwise への保存に失敗しました。",
+  "entry_actions.image_gallery": "画像ギャラリー",
+  "entry_actions.image_gallery_description": "記事に複数の大きな画像がある場合、ギャラリーモーダルで記事内のすべての画像を閲覧できます",
   "entry_actions.mark_as_read": "既読にする",
   "entry_actions.mark_as_unread": "未読にする",
   "entry_actions.open_in_browser": "{{which}} で開く",
@@ -130,12 +132,14 @@
   "entry_actions.unstar": "スターを解除",
   "entry_actions.unstarred": "スターが解除されました。",
   "entry_actions.view_source_content": "コンテンツをこの場で表示",
+  "entry_actions.view_source_content_description": "ソースウェブサイトのスタイルでこの記事の内容を読んでみる",
   "entry_column.filtered_content_tip": "コンテンツをフィルタリングして非表示にします。",
   "entry_column.filtered_content_tip_2": "上記のエントリーに加え、フィルタリングされたコンテンツもあります。",
   "entry_column.refreshing": "新しいエントリーを更新中...",
   "entry_content.ai_summary": "AI による要約",
   "entry_content.fetching_content": "元のコンテンツを取得し、処理中です...",
   "entry_content.header.play_tts": "TTS を再生",
+  "entry_content.header.play_tts_description": "設定でTTS音声を選択し、TTSを開始して音声コンテンツに変換します",
   "entry_content.header.readability": "読みやすさ",
   "entry_content.no_content": "コンテンツがありません",
   "entry_content.readability_notice": "このコンテンツは Readability により提供されています。誤字などを発見した場合は、元のサイトでオリジナルのコンテンツをご覧ください。",
diff --git a/locales/app/zh-CN.json b/locales/app/zh-CN.json
@@ -123,6 +123,7 @@
   "entry_actions.failed_to_save_to_readwise": "保存到 Readwise 失败。",
   "entry_actions.failed_to_save_to_zotero": "保存到 Zotero 失败",
   "entry_actions.image_gallery": "图片库",
+  "entry_actions.image_gallery_description": "当文章中存在多张大图时，可以在 Gallery Modal 中浏览文章中的全部图片",
   "entry_actions.mark_above_as_read": "将以上标记为已读",
   "entry_actions.mark_as_read": "标记为已读/未读",
   "entry_actions.mark_as_unread": "标记为未读",
@@ -154,6 +155,7 @@
   "entry_actions.unstar": "取消收藏",
   "entry_actions.unstarred": "取消收藏",
   "entry_actions.view_source_content": "查看原文",
+  "entry_actions.view_source_content_description": "尝试以源网站的风格阅读此文章的内容",
   "entry_actions.warn_info_for_desktop": "此功能只在桌面端可用",
   "entry_column.filtered_content_tip": "部分内容已被过滤隐藏。",
   "entry_column.filtered_content_tip_2": "除了上面显示的内容外，还有一些被过滤的内容。",
@@ -162,6 +164,7 @@
   "entry_content.fetching_content": "正在获取原始内容并处理",
   "entry_content.fetching_content_failed": "获取原始内容失败",
   "entry_content.header.play_tts": "播放文本转语音",
+  "entry_content.header.play_tts_description": "在设置中选择一个 TTS 语音，启动 TTS 转换为有声内容",
   "entry_content.header.readability": "阅读模式",
   "entry_content.header.readability_description": "利用 Readability 获取原始网站内容并解析的能力或可提升内容可读性。建议在 RSS 内容不可用或不完整时使用。",
   "entry_content.no_content": "没有内容",
diff --git a/locales/app/zh-TW.json b/locales/app/zh-TW.json
@@ -121,6 +121,7 @@
   "entry_actions.failed_to_save_to_readwise": "無法儲存到 Readwise。",
   "entry_actions.failed_to_save_to_zotero": "無法儲存到 Zotero。",
   "entry_actions.image_gallery": "影像圖庫",
+  "entry_actions.image_gallery_description": "當文章中存在多張大圖時，可以在 Gallery Modal 中瀏覽文章中的全部圖片",
   "entry_actions.mark_above_as_read": "將以上標記為已讀",
   "entry_actions.mark_as_read": "標記為已讀",
   "entry_actions.mark_as_unread": "標記為未讀",
@@ -152,6 +153,7 @@
   "entry_actions.unstar": "取消收藏",
   "entry_actions.unstarred": "已取消收藏",
   "entry_actions.view_source_content": "查看原始內容",
+  "entry_actions.view_source_content_description": "嘗試以源網站的風格閱讀此文章的內容",
   "entry_actions.warn_info_for_desktop": "此功能只在桌面端可用",
   "entry_column.filtered_content_tip": "您已隱藏部分過濾的內容。",
   "entry_column.filtered_content_tip_2": "除了上方顯示的條目外，還有一些被過濾的內容。",
@@ -160,6 +162,7 @@
   "entry_content.fetching_content": "正在獲取原始內容並處理",
   "entry_content.fetching_content_failed": "獲取原始內容失敗",
   "entry_content.header.play_tts": "播放文字轉語音",
+  "entry_content.header.play_tts_description": "在設定中選擇一個 TTS 語音，啟動 TTS 轉換為有聲內容",
   "entry_content.header.readability": "可讀模式",
   "entry_content.header.readability_description": "利用 Readability 獲取原始網站內容並解析的能力或許可提升內容可讀性。建議於 RSS 內容不可用或不完整時使用。",
   "entry_content.no_content": "無內容",
