From 3503cbb9a2d341ffaf8eecc79f1712153cf025fe Mon Sep 17 00:00:00 2001 From: humyfred <513407656@qq.om> Date: Wed, 2 Mar 2022 00:37:18 +0800 Subject: [PATCH 1/2] fix(suggester): fix sugggester hook compatible for node env --- src/core/hooks/Suggester.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/core/hooks/Suggester.js b/src/core/hooks/Suggester.js index 6aa3c4cb..3a976c2a 100644 --- a/src/core/hooks/Suggester.js +++ b/src/core/hooks/Suggester.js @@ -21,9 +21,11 @@ */ import escapeRegExp from 'lodash/escapeRegExp'; import SyntaxBase from '@/core/SyntaxBase'; -import Codemirror from 'codemirror'; +import { Pass } from 'codemirror/src/util/misc'; import { isLookbehindSupported } from '@/utils/regexp'; import { replaceLookbehind } from '@/utils/lookbehind-replace'; +import { isBrowser } from '@/utils/env'; + export default class Suggester extends SyntaxBase { static HOOK_NAME = 'suggester'; @@ -79,7 +81,7 @@ export default class Suggester extends SyntaxBase { makeHtml(str) { if (!this.RULE.reg) return str; - if (!suggesterPanel.hasEditor()) { + if (!suggesterPanel.hasEditor() && isBrowser()) { const { editor } = this.$engine.$cherry; suggesterPanel.setEditor(editor); suggesterPanel.setSuggester(this.suggester); @@ -124,7 +126,7 @@ export default class Suggester extends SyntaxBase { } mounted() { - if (!suggesterPanel.hasEditor()) { + if (!suggesterPanel.hasEditor() && isBrowser()) { const { editor } = this.$engine.$cherry; suggesterPanel.setEditor(editor); suggesterPanel.setSuggester(this.suggester); @@ -141,7 +143,7 @@ class SuggesterPanel { this.cursorMove = true; this.suggesterConfig = {}; - if (!this.$suggesterPanel) { + if (!this.$suggesterPanel && isBrowser()) { document.body.append(this.createDom(SuggesterPanel.panelWrap)); this.$suggesterPanel = document.querySelector('.cherry-suggester-panel'); } @@ -187,19 +189,19 @@ class SuggesterPanel { Up() { if (suggesterPanel.cursorMove) { // logic to decide whether to move up or not - return Codemirror.Pass; + return Pass; } }, Down() { if (suggesterPanel.cursorMove) { // logic to decide whether to move up or not - return Codemirror.Pass; + return Pass; } }, Enter() { if (suggesterPanel.cursorMove) { // logic to decide whether to move up or not - return Codemirror.Pass; + return Pass; } }, }); From 57faa61ffee2dd08d012874dbba9ce88be406e3d Mon Sep 17 00:00:00 2001 From: humyfred <513407656@qq.om> Date: Wed, 2 Mar 2022 00:38:57 +0800 Subject: [PATCH 2/2] docs: optimize docs about node env usage --- README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 90958a96..bcc29b7f 100644 --- a/README.md +++ b/README.md @@ -129,11 +129,9 @@ const cherryInstance = new Cherry({ ### Node ```javascript -const { default: Cherry } = require('cherry-markdown'); -const cherryInstance = new Cherry({ - id: 'markdown-container', - value: '# welcome to cherry editor!', -}); +const { default: CherryEngine } = require('cherry-markdown/dist/cherry-markdown.engine.core.common'); +const cherryEngineInstance = new CherryEngine(); +const htmlContent = cherryEngineInstance.makeHtml('# welcome to cherry editor!'); ``` ## Lite Version