fix(deps): update dependency react-router-dom to v7

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+ko_fi: jaywcjlove
+buy_me_a_coffee: jaywcjlove
+custom: ["https://www.paypal.me/kennyiseeyou", "https://jaywcjlove.github.io/#/sponsor"]

.github/workflows/ci.yml

@@ -6,17 +6,18 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
+          registry-url: 'https://registry.npmjs.org'
 
       - run: npm install
       - run: npm run build
       - run: npm run doc
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: webiste
           path: |
@@ -40,7 +41,7 @@ jobs:
         uses: jaywcjlove/changelog-generator@main
 
       - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           commit_message: ${{ github.event.head_commit.message }} ${{steps.tag_version.outputs.tag}} 
           github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -66,8 +67,8 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: webiste
           path: website/build
@@ -98,33 +99,33 @@ jobs:
           docker tag wxmp ${{ secrets.DOCKER_USER }}/wxmp:${{needs.build.outputs.version}}
           docker push ${{ secrets.DOCKER_USER }}/wxmp:${{needs.build.outputs.version}}
 
-      # Create Docker Image in GitHub
+      # # Create Docker Image in GitHub
-      - name: Login to GitHub registry
+      # - name: Login to GitHub registry
-        run: echo ${{ github.token }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+      #   run: echo ${{ github.token }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
-      - name: Build docker image
+      # - name: Build docker image
-        working-directory: website
+      #   working-directory: website
-        run: docker build -t ghcr.io/jaywcjlove/wxmp:latest .
+      #   run: docker build -t ghcr.io/jaywcjlove/wxmp:latest .
 
-      - name: Publish to GitHub registry
+      # - name: Publish to GitHub registry
-        run: docker push ghcr.io/jaywcjlove/wxmp:latest
+      #   run: docker push ghcr.io/jaywcjlove/wxmp:latest
 
-      - name: Tag docker image (beta) and publish to GitHub registry
+      # - name: Tag docker image (beta) and publish to GitHub registry
-        if: needs.build.outputs.successful
+      #   if: needs.build.outputs.successful
-        run: |
+      #   run: |
-            echo "version: v${{ needs.build.outputs.version }}"
+      #       echo "version: v${{ needs.build.outputs.version }}"
-            docker tag ghcr.io/jaywcjlove/wxmp:latest ghcr.io/jaywcjlove/wxmp:${{needs.build.outputs.version}}
+      #       docker tag ghcr.io/jaywcjlove/wxmp:latest ghcr.io/jaywcjlove/wxmp:${{needs.build.outputs.version}}
-            docker push ghcr.io/jaywcjlove/wxmp:${{needs.build.outputs.version}}
+      #       docker push ghcr.io/jaywcjlove/wxmp:${{needs.build.outputs.version}}
 
   build_windows: 
     needs: [build]
     runs-on: windows-latest
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
 
       - name: Install
         run: npm install --build-from-source
@@ -133,7 +134,7 @@ jobs:
       - run: npm run build
       # - run: npm run electron
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: webiste
           path: website/build
@@ -143,8 +144,11 @@ jobs:
         run: npm run deps
 
       - run: npm run build:app
+      - working-directory: electron/app/dist
+        run: ls -R
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
+        if: needs.build.outputs.successful == 'true'
         with:
           name: wxmp-windows
           path: |
@@ -155,16 +159,16 @@ jobs:
     runs-on: macos-latest
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
 
       - run: npm install
       - run: npm run hoist
       - run: npm run build
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: webiste
           path: website/build
@@ -174,8 +178,11 @@ jobs:
         run: npm run deps
       
       - run: npm run build:app
+      - working-directory: electron/app/dist
+        run: ls -R
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
+        if: needs.build.outputs.successful == 'true'
         with:
           name: wxmp-macos
           path: |
@@ -186,16 +193,16 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 45
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
       - run: npm install
       - run: npm run hoist
       - run: npm run build
       # - run: npm run electron
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: webiste
           path: website/build
@@ -205,8 +212,11 @@ jobs:
         run: npm run deps
 
       - run: npm run build:app
+      - working-directory: electron/app/dist
+        run: ls -R
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
+        if: needs.build.outputs.successful == 'true'
         with:
           name: wxmp-linux
           path: |
@@ -216,26 +226,26 @@ jobs:
 
   create_release:
     needs: [build, build_windows, build_macos, build_linux]
-    if: needs.build.outputs.successful
+    if: needs.build.outputs.successful == 'true'
     runs-on: ubuntu-latest
     timeout-minutes: 45
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: wxmp-linux
           path: dist/linux
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: wxmp-macos
           path: dist/macos
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: wxmp-windows
           path: dist/windows
@@ -246,7 +256,7 @@ jobs:
 
       - name: Generate Changelog
         id: changelog
-        uses: jaywcjlove/changelog-generator@v1.5.7
+        uses: jaywcjlove/changelog-generator@main
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           filter-author: (jaywcjlove|小弟调调™|dependabot\[bot\]|Renovate Bot)
@@ -254,34 +264,51 @@ jobs:
 
       - name: Create Release
         uses: ncipollo/release-action@v1
-        if: needs.build.outputs.successful
+        if: needs.build.outputs.successful == 'true'
         with:
+          allowUpdates: true
           token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ steps.changelog.outputs.tag }}
           tag: ${{ steps.changelog.outputs.tag }}
+          artifacts: "dist/linux/*.rpm,dist/linux/*.deb,dist/macos/*.zip,dist/macos/*.dmg,dist/windows/*.exe"
           body: |
             Documentation ${{ steps.changelog.outputs.tag }}: https://raw.githack.com/jaywcjlove/wxmp/${{ steps.changelog.outputs.gh-pages-short-hash }}/index.html  
             Comparing Changes: ${{ steps.changelog.outputs.compareurl }}  
 
             ${{ steps.changelog.outputs.changelog }}
 
+            ```bash
+            docker pull wcjiang/wxmp:${{needs.build.outputs.create_tag_versionNumber}}
+            ```
+
+            ```bash
+            docker run --name wxmp --rm -d -p 9666:3000 wcjiang/wxmp:${{ needs.build.outputs.create_tag_versionNumber }}
+            # Or
+            docker run --name wxmp -itd -p 9666:3000 wcjiang/wxmp:${{ needs.build.outputs.create_tag_versionNumber }}
+            ```
+
+            Visit the following URL in your browser
+
+            ```bash
+            http://localhost:9666/
+            ```
+
   roll_back:
     if: failure()
     needs: [build, create_release]
     runs-on: ubuntu-latest
     timeout-minutes: 4
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref }}
 
       - run: echo "outputs.version - ${{ needs.build.outputs.create_tag_version }}"
 
-      - uses: dev-drprasad/delete-tag-and-release@v0.2.0
+      - uses: dev-drprasad/delete-tag-and-release@v1.1
-        if: needs.build.outputs.successful
+        if: needs.build.outputs.successful == 'true'
         with:
           delete_release: true
           repo: jaywcjlove/wxmp
           tag_name: '${{ needs.build.outputs.create_tag_version }}'
