Shun Miyazawa 2 лет назад
Родитель
Сommit
6d46641fc7

+ 16 - 4
packages/editor/src/components/CodeMirrorEditor/CodeMirrorEditor.module.scss

@@ -1,12 +1,9 @@
 @use '@growi/core/scss/bootstrap/init' as bs;
 
 
-.codemirror-editor-container :global {
+%codemirror-editor-common-container {
 
   .cm-editor {
-    width: 100%;
-    height: 100%;
-
     // Header highlight style
     .cm-header {
       text-decoration: none;
@@ -39,6 +36,21 @@
 
 }
 
+.codemirror-editor-main-container :global {
+  @extend %codemirror-editor-common-container;
+  .cm-editor {
+    width: 100%;
+    height: 100%;
+  }
+}
+
+.codemirror-editor-comment-container :global {
+  @extend %codemirror-editor-common-container;
+  .cm-editor {
+    height: 200px
+  }
+}
+
 
 @mixin insertMaterialSymbolAndMessage($code, $message) {
   .overlay-icon:before {

+ 7 - 4
packages/editor/src/components/CodeMirrorEditor/CodeMirrorEditor.tsx

@@ -19,9 +19,12 @@ import { Toolbar } from './Toolbar';
 
 import style from './CodeMirrorEditor.module.scss';
 
-const CodeMirrorEditorContainer = forwardRef<HTMLDivElement>((props, ref) => {
+const CodeMirrorEditorContainer = forwardRef<HTMLDivElement, { editorKey: string | GlobalCodeMirrorEditorKey }>((props, ref) => {
+  const { editorKey } = props;
+  const styles = editorKey === GlobalCodeMirrorEditorKey.MAIN ? style['codemirror-editor-main-container'] : style['codemirror-editor-comment-container'];
+
   return (
-    <div {...props} className={`flex-expand-vert ${style['codemirror-editor-container']}`} ref={ref} />
+    <div {...props} className={`flex-expand-vert ${styles}`} ref={ref} />
   );
 });
 
@@ -198,10 +201,10 @@ export const CodeMirrorEditor = (props: Props): JSX.Element => {
   }, [isUploading, isDragAccept, isDragReject, acceptedFileType]);
 
   return (
-    <div className={`${style['codemirror-editor']} flex-expand-vert`}>
+    <div className={`${style['codemirror-editor']} flex-expand-vert}`}>
       <div {...getRootProps()} className={`dropzone ${fileUploadState} flex-expand-vert`}>
         <FileDropzoneOverlay isEnabled={isDragActive} />
-        <CodeMirrorEditorContainer ref={containerRef} />
+        <CodeMirrorEditorContainer editorKey={editorKey} ref={containerRef} />
         <Toolbar editorKey={editorKey} onFileOpen={open} acceptedFileType={acceptedFileType} />
       </div>
     </div>