Merge remote-tracking branch 'origin/main' into react/launch_bar

apps/client/src/translations/cn/translation.json

@@ -1469,7 +1469,7 @@
     "import-into-note": "导入到笔记",
     "apply-bulk-actions": "应用批量操作",
     "converted-to-attachments": "{{count}} 个笔记已被转换为附件。",
-    "convert-to-attachment-confirm": "确定要将选中的笔记转换为其父笔记的附件吗？",
+    "convert-to-attachment-confirm": "确定要将选中的笔记转换为其父笔记的附件吗？此操作仅适用于图像笔记，其他笔记将被跳过。",
     "duplicate": "复制",
     "open-in-popup": "快速编辑",
     "archive": "归档",
@@ -1714,7 +1714,8 @@
     "open_note_in_new_tab": "在新标签页中打开笔记",
     "open_note_in_new_split": "在新分屏中打开笔记",
     "open_note_in_new_window": "在新窗口中打开笔记",
-    "open_note_in_popup": "快速编辑"
+    "open_note_in_popup": "快速编辑",
+    "open_note_in_other_split": "在另一个分屏中打开笔记"
   },
   "electron_integration": {
     "desktop-application": "桌面应用程序",

apps/client/src/translations/ja/translation.json

@@ -421,7 +421,7 @@
     "apply-bulk-actions": "一括操作の適用",
     "converted-to-attachments": "{{count}}ノートが添付ファイルに変換されました。",
     "convert-to-attachment": "添付ファイルに変換",
-    "convert-to-attachment-confirm": "選択したノートを親ノートの添付ファイルに変換しますか？",
+    "convert-to-attachment-confirm": "選択したノートを親ノートの添付ファイルに変換してもよろしいですか？この操作は画像ノートにのみ適用され、その他のノートはスキップされます。",
     "open-in-popup": "クイック編集",
     "hoist-note": "ホイストノート",
     "unhoist-note": "ノートをホイストしない",

apps/client/src/translations/tw/translation.json

@@ -734,7 +734,8 @@
   },
   "zpetne_odkazy": {
     "relation": "關聯",
-    "backlink_one": "{{count}} 個反連結"
+    "backlink_one": "{{count}} 個反連結",
+    "backlink_other": "{{count}} 個反連結"
   },
   "mobile_detail_menu": {
     "insert_child_note": "插入子筆記",
@@ -1428,7 +1429,7 @@
     "import-into-note": "匯入至筆記",
     "apply-bulk-actions": "套用批次操作",
     "converted-to-attachments": "{{count}} 個筆記已被轉換為附件。",
-    "convert-to-attachment-confirm": "確定要將所選的筆記轉換為其父級筆記的附件嗎？",
+    "convert-to-attachment-confirm": "確定要將所選的筆記轉換為其父級筆記的附件嗎？此操作僅適用於圖像筆記，其他筆記將被跳過。",
     "duplicate": "複製副本",
     "open-in-popup": "快速編輯",
     "archive": "封存",
@@ -1673,7 +1674,8 @@
     "open_note_in_new_tab": "在新分頁中打開筆記",
     "open_note_in_new_split": "在新頁面分割中打開筆記",
     "open_note_in_new_window": "在新視窗中打開筆記",
-    "open_note_in_popup": "快速編輯"
+    "open_note_in_popup": "快速編輯",
+    "open_note_in_other_split": "在另一個頁面分割中打開筆記"
   },
   "zen_mode": {
     "button_exit": "退出禪模式"

apps/client/src/widgets/note_map/NoteMap.tsx

@@ -95,13 +95,13 @@ export default function NoteMap({ note, widgetMode, parentRef }: NoteMapProps) {
         if (!graphRef.current || !notesAndRelationsRef.current) return;
         graphRef.current.d3Force("link")?.distance(linkDistance);
         graphRef.current.graphData(notesAndRelationsRef.current);
-    }, [ linkDistance ]);
+    }, [ linkDistance, mapType ]);
 
     // React to container size
     useEffect(() => {
         if (!containerSize || !graphRef.current) return;
         graphRef.current.width(containerSize.width).height(containerSize.height);
-    }, [ containerSize?.width, containerSize?.height ]);
+    }, [ containerSize?.width, containerSize?.height, mapType ]);
 
     // Fixing nodes when dragged.
     useEffect(() => {
@@ -114,7 +114,7 @@ export default function NoteMap({ note, widgetMode, parentRef }: NoteMapProps) {
                 node.fy = undefined;
             }
         })
