vditor 3.8.4 → 3.8.8

package/dist/ts/markdown/adapterRender.d.ts

@@ -0,0 +1,33 @@
+export declare const mathRenderAdapter: {
+    getCode: (mathElement: Element) => string;
+    getElements: (element: HTMLElement) => NodeListOf<Element>;
+};
+export declare const mermaidRenderAdapter: {
+    /** 不仅要返回code，并且需要将 code 设置为 el 的 innerHTML */
+    getCode: (el: Element) => string;
+    getElements: (element: HTMLElement) => NodeListOf<Element>;
+};
+export declare const mindmapRenderAdapter: {
+    getCode: (el: Element) => string;
+    getElements: (el: HTMLElement | Document) => NodeListOf<Element>;
+};
+export declare const chartRenderAdapter: {
+    getCode: (el: HTMLElement) => string;
+    getElements: (el: HTMLElement | Document) => NodeListOf<Element>;
+};
+export declare const abcRenderAdapter: {
+    getCode: (el: Element) => string;
+    getElements: (el: HTMLElement | Document) => NodeListOf<Element>;
+};
+export declare const graphvizRenderAdapter: {
+    getCode: (el: Element) => string;
+    getElements: (el: HTMLElement | Document) => NodeListOf<Element>;
+};
+export declare const flowchartRenderAdapter: {
+    getCode: (el: Element) => string;
+    getElements: (el: HTMLElement | Document) => NodeListOf<Element>;
+};
+export declare const plantumlRenderAdapter: {
+    getCode: (el: Element) => string;
+    getElements: (el: HTMLElement | Document) => NodeListOf<Element>;
+};

package/dist/ts/markdown/codeRender.d.ts

@@ -1,2 +1 @@
-/// <reference types="./types" />
-export declare const codeRender: (element: HTMLElement, lang?: keyof II18n) => void;
+export declare const codeRender: (element: HTMLElement) => void;

package/dist/ts/ui/initUI.d.ts

