jam411 3 лет назад
Родитель
Сommit
8a4734cac5

+ 3 - 5
packages/app/src/components/PageEditor/HandsontableModal.tsx

@@ -10,6 +10,7 @@ import {
 import { debounce } from 'throttle-debounce';
 
 import MarkdownTable from '~/client/models/MarkdownTable';
+import mtu from '~/components/PageEditor/MarkdownTableUtil';
 import { useHandsontableModal } from '~/stores/modal';
 
 import ExpandOrContractButton from '../ExpandOrContractButton';
@@ -19,7 +20,6 @@ import { MarkdownTableDataImportForm } from './MarkdownTableDataImportForm';
 import styles from './HandsontableModal.module.scss';
 import 'handsontable/dist/handsontable.full.min.css';
 
-
 const DEFAULT_HOT_HEIGHT = 300;
 const MARKDOWNTABLE_TO_HANDSONTABLE_ALIGNMENT_SYMBOL_MAPPING = {
   r: 'htRight',
@@ -31,7 +31,7 @@ const MARKDOWNTABLE_TO_HANDSONTABLE_ALIGNMENT_SYMBOL_MAPPING = {
 export const HandsontableModal = (): JSX.Element => {
 
   const { t } = useTranslation('commons');
-  const { data: handsontableModalData, close: closeHandsontableModal, save: saveHandsontableModal } = useHandsontableModal();
+  const { data: handsontableModalData, close: closeHandsontableModal } = useHandsontableModal();
   const isOpened = handsontableModalData?.isOpened ?? false;
   const table = handsontableModalData?.table;
   const autoFormatMarkdownTable = handsontableModalData?.autoFormatMarkdownTable ?? false;
@@ -130,9 +130,7 @@ export const HandsontableModal = (): JSX.Element => {
       markdownTableOption.latest,
     ).normalizeCells();
 
-    if (saveHandsontableModal != null) {
-      saveHandsontableModal(editor, newMarkdownTable);
-    }
+    mtu.replaceFocusedMarkdownTableWithEditor(editor, newMarkdownTable);
 
     cancel();
   };

+ 2 - 8
packages/app/src/stores/modal.tsx

@@ -1,7 +1,6 @@
 import { SWRResponse } from 'swr';
 
 import MarkdownTable from '~/client/models/MarkdownTable';
-import mtu from '~/components/PageEditor/MarkdownTableUtil';
 import { IPageToDeleteWithMeta, IPageToRenameWithMeta } from '~/interfaces/page';
 import {
   OnDuplicatedFunction, OnRenamedFunction, OnDeletedFunction, OnPutBackedFunction,
@@ -490,12 +489,11 @@ type HandsontableModalStatus = {
 type HandsontableModalStatusUtils = {
   open(table: MarkdownTable, editor: any, autoFormatMarkdownTable: boolean): Promise<HandsontableModalStatus | undefined>
   close(): Promise<HandsontableModalStatus | undefined>
-  save(editor:any, tables: MarkdownTable): void
 }
 
 export const useHandsontableModal = (status?: HandsontableModalStatus): SWRResponse<HandsontableModalStatus, Error> & HandsontableModalStatusUtils => {
   const initialData: HandsontableModalStatus = {
-    isOpened: false, table: undefined, editor: '', autoFormatMarkdownTable: false,
+    isOpened: false, table: undefined, editor: undefined, autoFormatMarkdownTable: false,
   };
   const swrResponse = useStaticSWR<HandsontableModalStatus, Error>('handsontableModalStatus', status, { fallbackData: initialData });
 
@@ -503,16 +501,12 @@ export const useHandsontableModal = (status?: HandsontableModalStatus): SWRRespo
     isOpened: true, table, editor, autoFormatMarkdownTable,
   });
   const close = () => swrResponse.mutate({
-    isOpened: false, table: undefined, editor: '', autoFormatMarkdownTable: false,
+    isOpened: false, table: undefined, editor: undefined, autoFormatMarkdownTable: false,
   });
-  const save = (editor: any, tables: MarkdownTable) => {
-    mtu.replaceFocusedMarkdownTableWithEditor(editor, tables);
-  };
 
   return {
     ...swrResponse,
     open,
     close,
-    save,
   };
 };