WNomunomu 2 лет назад
Родитель
Сommit
0c25a366ac

+ 14 - 0
apps/app/src/components/Layout/BasicLayout.tsx

@@ -3,12 +3,17 @@ import React, { ReactNode } from 'react';
 import dynamic from 'next/dynamic';
 import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
+import { Button } from 'reactstrap';
+
+import { useParentPageSelectModal } from '~/stores/modal';
 
 import { GrowiNavbar } from '../Navbar/GrowiNavbar';
+import { ParentPageSelectModal } from '../ParentPageSelectModal';
 import Sidebar from '../Sidebar';
 
 import { RawLayout } from './RawLayout';
 
+
 const AlertSiteUrlUndefined = dynamic(() => import('../AlertSiteUrlUndefined').then(mod => mod.AlertSiteUrlUndefined), { ssr: false });
 const DeleteAttachmentModal = dynamic(() => import('../PageAttachment/DeleteAttachmentModal').then(mod => mod.DeleteAttachmentModal), { ssr: false });
 const HotkeysManager = dynamic(() => import('../Hotkeys/HotkeysManager'), { ssr: false });
@@ -34,7 +39,12 @@ type Props = {
   className?: string
 }
 
+
 export const BasicLayout = ({ children, className }: Props): JSX.Element => {
+  const {
+    open: openModal,
+  } = useParentPageSelectModal();
+
   return (
     <RawLayout className={className ?? ''}>
       <DndProvider backend={HTML5Backend}>
@@ -70,6 +80,10 @@ export const BasicLayout = ({ children, className }: Props): JSX.Element => {
 
       <ShortcutsModal />
       <SystemVersion showShortcutsButton />
+
+      <Button onClick={() => openModal()}>Open!</Button>
+      <ParentPageSelectModal/>
+      {/* TODO: remove unnecessary code with https://redmine.weseek.co.jp/issues/128327 */}
     </RawLayout>
   );
 };

+ 1 - 9
apps/app/src/components/PageEditor/Editor.tsx

@@ -7,18 +7,16 @@ import React, {
 import Dropzone from 'react-dropzone';
 import { useTranslation } from 'react-i18next';
 import {
-  Modal, ModalHeader, ModalBody, Button,
+  Modal, ModalHeader, ModalBody,
 } from 'reactstrap';
 
 import { toastError, toastSuccess } from '~/client/util/toastr';
 import { IEditorSettings } from '~/interfaces/editor-settings';
 import { useDefaultIndentSize } from '~/stores/context';
 import { useEditorSettings } from '~/stores/editor';
-import { useParentPageSelectModal } from '~/stores/modal';
 import { useIsMobile } from '~/stores/ui';
 
 import { IEditorMethods } from '../../interfaces/editor-methods';
-import { ParentPageSelectModal } from '../ParentPageSelectModal';
 
 import AbstractEditor from './AbstractEditor';
 import { Cheatsheet } from './Cheatsheet';
@@ -69,9 +67,6 @@ const Editor: ForwardRefRenderFunction<IEditorMethods, EditorPropsType> = (props
   const { data: editorSettings } = useEditorSettings();
   const { data: defaultIndentSize } = useDefaultIndentSize();
   const { data: isMobile } = useIsMobile();
-  const {
-    open: openModal,
-  } = useParentPageSelectModal();
 
   const dropzoneRef = useRef<DropzoneRef>(null);
   // CodeMirrorEditor ref
@@ -341,9 +336,6 @@ const Editor: ForwardRefRenderFunction<IEditorMethods, EditorPropsType> = (props
           }}
         </Dropzone>
 
-        <Button onClick={() => openModal()}>起動!</Button>
-        <ParentPageSelectModal></ParentPageSelectModal>
-
         { isUploadable
           && (
             <button