Yuki Takei 3 лет назад
Родитель
Сommit
6f3f7225a7

+ 4 - 7
packages/app/src/services/renderer/renderer.ts

@@ -212,11 +212,8 @@ const logger = loggerFactory('growi:util:GrowiRenderer');
 
 export type RendererOptions = Partial<ReactMarkdownOptions>;
 
-export interface ReactMarkdownOptionsGenerator {
-  (config: RendererConfig): RendererOptions
-}
 
-const generateCommonOptions: ReactMarkdownOptionsGenerator = (config: RendererConfig): RendererOptions => {
+const generateCommonOptions = (config: RendererConfig): RendererOptions => {
   return {
     remarkPlugins: [gfm],
     rehypePlugins: [
@@ -334,7 +331,7 @@ export const generateTocOptions = (config: RendererConfig, tocNode: HtmlElementN
   return options;
 };
 
-export const generatePreviewOptions: ReactMarkdownOptionsGenerator = (config: RendererConfig): RendererOptions => {
+export const generatePreviewOptions = (config: RendererConfig): RendererOptions => {
   const options = generateCommonOptions(config);
 
   // // Add configurers for preview
@@ -350,7 +347,7 @@ export const generatePreviewOptions: ReactMarkdownOptionsGenerator = (config: Re
   return options;
 };
 
-export const generateCommentPreviewOptions: ReactMarkdownOptionsGenerator = (config: RendererConfig): RendererOptions => {
+export const generateCommentPreviewOptions = (config: RendererConfig): RendererOptions => {
   const options = generateCommonOptions(config);
   const { remarkPlugins } = options;
 
@@ -372,7 +369,7 @@ export const generateCommentPreviewOptions: ReactMarkdownOptionsGenerator = (con
   return options;
 };
 
-export const generateOthersOptions: ReactMarkdownOptionsGenerator = (config: RendererConfig): RendererOptions => {
+export const generateOthersOptions = (config: RendererConfig): RendererOptions => {
   const options = generateCommonOptions(config);
 
   // renderer.addConfigurers([

+ 6 - 1
packages/app/src/stores/renderer.tsx

@@ -1,8 +1,9 @@
 import { Key, SWRResponse } from 'swr';
 import useSWRImmutable from 'swr/immutable';
 
+import { RendererConfig } from '~/interfaces/services/renderer';
 import {
-  ReactMarkdownOptionsGenerator, RendererOptions,
+  RendererOptions,
   generatePreviewOptions, generateCommentPreviewOptions, generateOthersOptions,
   generateViewOptions, generateTocOptions,
 } from '~/services/renderer/renderer';
@@ -10,6 +11,10 @@ import {
 
 import { useCurrentPageTocNode, useRendererConfig } from './context';
 
+interface ReactMarkdownOptionsGenerator {
+  (config: RendererConfig): RendererOptions
+}
+
 // The base hook with common processes
 const _useOptionsBase = (
     rendererId: string, generator: ReactMarkdownOptionsGenerator,