reiji-h 2 лет назад
Родитель
Сommit
684a0b447f
1 измененных файлов с 2 добавлено и 25 удалено
  1. 2 25
      apps/app/src/client/services/renderer/slide-viewer-renderer.tsx

+ 2 - 25
apps/app/src/client/services/renderer/slide-viewer-renderer.tsx

@@ -4,7 +4,6 @@ import * as drawio from '@growi/remark-drawio';
 import * as lsxGrowiDirective from '@growi/remark-lsx/dist/client';
 import * as lsxGrowiDirective from '@growi/remark-lsx/dist/client';
 import katex from 'rehype-katex';
 import katex from 'rehype-katex';
 import sanitize from 'rehype-sanitize';
 import sanitize from 'rehype-sanitize';
-import breaks from 'remark-breaks';
 import math from 'remark-math';
 import math from 'remark-math';
 import deepmerge from 'ts-deepmerge';
 import deepmerge from 'ts-deepmerge';
 import type { Pluggable } from 'unified';
 import type { Pluggable } from 'unified';
@@ -15,7 +14,6 @@ import * as mermaid from '~/features/mermaid';
 import { RehypeSanitizeOption } from '~/interfaces/rehype';
 import { RehypeSanitizeOption } from '~/interfaces/rehype';
 import type { RendererOptions } from '~/interfaces/renderer-options';
 import type { RendererOptions } from '~/interfaces/renderer-options';
 import type { RendererConfig } from '~/interfaces/services/renderer';
 import type { RendererConfig } from '~/interfaces/services/renderer';
-import * as keywordHighlighter from '~/services/renderer/rehype-plugins/keyword-highlighter';
 import * as attachment from '~/services/renderer/remark-plugins/attachment';
 import * as attachment from '~/services/renderer/remark-plugins/attachment';
 import * as plantuml from '~/services/renderer/remark-plugins/plantuml';
 import * as plantuml from '~/services/renderer/remark-plugins/plantuml';
 import * as xsvToTable from '~/services/renderer/remark-plugins/xsv-to-table';
 import * as xsvToTable from '~/services/renderer/remark-plugins/xsv-to-table';
@@ -23,11 +21,10 @@ import {
   commonSanitizeOption, generateCommonOptions, injectCustomSanitizeOption, verifySanitizePlugin,
   commonSanitizeOption, generateCommonOptions, injectCustomSanitizeOption, verifySanitizePlugin,
 } from '~/services/renderer/renderer';
 } from '~/services/renderer/renderer';
 
 
-const generateSimpleViewOptions = (
+
+export const generatePresentationViewOptions = (
     config: RendererConfig,
     config: RendererConfig,
     pagePath: string,
     pagePath: string,
-    highlightKeywords?: string | string[],
-    overrideIsEnabledLinebreaks?: boolean,
 ): RendererOptions => {
 ): RendererOptions => {
   const options = generateCommonOptions(pagePath);
   const options = generateCommonOptions(pagePath);
 
 
@@ -45,12 +42,6 @@ const generateSimpleViewOptions = (
     refsGrowiDirective.remarkPlugin,
     refsGrowiDirective.remarkPlugin,
   );
   );
 
 
-  const isEnabledLinebreaks = overrideIsEnabledLinebreaks ?? config.isEnabledLinebreaks;
-
-  if (isEnabledLinebreaks) {
-    remarkPlugins.push(breaks);
-  }
-
   if (config.xssOption === RehypeSanitizeOption.CUSTOM) {
   if (config.xssOption === RehypeSanitizeOption.CUSTOM) {
     injectCustomSanitizeOption(config);
     injectCustomSanitizeOption(config);
   }
   }
@@ -71,7 +62,6 @@ const generateSimpleViewOptions = (
   rehypePlugins.push(
   rehypePlugins.push(
     [lsxGrowiDirective.rehypePlugin, { pagePath, isSharedPage: config.isSharedPage }],
     [lsxGrowiDirective.rehypePlugin, { pagePath, isSharedPage: config.isSharedPage }],
     [refsGrowiDirective.rehypePlugin, { pagePath }],
     [refsGrowiDirective.rehypePlugin, { pagePath }],
-    [keywordHighlighter.rehypePlugin, { keywords: highlightKeywords }],
     rehypeSanitizePlugin,
     rehypeSanitizePlugin,
     katex,
     katex,
   );
   );
@@ -95,16 +85,3 @@ const generateSimpleViewOptions = (
   }
   }
   return options;
   return options;
 };
 };
-
-export const generatePresentationViewOptions = (
-    config: RendererConfig,
-    pagePath: string,
-): RendererOptions => {
-  // based on simple view options
-  const options = generateSimpleViewOptions(config, pagePath);
-
-  if (config.isEnabledXssPrevention) {
-    verifySanitizePlugin(options, false);
-  }
-  return options;
-};