Merge branch 'develop' into beta

Author: imzbf

dev/main.tsx

@@ -38,7 +38,18 @@ config({
         type: 'lineNumbers',
         extension: lineNumbers()
       }
-    ];
+    ].map((item) => {
+      if (item.type === 'linkShortener') {
+        return {
+          ...item,
+          options: {
+            maxLength: 100
+          }
+        };
+      }
+
+      return item;
+    });
   },
   // markdownItConfig: (mdit) => {
   // mdit.use(ancher, {

eslint.config.mjs

@@ -1,31 +1,5 @@
-// import js from '@eslint/js';
-// import globals from 'globals';
-// import reactHooks from 'eslint-plugin-react-hooks';
-// import reactRefresh from 'eslint-plugin-react-refresh';
-// import tseslint from 'typescript-eslint';
-
-// export default tseslint.config(
-//   { ignores: ['lib'] },
-//   {
-//     extends: [js.configs.recommended, ...tseslint.configs.recommended],
-//     files: ['**/*.{ts,tsx}'],
-//     languageOptions: {
-//       ecmaVersion: 2020,
-//       globals: globals.browser
-//     },
-//     plugins: {
-//       'react-hooks': reactHooks,
-//       'react-refresh': reactRefresh
-//     },
-//     rules: {
-//       ...reactHooks.configs.recommended.rules,
-//       'react-refresh/only-export-components': ['warn', { allowConstantExport: true }],
-//       '@typescript-eslint/no-explicit-any': 'off'
-//     }
-//   }
-// );
-
 import eslint from '@eslint/js';
+import { defineConfig } from 'eslint/config';
 import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';
 import globals from 'globals';
 import tseslint from 'typescript-eslint';
@@ -34,7 +8,7 @@ import importPlugin from 'eslint-plugin-import';
 import reactHooks from 'eslint-plugin-react-hooks';
 import reactRefresh from 'eslint-plugin-react-refresh';
 
