Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import React, {

import { Lang } from '@growi/core';
import { useCodeMirrorEditorIsolated } from '@growi/editor/dist/client/stores/codemirror-editor';
import { useDrawioModalForEditorStatus, useDrawioModalForEditorActions } from '@growi/editor/dist/states/modal/drawio-for-editor';
import { LoadingSpinner } from '@growi/ui/dist/components';
import {
Modal,
Expand All @@ -13,7 +14,6 @@ import {
import { replaceFocusedDrawioWithEditor, getMarkdownDrawioMxfile } from '~/client/components/PageEditor/markdown-drawio-util-for-editor';
import { useRendererConfig } from '~/states/server-configurations';
import { useDrawioModalActions, useDrawioModalStatus } from '~/states/ui/modal/drawio';
import { useDrawioModalForEditorStatus, useDrawioModalForEditorActions } from '~/states/ui/modal/drawio-for-editor';
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

同じものが2つあったので apps/app に存在するものを削除

  • /states/ui/modal/drawio-for-editor
  • @growi/editor/dist/states/modal/drawio-for-editor

import { useSWRxPersonalSettings } from '~/stores/personal-settings';
import loggerFactory from '~/utils/logger';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@
import type { JSX } from 'react';

import { useDrawioModalForEditorStatus } from '@growi/editor/dist/states/modal/drawio-for-editor';

import { useLazyLoader } from '~/components/utils/use-lazy-loader';
import { useDrawioModalStatus } from '~/states/ui/modal/drawio';


type DrawioModalProps = Record<string, unknown>;

export const DrawioModalLazyLoaded = (): JSX.Element => {
const status = useDrawioModalStatus();
const statusForEditor = useDrawioModalForEditorStatus();

const isOpened = status?.isOpened ?? false;
const isOpenedInEditor = statusForEditor?.isOpened ?? false;

const DrawioModal = useLazyLoader<DrawioModalProps>(
'drawio-modal',
() => import('./DrawioModal').then(mod => ({ default: mod.DrawioModal })),
status?.isOpened ?? false,
isOpened || isOpenedInEditor,
);

return DrawioModal ? <DrawioModal /> : <></>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ export const PagePathNavSticky = (props: PagePathNavLayoutProps): JSX.Element =>

const isPrinting = usePrintMode();

const isPrinting = usePrintMode();
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

こちらのコメントの内容と同様
#10515 (comment)


const pageControlsX = usePageControlsX();
const [sidebarWidth] = useCurrentProductNavWidth();
const { sidebarMode } = useSidebarMode();
Expand Down
1 change: 1 addition & 0 deletions apps/app/src/components/PageView/PageViewLayout.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { JSX, ReactNode } from 'react';

// biome-ignore lint/style/noRestrictedImports: ignore
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

こちらのコメントの内容と同様
#10515 (comment)

import { usePrintMode } from '~/client/services/use-print-mode';

import styles from './PageViewLayout.module.scss';
Expand Down
28 changes: 0 additions & 28 deletions apps/app/src/states/ui/modal/drawio-for-editor.ts

This file was deleted.

Loading