Merge remote-tracking branch 'origin/master'

88250 · Apr 30, 2020 · 08a09d6 · 08a09d6
2 parents b8a1554 + 123fe8d
commit 08a09d6
Show file tree

Hide file tree

Showing 14 changed files with 63 additions and 29 deletions.
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -54,6 +54,6 @@
     "webpack-cli": "^3.3.10"
   },
   "dependencies": {
-    "vditor": "^3.1.6"
+    "vditor": "^3.1.20"
   }
 }
diff --git a/app/src/config/image.ts b/app/src/config/image.ts
@@ -16,7 +16,7 @@ export const image = {
             });
         });
     },
-    onSetimage: (liandi: ILiandi, image: IImage) => {
-        liandi.config.image = image;
+    onSetimage: (liandi: ILiandi, imageConfig: IImage) => {
+        liandi.config.image = imageConfig;
     }
 };
diff --git a/app/src/config/markdown.ts b/app/src/config/markdown.ts
@@ -14,7 +14,7 @@ export const markdown = {
     <label>
         <input value="ir" name="editMode" type="radio"${liandi.config.markdown.editorMode === 'ir' ? ' checked' : ''}/>
         <span class="fn__space"></span>${i18n[liandi.config.lang].ir}
-    </label>  
+    </label>
     <span class="fn__space"></span><span class="fn__space"></span>
     <label>
         <input value="sv" name="editMode" type="radio"${liandi.config.markdown.editorMode === 'sv' ? ' checked' : ''}/>

diff --git a/app/src/config/search.ts b/app/src/config/search.ts
@@ -69,7 +69,9 @@ export const initConfigSearch = (liandi: ILiandi, element: HTMLElement) => {
             return;
         }
         if (event.key === 'Escape') {
-            destroyDialog();
+            destroyDialog(() => {
+                liandi.editors.focus();
+            });
             event.preventDefault();
         }
     });