@@ -7,3 +7,4 @@ declare global {
 export declare const initUI: (vditor: IVditor) => void;
 export declare const setPadding: (vditor: IVditor) => void;
 export declare const setTypewriterPosition: (vditor: IVditor) => void;
+export declare function UIUnbindListener(): void;

package/dist/ts/wysiwyg/index.d.ts

@@ -9,11 +9,13 @@ declare class WYSIWYG {
     preventInput: boolean;
     composingLock: boolean;
     commentIds: string[];
+    private scrollListener;
     constructor(vditor: IVditor);
     getComments(vditor: IVditor, getData?: boolean): ICommentsData[];
     triggerRemoveComment(vditor: IVditor): void;
     showComment(): void;
     hideComment(): void;
+    unbindListener(): void;
     private copy;
     private bindEvent;
 }

package/dist/types/index.d.ts

@@ -2,6 +2,10 @@ declare module "*.svg";
 
 declare module "*.png";
 
+interface Window {
+    VditorI18n: ITips;
+}
+
 interface IObject {
     [key: string]: string;
 }
@@ -114,6 +118,8 @@ declare class Lute {
 
     public static NewNodeID(): string;
 
+    public static Sanitize(html: string): string;
+
     private constructor();
 
     public SetJSRenderers(options?: {
@@ -216,6 +222,9 @@ declare class Lute {
 
     // 粘贴是 md 转换为 sv
     public Md2VditorSVDOM(text: string): string;
+
+    // 将markdown转化为JSON结构输出 https://github.com/88250/lute/issues/120
+    public RenderJSON(markdown: string): string;
 }
 
 declare const webkitAudioContext: {
@@ -223,11 +232,95 @@ declare const webkitAudioContext: {
     new(contextOptions?: AudioContextOptions): AudioContext,
 };
 
+interface ITips {
+    [index: string]: string;
+
+    alignCenter: string;
+    alignLeft: string;
+    alignRight: string;
+    alternateText: string;
+    bold: string;
+    both: string;
+    check: string;
+    close: string;
+    code: string;
+    "code-theme": string;
+    column: string;
+    comment: string;
+    confirm: string;
+    "content-theme": string;
+    copied: string;
+    copy: string;
+    "delete-column": string;
+    "delete-row": string;
+    devtools: string;
+    down: string;
+    downloadTip: string;
+    edit: string;
+    "edit-mode": string;
+    emoji: string;
+    export: string;
+    fileTypeError: string;
+    footnoteRef: string;
+    fullscreen: string;
+    generate: string;
+    headings: string;
+    help: string;
+    imageURL: string;
+    indent: string;
+    info: string;
+    "inline-code": string;
+    "insert-after": string;
+    "insert-before": string;
+    insertColumnLeft: string;
+    insertColumnRight: string;
+    insertRowAbove: string;
+    insertRowBelow: string;
+    instantRendering: string;
+    italic: string;
+    language: string;
+    line: string;
+    link: string;
+    linkRef: string;
+    list: string;
+    more: string;
+    nameEmpty: string;
+    "ordered-list": string;
+    outdent: string;
+    outline: string;
+    over: string;
+    performanceTip: string;
+    preview: string;
+    quote: string;
+    record: string;
+    "record-tip": string;
+    recording: string;
+    redo: string;
+    remove: string;
+    row: string;
+    spin: string;
+    splitView: string;
+    strike: string;
+    table: string;
+    textIsNotEmpty: string;
+    title: string;
+    tooltipText: string;
+    undo: string;
+    up: string;
+    update: string;
+    upload: string;
+    uploadError: string;
+    uploading: string;
+    wysiwyg: string;
+}
+
 interface II18n {
-    en_US: IObject;
-    ja_JP: IObject;
-    ko_KR: IObject;
-    zh_CN: IObject;
+    en_US: ITips;
+    ja_JP: ITips;
+    ko_KR: ITips;
+    ru_RU: ITips;
+    zh_CN: ITips;
+    zh_TW: ITips;
 }
 
 interface IClasses {
@@ -279,7 +372,7 @@ interface IUpload {
     validate?(files: File[]): string | boolean;
 
     /** 自定义上传，当发生错误时返回错误信息 */
-    handler?(files: File[]): string | null;
+    handler?(files: File[]): string | null | Promise<string> | Promise<null>;
 
     /** 对服务端返回的数据进行转换，以满足内置的数据结构 */
     format?(files: File[], responseText: string): string;
@@ -288,7 +381,7 @@ interface IUpload {
     linkToImgFormat?(responseText: string): string;
 
     /** 将上传的文件处理后再返回  */
-    file?(files: File[]): File[];
+    file?(files: File[]): File[] | Promise<File[]>;
 
     /** 图片地址上传后的回调  */
     linkToImgCallback?(responseText: string): void;
@@ -416,6 +509,7 @@ interface IPreviewOptions {
     mode: "dark" | "light";
     customEmoji?: IObject;
     lang?: (keyof II18n);
+    i18n?: ITips;
     lazyLoadImage?: string;
     emojiPath?: string;
     hljs?: IHljs;
@@ -443,7 +537,7 @@ interface IHintData {
 interface IHintExtend {
     key: string;
 
-    hint?(value: string): IHintData[];
+    hint?(value: string): IHintData[] | Promise<IHintData[]>;
 }
 
 /** @link https://ld246.com/article/1549638745630#options-hint */
@@ -490,6 +584,8 @@ interface IOptions {
     placeholder?: string;
     /** 多语言。默认值: 'zh_CN' */
     lang?: (keyof II18n);
+    /** 国际化, 自定义语言。优先级低于lang */
+    i18n?: ITips;
     /** @link https://ld246.com/article/1549638745630#options-fullscreen */
     fullscreen?: {
         index: number;
@@ -556,7 +652,7 @@ interface IOptions {
     after?(): void;
 
     /** 输入后触发 */
-    input?(value: string, previewElement?: HTMLElement): void;
+    input?(value: string): void;
 
     /** 聚焦后触发  */
     focus?(value: string): void;
@@ -651,6 +747,7 @@ interface IVditor {
         triggerRemoveComment(vditor: IVditor): void,
         showComment(): void,
         hideComment(): void,
+        unbindListener(): void,
     };
     ir?: {
         range: Range,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vditor",
-  "version": "3.8.4",
+  "version": "3.8.8",
   "description": "♏ 易于使用的 Markdown 编辑器，为适配不同的应用场景而生",
   "author": "Vanessa <v@b3log.org> (http://vanessa.b3log.org)",
   "homepage": "https://b3log.org/vditor",
@@ -19,36 +19,35 @@
   },
   "types": "dist/index.d.ts",
   "devDependencies": {
-    "@babel/core": "^7.10.4",
-    "@babel/preset-env": "^7.10.4",
+    "@babel/core": "^7.14.2",
+    "@babel/preset-env": "^7.14.2",
     "@types/diff-match-patch": "^1.0.32",
-    "@types/jest": "^26.0.19",
-    "@types/puppeteer": "^2.1.1",
-    "autoprefixer": "^9.8.4",
-    "babel-loader": "^8.1.0",
-    "copy-webpack-plugin": "^6.0.3",
-    "css-loader": "^3.6.0",
+    "@types/jest": "^26.0.23",
+    "@types/puppeteer": "^2.1.5",
+    "autoprefixer": "^9.8.6",
+    "babel-loader": "^8.2.2",
+    "clean-webpack-plugin": "^4.0.0-alpha.0",
+    "copy-webpack-plugin": "^6.4.1",
+    "css-loader": "^5.2.4",
     "file-loader": "^4.3.0",
-    "html-webpack-plugin": "^3.2.0",
+    "html-webpack-plugin": "^5.3.1",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^26.6.3",
     "mini-css-extract-plugin": "^0.8.2",
-    "node-sass": "^4.14.1",
-    "on-build-webpack": "^0.1.0",
-    "optimize-css-assets-webpack-plugin": "^5.0.3",
-    "postcss-loader": "^3.0.0",
+    "node-sass": "^6.0.1",
+    "postcss-loader": "^5.2.0",
     "puppeteer": "^1.20.0",
-    "rimraf": "^3.0.2",
-    "sass-loader": "^7.3.1",
-    "style-loader": "^1.2.1",
-    "ts-jest": "^26.4.4",
+    "sass-loader": "^10.2.0",
+    "style-loader": "^1.3.0",
+    "terser-webpack-plugin": "^5.1.2",
+    "ts-jest": "^26.5.6",
     "ts-loader": "^6.2.2",
     "tslint": "^5.20.1",
-    "typescript": "^3.9.6",
-    "webpack": "^4.43.0",
-    "webpack-bundle-analyzer": "^3.8.0",
-    "webpack-cli": "^3.3.12",
-    "webpack-dev-server": "^3.11.0"
+    "typescript": "^3.9.9",
+    "webpack": "^5.37.0",
+    "webpack-bundle-analyzer": "^3.9.0",
+    "webpack-cli": "^4.7.0",
+    "webpack-dev-server": "^4.1.0"
   },
   "license": "MIT",
   "repository": "git://github.com/Vanessa219/vditor.git",
@@ -59,7 +58,7 @@
     "lint": "tslint --fix -c tslint.json '{src,types}/**/*.ts'",
     "test:watch": "jest --watch",
     "test": "jest --coverage",
-    "start": "webpack-dev-server --config webpack.start.js",
+    "start": "webpack serve --config webpack.start.js",
     "build": "webpack"
   },
   "keywords": [

package/src/assets/scss/_content.scss

@@ -91,6 +91,10 @@
       padding: 10px;
       margin: 0 auto;
     }
+
+    img:not(.emoji) {
+      cursor: pointer;
+    }
   }
 
   &-devtools {

package/src/assets/scss/_reset.scss

@@ -155,6 +155,9 @@
       margin-bottom: 16px;
       overflow: auto;
       border-spacing: 0;
+      display: block;
+      word-break: keep-all;
+      width: 100%;
 
       tr {
         background-color: #fafbfc;
@@ -166,6 +169,14 @@
         padding: 6px 13px;
         border: 1px solid #dfe2e5;
         word-break: normal;
+        white-space: nowrap;
+
+        &:first-child::after {
+          content: "";
+          display: inline-block;
+          vertical-align: top;
+          min-height: 24px;
+        }
       }
 
       th {