@blocklet/editor 2.4.87 → 2.4.89

package/lib/ext/CustomComponent/components/Code.d.ts

@@ -1,6 +1,9 @@
 import { type EditorThemeClasses } from 'lexical';
 export declare const LANGUAGE_ALIAS: Record<string, string>;
-export declare const LANGUAGE_ICON: Record<string, string>;
+export declare const LANGUAGE_ICON: Record<string, string | {
+    light: string;
+    dark: string;
+}>;
 export declare const XCODE_TRANSLATIONS: {
     en: {
         seeAllLines: string;

package/lib/ext/CustomComponent/components/Code.js

@@ -12,9 +12,11 @@ export const LANGUAGE_ALIAS = {
     be: 'berry',
     cdc: 'cadence',
     clj: 'clojure',
+    coffee: 'coffeescript',
     ql: 'codeql',
     lisp: 'common-lisp',
     cql: 'cypher',
+    erl: 'erlang',
     f: 'fortran-fixed-form',
     for: 'fortran-fixed-form',
     f77: 'fortran-fixed-form',
@@ -31,23 +33,29 @@ export const LANGUAGE_ALIAS = {
     golang: 'go',
     gis: 'glimmer-js',
     gts: 'glimmer-ts',
+    js: 'javascript',
+    jl: 'julia',
     kt: 'kotlin',
     kts: 'kotlin',
     kql: 'kusto',
     hbs: 'handlebars',
     hs: 'haskell',
     make: 'makefile',
+    md: 'markdown',
+    mdc: 'markdown',
     mediawiki: 'wikitext',
     nf: 'nextflow',
     nu: 'nushell',
     objectivec: 'objective-c',
     objc: 'objective-c',
     proto: 'protobuf',
+    perl6: 'perl',
     ps: 'powershell',
     ps1: 'powershell',
     rb: 'ruby',
     rs: 'rust',
     shader: 'shaderlab',
+    styl: 'stylus',
     vbnet: 'vb',
     vy: 'vyper',
     wiki: 'wikitext',
@@ -68,15 +76,18 @@ export const LANGUAGE_ICON = {
     applescript: 'logos:apple',
     ara: '',
     asm: '',
-    astro: 'logos:astro-icon',
+    astro: {
+        light: 'vscode-icons:file-type-light-astro',
+        dark: 'vscode-icons:file-type-astro',
+    },
     awk: 'vscode-icons:file-type-awk',
     ballerina: 'material-icon-theme:ballerina',
-    bash: 'vscode-icons:file-type-shell',
+    bash: 'material-icon-theme:console',
     bat: 'catppuccin:batch',
     batch: 'catppuccin:batch',
     beancount: '',
     berry: '',
-    bibtex: 'file-icons:bibtex',
+    bibtex: '',
     bicep: 'logos:microsoft',
     blade: 'logos:laravel',
     c: 'logos:c',
@@ -91,13 +102,15 @@ export const LANGUAGE_ICON = {
     cobol: 'vscode-icons:file-type-cobol',
     codeowners: 'vscode-icons:file-type-codeowners',
     codeql: 'vscode-icons:file-type-codeql',
-    coffee: 'logos:coffeescript',
-    coffeescript: 'logos:coffeescript',
+    coffeescript: 'catppuccin:coffeescript',
     'common-lisp': 'vscode-icons:file-type-lisp',
     console: '',
     coq: 'file-icons:coq',
     cpp: 'logos:c-plusplus',
-    crystal: 'logos:crystal',
+    crystal: {
+        light: 'vscode-icons:file-type-light-crystal',
+        dark: 'vscode-icons:file-type-crystal',
+    },
     cs: 'logos:c-sharp',
     csharp: 'logos:c-sharp',
     css: 'logos:css-3',
@@ -119,11 +132,13 @@ export const LANGUAGE_ICON = {
     elm: 'vscode-icons:file-type-elm',
     'emacs-lisp': 'logos:emacs',
     erb: 'logos:ruby',
-    erl: 'logos:erlang',
-    erlang: 'logos:erlang',
+    erlang: {
+        dark: 'vscode-icons:file-type-erlang2',
+        light: 'vscode-icons:file-type-erlang',
+    },
     'fortran-fixed-form': 'vscode-icons:file-type-fortran',
     'fortran-free-form': 'vscode-icons:file-type-fortran',
-    fennel: 'l',
+    fennel: '',
     fish: '',
     fluent: '',
     fsharp: 'vscode-icons:file-type-fsharp2',
@@ -143,9 +158,9 @@ export const LANGUAGE_ICON = {
     go: 'vscode-icons:file-type-go',
     gql: 'logos:graphql',
     graphql: 'logos:graphql',
-    groovy: 'vscode-icons:file-type-groovy',
+    groovy: 'material-icon-theme:groovy',
     hack: 'logos:hack',
-    haml: 'logos:haml',
+    haml: 'catppuccin:haml',
     handlebars: 'vscode-icons:file-type-handlebars',
     haskell: 'vscode-icons:file-type-haskell',
     haxe: 'logos:haxe',
@@ -156,42 +171,44 @@ export const LANGUAGE_ICON = {
     'html-derivative': 'logos:html-5',
     http: 'vscode-icons:file-type-http',
     hxml: '',
-    hy: 'vscode-icons:file-type-hy',
+    hy: 'file-icons:hy',
     imba: 'vscode-icons:file-type-imba',
     ini: 'vscode-icons:file-type-ini',
     jade: 'logos:pug',
     java: 'logos:java',
-    javascript: 'logos:javascript',
+    javascript: 'devicon:javascript',
     jinja: 'vscode-icons:file-type-jinja',
     jison: '',
-    jl: 'logos:julia',
-    js: 'logos:javascript',
     json: 'vscode-icons:file-type-json',
-    json5: 'vscode-icons:file-type-json5',
+    json5: {
+        light: 'vscode-icons:file-type-light-json5',
+        dark: 'vscode-icons:file-type-json5',
+    },
     jsonc: 'vscode-icons:file-type-json',
     jsonl: 'vscode-icons:file-type-json',
     jsonnet: 'vscode-icons:file-type-jsonnet',
     jssm: '',
     jsx: 'logos:react',
-    julia: 'logos:julia',
+    julia: 'vscode-icons:file-type-julia',
     kotlin: 'vscode-icons:file-type-kotlin',
     kusto: 'vscode-icons:file-type-kusto',
     latex: '',
     lean: 'vscode-icons:file-type-lean',
     lean4: 'vscode-icons:file-type-lean',
-    less: 'logos:less',
+    less: 'catppuccin:less',
     liquid: 'logos:shopify',
     lit: 'logos:lit',
-    log: 'vscode-icons:file-type-shell',
+    log: 'material-icon-theme:console',
     logo: '',
     lua: 'logos:lua',
     luau: 'vscode-icons:file-type-luau',
     makefile: 'vscode-icons:file-type-makefile',
-    markdown: 'logos:markdown',
+    markdown: {
+        light: 'catppuccin:markdown-mdx',
+        dark: 'catppuccin:markdown',
+    },
     marko: 'logos:marko',
     matlab: 'vscode-icons:file-type-matlab',
-    md: 'logos:markdown',
-    mdc: 'logos:markdown',
     mdx: 'logos:mdx',
     mermaid: '',
     mojo: 'vscode-icons:file-type-mojo',
@@ -200,16 +217,16 @@ export const LANGUAGE_ICON = {
     narrat: '',
     nextflow: 'vscode-icons:file-type-nextflow',
     nginx: 'logos:nginx',
-    nim: 'vscode-icons:file-type-nim',
+    nim: 'catppuccin:nim',
     nix: 'vscode-icons:file-type-nix',
     nushell: '',
-    'objective-c': 'vscode-icons:file-type-objectivec',
-    'objective-cpp': 'vscode-icons:file-type-objectivecpp',
+    'objective-c': 'material-icon-theme:objective-c',
+    'objective-cpp': 'material-icon-theme:objective-cpp',
     ocaml: 'vscode-icons:file-type-ocaml',
     pascal: '',
-    perl: 'logos:perl',
+    perl: 'catppuccin:perl',
     perl6: '',
-    php: 'logos:php',
+    php: 'catppuccin:php',
     plsql: 'vscode-icons:file-type-plsql',
     po: '',
     postcss: 'logos:postcss',
@@ -217,13 +234,13 @@ export const LANGUAGE_ICON = {
     potx: '',
     powerquery: '',
     powershell: 'vscode-icons:file-type-powershell',
-    prisma: 'logos:prisma',
+    prisma: 'material-icon-theme:prisma',
     prolog: 'vscode-icons:file-type-prolog',
     properties: '',
     protobuf: 'vscode-icons:file-type-protobuf',
     pug: 'logos:pug',
     puppet: 'logos:puppet',
-    purescript: 'logos:purescript',
+    purescript: 'material-icon-theme:purescript',
     py: 'logos:python',
     python: 'logos:python',
     qml: 'logos:qt',
@@ -240,19 +257,22 @@ export const LANGUAGE_ICON = {
     riscv: '',
     rst: '',
     ruby: 'logos:ruby',
-    rust: 'logos:rust',
+    rust: 'catppuccin:rust-alt',
     sas: 'vscode-icons:file-type-sas',
     sass: 'logos:sass',
     scala: 'logos:scala',
     scheme: '',
     scss: 'logos:sass',
-    sh: 'vscode-icons:file-type-shell',
-    shaderlab: 'vscode-icons:file-type-shaderlab',
-    shell: 'vscode-icons:file-type-shell',
-    shellscript: 'vscode-icons:file-type-shell',
-    shellsession: 'vscode-icons:file-type-shell',
+    sh: 'material-icon-theme:console',
+    shaderlab: 'catppuccin:shader',
+    shell: 'material-icon-theme:console',
+    shellscript: 'material-icon-theme:console',
+    shellsession: 'material-icon-theme:console',
     smalltalk: '',
-    solidity: 'logos:solidity',
+    solidity: {
+        light: 'vscode-icons:file-type-light-solidity',
+        dark: 'vscode-icons:file-type-solidity',
+    },
     soy: '',
     sparql: 'vscode-icons:file-type-sparql',
     spl: '',
@@ -260,17 +280,19 @@ export const LANGUAGE_ICON = {
     sql: 'vscode-icons:file-type-sql',
     'ssh-config': '',
     stata: 'vscode-icons:file-type-stata',
-    styl: 'logos:stylus',
-    stylus: 'logos:stylus',
+    stylus: 'file-icons:stylus-s',
     svelte: 'logos:svelte-icon',
     swift: 'logos:swift',
     'system-verilog': 'vscode-icons:file-type-systemverilog',
-    systemd: 'vscode-icons:file-type-systemd',
+    systemd: {
+        light: 'material-icon-theme:systemd-light',
+        dark: 'material-icon-theme:systemd',
+    },
     tasl: '',
     tcl: 'vscode-icons:file-type-tcl',
     templ: '',
     terraform: 'logos:terraform',
-    tex: 'vscode-icons:file-type-light-tex',
+    tex: 'material-icon-theme:tex',
     tf: 'logos:terraform',
     tfvars: 'logos:terraform',
     toml: 'logos:toml',
@@ -286,7 +308,7 @@ export const LANGUAGE_ICON = {
     typespec: 'vscode-icons:file-type-typescript-official',
     typst: '',
     v: '',
-    vala: 'vscode-icons:file-type-vala',
+    vala: 'catppuccin:vala',
     vb: 'vscode-icons:file-type-vb',
     verilog: 'vscode-icons:file-type-systemverilog',
     vhdl: 'vscode-icons:file-type-vhdl',
@@ -303,10 +325,16 @@ export const LANGUAGE_ICON = {
     wolfram: 'vscode-icons:file-type-wolfram',
     xml: 'vscode-icons:file-type-xml',
     xsl: 'vscode-icons:file-type-xsl',
-    yaml: 'vscode-icons:file-type-yaml',
+    yaml: {
+        light: 'vscode-icons:file-type-light-yaml-official',
+        dark: 'vscode-icons:file-type-yaml-official',
+    },
     zenscript: '',
     zig: 'vscode-icons:file-type-zig',
-    zsh: 'logos:zsh',
+    zsh: {
+        light: 'devicon:zsh',
+        dark: 'devicon-plain:zsh',
+    },
 };
 // 多语言翻译
 export const XCODE_TRANSLATIONS = {
@@ -332,7 +360,13 @@ function CodeHeader({ title, icon, actions }) {
             borderColor: 'divider',
             bgcolor: 'background.paper',
             borderRadius: '8px 8px 0 0',
-        }, children: [_jsxs(Box, { sx: { display: 'flex', alignItems: 'center', gap: 1, flex: 1 }, children: [icon && (_jsx(Box, { component: Icon, icon: icon, sx: { fontSize: '22px', height: '22px', lineHeight: '22px', color: 'text.secondary' } })), title && (_jsx(Typography, { variant: "body2", sx: { color: 'text.secondary', fontWeight: 500 }, children: title }))] }), actions && _jsx(Box, { sx: { display: 'flex', alignItems: 'center', gap: 0.5 }, children: actions })] }));
+        }, children: [_jsxs(Box, { sx: { display: 'flex', alignItems: 'center', gap: 1, flex: 1 }, children: [icon && (_jsx(Box, { component: Icon, icon: icon, sx: {
+                            fontSize: '24px',
+                            height: '24px',
+                            lineHeight: '24px',
+                            color: 'text.secondary',
+                            fill: ({ palette }) => palette.text.secondary,
+                        } })), title && (_jsx(Typography, { variant: "body2", sx: { color: 'text.secondary', fontWeight: 500 }, children: title }))] }), actions && _jsx(Box, { sx: { display: 'flex', alignItems: 'center', gap: 0.5 }, children: actions })] }));
 }
 /** 通用操作按钮 */
 function ActionButton({ className, icon, onClick, sx = {}, }) {
@@ -419,8 +453,13 @@ export default function Code({ editorTheme, language, title, body = '', foldable
     if (Number.isNaN(foldThreshold)) {
         foldThreshold = 25;
     }
+    const { mode } = muiTheme.palette;
     const _lang = LANGUAGE_ALIAS[language] || language;
-    const languageIcon = LANGUAGE_ICON[_lang] || 'heroicons:code-bracket-solid';
+    // support for light/dark icon
+    const languageIcon = 
+    // @ts-ignore
+    (typeof LANGUAGE_ICON[_lang] === 'object' ? LANGUAGE_ICON[_lang][mode] : LANGUAGE_ICON[_lang]) ||
+        'heroicons:code-bracket-solid';
     const lineCount = body ? body.split('\n').length : 0;
     const showFoldButton = foldable && lineCount > foldThreshold;
     // 初始折叠状态：启用折叠且超过阈值就折叠

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/editor",
-  "version": "2.4.87",
+  "version": "2.4.89",
   "main": "lib/index.js",
   "publishConfig": {
     "access": "public"
@@ -71,7 +71,7 @@
     "ufo": "^1.5.4",
     "url-join": "^4.0.1",
     "zustand": "^4.5.5",
-    "@blocklet/pdf": "2.4.87"
+    "@blocklet/pdf": "2.4.89"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",