Merge branch 'develop' of ssh://github.com/element-hq/element-web into renovate/major-typescript

# Conflicts:
#	pnpm-lock.yaml

Author: t3chguy

.github/renovate.json

@@ -4,23 +4,36 @@
     "postUpdateOptions": ["pnpmDedupe"],
     "packageRules": [
         {
+            "description": "Group all testcontainers docker digests",
             "groupName": "testcontainers docker digests",
             "groupSlug": "testcontainers-docker",
             "matchDepTypes": ["testcontainers-docker"],
             "matchPackageNames": ["*"]
+        },
+        {
+            "description": "Separate updates to overrides from other groups",
+            "matchDepTypes": ["pnpm.overrides"],
+            "groupSlug": null
+        },
+        {
+            "description": "Disable any major updates to overrides as this almost always is wrong",
+            "matchDepTypes": ["pnpm.overrides"],
+            "matchUpdateTypes": ["major"],
+            "enabled": false
         }
     ],
     "customManagers": [
         {
+            "description": "Update testcontainers docker digests",
             "customType": "regex",
             "datasourceTemplate": "docker",
             "versioningTemplate": "loose",
-            "description": "Update testcontainers docker digests",
             "managerFilePatterns": ["**/testcontainers/*.ts"],
             "matchStrings": ["\\s+\"(?<depName>[^@]+):(?<currentValue>[^@]+)@(?<currentDigest>sha256:[a-f0-9]+)\""],
             "depTypeTemplate": "testcontainers-docker"
         },
         {
+            "description": "Update element-desktop hakDependencies",
             "customType": "jsonata",
             "managerFilePatterns": ["/(^|/)package\\.json$/"],
             "fileFormat": "json",

apps/web/package.json

@@ -72,7 +72,7 @@
         "glob-to-regexp": "^0.4.1",
         "highlight.js": "^11.3.1",
         "html-entities": "^2.0.0",
-        "html-react-parser": "^5.2.2",
+        "html-react-parser": "^6.0.0",
         "is-ip": "^5.0.0",
         "js-xxhash": "^5.0.0",
         "jsrsasign": "^11.0.0",

apps/web/src/components/views/messages/CodeBlock.tsx

@@ -7,7 +7,7 @@ Please see LICENSE files in the repository root for full details.
 
 import React, { type JSX, useState } from "react";
 import classNames from "classnames";
-import { type DOMNode, Element as ParserElement, domToReact } from "html-react-parser";
+import { type DOMNode, type Element as ParserElement, domToReact } from "html-react-parser";
 import { textContent, getInnerHTML } from "domutils";
 import { CollapseIcon, CopyIcon, ExpandIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 
@@ -113,7 +113,7 @@ const CodeBlock: React.FC<Props> = ({ preNode }) => {
     let content = domToReact(preNode.children as DOMNode[]);
 
     // Add code element if it's missing since we depend on it
-    if (!preNode.children.some((child) => child instanceof ParserElement && child.tagName.toUpperCase() === "CODE")) {
+    if (!preNode.children.some((child) => child.type === "tag" && child.tagName.toUpperCase() === "CODE")) {
         content = <code>{content}</code>;
     }
 

apps/web/src/i18n/strings/zh_Hans.json

@@ -680,6 +680,12 @@
         "unfederated_label_default_on": "如果此房间将用于与拥有自己主服务器的外部团队协作，你可以禁用此功能。此设置以后无法更改。",
         "unsupported_version": "服务器不支持指定的房间版本。"
     },
+    "create_section_dialog": {
+        "create_section": "创建区域",
+        "description": "区域仅对你可见",
+        "label": "区域名称",
+        "title": "创建区域"
+    },
     "create_space": {
         "add_details_prompt": "添加一些信息以便人们识别。",
         "add_details_prompt_2": "你可以随时更改。",
@@ -3077,7 +3083,7 @@
         "category_messages": "消息",
         "category_other": "其它",
         "command_error": "指令出错",
-        "converttodm": "转换房间到私聊",
+        "converttodm": "转换房间为私聊",
         "converttoroom": "转换私聊到房间",
         "could_not_find_room": "无法找到房间",
         "deop": "通过指定的 ID 降权用户",

apps/web/src/renderer/utils.tsx

@@ -6,7 +6,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { type JSX } from "react";
-import { type DOMNode, Element, type HTMLReactParserOptions, type Text } from "html-react-parser";
+import { type DOMNode, type Element, type HTMLReactParserOptions, type Text } from "html-react-parser";
 import { type MatrixEvent, type Room } from "matrix-js-sdk/src/matrix";
 
 /**
@@ -89,7 +89,7 @@ export const combineRenderers =
                     if (result) return result;
                 }
             }
-            if (node instanceof Element) {
+            if (node.type === "tag") {
                 const tagName = node.tagName.toLowerCase() as keyof HTMLElementTagNameMap;
                 for (const replacer of renderers) {
                     const result = replacer[tagName]?.(node, parametersWithReplace, index);

packages/shared-components/package.json

@@ -56,7 +56,7 @@
         "@vector-im/compound-design-tokens": "catalog:",
         "classnames": "^2.5.1",
         "counterpart": "^0.18.6",
-        "html-react-parser": "^5.2.2",
+        "html-react-parser": "^6.0.0",
         "linkify-html": "4.3.2",
         "linkify-react": "4.3.2",
         "linkify-string": "4.3.2",
@@ -109,7 +109,7 @@
         "eslint-plugin-unicorn": "^56.0.0",
         "prettier": "^3.6.2",
         "storybook": "^10.0.7",
-        "storybook-addon-vis": "^3.1.2",
+        "storybook-addon-vis": "^4.0.0",
         "typedoc": "^0.28.16",
         "typedoc-plugin-markdown": "^4.9.0",
         "typedoc-plugin-missing-exports": "^4.1.2",

packages/shared-components/src/i18n/strings/zh_Hans.json

@@ -5,6 +5,7 @@
     "action": {
         "back": "返回",
         "click": "点击",
+        "close": "关闭",
         "collapse": "折叠",
         "delete": "删除",
         "dismiss": "忽略",
@@ -14,8 +15,11 @@
         "go": "转到",
         "hide": "隐藏",
         "invite": "邀请",
+        "new_conversation": "新对话",
         "new_room": "新房间",
+        "new_section": "新区域",
         "new_video_room": "新视频房间",
+        "open_menu": "打开菜单",
         "pause": "暂停",
         "pin": "置顶",
         "play": "播放",
@@ -32,12 +36,14 @@
     "common": {
         "attachment": "附件",
         "encryption_enabled": "加密已启用",
+        "loading": "正在载入…",
         "options": "选项",
         "preferences": "偏好",
         "state_encryption_enabled": "实验性的状态加密已启用"
     },
     "left_panel": {
-        "open_dial_pad": "打开拨号键盘"
+        "open_dial_pad": "打开拨号键盘",
+        "separator_label": "点击或拖动以展开"
     },
     "notifications": {
         "all_messages": "所有消息",
@@ -110,7 +116,8 @@
             "leave_room": "离开房间",
             "low_priority": "低优先级",
             "mark_read": "设为已读",
-            "mark_unread": "设为未读"
+            "mark_unread": "设为未读",
+            "move_to_section": "移动到"
         },
         "notification_options": "通知选项",
         "open_space_menu": "打开空间菜单",
@@ -119,6 +126,11 @@
             "more_options": "更多选项"
         },
         "room_options": "房间选项",
+        "section_created": "区域已创建",
+        "section_header": {
+            "toggle": "切换区域 %(section)s",
+            "toggle_unread": "切换到区域 %(section)s 中的未读房间"
+        },
         "show_message_previews": "显示消息预览",
         "sort": "排序",
         "sort_type": {