update init

packages/app/public/static/locales/ja_JP/commons.json

@@ -69,7 +69,7 @@
     "data_import_form": {
       "select_data_format": "データフォーマット",
       "import_data": "インポートデータ",
-      "paste_table_data": "デーブルデータを貼り付け",
+      "paste_table_data": "テーブルデータを貼り付け",
       "parse_error": "パーザーエラー",
       "cancel": "キャンセル",
       "import": "インポート"

packages/app/src/components/PageEditor/CodeMirrorEditor.jsx

@@ -1017,7 +1017,6 @@ class CodeMirrorEditor extends AbstractEditor {
         size="sm"
         title="Table"
         onClick={() => {
-          console.log(mtu.getMarkdownTable(this.getCodeMirror()));
           this.props.onClickTableBtn(
             mtu.getMarkdownTable(this.getCodeMirror()),
             this.getCodeMirror(),

packages/app/src/components/PageEditor/HandsontableModal.tsx

@@ -33,12 +33,10 @@ export const HandsontableModal = (): JSX.Element => {
   const { t } = useTranslation('commons');
   const { data: handsontableModalData, close: closeHandsontableModal, onSave } = useHandsontableModal();
   const isOpened = handsontableModalData?.isOpened ?? false;
-  const tableData = handsontableModalData?.table;
-  const autoFormatMarkdownTable = handsontableModalData?.autoFormatMarkdownTable;
+  const table = handsontableModalData?.table;
+  const autoFormatMarkdownTable = handsontableModalData?.autoFormatMarkdownTable ?? false;
   const editor = handsontableModalData?.editor;
 
-  console.log('tableData', tableData);
-
   const defaultMarkdownTable = () => {
     return new MarkdownTable(
       [
@@ -85,12 +83,14 @@ export const HandsontableModal = (): JSX.Element => {
   const [hotTableContainer, setHotTableContainer] = useState<HTMLDivElement | null>();
   const [isDataImportAreaExpanded, setIsDataImportAreaExpanded] = useState<boolean>(false);
   const [isWindowExpanded, setIsWindowExpanded] = useState<boolean>(false);
-  const [markdownTableOnInit, setMarkdownTableOnInit] = useState<MarkdownTable>(() => defaultMarkdownTable());
-  const [markdownTable, setMarkdownTable] = useState<MarkdownTable>(tableData ?? defaultMarkdownTable);
+  const [markdownTable, setMarkdownTable] = useState<MarkdownTable>(defaultMarkdownTable);
+  const [markdownTableOnInit, setMarkdownTableOnInit] = useState<MarkdownTable>(defaultMarkdownTable);
   const [handsontableHeight, setHandsontableHeight] = useState<number>(DEFAULT_HOT_HEIGHT);
 
   useEffect(() => {
-    setMarkdownTable(tableData ?? defaultMarkdownTable);
+    const initTableInstance = table == null ? defaultMarkdownTable : table.clone();
+    setMarkdownTable(table ?? defaultMarkdownTable);
+    setMarkdownTableOnInit(initTableInstance);
   // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isOpened]);
 
@@ -103,13 +103,6 @@ export const HandsontableModal = (): JSX.Element => {
     },
   };
 
-  const init = (markdownTable: MarkdownTable) => {
-    const initMarkdownTable = markdownTable || defaultMarkdownTable();
-    setMarkdownTableOnInit(initMarkdownTable);
-    setMarkdownTable(initMarkdownTable.clone());
-    manuallyResizedColumnIndicesSet.clear();
-  };
-
   /**
    * Reset table data to initial value
    *
@@ -128,7 +121,7 @@ export const HandsontableModal = (): JSX.Element => {
   };
 
   const save = async() => {
-    if (hotTable == null) {
+    if (hotTable == null || editor == null) {
       return;
     }
 
@@ -161,7 +154,7 @@ export const HandsontableModal = (): JSX.Element => {
       return;
     }
 
-    /* c
+    /*
      * The following bug disturbs to use 'beforeColumnResizeHandler' to store column index -- 2018.10.23 Yuki Takei
      * https://github.com/handsontable/handsontable/issues/3328
      *
@@ -200,8 +193,6 @@ export const HandsontableModal = (): JSX.Element => {
     const align = markdownTable.options.align;
     const hotInstance = hotTable.hotInstance;
 
-    console.log('aa', markdownTable);
-
     if (hotInstance.isDestroyed === true || align == null) {
       return;
     }
@@ -347,6 +338,13 @@ export const HandsontableModal = (): JSX.Element => {
     setIsDataImportAreaExpanded(!isDataImportAreaExpanded);
   };
 
+  const init = (markdownTable: MarkdownTable) => {
+    const initMarkdownTable = markdownTable || defaultMarkdownTable;
+    setMarkdownTableOnInit(initMarkdownTable);
+    setMarkdownTable(initMarkdownTable.clone());
+    manuallyResizedColumnIndicesSet.clear();
+  };
+
   /**
    * Import a markdowntable
    *

packages/app/src/components/PageEditor/MarkdownTableUtil.js

@@ -93,7 +93,6 @@ class MarkdownTableUtil {
     }
 
     const strFromBotToEot = editor.getDoc().getRange(this.getBot(editor), this.getEot(editor));
-    console.log('get', MarkdownTable.fromMarkdownString(strFromBotToEot));
     return MarkdownTable.fromMarkdownString(strFromBotToEot);
   }
 

packages/app/src/stores/modal.tsx

@@ -482,7 +482,7 @@ export const useDrawioModal = (status?: DrawioModalStatus): SWRResponse<DrawioMo
 */
 type HandsontableModalStatus = {
   isOpened: boolean,
-  table: MarkdownTable,
+  table?: MarkdownTable,
   editor: any,
   autoFormatMarkdownTable: boolean,
 }
@@ -495,7 +495,7 @@ type HandsontableModalStatusUtils = {
 
 export const useHandsontableModal = (status?: HandsontableModalStatus): SWRResponse<HandsontableModalStatus, Error> & HandsontableModalStatusUtils => {
   const initialData: HandsontableModalStatus = {
-    isOpened: false, table: new MarkdownTable(), editor: '', autoFormatMarkdownTable: false,
+    isOpened: false, table: undefined, editor: '', autoFormatMarkdownTable: false,
   };
   const swrResponse = useStaticSWR<HandsontableModalStatus, Error>('handsontableModalStatus', status, { fallbackData: initialData });
 
@@ -503,7 +503,7 @@ export const useHandsontableModal = (status?: HandsontableModalStatus): SWRRespo
     isOpened: true, table, editor, autoFormatMarkdownTable,
   });
   const close = () => swrResponse.mutate({
-    isOpened: false, table: new MarkdownTable(), editor: '', autoFormatMarkdownTable: false,
+    isOpened: false, table: undefined, editor: '', autoFormatMarkdownTable: false,
   });
   const onSave = (editor: any, tables: MarkdownTable) => {
     mtu.replaceFocusedMarkdownTableWithEditor(editor, tables);