فهرست منبع

Revert "bugFix"

This reverts commit 6d46641fc71cc29ca3b167c17721fde8ded88bc7.
Shun Miyazawa 2 سال پیش
والد
کامیت
8228637c17

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

@@ -1,9 +1,12 @@
 @use '@growi/core/scss/bootstrap/init' as bs;
 
 
-%codemirror-editor-common-container {
+.codemirror-editor-container :global {
 
   .cm-editor {
+    width: 100%;
+    height: 100%;
+
     // Header highlight style
     .cm-header {
       text-decoration: none;
@@ -36,21 +39,6 @@
 
 }
 
-.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 {

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

@@ -19,12 +19,9 @@ import { Toolbar } from './Toolbar';
 
 import style from './CodeMirrorEditor.module.scss';
 
-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'];
-
+const CodeMirrorEditorContainer = forwardRef<HTMLDivElement>((props, ref) => {
   return (
-    <div {...props} className={`flex-expand-vert ${styles}`} ref={ref} />
+    <div {...props} className={`flex-expand-vert ${style['codemirror-editor-container']}`} ref={ref} />
   );
 });
 
@@ -201,10 +198,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 editorKey={editorKey} ref={containerRef} />
+        <CodeMirrorEditorContainer ref={containerRef} />
         <Toolbar editorKey={editorKey} onFileOpen={open} acceptedFileType={acceptedFileType} />
       </div>
     </div>