-    }, [ fixNodes ]);
+    }, [ fixNodes, mapType ]);
 
     return (
         <div className="note-map-widget">

apps/client/src/widgets/ribbon/NoteActions.tsx

@@ -107,12 +107,12 @@ function NoteContextMenu({ note, noteContext }: { note: FNote, noteContext?: Not
       <FormDropdownDivider />
 
       <CommandItem command="showAttachments" icon="bx bx-paperclip" disabled={isInOptionsOrHelp} text={t("note_actions.note_attachments")} />
-      {glob.isDev && <DevelopmentActions note={note} />}
+      {glob.isDev && <DevelopmentActions note={note} noteContext={noteContext} />}
     </Dropdown>
   );
 }
 
-function DevelopmentActions({ note }: { note: FNote }) {
+function DevelopmentActions({ note, noteContext }: { note: FNote, noteContext?: NoteContext }) {
     return (
         <>
             <FormListHeader text="Development-only Actions" />
@@ -120,6 +120,16 @@ function DevelopmentActions({ note }: { note: FNote }) {
                 icon="bx bx-printer"
                 onClick={() => window.open(`/?print=#root/${note.noteId}`, "_blank")}
             >Open print page</FormListItem>
+            {note.type === "text" && (
+                <FormListItem
+                    icon="bx bx-error"
+                    onClick={() => {
+                        noteContext?.getTextEditor(editor => {
+                            editor.editing.view.change(() => {
+                                throw new Error("Editor crashed.");
+                            });
+                        });
+                }}>Crash editor</FormListItem>)}
         </>
     )
 }

apps/client/src/widgets/ribbon/NoteMapTab.tsx

@@ -29,14 +29,14 @@ export default function NoteMapTab({ note }: TabContext) {
 
             {!isExpanded ? (
                 <ActionButton
-                    icon="bx bx-arrow-to-bottom"
+                    icon="bx bx-expand-vertical"
                     text={t("note_map.open_full")}
                     className="open-full-button"
                     onClick={() => setExpanded(true)}
                 />
             ) : (
                 <ActionButton
-                    icon="bx bx-arrow-to-top"
+                    icon="bx bx-collapse-vertical"
                     text={t("note_map.collapse")}
                     className="collapse-button"
                     onClick={() => setExpanded(false)}

apps/client/src/widgets/type_widgets/text/toolbar.ts

@@ -144,8 +144,7 @@ export function buildFloatingToolbar() {
             "imageUpload",
             "markdownImport",
             "specialCharacters",
-            "emoji",
+            "emoji"
-            "findAndReplace"
         ]
     };
 }

docs/README-fa.md

@@ -75,8 +75,8 @@ quick overview:
 * Note [attributes](https://triliumnext.github.io/Docs/Wiki/attributes) can be
   used for note organization, querying and advanced
   [scripting](https://triliumnext.github.io/Docs/Wiki/scripts)
-* UI available in English, German, Spanish, French, Romanian, and Chinese
+* محیط کاربری به زبان‌های انگیلیسی، آلمانی، اسپانیایی، فرانسوی، رومانیایی، و
-  (simplified and traditional)
+  چینی (ساده‌شده و سنتی)
 * Direct [OpenID and TOTP
   integration](./docs/User%20Guide/User%20Guide/Installation%20%26%20Setup/Server%20Installation/Multi-Factor%20Authentication.md)
   for more secure login

docs/Release Notes/!!!meta.json

@@ -1,6 +1,6 @@
 {
     "formatVersion": 2,
-    "appVersion": "0.99.5",
+    "appVersion": "0.100.0",
     "files": [
         {
             "isClone": false,

docs/Release Notes/Release Notes/v0.100.0.md

@@ -85,6 +85,7 @@
 *   Switching an existing note (with children) to mindmap type will still display preview cards for its children.
 *   Clarify converting notes to attachments in tree context menu (better message, disable option when not supported).
 *   Note actions: some menu items disabled when switching note type.
+*   [Note map: map overflows when switching type in ribbon](https://github.com/TriliumNext/Trilium/pull/7939) by @SiriusXT
 
 ## ✨ Improvements