-export default tseslint.config(
+export default defineConfig(
   {
     ignores: ['lib', 'eslint.config.mjs']
   },

package.json

@@ -45,21 +45,21 @@
     "prepare": "husky"
   },
   "dependencies": {
-    "@codemirror/autocomplete": "^6.18.6",
+    "@codemirror/autocomplete": "^6.18.7",
     "@codemirror/commands": "^6.8.1",
-    "@codemirror/lang-markdown": "^6.3.0",
-    "@codemirror/language": "^6.11.0",
+    "@codemirror/lang-markdown": "^6.3.4",
+    "@codemirror/language": "^6.11.3",
     "@codemirror/language-data": "^6.5.1",
     "@codemirror/search": "^6.5.11",
     "@codemirror/state": "^6.5.2",
-    "@codemirror/view": "^6.36.8",
+    "@codemirror/view": "^6.38.2",
     "@lezer/highlight": "^1.2.1",
     "@types/markdown-it": "^14.0.1",
     "@vavt/copy2clipboard": "^1.0.1",
     "@vavt/util": "^2.1.0",
-    "codemirror": "^6.0.1",
-    "lru-cache": "^11.0.1",
-    "lucide-react": "^0.454.0",
+    "codemirror": "^6.0.2",
+    "lru-cache": "^11.2.1",
+    "lucide-react": "^0.542.0",
     "markdown-it": "^14.0.0",
     "markdown-it-image-figures": "^2.1.1",
     "markdown-it-sub": "^2.0.0",
@@ -68,44 +68,44 @@
     "xss": "^1.0.15"
   },
   "devDependencies": {
-    "@eslint/js": "^9.34.0",
+    "@eslint/js": "^9.35.0",
     "@types/katex": "^0.16.7",
     "@types/multiparty": "^4.2.1",
-    "@types/node": "^22.8.2",
-    "@types/react": "^18.3.12",
-    "@types/react-dom": "^18.3.1",
-    "@typescript-eslint/eslint-plugin": "^8.42.0",
-    "@typescript-eslint/parser": "^8.42.0",
+    "@types/node": "^24.3.1",
+    "@types/react": "^19.1.12",
+    "@types/react-dom": "^19.1.9",
+    "@typescript-eslint/eslint-plugin": "^8.43.0",
+    "@typescript-eslint/parser": "^8.43.0",
     "@vavt/markdown-theme": "^4.5.2",
     "@vavt/vite-plugin-import-markdown": "^1.0.1",
-    "@vitejs/plugin-react": "^4.3.3",
-    "axios": "^1.7.7",
+    "@vitejs/plugin-react": "^5.0.2",
+    "axios": "^1.11.0",
     "cropperjs": "^1.6.2",
     "echarts": "^6.0.0",
-    "eslint": "^9.34.0",
+    "eslint": "^9.35.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-import-resolver-typescript": "^4.4.4",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-prettier": "^5.5.4",
     "eslint-plugin-react-hooks": "^5.0.0",
     "eslint-plugin-react-refresh": "^0.4.13",
-    "globals": "^15.11.0",
+    "globals": "^16.3.0",
     "highlight.js": "^11.10.0",
     "husky": "^9.1.7",
     "katex": "^0.16.22",
-    "less": "^4.2.0",
-    "lint-staged": "^15.4.3",
-    "mermaid": "^11.9.0",
+    "less": "^4.4.1",
+    "lint-staged": "^16.1.6",
+    "mermaid": "^11.11.0",
     "multiparty": "^4.2.3",
     "prettier": "^3.6.2",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "react": "^19.1.1",
+    "react-dom": "^19.1.1",
     "screenfull": "^6.0.2",
     "tsc-alias": "^1.8.10",
-    "tsx": "^4.19.2",
+    "tsx": "^4.20.5",
     "typescript": "^5.9.2",
-    "typescript-eslint": "^8.42.0",
-    "vite": "^5.4.9"
+    "typescript-eslint": "^8.43.0",
+    "vite": "^7.1.5"
   },
   "peerDependencies": {
     "react": ">=18.0.0",

packages/MdCatalog/context.ts

@@ -1,9 +1,11 @@
-import { createContext, MutableRefObject } from 'react';
+import { createContext, RefObject } from 'react';
 
-export const CatalogContext = createContext<{
-  scrollElementRef: MutableRefObject<HTMLElement | undefined> | undefined;
-  rootNodeRef: MutableRefObject<Document | ShadowRoot | undefined> | undefined;
-}>({
+export interface CatalogContextValue {
+  scrollElementRef?: RefObject<HTMLElement | null>;
+  rootNodeRef?: RefObject<Document | ShadowRoot | null>;
+}
+
+export const CatalogContext = createContext<CatalogContextValue>({
   scrollElementRef: undefined,
   rootNodeRef: undefined
 });

packages/MdCatalog/index.tsx

@@ -22,7 +22,7 @@ import bus from '~/utils/event-bus';
 import { getComputedStyleNum } from '~/utils/scroll-auto';
 
 import CatalogLink from './CatalogLink';
-import { CatalogContext } from './context';
+import { CatalogContext, CatalogContextValue } from './context';
 
 export interface TocItem extends HeadList {
   index: number;
@@ -106,11 +106,11 @@ const MdCatalog = (props: CatalogProps) => {
   // 目录根部元素
   const catalogRef = useRef<HTMLDivElement>(null);
   // 获取到的滚动root节点
-  const scrollElementRef = useRef<HTMLElement>();
+  const scrollElementRef = useRef<HTMLElement>(null);
   // 滚动容器，包括document
-  const scrollContainerRef = useRef<HTMLElement | Document>();
+  const scrollContainerRef = useRef<HTMLElement | Document>(undefined);
   // 获取到的目录root节点，注意，不支持目录和编辑器不在同一个web c中使用
-  const rootNodeRef = useRef<Document | ShadowRoot>();
+  const rootNodeRef = useRef<Document | ShadowRoot>(null);
   // 编辑器view
   const [editorView, setEditorView] = useState<EditorView>();
 
@@ -301,7 +301,7 @@ const MdCatalog = (props: CatalogProps) => {
     };
   }, [offsetTop, mdHeadingId, getScrollElement, editorId, syncWith, editorView]);
 
-  const providerValue = useMemo(() => {
+  const providerValue = useMemo<CatalogContextValue>(() => {
     return {
       scrollElementRef,
       rootNodeRef

packages/MdEditor/Editor.tsx

@@ -90,7 +90,7 @@ const Editor = forwardRef((props: EditorProps, ref: ForwardedRef<unknown>) => {
     };
   });
   const rootRef = useRef<HTMLDivElement>(null);
-  const codeRef = useRef<ContentExposeParam>();
+  const codeRef = useRef<ContentExposeParam>(undefined);
 
   const onScrollAutoChange = useCallback(
     (v: boolean) => {

packages/MdEditor/components/Dropdown/index.tsx

@@ -128,7 +128,7 @@ const DropDown = (props: ModalProps) => {
   const slotOverlay = props.overlay;
 
   // 触发器
-  const trigger = cloneElement(slotDefault, {
+  const trigger = cloneElement<any>(slotDefault, {
     ref: triggerRef,
     key: 'cloned-dropdown-trigger'
   });

packages/MdEditor/components/Modal/index.tsx

@@ -41,7 +41,7 @@ const Modal = (props: ModalProps) => {
   const modalRef = useRef<HTMLDivElement>(null);
   const modalHeaderRef = useRef<HTMLDivElement>(null);
 
-  const bodyRef = useRef<Element | ShadowRoot>();
+  const bodyRef = useRef<Element | ShadowRoot>(null);
 
   // 创建的弹窗容器，存放在document.body末尾
   const containerRef = useRef<HTMLDivElement>(null);
@@ -83,10 +83,10 @@ const Modal = (props: ModalProps) => {
   }, [props.height, props.isFullscreen, props.width]);
 
   useEffect(() => {
-    const rootNode = rootRef!.current?.getRootNode() as ShadowRoot;
+    const rootNode = rootRef?.current?.getRootNode() as ShadowRoot;
     bodyRef.current = rootNode instanceof Document ? document.body : rootNode;
     return () => {
-      bodyRef.current = undefined;
+      bodyRef.current = null;
     };
   }, [rootRef]);
 

packages/MdEditor/layouts/Content/codemirror/floatingToolbar.tsx

@@ -1,7 +1,7 @@
 import { StateEffect, StateField } from '@codemirror/state';
 import { EditorView, showTooltip, Tooltip } from '@codemirror/view';
 import { createContext, useContext, useSyncExternalStore } from 'react';
-import ReactDOM from 'react-dom/client';
+import { createRoot } from 'react-dom/client';
 import { defaultContextValue } from '~/context';
 import Toolbar from '~/layouts/FloatingToolbar';
 import { ContextType } from '~/type';
@@ -37,7 +37,7 @@ const tooltipField = StateField.define<Tooltip | null>({
   provide: (f) => showTooltip.from(f)
 });
 
-export const createFloatingToolbarPlugin = (options: {
+export const createFloatingToolbar = (options: {
   contextValue: FloatingToolbarContextValue<ContextType>;
 }) => {
   const showTooltip = (view: EditorView, pos: number) => {
@@ -54,7 +54,7 @@ export const createFloatingToolbarPlugin = (options: {
           const appNode = document.createElement('div');
           dom.appendChild(appNode);
 
-          const root = ReactDOM.createRoot(appNode);
+          const root = createRoot(appNode);
 
           root.render(
             <FloatingToolbarContext.Provider value={options.contextValue}>

packages/MdEditor/layouts/Content/codemirror/textShortener.ts

@@ -26,7 +26,7 @@ const defaultTextRegex = new RegExp(
   'gi'
 );
 
-export const textShortenerPlugin = (options: TextShortenerOptions) => {
+export const createTextShortener = (options: TextShortenerOptions) => {
   const shortenText = (text: string): string => {
     return text.length > 10 ? text.slice(0, 10) + '...' : text;
   };