Przeglądaj źródła

delete export MARP_CONTAINER

reiji-h 2 lat temu
rodzic
commit
c8245003bd

+ 6 - 11
apps/app/src/components/ReactMarkdownComponents/SlideViewer.tsx

@@ -1,6 +1,5 @@
 import React from 'react';
 import React from 'react';
 
 
-import { MARP_CONTAINER_CLASS_NAME } from '@growi/presentation';
 import dynamic from 'next/dynamic';
 import dynamic from 'next/dynamic';
 import { ReactMarkdownOptions } from 'react-markdown/lib/react-markdown';
 import { ReactMarkdownOptions } from 'react-markdown/lib/react-markdown';
 
 
@@ -25,16 +24,12 @@ export const SlideViewer: React.FC<SlideViewerProps> = React.memo((props: SlideV
   const { data: rendererOptions } = usePresentationViewOptions();
   const { data: rendererOptions } = usePresentationViewOptions();
 
 
   return (
   return (
-    <div className={`${MARP_CONTAINER_CLASS_NAME}`}>
-      <div className="slides">
-        <Slides
-          hasMarpFlag={marp === 'marp'}
-          options={{ rendererOptions: rendererOptions as ReactMarkdownOptions }}
-        >
-          {children}
-        </Slides>
-      </div>
-    </div>
+    <Slides
+      hasMarpFlag={marp === 'marp'}
+      options={{ rendererOptions: rendererOptions as ReactMarkdownOptions }}
+    >
+      {children}
+    </Slides>
   );
   );
 });
 });
 
 

+ 3 - 5
packages/presentation/src/components/Presentation.tsx

@@ -4,7 +4,7 @@ import Reveal from 'reveal.js';
 
 
 import type { PresentationOptions } from '../consts';
 import type { PresentationOptions } from '../consts';
 
 
-import { MARP_CONTAINER_CLASS_NAME, Slides } from './Slides';
+import { Slides } from './Slides';
 
 
 import 'reveal.js/dist/reveal.css';
 import 'reveal.js/dist/reveal.css';
 import './Presentation.global.scss';
 import './Presentation.global.scss';
@@ -57,10 +57,8 @@ export const Presentation = (props: PresentationProps): JSX.Element => {
   }, [children, revealOptions]);
   }, [children, revealOptions]);
 
 
   return (
   return (
-    <div className={`grw-presentation ${styles['grw-presentation']} reveal ${MARP_CONTAINER_CLASS_NAME}`}>
-      <div className="slides">
-        <Slides options={options}>{children}</Slides>
-      </div>
+    <div className={`grw-presentation ${styles['grw-presentation']} reveal`}>
+      <Slides options={options}>{children}</Slides>
     </div>
     </div>
   );
   );
 };
 };

+ 12 - 9
packages/presentation/src/components/Slides.tsx

@@ -8,9 +8,7 @@ import { MarpSlides } from './MarpSlides';
 
 
 import './Slides.global.scss';
 import './Slides.global.scss';
 
 
-// TODO: to remove MARP_CONTAINER_CLASS_NAME
-// https://redmine.weseek.co.jp/issues/125680
-export const MARP_CONTAINER_CLASS_NAME = 'marpit';
+const MARP_CONTAINER_CLASS_NAME = 'marpit';
 
 
 const marpit = new Marp({
 const marpit = new Marp({
   container: [
   container: [
@@ -35,10 +33,15 @@ type Props = {
 export const Slides = (props: Props): JSX.Element => {
 export const Slides = (props: Props): JSX.Element => {
   const { options, children, hasMarpFlag } = props;
   const { options, children, hasMarpFlag } = props;
 
 
-  if (hasMarpFlag) {
-    return <MarpSlides marpit={marpit}>{children}</MarpSlides>;
-  }
-
-  return <GrowiSlides options={options} marpit={marpit}>{children}</GrowiSlides>;
-
+  return (
+    <div className={`${MARP_CONTAINER_CLASS_NAME}`}>
+      <div className="slides">
+        {
+          hasMarpFlag
+            ? <MarpSlides marpit={marpit}>{children}</MarpSlides>
+            : <GrowiSlides options={options} marpit={marpit}>{children}</GrowiSlides>
+        }
+      </div>
+    </div>
+  );
 };
 };