Steven Fukase 4 лет назад
Родитель
Сommit
66e3480288

+ 7 - 2
packages/app/src/client/services/EditorContainer.js

@@ -205,8 +205,13 @@ export default class EditorContainer extends Container {
    */
   async retrieveEditorSettings() {
     const { data } = await this.appContainer.apiv3Get('/personal-setting/editor-settings');
-    const isTextlintEnabled = data.textlintSettings?.isTextlintEnabled;
-    const textlintRules = data.textlintSettings?.textlintRules;
+
+    if (data?.textlintSettings == null) {
+      return;
+    }
+
+    const { isTextlintEnabled = false, textlintRules = [] } = data.textlintSettings;
+
     this.setState({
       isTextlintEnabled,
       textlintRules,

+ 2 - 2
packages/app/src/components/PageEditor/CodeMirrorEditor.jsx

@@ -883,7 +883,7 @@ export default class CodeMirrorEditor extends AbstractEditor {
 
   render() {
     const mode = this.state.isGfmMode ? 'gfm-growi' : undefined;
-    const lint = this.props.isTextlintEnabled === true ? this.codemirrorLintConfig : false;
+    const lint = this.props.isTextlintEnabled ? this.codemirrorLintConfig : false;
     const additionalClasses = Array.from(this.state.additionalClassSet).join(' ');
     const placeholder = this.state.isGfmMode ? 'Input with Markdown..' : 'Input with Plain Text..';
 
@@ -986,7 +986,7 @@ export default class CodeMirrorEditor extends AbstractEditor {
 CodeMirrorEditor.propTypes = Object.assign({
   editorOptions: PropTypes.object.isRequired,
   isTextlintEnabled: PropTypes.bool,
-  lintRules: PropTypes.array,
+  textlintRules: PropTypes.array,
   emojiStrategy: PropTypes.object,
   lineNumbers: PropTypes.bool,
   onMarkdownHelpButtonClicked: PropTypes.func,