Merge pull request #8040 from weseek/imprv/129384-129404-correct-update-message

imprv: Correct update message

apps/app/src/client/services/AdminCustomizeContainer.js

@@ -216,7 +216,7 @@ export default class AdminCustomizeContainer extends Container {
         isEnabledStaleNotification: customizedParams.isEnabledStaleNotification,
         isAllReplyShown: customizedParams.isAllReplyShown,
         isSearchScopeChildrenAsDefault: customizedParams.isSearchScopeChildrenAsDefault,
-        isEnabledMarp: customizedParams.state.isEnabledMarp,
+        isEnabledMarp: customizedParams.isEnabledMarp,
       });
     }
     catch (err) {

packages/presentation/src/components/Presentation.tsx

@@ -42,10 +42,8 @@ export const Presentation = (props: PresentationProps): JSX.Element => {
   const { options, isEnabledMarp, children } = props;
   const { revealOptions } = options;
 
-  let marp = false;
-  if (isEnabledMarp) {
-    [marp] = parseSlideFrontmatterInMarkdown(children);
-  }
+  const [marp] = parseSlideFrontmatterInMarkdown(children);
+  const hasMarpFlag = isEnabledMarp && marp;
 
   useEffect(() => {
     let deck: Reveal.Api;
@@ -66,7 +64,7 @@ export const Presentation = (props: PresentationProps): JSX.Element => {
 
   return (
     <div className={`grw-presentation ${styles['grw-presentation']} reveal`}>
-      <Slides options={options} hasMarpFlag={marp} presentation>{children}</Slides>
+      <Slides options={options} hasMarpFlag={hasMarpFlag} presentation>{children}</Slides>
     </div>
   );
 };

packages/presentation/src/services/growi-marpit.ts

@@ -60,4 +60,4 @@ export const presentationMarpit = new Marp({
   emoji: undefined,
   html: false,
   math: false,
-}).use(lineNumber);
+});