soumaeda 2 лет назад
Родитель
Сommit
6fe528947e

+ 1 - 1
apps/app/src/components/TemplateModal/TemplateModal.tsx

@@ -5,6 +5,7 @@ import React, {
 import assert from 'assert';
 
 import { Lang } from '@growi/core';
+import { useTemplateModal, type TemplateModalStatus } from '@growi/editor/src/stores/use-template';
 import {
   extractSupportedLocales, getLocalizedTemplate, type TemplateSummary,
 } from '@growi/pluginkit/dist/v4';
@@ -21,7 +22,6 @@ import {
 } from 'reactstrap';
 
 import { useSWRxTemplate, useSWRxTemplates } from '~/features/templates/stores';
-import { useTemplateModal, type TemplateModalStatus } from '~/stores/modal';
 import { usePersonalSettings } from '~/stores/personal-settings';
 import { usePreviewOptions } from '~/stores/renderer';
 import loggerFactory from '~/utils/logger';

+ 0 - 32
apps/app/src/stores/modal.tsx

@@ -630,38 +630,6 @@ export const useBookmarkFolderDeleteModal = (status?: DeleteBookmarkFolderModalS
   };
 };
 
-/*
- * TemplateModal
- */
-
-type TemplateSelectedCallback = (templateText: string) => void;
-type TemplateModalOptions = {
-  onSubmit?: TemplateSelectedCallback,
-}
-export type TemplateModalStatus = TemplateModalOptions & {
-  isOpened: boolean,
-}
-
-type TemplateModalUtils = {
-  open(opts: TemplateModalOptions): void,
-  close(): void,
-}
-
-export const useTemplateModal = (): SWRResponse<TemplateModalStatus, Error> & TemplateModalUtils => {
-
-  const initialStatus: TemplateModalStatus = { isOpened: false };
-  const swrResponse = useStaticSWR<TemplateModalStatus, Error>('templateModal', undefined, { fallbackData: initialStatus });
-
-  return Object.assign(swrResponse, {
-    open: (opts: TemplateModalOptions) => {
-      swrResponse.mutate({ isOpened: true, onSubmit: opts.onSubmit });
-    },
-    close: () => {
-      swrResponse.mutate({ isOpened: false });
-    },
-  });
-};
-
 /**
  * DeleteAttachmentModal
  */

+ 4 - 4
packages/editor/src/components/CodeMirrorEditor/Toolbar/TemplateButton.tsx

@@ -2,7 +2,7 @@ import { useCallback } from 'react';
 
 
 import { useCodeMirrorEditorIsolated } from '../../../stores';
-import { useTemplateModalForEditor } from '../../../stores/use-templete';
+import { useTemplateModal } from '../../../stores/use-template';
 
 type Props = {
   editorKey: string,
@@ -11,14 +11,14 @@ type Props = {
 export const TemplateButton = (props: Props): JSX.Element => {
   const { editorKey } = props;
   const { data: codeMirrorEditor } = useCodeMirrorEditorIsolated(editorKey);
-  const { open: openTempleteModal } = useTemplateModalForEditor();
+  const { open: openTemplateModal } = useTemplateModal();
 
   const onClickTempleteButton = useCallback(() => {
     const editor = codeMirrorEditor?.view;
     const insertText = (text: string) => editor?.dispatch(editor.state.replaceSelection(text));
     const onSubmit = (templateText: string) => insertText(templateText);
-    openTempleteModal({ onSubmit });
-  }, [codeMirrorEditor?.view, openTempleteModal]);
+    openTemplateModal({ onSubmit });
+  }, [codeMirrorEditor?.view, openTemplateModal]);
 
   return (
     <button type="button" className="btn btn-toolbar-button" onClick={onClickTempleteButton}>

+ 1 - 1
packages/editor/src/stores/use-templete.ts → packages/editor/src/stores/use-template.ts

@@ -14,7 +14,7 @@ type TemplateModalUtils = {
   close(): void,
 }
 
-export const useTemplateModalForEditor = (): SWRResponse<TemplateModalStatus, Error> & TemplateModalUtils => {
+export const useTemplateModal = (): SWRResponse<TemplateModalStatus, Error> & TemplateModalUtils => {
 
   const initialStatus: TemplateModalStatus = { isOpened: false };
   const swrResponse = useSWRStatic<TemplateModalStatus, Error>('templateModal', undefined, { fallbackData: initialStatus });