Yuki Takei 3 лет назад
Родитель
Сommit
f902f789ec
2 измененных файлов с 18 добавлено и 11 удалено
  1. 13 6
      packages/app/src/services/renderer/growi-renderer.ts
  2. 5 5
      packages/app/src/stores/renderer.tsx

+ 13 - 6
packages/app/src/services/renderer/growi-renderer.ts

@@ -197,7 +197,7 @@ export default class GrowiRenderer {
 }
 }
 
 
 export interface RendererGenerator {
 export interface RendererGenerator {
-  (growiRendererConfig: GrowiRendererConfig, rendererSettings: RendererSettings | null, pagePath?: Nullable<string>): GrowiRenderer
+  (growiRendererConfig: GrowiRendererConfig, rendererSettings: RendererSettings, pagePath?: Nullable<string>): GrowiRenderer
 }
 }
 
 
 export const generateViewRenderer: RendererGenerator = (
 export const generateViewRenderer: RendererGenerator = (
@@ -234,13 +234,14 @@ export const generatePreviewRenderer: RendererGenerator = (
     new TableConfigurer(),
     new TableConfigurer(),
   ]);
   ]);
 
 
+  renderer.setMarkdownSettings({ breaks: rendererSettings?.isEnabledLinebreaks });
   renderer.configure();
   renderer.configure();
 
 
   return renderer;
   return renderer;
 };
 };
 
 
-const generateRendererWithTableConfigurer: RendererGenerator = (
-    growiRendererConfig: GrowiRendererConfig, rendererSettings: RendererSettings | null, pagePath?: Nullable<string>,
+export const generateCommentPreviewRenderer: RendererGenerator = (
+    growiRendererConfig: GrowiRendererConfig, rendererSettings: RendererSettings, pagePath?: Nullable<string>,
 ): GrowiRenderer => {
 ): GrowiRenderer => {
   const renderer = new GrowiRenderer(growiRendererConfig, pagePath);
   const renderer = new GrowiRenderer(growiRendererConfig, pagePath);
   renderer.init();
   renderer.init();
@@ -249,17 +250,23 @@ const generateRendererWithTableConfigurer: RendererGenerator = (
     new TableConfigurer(),
     new TableConfigurer(),
   ]);
   ]);
 
 
+  renderer.setMarkdownSettings({ breaks: rendererSettings.isEnabledLinebreaksInComments });
   renderer.configure();
   renderer.configure();
 
 
   return renderer;
   return renderer;
 };
 };
 
 
-export const generateCommentPreviewRenderer: RendererGenerator = (
+export const generateOthersRenderer: RendererGenerator = (
     growiRendererConfig: GrowiRendererConfig, rendererSettings: RendererSettings, pagePath?: Nullable<string>,
     growiRendererConfig: GrowiRendererConfig, rendererSettings: RendererSettings, pagePath?: Nullable<string>,
 ): GrowiRenderer => {
 ): GrowiRenderer => {
-  const renderer = generateRendererWithTableConfigurer(growiRendererConfig, null, pagePath);
+  const renderer = new GrowiRenderer(growiRendererConfig, pagePath);
+  renderer.init();
 
 
-  renderer.setMarkdownSettings({ breaks: rendererSettings.isEnabledLinebreaksInComments });
+  renderer.addConfigurers([
+    new TableConfigurer(),
+  ]);
+
+  renderer.setMarkdownSettings({ breaks: rendererSettings.isEnabledLinebreaks });
   renderer.configure();
   renderer.configure();
 
 
   return renderer;
   return renderer;

+ 5 - 5
packages/app/src/stores/renderer.tsx

@@ -3,7 +3,7 @@ import useSWRImmutable from 'swr/immutable';
 
 
 import { RendererSettings } from '~/interfaces/services/renderer';
 import { RendererSettings } from '~/interfaces/services/renderer';
 import GrowiRenderer, {
 import GrowiRenderer, {
-  generateCommentPreviewRenderer, generatePreviewRenderer, generateViewRenderer, RendererGenerator,
+  generateViewRenderer, generatePreviewRenderer, generateCommentPreviewRenderer, generateOthersRenderer, RendererGenerator,
 } from '~/services/renderer/growi-renderer';
 } from '~/services/renderer/growi-renderer';
 import { useStaticSWR } from '~/stores/use-static-swr';
 import { useStaticSWR } from '~/stores/use-static-swr';
 
 
@@ -48,23 +48,23 @@ export const useCommentPreviewRenderer = (): SWRResponse<GrowiRenderer, Error> =
 export const useSearchResultRenderer = (): SWRResponse<GrowiRenderer, Error> => {
 export const useSearchResultRenderer = (): SWRResponse<GrowiRenderer, Error> => {
   const key = 'searchResultRenderer';
   const key = 'searchResultRenderer';
 
 
-  return _useRendererBase(key, generateViewRenderer);
+  return _useRendererBase(key, generateOthersRenderer);
 };
 };
 
 
 export const useTimelineRenderer = (): SWRResponse<GrowiRenderer, Error> => {
 export const useTimelineRenderer = (): SWRResponse<GrowiRenderer, Error> => {
   const key = 'timelineRenderer';
   const key = 'timelineRenderer';
 
 
-  return _useRendererBase(key, generateViewRenderer);
+  return _useRendererBase(key, generateOthersRenderer);
 };
 };
 
 
 export const useDraftRenderer = (): SWRResponse<GrowiRenderer, Error> => {
 export const useDraftRenderer = (): SWRResponse<GrowiRenderer, Error> => {
   const key = 'draftRenderer';
   const key = 'draftRenderer';
 
 
-  return _useRendererBase(key, generateViewRenderer);
+  return _useRendererBase(key, generateOthersRenderer);
 };
 };
 
 
 export const useCustomSidebarRenderer = (): SWRResponse<GrowiRenderer, Error> => {
 export const useCustomSidebarRenderer = (): SWRResponse<GrowiRenderer, Error> => {
   const key: Key = 'customSidebarRenderer';
   const key: Key = 'customSidebarRenderer';
 
 
-  return _useRendererBase(key, generateViewRenderer);
+  return _useRendererBase(key, generateOthersRenderer);
 };
 };