-        env:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -2,10 +2,15 @@
   <h1 align="center">微信公众号 Markdown 编辑器</h1>
 </div>
 
-![微信公众号 Markdown 编辑器](https://user-images.githubusercontent.com/1680273/188264183-a6b8cb6a-92e1-4a73-afc5-4f0234b26ed3.png)
+[![Buy me a coffee](https://img.shields.io/badge/Buy%20me%20a%20coffee-048754?logo=buymeacoffee)](https://jaywcjlove.github.io/#/sponsor)
+[![CI](https://github.com/jaywcjlove/wxmp/actions/workflows/ci.yml/badge.svg)](https://github.com/jaywcjlove/wxmp/actions/workflows/ci.yml)
+
+[![微信公众号 Markdown 编辑器](https://user-images.githubusercontent.com/1680273/188264183-a6b8cb6a-92e1-4a73-afc5-4f0234b26ed3.png)](https://jaywcjlove.github.io/wxmp)
 
 微信公众号文章 Markdown 在线编辑器，使用 markdown 语法创建一篇简介美观大方的微信公众号图文。由于发版本麻烦，和一些功能无法扩展停滞开发了，未来不再开发 Chrome 的插件(暂存在 chrome 分支)，通过 web 版本定制更丰富的功能。
 
+[![Markdown 编辑器桌面应用](https://user-images.githubusercontent.com/1680273/188407235-ead43d61-2ef8-416a-926f-396d8b824b33.png)](https://github.com/jaywcjlove/wxmp/releases)
+
 ## 功能特性
 
 开发计划和一些功能介绍，有需求可以在 issue 中提，使得工具变得更加完善。下面示例用于 web 应用中效果展示。
@@ -15,11 +20,11 @@
 - [x] 支持主题选择 & 编辑预览。
 - [x] 支持明暗两种主题预览。
 - [ ] 支持代码块主题样式选择。
-- [ ] 支持全局字号大小选择。
+- [x] 支持色盘取色，快速替换文章整体色调
-- [ ] 支持色盘取色，快速替换文章整体色调
 - [x] 支持 URL 参数加载 Markdown 内容。
 - [x] 支持 URL 参数选择预览主题。
-- [x] 使用 electron 生成桌面应用。
+- [x] CI 自动生成 Electron 桌面应用。
+- [ ] ~~支持全局字号大小选择。~~
 
 ### 支持代码块样式
 
@@ -126,7 +131,7 @@ Markdown URL 地址: https://raw.githubusercontent.com/jaywcjlove/c-tutorial/mas
 
 ## 主题定制
 
-在目录 `src/themes` 中存放默认主题，在 `src/store/context.tsx` 中配置主题，主题使用 css 定义样式，不支持复杂的选择器。提供在线主题编辑器，欢迎修改并 PR 进仓库供大家使用。
+在目录 `website/src/themes` 中存放默认主题，在 `website/src/store/context.tsx` 中配置主题，主题使用 `css` 定义样式，不支持复杂的选择器。提供在线主题编辑器，欢迎修改并 `PR` 进仓库供大家使用。
 
 ```css
 /* 1~6 标题样式定义 */

electron/app/package.json

@@ -2,7 +2,7 @@
   "name": "wxmp",
   "description": "微信公众号 Markdown 编辑器",
   "homepage": "https://github.com/jaywcjlove/wxmp.git",
-  "version": "2.2.0",
+  "version": "2.4.0",
   "main": "main.js",
   "author": "Kenny Wong <398188662@qq.com>",
   "private": true,
@@ -18,13 +18,13 @@
     "build": "npm run copy && cross-env NODE_ENV=production electron-builder build --publish=never --config config.json"
   },
   "dependencies": {
-    "@wcj/wxmp-main": "2.2.0"
+    "@wcj/wxmp-main": "2.4.0"
   },
   "devDependencies": {
-    "@wcj/wxmp-preload": "2.2.0",
+    "@wcj/wxmp-preload": "2.4.0",
-    "cpy-cli": "4.2.0",
+    "cpy-cli": "^5.0.0",
-    "electron": "19.0.5",
+    "electron": "20.1.3",
-    "electron-builder": "23.1.0",
+    "electron-builder": "23.3.3",
-    "website": "2.2.0"
+    "website": "2.4.0"
   }
 }

electron/main/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@wcj/wxmp-main",
-  "version": "2.2.0",
+  "version": "2.4.0",
   "main": "./lib/index.js",
   "private": true,
   "scripts": {
-    "build": "tsbb build --disable-babel --file-names src/index.ts",
+    "build": "tsbb build",
-    "watch": "tsbb watch --disable-babel --file-names src/index.ts"
+    "watch": "tsbb watch"
   },
   "files": [
     "lib"
   ],
   "devDependencies": {
-    "electron": "19.0.5"
+    "electron": "20.1.3"
   }
 }

electron/main/src/app.ts

@@ -14,15 +14,16 @@ export class App {
   async createWindow(options: Options = {}, loadURL?: string) {
     await app.whenReady();
     const opts: Options = {
-      titleBarStyle: 'hidden', // 无标题栏
+      // titleBarStyle: 'hiddenInset', // 无标题栏
-      frame: false, // 创建无边窗口
+      // frame: false, // 创建无边窗口
-      width: 800,
+      width: 850,
       height: 600,
       minWidth: 850,
+      minHeight: 600,
       center: true,
-      maximizable: true,
+      // maximizable: true,
-      minimizable: true,
+      // minimizable: true,
-      resizable: true,
+      // resizable: true,
       webPreferences: {
         // 多线程
         nodeIntegrationInWorker: true,

electron/preload/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@wcj/wxmp-preload",
-  "version": "2.2.0",
+  "version": "2.4.0",
   "main": "./lib/index.js",
   "private": true,
   "scripts": {
-    "build": "tsbb build --disable-babel --file-names src/index.ts",
+    "build": "tsbb build",
-    "watch": "tsbb watch --disable-babel --file-names src/index.ts"
+    "watch": "tsbb watch"
   },
   "files": [
     "lib"
   ],
   "devDependencies": {
-    "electron": "19.0.5"
+    "electron": "20.1.3"
   }
 }

electron/preload/src/index.ts

@@ -1,18 +1,4 @@
-const styleStr = `.siderbar {
+const styleStr = `.header .logo {}`;
-  -webkit-app-region: drag;
-}
-.siderbar header h1 a, github-corners {
-  display: none;
-}
-article.content:before {
-  -webkit-app-region: drag;
-  position: absolute;
-  content: ' ';
-  display: block;
-  height: 41px;
-  width: 100%;
-  z-index: -1;
-}`;
 
 document.addEventListener('DOMContentLoaded', () => {
   const head = document.querySelector('head');

lerna.json

@@ -1,4 +1,4 @@
 {
-  "version": "2.2.0",
+  "version": "2.4.0",
   "packages": ["website", "electron/*"]
 }

package.json

@@ -9,18 +9,19 @@
     "version": "lerna version --exact --force-publish --no-push --no-git-tag-version",
     "prepare": "husky install",
     "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
-    "pretty-quick": "pretty-quick --staged",
     "hoist": "lerna bootstrap --hoist",
     "clean": "lerna clean --yes"
   },
   "license": "MIT",
   "devDependencies": {
+    "@lerna/legacy-package-management": "^8.0.0",
     "cross-env": "^7.0.3",
     "husky": "^8.0.1",
-    "lerna": "5.5.0",
+    "lerna": "^8.0.0",
-    "prettier": "^2.7.1",
+    "prettier": "^3.0.2",
-    "pretty-quick": "~3.1.3",
+    "react": "~18.2.0",
-    "tsbb": "^3.7.5"
+    "react-dom": "~18.2.0",
+    "tsbb": "~4.4.0"
   },
   "workspaces": {
     "packages": [

website/.kktrc.ts

@@ -20,6 +20,8 @@ export default (conf: Configuration, env: 'development' | 'production', options:
     }),
   );
 
+  /** https://github.com/kktjs/kkt/issues/446 */
+  conf.ignoreWarnings = [{ module: /node_modules[\\/]parse5[\\/]/ }];
   conf.module!.exprContextCritical = false;
   if (env === 'production') {
     conf.output = { ...conf.output, publicPath: './' };

website/package.json

@@ -1,6 +1,6 @@
 {
   "name": "website",
-  "version": "2.2.0",
+  "version": "2.4.0",
   "private": true,
   "scripts": {
     "start": "kkt start",
@@ -25,33 +25,31 @@
     "@uiw/codemirror-theme-xcode": "^4.11.6",
     "@uiw/react-back-to-top": "^1.2.0",
     "@uiw/react-github-corners": "^1.5.15",
-    "@uiw/react-markdown-editor": "^5.7.0",
+    "@uiw/react-markdown-editor": "^6.0.0",
     "@wcj/dark-mode": "^1.0.15",
     "css-tree": "^2.2.1",
-    "react": "^18.2.0",
+    "react": "~18.2.0",
-    "react-code-preview-layout": "^2.0.4",
+    "react-dom": "~18.2.0",
-    "react-dom": "^18.2.0",
     "react-hot-toast": "^2.3.0",
-    "react-router-dom": "^6.3.0",
+    "react-router-dom": "^7.0.0",
-    "rehype-attr": "^2.0.8",
+    "rehype-attr": "^3.0.0",
-    "rehype-ignore": "^1.0.1",
+    "rehype-ignore": "^2.0.0",
-    "rehype-prism-plus": "^1.5.0",
+    "rehype-prism-plus": "^2.0.0",
-    "rehype-raw": "^6.1.1",
+    "rehype-raw": "^7.0.0",
-    "rehype-stringify": "^9.0.3",
+    "rehype-stringify": "^10.0.0",
-    "remark-gfm": "^3.0.1",
+    "remark-gfm": "^4.0.0",
-    "remark-parse": "^10.0.1",
+    "remark-parse": "^11.0.0",
-    "remark-rehype": "^10.1.0",
+    "remark-rehype": "^11.0.0",
-    "styled-components": "^5.3.5",
+    "styled-components": "~6.1.0",
-    "unified": "^10.1.2"
+    "unified": "^11.0.0"
   },
   "devDependencies": {
     "@kkt/less-modules": "^7.2.0",
     "@kkt/raw-modules": "^7.2.0",
     "@kkt/scope-plugin-options": "^7.2.0",
-    "@types/css-tree": "^1.0.7",
+    "@types/css-tree": "^2.3.1",
     "@types/react": "^18.0.17",
     "@types/react-dom": "^18.0.6",
-    "@types/styled-components": "^5.1.25",
     "kkt": "^7.2.0",
     "markdown-react-code-preview-loader": "^2.1.2"
   },

website/src/commands/color.tsx

@@ -0,0 +1,42 @@
+import React, { useContext } from 'react';
+import { ICommand } from '@uiw/react-markdown-editor';
+import styled from 'styled-components';
+import { Context } from '../store/context';
+
+const Input = styled.input`
+  position: absolute;
+  opacity: 0;
+  height: 20px;
+  width: 20px;
+`;
+
+const Button = styled.button``;
+
+const ColorView: React.FC<{}> = (props) => {
+  const { preColor, setPreColor } = useContext(Context);
+  const handleChange = (evn: React.ChangeEvent<HTMLInputElement>) => {
+    setPreColor(evn.target.value);
+  };
+  const color = preColor ? preColor : 'currentColor';
+  return (
+    <Button type="button">
+      <svg viewBox="0 0 24 24" fill="none" height="16" width="16">
+        <path
+          fill="currentColor"
+          fillRule="evenodd"
+          clipRule="evenodd"
+          d="M8.203 2.004c1.261 0 2.304 1.103 2.476 2.538l8.483 8.484-7.778 7.778a3 3 0 0 1-4.243 0L2.9 16.562a3 3 0 0 1 0-4.243l2.804-2.805V4.961c0-1.633 1.12-2.957 2.5-2.957Zm.5 2.957v1.553l-1 1V4.961c0-.327.224-.591.5-.591.277 0 .5.264.5.591Zm0 5.914V9.342l-4.39 4.391a1 1 0 0 0 0 1.414l4.243 4.243a1 1 0 0 0 1.414 0l6.364-6.364-5.63-5.63v3.48l-.003.128h-2.01a.698.698 0 0 0 .012-.129Z"
+        />
+        <path d="M16.859 16.875a3 3 0 1 0 4.242 0l-2.121-2.121-2.121 2.12Z" fill={color} />
+      </svg>
+
+      <Input type="color" value={preColor} onChange={handleChange} />
+    </Button>
+  );
+};
+
+export const colorCommand: ICommand = {
+  name: 'color',
+  keyCommand: 'color',
+  button: () => <ColorView />,
+};

website/src/commands/copy.tsx

@@ -4,30 +4,35 @@ import toast from 'react-hot-toast';
 import styled from 'styled-components';
 
 const Button = styled.button`
-  white-space: nowrap;
+  /* white-space: nowrap;
   width: initial !important;
   display: flex;
-  align-items: center;
+  align-items: center; */
-  padding: 0 0.4rem !important;
 `;
 
 const CopyView: React.FC<{ command: ICommand; editorProps: IMarkdownEditor & ToolBarProps }> = (props) => {
   const { editorProps } = props;
   const handleClick = () => {
-    const dom = editorProps.preview.current;
+    const dom: HTMLDivElement | null = editorProps.preview.current;
-    dom?.focus();
+    if (!dom) {
-    window.getSelection()?.removeAllRanges();
+      toast.error(<div>dom is null</div>);
-    let range = document.createRange();
+      return;
-    range.setStartBefore(dom?.firstChild!);
+    }
-    range.setEndAfter(dom?.lastChild!);
+    dom.focus();
-    window.getSelection()?.addRange(range);
+    const htmlContent = dom.innerHTML;
-    document.execCommand(`copy`);
+    navigator.clipboard
-    window.getSelection()?.removeAllRanges();
+      .writeText(htmlContent)
-    toast.success(<div>复制成功！去公众号编辑器复制吧！</div>);
+      .then(() => {
+        toast.success(<div>复制成功！去公众号编辑器粘贴吧！</div>);
+      })
+      .catch((err) => {
+        toast.error(<div>{JSON.stringify(err)}</div>);
+        console.error('Failed to copy: ', err);
+      });
   };
   return (
     <Button type="button" onClick={handleClick}>
-      {props.command.icon} 复制
+      {props.command.icon}
     </Button>
   );
 };

website/src/commands/css.tsx

@@ -4,7 +4,7 @@ import styled from 'styled-components';
 
 const Link = styled(NavLink)`
   font-size: 0.8rem;
-  line-height: 0.8rem;
+  line-height: 0.7rem;
   text-decoration: none;
   padding: 0.18rem 0.3rem;
   &:hover {

website/src/commands/theme.tsx

@@ -12,7 +12,7 @@ const Select = styled.select`
   padding: 0 0.2rem 0 0.2rem;
   margin: 0;
   font-family: inherit;
-  font-size: 0.8rem;
+  font-size: 0.7rem;
   outline: none;
   height: 1.15rem;
   cursor: inherit;
@@ -49,7 +49,6 @@ const ThemePreviewView: React.FC<{}> = () => {
   const { setCss, previewTheme, setPreviewTheme } = useContext(Context);
   const handleChange = (ev: React.ChangeEvent<HTMLSelectElement>) => {
     const value = ev.target.value as PreviewThemeValue;
-    console.log('vvvv');
     setPreviewTheme(value);
     setCss(previewThemes[value].value);
   };

website/src/components/Layout.tsx

@@ -8,14 +8,22 @@ import { ReactComponent as Loading } from '../assets/tail-spin.svg';
 import { Context } from '../store/context';
 
 const Warpper = styled.div``;
+const HeaderPlace = styled.div`
+  position: relative;
+  height: 2.8rem;
+`;
 
 const Header = styled.header`
   -webkit-app-region: drag;
   display: flex;
   flex-direction: row;
   justify-content: space-between;
+  background: var(--color-canvas-default);
   border-bottom: 1px solid var(--color-border-muted);
-  padding: 0.5rem 0.6rem 0.5rem 1rem;
+  padding: 0.5rem 0.6rem 0.5rem 0.8rem;
+  position: fixed;
+  width: 100%;
+  z-index: 9;
 `;
 
 const Article = styled.article`
@@ -64,14 +72,16 @@ const Section = styled.section`
     text-decoration: none;
     color: var(--color-theme-text);
     padding: 0.1rem 0.3rem;
-    box-shadow: inset 0 0 0 var(--color-accent-fg);
     transition: all 0.3s;
     font-size: 0.9rem;
+    border-radius: 0.2rem;
     &.active {
+      background-color: var(--color-accent-fg);
       box-shadow: inset 0 -0.3rem 0 var(--color-accent-fg);
+      color: #fff;
     }
     &:hover:not(.active):not(:last-child) {
-      box-shadow: inset 0 -1.5rem 0 var(--color-accent-fg);
+      background-color: var(--color-accent-fg);
       color: #fff;
       border-radius: 0.2rem;
     }
@@ -82,25 +92,27 @@ export function Layout() {
   const { isLoading } = useContext(Context);
   return (
     <Warpper className="wmde-markdown-color">
-      <Header>
+      <HeaderPlace>
-        <Article>
+        <Header className="header">
-          <Logo width={28} height={28} />
+          <Article className="logo">
-          <Title>
+            <Logo width={28} height={28} />
-            微信公众号排版编辑器
+            <Title>
-            <sup> v{VERSION} </sup>
+              微信公众号排版编辑器
-          </Title>
+              <sup> v{VERSION} </sup>
-          {isLoading && <Loading />}
+            </Title>
-        </Article>
+            {isLoading && <Loading />}
-        <Section>
+          </Article>
-          <NavLink to="/">首页</NavLink>
+          <Section>
-          <NavLink to="/editor/theme">编辑主题</NavLink>
+            <NavLink to="/">首页</NavLink>
-          <NavLink to="/doc">文档</NavLink>
+            <NavLink to="/editor/theme">编辑主题</NavLink>
-          <dark-mode permanent dark="Dark" light="Light" />
+            <NavLink to="/doc">文档</NavLink>
-          <a href="https://github.com/jaywcjlove/wxmp" target="__blank">
+            <dark-mode permanent dark="Dark" light="Light" />
-            <GithubIcon width={23} height={23} />
+            <a href="https://github.com/jaywcjlove/wxmp" target="__blank">
-          </a>
+              <GithubIcon width={23} height={23} />
-        </Section>
+            </a>
-      </Header>
+          </Section>
+        </Header>
+      </HeaderPlace>
       <Outlet />
     </Warpper>
   );

website/src/pages/home/Preview.tsx

@@ -5,15 +5,16 @@ import { Context } from '../../store/context';
 
 import { markdownToHTML } from '../../utils/markdownToHTML';
 
-const Warpper = styled.div`
+export const Warpper = styled.div`
   width: 375px;
   padding: 20px;
   box-shadow: 0 0 60px rgb(0 0 0 / 10%);
   min-height: 100%;
+  font-size: 17px;
 `;
 
 export const Preview = (props: MarkdownPreviewProps) => {
-  const { css } = useContext(Context);
+  const { css, preColor, previewTheme } = useContext(Context);
-  const html = markdownToHTML(props.source || '', css);
+  const html = markdownToHTML(props.source || '', css, { preColor, previewTheme });
   return <Warpper contentEditable spellCheck={false} dangerouslySetInnerHTML={{ __html: html }} />;
 };

website/src/pages/home/index.tsx

@@ -1,37 +1,32 @@
 import MarkdownEditor, { getCommands } from '@uiw/react-markdown-editor';
 import { useContext } from 'react';
+// @ts-ignore
 import { EditorView } from '@codemirror/view';
-import styled from 'styled-components';
 import { Preview } from './Preview';
 import { copy } from '../../commands/copy';
+import { colorCommand } from '../../commands/color';
 import { theme as themeCommand, previeTheme } from '../../commands/theme';
 import { cssCommand } from '../../commands/css';
 import { Context, themes } from '../../store/context';
 
-export const Warpper = styled.div`
-  height: calc(100vh - 2.9rem);
-`;
-
 export const HomePage = () => {
   const commands = [...getCommands(), themeCommand];
   const { theme, markdown, isLoading, setMarkdown } = useContext(Context);
   const themeValue = themes[theme].value;
   const handleChange = (value: string) => setMarkdown(value);
   return (
-    <Warpper>
+    <MarkdownEditor
-      <MarkdownEditor
+      value={markdown}
-        value={markdown}
+      toolbars={commands}
-        toolbars={commands}
+      theme={themeValue}
-        theme={themeValue}
+      readOnly={isLoading}
-        readOnly={isLoading}
+      toolbarsMode={[cssCommand, previeTheme, copy, colorCommand, 'fullscreen', 'preview']}
-        toolbarsMode={[cssCommand, previeTheme, copy, 'fullscreen', 'preview']}
+      extensions={[EditorView.lineWrapping]}
-        extensions={[EditorView.lineWrapping]}
+      renderPreview={Preview}
-        renderPreview={Preview}
+      previewWidth="420px"
-        previewWidth="420px"
+      onChange={handleChange}
-        onChange={handleChange}
+      visible={true}
-        visible={true}
+      height="calc(100vh - 4.6rem)"
-        height="calc(100vh - 4.70rem)"
+    />
-      />
-    </Warpper>
   );
 };

website/src/pages/theme/Preview.tsx

@@ -1,19 +1,11 @@
-import { MarkdownPreviewProps } from '@uiw/react-markdown-preview';
-import styled from 'styled-components';
 import { useContext } from 'react';
 import { Context } from '../../store/context';
 
 import { markdownToHTML } from '../../utils/markdownToHTML';
+import { Warpper } from '../home/Preview';
 
-const Warpper = styled.div`
+export const Preview = () => {
-  width: 375px;
+  const { css, markdown, preColor, previewTheme } = useContext(Context);
-  padding: 20px;
+  const html = markdownToHTML(markdown, css, { preColor, previewTheme });
-  box-shadow: 0 0 60px rgb(0 0 0 / 10%);
-  min-height: 100%;
-`;
-
-export const Preview = (props: MarkdownPreviewProps) => {
-  const { css, markdown } = useContext(Context);
-  const html = markdownToHTML(markdown, css);
   return <Warpper contentEditable spellCheck={false} dangerouslySetInnerHTML={{ __html: html }} />;
 };

website/src/pages/theme/editor.tsx

@@ -8,7 +8,6 @@ import { previousCommand } from '../../commands/css';
 import { themeTitle } from '../../commands/title';
 import { theme as themeCommand, previeTheme } from '../../commands/theme';
 import { Context, themes } from '../../store/context';
-import { Warpper } from '../home';
 
 export const EditorPage = () => {
   const commands = [themeTitle, themeCommand, previousCommand];
@@ -17,20 +16,18 @@ export const EditorPage = () => {
   const value = themes[theme].value;
   const handleChange = (value: string) => setCss(value);
   return (
-    <Warpper>
+    <MarkdownEditor
-      <MarkdownEditor
+      value={css}
-        value={css}
+      theme={value}
-        theme={value}
+      readOnly={isLoading}
-        readOnly={isLoading}
+      toolbars={commands}
-        toolbars={commands}
+      toolbarsMode={toolbarsMode}
-        toolbarsMode={toolbarsMode}
+      reExtensions={[EditorView.lineWrapping, cssLang()]}
-        reExtensions={[EditorView.lineWrapping, cssLang()]}
+      renderPreview={Preview}
-        renderPreview={Preview}
+      previewWidth="420px"
-        previewWidth="420px"
+      onChange={handleChange}
-        onChange={handleChange}
+      visible={true}
-        visible={true}
+      height="calc(100vh - 4.6rem)"
-        height="calc(100vh - 4.92rem)"
+    />
-      />
-    </Warpper>
   );
 };

website/src/store/Provider.tsx

@@ -12,6 +12,9 @@ export const Provider: React.FC<React.PropsWithChildren> = ({ children }) => {
   const [css, setCss] = React.useState<string>(previewThemes[initPreviewTheme].value);
   const [previewTheme, setPreviewTheme] = React.useState<PreviewThemeValue>(initPreviewTheme);
   const [theme, setTheme] = React.useState<ThemeValue>('default');
+  const [preColor, setPreColor] = React.useState<string>(
+    previewThemes[initPreviewTheme] ? previewThemes[initPreviewTheme].color : '',
+  );
   const [isLoading, setIsLoading] = React.useState<boolean>(true);
   const { data: mddata, isLoading: loading } = useMdSource(mdurl);
   useEffect(() => {
@@ -26,9 +29,12 @@ export const Provider: React.FC<React.PropsWithChildren> = ({ children }) => {
     }
   }, [mddata, mdurl]);
   useEffect(() => setIsLoading(loading), [loading]);
+  useEffect(() => setPreColor(previewThemes[initPreviewTheme].color), [initPreviewTheme]);
   return (
     <Context.Provider
       value={{
+        preColor,
+        setPreColor,
         isLoading,
         setIsLoading,
         markdown,

website/src/store/context.tsx

@@ -97,25 +97,64 @@ export const previewThemes = {
   default: {
     label: '翡翠绿',
     value: defStyle,
+    color: '#009874',
   },
   simple: {
     label: '简洁蓝',
     value: simpleStyle,
+    color: '#0f4c81',
   },
   underscore: {
     label: '下划线黄',
     value: underscoreStyle,
+    color: '#ffb11b',
   },
   base: {
     label: '简洁',
     value: baseStyle,
+    color: '',
   },
 };
 
+/** 用于全局主题替换样式 */
+export const replaceData: Record<PreviewThemeValue, ReplaceData[]> = {
+  underscore: [
+    { select: 'a', name: 'color', value: '{{color}}' },
+    { select: 'h1', name: 'box-shadow', value: 'inset 0 -0.9rem 0 0 {{color}}' },
+    { select: 'h2', name: 'box-shadow', value: 'inset 0 -0.7rem 0 0 {{color}}' },
+    { select: 'h3', name: 'border-left', value: '5px solid {{color}}' },
+  ],
+  default: [
+    { select: 'a', name: 'color', value: '{{color}}' },
+    { select: 'h1', name: 'border-bottom', value: '3px solid {{color}}' },
+    { select: 'h2', name: 'background', value: '{{color}}' },
+    { select: 'h3', name: 'border-left', value: '5px solid {{color}}' },
+  ],
+  simple: [
+    { select: 'a', name: 'color', value: '{{color}}' },
+    { select: 'h1', name: 'border-bottom', value: '3px solid {{color}}' },
+    { select: 'h2', name: 'background', value: '{{color}}' },
+    { select: 'h3', name: 'border-left', value: '5px solid {{color}}' },
+    { select: '.code-spans', name: 'color', value: '{{color}}' },
+  ],
+  base: [],
+};
+
+export type ReplaceData = {
+  select: string;
+  name: string;
+  value: string;
+};
+
+export const colors = (Object.keys(previewThemes) as Array<keyof typeof previewThemes>).map(
+  (key) => previewThemes[key].color,
+);
 export type ThemeValue = keyof typeof themes;
 export type PreviewThemeValue = keyof typeof previewThemes;
 
 export interface CreateContext {
+  preColor: string;
+  setPreColor: React.Dispatch<React.SetStateAction<string>>;
   isLoading: boolean;
   setIsLoading: React.Dispatch<React.SetStateAction<boolean>>;
   markdown: string;
@@ -129,6 +168,8 @@ export interface CreateContext {
 }
 
 export const Context = React.createContext<CreateContext>({
+  preColor: '',
+  setPreColor: () => {},
   isLoading: true,
   setIsLoading: () => {},
   markdown: data.source,

website/src/themes/base.md.css

@@ -5,14 +5,14 @@ a {
 
 h1 {
   color: inherit;
-  font-size: 1.5rem;
+  font-size: 18px;
   font-weight: bold;
 }
 
 h2 {
   color: inherit;
   margin: 2.5rem 0 1rem 0;
-  font-size: 1.3em;
+  font-size: 16px;
   font-weight: bold;
 }
 
@@ -20,19 +20,20 @@ h3 {
   color: inherit;
   margin: 1em 0 1em 0;
   font-weight: bold;
-  font-size: 1em;
+  font-size: 14px;
 }
 
 h4 {
   color: inherit;
   margin: 0.6em 0 0.6em 0;
   font-weight: bold;
-  font-size: 0.9em;
+  font-size: 12px;
 }
 
 p {
   color: initial;
-  font-size: 0.85em;
+  font-size: 16px;
+  line-height: 1.5em;
 }
 
 ul {
@@ -45,13 +46,15 @@ ol {
 
 li {
   margin: 0;
-  font-size: 0.85em;
+  font-size: 14px;
+  line-height: 1.5em;
 }
 
 blockquote {
   font-style: normal;
   border-left: none;
   margin: 1em 0;
+  line-height: 1.5em;
 }
 
 pre {
@@ -60,7 +63,7 @@ pre {
   padding: 1em;
   color: rgb(51, 51, 51);
   background: rgb(248, 248, 248);
-  font-size: 0.85em;
+  font-size: 14px;
   font-weight: 400;
   letter-spacing: normal;
   word-spacing: 0px;
@@ -73,7 +76,7 @@ table {
   width: 100% !important;
   border-collapse: collapse;
   line-height: 1.35;
-  font-size: 0.85em;
+  font-size: 14px;
 }
 
 td {
@@ -90,7 +93,7 @@ th {
 .code-highlight {
   text-align: left;
   font-family: Menlo, 'Operator Mono', Consolas, Monaco, monospace;
-  font-size: 0.85em;
+  font-size: 14px;
   margin: 0px;
   white-space: nowrap;
 }
@@ -117,14 +120,14 @@ th {
   display: table;
   font-family: -apple-system-font, BlinkMacSystemFont, 'Helvetica Neue', 'PingFang SC', 'Hiragino Sans GB',
     'Microsoft YaHei UI', 'Microsoft YaHei', Arial, sans-serif;
-  font-size: 1em;
+  font-size: 14px;
   font-weight: bold;
   margin: 3rem 0 0.6rem 0;
   padding-left: 0.2rem;
 }
 
 .footnotes-list {
-  font-size: 0.75em;
+  font-size: 10px;
   font-style: italic;
   line-height: 1.2;
   margin: 0.4rem 0;

website/src/themes/default.md.css

@@ -1,7 +1,7 @@
 a {
-  color: #576b95;
+  color: #009874;
   text-decoration: none;
-  font-size: 0.85em;
+  font-size: 14px;
 }
 
 h1 {
@@ -11,11 +11,11 @@ h1 {
   line-height: 1.75;
   font-family: -apple-system-font, BlinkMacSystemFont, 'Helvetica Neue', 'PingFang SC', 'Hiragino Sans GB',
     'Microsoft YaHei UI', 'Microsoft YaHei', Arial, sans-serif;
-  font-size: 1em;
+  font-size: 18px;
   font-weight: bold;
   margin: 2em auto 1em;
   padding: 0 1em;
-  border-bottom: 2px solid #009874;
+  border-bottom: 3px solid #009874;
   margin-top: 0;
 }
 
@@ -26,7 +26,7 @@ h2 {
   line-height: 1.75;
   font-family: -apple-system-font, BlinkMacSystemFont, 'Helvetica Neue', 'PingFang SC', 'Hiragino Sans GB',
     'Microsoft YaHei UI', 'Microsoft YaHei', Arial, sans-serif;
-  font-size: 1.3em;
+  font-size: 16px;
   font-weight: bold;
   margin: 4em auto 2em;
   padding: 0 0.3em;
@@ -34,21 +34,17 @@ h2 {
   background: #009874;
 }
 
-p {
-  font-size: 0.85em;
-}
-
 h3 {
   text-align: left;
   color: #3f3f3f;
   line-height: 1.2;
   font-family: -apple-system-font, BlinkMacSystemFont, 'Helvetica Neue', 'PingFang SC', 'Hiragino Sans GB',
     'Microsoft YaHei UI', 'Microsoft YaHei', Arial, sans-serif;
-  font-size: 1.1em;
+  font-size: 14px;
   font-weight: bold;
   margin: 2em 8px 0.75em 0;
   padding-left: 8px;
-  border-left: 3px solid #009874;
+  border-left: 5px solid #009874;
 }
 
 ul {
@@ -62,22 +58,29 @@ ol {
 li {
   margin: 0;
   line-height: 1.5em;
-  color: rgb(30 41 59);
+  font-size: 14px;
-  font-size: 0.85em;
+  line-height: 1.5em;
+}
+
+p {
+  font-size: 16px;
+  line-height: 1.5em;
+  padding: 0.5em 0 !important;
+  margin-bottom: 0 !important;
+  margin-top: 0 !important;
 }
 
 blockquote {
   text-align: left;
-  line-height: 1.75;
   font-family: -apple-system-font, BlinkMacSystemFont, 'Helvetica Neue', 'PingFang SC', 'Hiragino Sans GB',
     'Microsoft YaHei UI', 'Microsoft YaHei', Arial, sans-serif;
-  font-size: 0.85em;
+  font-size: 14px;
   font-style: normal;
   border-left: none;
-  padding: 0.1rem 1rem;
+  padding: 0.5em 1em;
   border-radius: 4px;
   background: rgba(27, 31, 35, 0.05);
-  margin: 1rem 0;
+  margin: 1em 0;
 }
 
 pre {
@@ -111,7 +114,7 @@ table {
   width: 100% !important;
   border-collapse: collapse;
   line-height: 1.35;
-  font-size: 0.85em;
+  font-size: 14px;
 }
 
 td {
@@ -129,7 +132,7 @@ th {
   text-align: left;
   line-height: 1.75;
   font-family: Menlo, 'Operator Mono', Consolas, Monaco, monospace;
-  font-size: 0.85em;
+  font-size: 14px;
   margin: 0px;
   white-space: nowrap;
 }
@@ -143,7 +146,7 @@ th {
   text-align: left;
   line-height: 1;
   white-space: initial;
-  color: #009874;
+  color: #333;
   background: rgba(27, 31, 35, 0.05);
   padding: 0.1em 0.3em;
   border-radius: 0.3em;
@@ -157,14 +160,14 @@ th {
   display: table;
   font-family: -apple-system-font, BlinkMacSystemFont, 'Helvetica Neue', 'PingFang SC', 'Hiragino Sans GB',
     'Microsoft YaHei UI', 'Microsoft YaHei', Arial, sans-serif;
-  font-size: 1em;
+  font-size: 14px;
   font-weight: bold;
   margin: 3em 0 0.6em 0;
   padding-left: 0.2em;
 }
 
 .footnotes-list {
-  font-size: 0.75em;
+  font-size: 10px;
   font-style: italic;
   line-height: 1.2;
   margin: 0.4rem 0;

website/src/themes/simple.md.css

@@ -1,7 +1,7 @@
 a {
-  color: #576b95;
+  color: #0f4c81;
   text-decoration: none;
-  font-size: 0.85em;
+  font-size: 14px;
 }
 
 h1 {
@@ -11,11 +11,11 @@ h1 {
   line-height: 1.75;
   font-family: -apple-system-font, BlinkMacSystemFont, 'Helvetica Neue', 'PingFang SC', 'Hiragino Sans GB',
     'Microsoft YaHei UI', 'Microsoft YaHei', Arial, sans-serif;
-  font-size: 1.2em;
+  font-size: 18px;
   font-weight: bold;
   margin: 2em auto 1em;
   padding: 0 1em;
-  border-bottom: 2px solid #0f4c81;
+  border-bottom: 3px solid #0f4c81;
   margin-top: 0;
 }
 
@@ -26,7 +26,7 @@ h2 {
   line-height: 1.75;
   font-family: -apple-system-font, BlinkMacSystemFont, 'Helvetica Neue', 'PingFang SC', 'Hiragino Sans GB',
     'Microsoft YaHei UI', 'Microsoft YaHei', Arial, sans-serif;
-  font-size: 1.2em;
+  font-size: 16px;
   font-weight: bold;
   margin: 4em auto 2em;
   padding: 0 0.3em;
@@ -34,21 +34,17 @@ h2 {
   background: #0f4c81;
 }
 
-p {
-  font-size: 0.85em;
-}
-
 h3 {
   text-align: left;
   color: #3f3f3f;
   line-height: 1.2;
   font-family: -apple-system-font, BlinkMacSystemFont, 'Helvetica Neue', 'PingFang SC', 'Hiragino Sans GB',
     'Microsoft YaHei UI', 'Microsoft YaHei', Arial, sans-serif;
-  font-size: 1.1em;
+  font-size: 14px;
   font-weight: bold;
   margin: 2em 8px 0.75em 0;
   padding-left: 8px;
-  border-left: 3px solid #0f4c81;
+  border-left: 5px solid #0f4c81;
 }
 
 ul {
@@ -62,22 +58,29 @@ ol {
 li {
   margin: 0;
   line-height: 1.5em;
-  color: rgb(30 41 59);
+  font-size: 14px;
-  font-size: 0.85em;
+  line-height: 1.5em;
+}
+
+p {
+  font-size: 16px;
+  line-height: 1.5em;
+  padding: 0.5em 0 !important;
+  margin-bottom: 0 !important;
+  margin-top: 0 !important;
 }
 
 blockquote {
   text-align: left;
-  line-height: 1.75;
   font-family: -apple-system-font, BlinkMacSystemFont, 'Helvetica Neue', 'PingFang SC', 'Hiragino Sans GB',
     'Microsoft YaHei UI', 'Microsoft YaHei', Arial, sans-serif;
-  font-size: 0.85em;
+  font-size: 14px;
   font-style: normal;
   border-left: none;
-  padding: 0.1rem 1rem;
+  padding: 0.5em 1em;
   border-radius: 4px;
   background: rgba(27, 31, 35, 0.05);
-  margin: 1rem 0;
+  margin: 1em 0;
 }
 
 pre {
@@ -111,7 +114,7 @@ table {
   width: 100% !important;
   border-collapse: collapse;
   line-height: 1.35;
-  font-size: 0.85em;
+  font-size: 14px;
 }
 
 td {
@@ -129,7 +132,7 @@ th {
   text-align: left;
   line-height: 1.75;
   font-family: Menlo, 'Operator Mono', Consolas, Monaco, monospace;
-  font-size: 0.85em;
+  font-size: 14px;
   margin: 0px;
   white-space: nowrap;
 }
@@ -148,7 +151,7 @@ th {
   padding: 0.1em 0.3em;
   border-radius: 0.3em;
   font-weight: bold;
-  font-size: 1em;
+  font-size: 14px;
   top: -0.1em;
   position: relative;
 }
@@ -157,14 +160,14 @@ th {
   display: table;
   font-family: -apple-system-font, BlinkMacSystemFont, 'Helvetica Neue', 'PingFang SC', 'Hiragino Sans GB',
     'Microsoft YaHei UI', 'Microsoft YaHei', Arial, sans-serif;
-  font-size: 1em;
+  font-size: 14px;
   font-weight: bold;
   margin: 3em 0 0.6em 0;
   padding-left: 0.2em;
 }
 
 .footnotes-list {
-  font-size: 0.75em;
+  font-size: 10px;
   font-style: italic;
   line-height: 1.2;
   margin: 0.4rem 0;

website/src/themes/underscore.md.css

@@ -1,7 +1,7 @@
 a {
-  color: #576b95;
+  color: #ffb11b;
   text-decoration: none;
-  font-size: 0.85em;
+  font-size: 14px;
 }
 
 h1 {
@@ -11,7 +11,7 @@ h1 {
   line-height: 1.15;
   font-family: -apple-system-font, BlinkMacSystemFont, 'Helvetica Neue', 'PingFang SC', 'Hiragino Sans GB',
     'Microsoft YaHei UI', 'Microsoft YaHei', Arial, sans-serif;
-  font-size: 1.3em;
+  font-size: 18px;
   font-weight: bold;
   margin: 2em auto 1em;
   padding: 0 1em 0.3em 1em;
@@ -24,24 +24,20 @@ h2 {
   line-height: 1.35;
   font-family: -apple-system-font, BlinkMacSystemFont, 'Helvetica Neue', 'PingFang SC', 'Hiragino Sans GB',
     'Microsoft YaHei UI', 'Microsoft YaHei', Arial, sans-serif;
-  font-size: 1.2em;
+  font-size: 16px;
   font-weight: bold;
   padding: 0 0.3em;
   margin: 2em 0 1em 0;
   box-shadow: inset 0 -0.7rem 0 0 #ffb11b;
 }
 
-p {
-  font-size: 0.85em;
-}
-
 h3 {
   text-align: left;
   color: #3f3f3f;
   line-height: 1.2;
   font-family: -apple-system-font, BlinkMacSystemFont, 'Helvetica Neue', 'PingFang SC', 'Hiragino Sans GB',
     'Microsoft YaHei UI', 'Microsoft YaHei', Arial, sans-serif;
-  font-size: 1.1em;
+  font-size: 14px;
   font-weight: bold;
   margin: 2em 8px 0.75em 0;
   padding-left: 8px;
@@ -59,22 +55,29 @@ ol {
 li {
   margin: 0;
   line-height: 1.5em;
-  color: rgb(30 41 59);
+  font-size: 14px;
-  font-size: 0.85em;
+}
+
+p {
+  font-size: 16px;
+  line-height: 1.5em;
+  padding: 0.5em 0 !important;
+  margin-bottom: 0 !important;
+  margin-top: 0 !important;
 }
 
 blockquote {
   text-align: left;
-  line-height: 1.75;
+  line-height: 1.5em;
   font-family: -apple-system-font, BlinkMacSystemFont, 'Helvetica Neue', 'PingFang SC', 'Hiragino Sans GB',
     'Microsoft YaHei UI', 'Microsoft YaHei', Arial, sans-serif;
-  font-size: 0.85em;
+  font-size: 14px;
   font-style: normal;
   border-left: none;
-  padding: 0.1rem 1rem;
+  padding: 0.5em 1em;
   border-radius: 4px;
   background: rgba(27, 31, 35, 0.05);
-  margin: 1rem 0;
+  margin: 1em 0;
 }
 
 pre {
@@ -108,7 +111,7 @@ table {
   width: 100% !important;
   border-collapse: collapse;
   line-height: 1.35;
-  font-size: 0.85em;
+  font-size: 14px;
 }
 
 td {
@@ -126,7 +129,7 @@ th {
   text-align: left;
   line-height: 1.75;
   font-family: Menlo, 'Operator Mono', Consolas, Monaco, monospace;
-  font-size: 0.85em;
+  font-size: 14px;
   margin: 0px;
   white-space: nowrap;
 }
@@ -140,12 +143,12 @@ th {
   text-align: left;
   line-height: 1;
   white-space: initial;
-  color: #ffb11b;
+  color: #333;
   background: rgba(27, 31, 35, 0.05);
   padding: 0.1em 0.3em;
   border-radius: 0.3em;
   font-weight: bold;
-  font-size: 1em;
+  font-size: 14px;
   top: -0.1em;
   position: relative;
 }
@@ -154,14 +157,14 @@ th {
   display: table;
   font-family: -apple-system-font, BlinkMacSystemFont, 'Helvetica Neue', 'PingFang SC', 'Hiragino Sans GB',
     'Microsoft YaHei UI', 'Microsoft YaHei', Arial, sans-serif;
-  font-size: 1em;
+  font-size: 14px;
   font-weight: bold;
   margin: 3em 0 0.6em 0;
   padding-left: 0.2em;
 }
 
 .footnotes-list {
-  font-size: 0.75em;
+  font-size: 10px;
   font-style: italic;
   line-height: 1.2;
   margin: 0.4rem 0;

website/src/utils/css.ts

@@ -1,20 +1,55 @@
 import { RootContent, Element, Text, Root } from 'hast';
+import { PreviewThemeValue, replaceData, ReplaceData } from '../store/context';
 
-export const getBlock = (data: any, str: string = '') => {
+/**
+ * {
+ *    "replace": [
+ *       { select: 'a', name: 'color', value: 'red' },
+ *       { select: 'h1', name: 'box-shadow', value: 'red' },
+ *       { select: 'h2', name: 'box-shadow', value: 'red' },
+ *       { select: 'h3', name: 'border-left', value: 'red' },
+ *       { select: 'h3', name: 'color', value: 'red' },
+ *    ]
+ * }
+ */
+type BlockOption = {
+  replace?: Array<ReplaceData>;
+};
+
+export const getBlock = (data: any, str: string = '', opts: BlockOption = {}) => {
+  const { replace } = opts;
   if (data && data.data && data.data.type === 'Declaration') {
-    str = `${data.data.property}: ${data.data.value.value}${data.data.important ? ' !important' : ''};`;
+    const value = replace?.find((m) => m.name === data.data.property)?.value || data.data.value.value;
+    // console.log(value)
+    str = `${data.data.property}: ${value}${data.data.important ? ' !important' : ''};`;
     if (data.next) {
-      str += getBlock(data.next);
+      str += getBlock(data.next, '', opts);
     }
   }
   return str;
 };
 
-export const cssdata = (list: any, result: Record<string, string> = {}) => {
+type Cssdata = {
+  theme?: PreviewThemeValue;
+  color?: string;
+};
+
+export const cssdata = (list: any, result: Record<string, string> = {}, opts: Cssdata = {}) => {
   if (list.data && list.data.type === 'Rule') {
-    result[list.data.prelude.value] = getBlock(list.data.block.children.head);
+    const selector = list.data.prelude.value;
+    const options: BlockOption = {};
+    // console.log('opts:', opts)
+    if (opts.color && opts.theme && replaceData[opts.theme]) {
+      options.replace = replaceData[opts.theme]
+        .filter((m) => m.select === selector)
+        .map((m) => ({
+          ...m,
+          value: m.value.replace('{{color}}', opts.color!),
+        }));
+    }
+    result[selector] = getBlock(list.data.block.children.head, '', options);
     if (list.next) {
-      result = cssdata(list.next, { ...result });
+      result = cssdata(list.next, { ...result }, opts);
     }
   }
   return result;
@@ -29,7 +64,6 @@ export const spaceEscape = (node: RootContent) => {
       }
       node.properties.className = className.filter((str: string) => !/(token|control-flow)/.test(str));
     }
-
     node.children.map((elm) => {
       if (elm.type === 'element' && elm.children) {
         spaceEscape(elm);
@@ -95,7 +129,7 @@ export const footnotesLabel = (node: Element) => {
   ];
 };
 
-export const imagesStyle = (node: Element, parent: Root | Element | null) => {
+export const imagesStyle = (node: Element, parent: Root | Element | undefined) => {
   if (
     parent?.type === 'element' &&
     /(p|a)/.test(parent.tagName) &&

website/src/utils/markdownToHTML.ts

@@ -13,9 +13,12 @@ import rehypeRewrite from 'rehype-rewrite';
 import stringify from 'rehype-stringify';
 import { cssdata, spaceEscape, footnotes, footnotesLabel, imagesStyle } from './css';
 
-export type MarkdownToHTMLOptions = {};
+export type MarkdownToHTMLOptions = {
+  preColor?: string;
+  previewTheme?: string;
+};
 
-export function markdownToHTML(md: string, css: string, options: MarkdownToHTMLOptions = {}) {
+export function markdownToHTML(md: string, css: string, opts: MarkdownToHTMLOptions = {}) {
   const ast = csstree.parse(css, {
     parseAtrulePrelude: false,
     parseRulePrelude: false,
@@ -23,19 +26,21 @@ export function markdownToHTML(md: string, css: string, options: MarkdownToHTMLO
     parseCustomProperty: false,
     positions: false,
   });
+
   // @ts-ignore
-  const data = cssdata(ast.children.head);
+  const data = cssdata(ast.children.head, {}, { color: opts.preColor, theme: opts.previewTheme });
   const processor = unified()
     .use(remarkParse)
     .use(remarkGfm)
     .use(remarkRehype, { allowDangerousHtml: true })
-    .use(rehypePrism)
     .use(rehypeRaw)
+    .use(rehypePrism, {
+      ignoreMissing: true,
+    })
     .use(rehypeIgnore, {})
     .use(rehypeAttrs, { properties: 'attr' })
     .use(rehypeRewrite, {
-      rewrite: (node, index, parent) => {
+      rewrite: (node, _index, parent) => {
-        // @ts-ignore
         if (
           node?.type === 'element' &&
           node?.tagName === 'code' &&