diff --git a/app/src/constants.ts b/app/src/constants.ts
@@ -11,6 +11,7 @@ export abstract class Constants {
     public static readonly LIANDI_EDITOR_OPEN: string = 'liandi-editor-open';
     public static readonly LIANDI_EDITOR_FULLSCREEN: string = 'liandi-editor-fullscreen';
     public static readonly LIANDI_EDITOR_RESTORE: string = 'liandi-editor-restore';
+    public static readonly LIANDI_EDITOR_CURSOR: string = 'liandi-editor-cursor';
 
     public static readonly LIANDI_WEBSOCKET_PUT: string = 'liandi-websocket-put';
 

diff --git a/app/src/editors/index.ts b/app/src/editors/index.ts
@@ -1,5 +1,6 @@
 import {rename} from '../util/rename';
 import {remote} from 'electron';
+import {Constants} from '../constants';
 
 export class Editors {
     private inputElement: HTMLInputElement;
@@ -34,10 +35,15 @@ export class Editors {
         this.editorWebviewElement.classList.add('fn__none');
     }
 
-    sendMessage(message: string, liandi: ILiandi, editorData?: { content: string, name: string }) {
+    focus() {
+        this.editorWebviewElement.focus();
+        this.sendMessage(Constants.LIANDI_EDITOR_CURSOR);
+    }
+
+    sendMessage(message: string, liandi?: ILiandi, editorData?: { content: string, name: string }) {
         if (editorData) {
             remote.getGlobal('liandiEditor').editorText = editorData.content;
-            this.inputElement.value = editorData.name.replace(".md", "");
+            this.inputElement.value = editorData.name.replace('.md', '');
             this.inputElement.classList.remove('fn__none');
             this.editorWebviewElement.classList.remove('fn__none');
         }

diff --git a/app/src/editors/webview.ts b/app/src/editors/webview.ts
@@ -10,10 +10,12 @@ const Vditor = require('vditor');
 export class EditorWebview {
     private isInitMenu: boolean;
     private vditor: any;
+    private range: Range;
 
     constructor() {
         this.isInitMenu = false;
-        initGlobalKeyPress();
+        this.range = document.createRange();
+        initGlobalKeyPress(this);
         this.onMessage();
         if (process.platform === 'win32') {
             document.body.classList.add('body--win32');
@@ -41,7 +43,7 @@ export class EditorWebview {
             id: 'copyAsPlainText',
             accelerator: 'CmdOrCtrl+Shift+C',
             click: () => {
-                clipboard.writeText(getSelection().getRangeAt(0).toString().replace(//g, ""));
+                clipboard.writeText(getSelection().getRangeAt(0).toString().replace(//g, ''));
             }
         }));
         menu.append(new remote.MenuItem({
@@ -88,10 +90,15 @@ export class EditorWebview {
         ipcRenderer.on(Constants.LIANDI_EDITOR_RELOAD, (event, data) => {
             this.onOpen(data);
         });
+        ipcRenderer.on(Constants.LIANDI_EDITOR_CURSOR, (event, data) => {
+            const selection = window.getSelection();
+            selection.removeAllRanges();
+            selection.addRange(this.range);
+        });
     }
 
     private isCtrl(event: KeyboardEvent) {
-        if (navigator.platform.toUpperCase().indexOf("MAC") >= 0) {
+        if (navigator.platform.toUpperCase().indexOf('MAC') >= 0) {
             // mac
             if (event.metaKey && !event.ctrlKey) {
                 return true;
@@ -103,7 +110,7 @@ export class EditorWebview {
             }
             return false;
         }
-    };
+    }
 
     private onOpen(liandi: ILiandi, value: string = remote.getGlobal('liandiEditor').editorText) {
         document.getElementById('liandiVditor').innerHTML = '';
@@ -132,6 +139,8 @@ export class EditorWebview {
                 'line',
                 'code',
                 'inline-code',
+                'insert-before',
+                'insert-after',
                 '|',
                 'upload',
                 'table',
@@ -162,6 +171,7 @@ export class EditorWebview {
                         }
                     },
                 },
+                'outline',
                 'devtools',
                 'info',
                 'help',
@@ -171,12 +181,16 @@ export class EditorWebview {
             cache: {
                 enable: false
             },
-            cdn: remote.getGlobal('liandiEditor').appDir + "/node_modules/vditor",
+            counter: {
+              enable: true
+            },
+            cdn: remote.getGlobal('liandiEditor').appDir + '/node_modules/vditor',
             preview: {
                 markdown: {
                     autoSpace: liandi.config.markdown.autoSpace,
                     chinesePunct: liandi.config.markdown.chinesePunct,
                     fixTermTypo: liandi.config.markdown.fixTermTypo,
+                    theme: liandi.config.theme,
                     toc: liandi.config.markdown.toc,
                     footnotes: liandi.config.markdown.footnotes,
                     setext: liandi.config.markdown.setext
@@ -189,13 +203,14 @@ export class EditorWebview {
                     style: liandi.config.theme === 'dark' ? 'native' : 'github'
                 }
             },
+            height: window.innerHeight - 20,
             upload: {
                 setHeaders: () => {
                     return {
                         'X-URL': encodeURIComponent(liandi.current.dir.url),
                         'X-PATH': encodeURIComponent(liandi.current.path),
                         'X-Mode': this.vditor.getCurrentMode()
-                    }
+                    };
                 },
                 linkToImgUrl: Constants.UPLOAD_FETCH_ADDRESS,
                 filename: (name: string) => name.replace(/[^(a-zA-Z0-9\u4e00-\u9fa5\.)]/g, '').replace(/[\?\\/:|<>\*\[\]\(\)\$%\{\}@~]/g, '').replace('/\\s/g', ''),
@@ -206,6 +221,7 @@ export class EditorWebview {
                 this.vditor.setValue(value);
                 remote.getGlobal('liandiEditor').editorText = value;
                 remote.getGlobal('liandiEditor').saved = true;
+                this.vditor.focus();
             },
             input: (textContent: string) => {
                 remote.getGlobal('liandiEditor').editorText = textContent;
@@ -217,19 +233,19 @@ export class EditorWebview {
             }
         });
 
-        this.vditor.vditor.wysiwyg.element.addEventListener("keydown", (event: KeyboardEvent) => {
+        this.vditor.vditor.wysiwyg.element.addEventListener('keydown', (event: KeyboardEvent) => {
             if (this.isCtrl(event) && event.key.toLowerCase() === 'v' && !event.altKey && event.shiftKey) {
-                const range = getSelection().getRangeAt(0)
+                const range = getSelection().getRangeAt(0);
                 range.extractContents();
                 this.vditor.insertValue(clipboard.readText());
                 event.preventDefault();
             }
 
             if (this.isCtrl(event) && event.key.toLowerCase() === 'c' && !event.altKey && event.shiftKey) {
-                clipboard.writeText(getSelection().getRangeAt(0).toString().replace(//g, ""));
+                clipboard.writeText(getSelection().getRangeAt(0).toString().replace(//g, ''));
                 event.preventDefault();
             }
-        })
+        });
     }
 }
 

diff --git a/app/src/hotkey/index.ts b/app/src/hotkey/index.ts
@@ -2,20 +2,21 @@ import {Constants} from '../constants';
 import {ipcRenderer} from 'electron';
 import {initSearch} from '../search';
 
-export const initGlobalKeyPress = (liandi?: ILiandi) => {
+export const initGlobalKeyPress = (liandi: ILiandi | any) => {
     let lastKeypressTime = 0;
 
-    window.addEventListener('keyup', (event) => {
+    window.addEventListener('keydown', (event) => {
         // 快捷搜素
         if (event.key === 'Shift') {
             const thisKeypressTime = new Date().getTime();
             if (thisKeypressTime - lastKeypressTime <= Constants.DOUBLE_DELTA
                 && thisKeypressTime - lastKeypressTime >= 50) { // 防止 win32 长按
                 lastKeypressTime = 0;
-                if (liandi) {
-                    initSearch(liandi);
-                } else {
+                if (liandi.range) {
+                    liandi.range = getSelection().getRangeAt(0);
                     ipcRenderer.sendToHost(Constants.LIANDI_SEARCH_OPEN);
+                } else {
+                    initSearch(liandi);
                 }
             }
             lastKeypressTime = thisKeypressTime;

diff --git a/app/src/i18n/index.ts b/app/src/i18n/index.ts
@@ -43,7 +43,7 @@ export const i18n: II18n = {
         copyAsPlainText: 'Copy As Plain Text',
         paste: 'Paste',
         pasteAsPlainText: 'Paste As Plain Text',
-        hideToolbar: "Hide Editor's toolbar",
+        hideToolbar: 'Hide Editor\'s toolbar',
         toc: 'Enable [toc]',
         footnotes: 'Enable [^footnotes]',
         autoFetch: 'Auto fetch remote image to local',

diff --git a/app/src/search/index.ts b/app/src/search/index.ts
@@ -7,6 +7,7 @@ import {initConfigSearch} from '../config/search';
 import {getPath, removeLastPath} from '../util/path';
 import {markdown} from '../config/markdown';
 import {image} from '../config/image';
+import {Constants} from '../constants';
 
 export const quickOpenFile = (liandi: ILiandi, dialogElement: Element) => {
     const currentList: HTMLElement = dialogElement.querySelector('div[data-name="search"] .list__item--current');
@@ -76,7 +77,10 @@ export const initSearch = (liandi: ILiandi) => {
   </div>
 </tab-panel>`,
         width: Math.max(window.innerWidth - 520, 600),
-        height: 520
+        height: 520,
+        destroyDialogCallback: () => {
+            liandi.editors.focus();
+        }
     });
 
     const dialogElement = document.querySelector('#dialog');
@@ -102,7 +106,9 @@ export const initSearch = (liandi: ILiandi) => {
             return;
         }
         if (event.key === 'Escape') {
-            destroyDialog();
+            destroyDialog(() => {
+                liandi.editors.focus();
+            });
             event.preventDefault();
         }
         let currentList: HTMLElement = dialogElement.querySelector('div[data-name="search"] .list__item--current');

diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts
@@ -59,6 +59,7 @@ declare interface ILiandi {
         onRename: (liandi: ILiandi, data: { newPath: string, oldPath: string, newName: string }) => void
     };
     editors?: {
+        focus: () => void;
         save: (liandi:ILiandi) => void;
         close: (liandi:ILiandi) => void;
         sendMessage: (message: string, liandi: ILiandi, editorData?: { content: string, name: string }) => void;

diff --git a/app/src/util/dialog.ts b/app/src/util/dialog.ts
@@ -20,7 +20,7 @@ export const dialog = (options: {
     if (!dialogElement) {
         document.body.insertAdjacentHTML('beforeend', `
 <div class="dialog" id="dialog">
-    ${options.hideBackground ? "" : '<div class="dialog__bg"></div>'}
+    ${options.hideBackground ? '' : '<div class="dialog__bg"></div>'}
     <div class="dialog__main fn__layer">
       <svg class="dialog__close"><use xlink:href="#iconClose"></use></svg>
       <div class="dialog__header" onselectstart="return false;">

diff --git a/app/src/websocket/index.ts b/app/src/websocket/index.ts
@@ -114,6 +114,7 @@ export class WebSocketUtil {
                     liandi.files.onLs(liandi, response.data);
                     break;
                 case 'get':
+                    liandi.editors.focus();
                     liandi.editors.sendMessage(Constants.LIANDI_EDITOR_OPEN, liandi, response.data);
                     break;
                 case 'searchget':