Yuki Takei 2 лет назад
Родитель
Сommit
9711e9f860

+ 1 - 3
apps/app/src/components/Page/CopyDropdown.jsx → apps/app/src/components/Common/CopyDropdown/CopyDropdown.jsx

@@ -25,7 +25,7 @@ const DropdownItemContents = ({ title, contents }) => (
 /* eslint-enable react/prop-types */
 /* eslint-enable react/prop-types */
 
 
 
 
-const CopyDropdown = (props) => {
+export const CopyDropdown = (props) => {
   const [dropdownOpen, setDropdownOpen] = useState(false);
   const [dropdownOpen, setDropdownOpen] = useState(false);
   const [tooltipOpen, setTooltipOpen] = useState(false);
   const [tooltipOpen, setTooltipOpen] = useState(false);
   const [isParamsAppended, setParamsAppended] = useState(!props.isShareLinkMode);
   const [isParamsAppended, setParamsAppended] = useState(!props.isShareLinkMode);
@@ -211,5 +211,3 @@ CopyDropdown.propTypes = {
   dropdownToggleClassName: PropTypes.string,
   dropdownToggleClassName: PropTypes.string,
   isShareLinkMode: PropTypes.bool,
   isShareLinkMode: PropTypes.bool,
 };
 };
-
-export default CopyDropdown;

+ 0 - 0
apps/app/src/components/Page/CopyDropdown.module.scss → apps/app/src/components/Common/CopyDropdown/CopyDropdown.module.scss


+ 1 - 0
apps/app/src/components/Common/CopyDropdown/index.ts

@@ -0,0 +1 @@
+export * from './CopyDropdown';

+ 0 - 0
apps/app/src/components/PagePathHierarchicalLink/PagePathHierarchicalLink.module.scss → apps/app/src/components/Common/PagePathHierarchicalLink/PagePathHierarchicalLink.module.scss


+ 1 - 1
apps/app/src/components/PagePathHierarchicalLink/PagePathHierarchicalLink.tsx → apps/app/src/components/Common/PagePathHierarchicalLink/PagePathHierarchicalLink.tsx

@@ -3,7 +3,7 @@ import React, { memo, useCallback } from 'react';
 import Link from 'next/link';
 import Link from 'next/link';
 import urljoin from 'url-join';
 import urljoin from 'url-join';
 
 
-import LinkedPagePath from '../../models/linked-page-path';
+import LinkedPagePath from '../../../models/linked-page-path';
 
 
 import styles from './PagePathHierarchicalLink.module.scss';
 import styles from './PagePathHierarchicalLink.module.scss';
 
 

+ 0 - 0
apps/app/src/components/PagePathHierarchicalLink/index.ts → apps/app/src/components/Common/PagePathHierarchicalLink/index.ts


+ 3 - 4
apps/app/src/components/PagePathNav.tsx → apps/app/src/components/Common/PagePathNav/PagePathNav.tsx

@@ -6,9 +6,8 @@ import dynamic from 'next/dynamic';
 
 
 import { useIsNotFound } from '~/stores/page';
 import { useIsNotFound } from '~/stores/page';
 
 
-import LinkedPagePath from '../models/linked-page-path';
-
-import { PagePathHierarchicalLink } from './PagePathHierarchicalLink';
+import LinkedPagePath from '../../../models/linked-page-path';
+import { PagePathHierarchicalLink } from '../PagePathHierarchicalLink';
 
 
 const { isTrashPage } = pagePathUtils;
 const { isTrashPage } = pagePathUtils;
 
 
@@ -19,7 +18,7 @@ type Props = {
   isCollapseParents?: boolean,
   isCollapseParents?: boolean,
 }
 }
 
 
-const CopyDropdown = dynamic(() => import('./Page/CopyDropdown'), { ssr: false });
+const CopyDropdown = dynamic(() => import('../CopyDropdown').then(mod => mod.CopyDropdown), { ssr: false });
 
 
 export const PagePathNav: FC<Props> = (props: Props) => {
 export const PagePathNav: FC<Props> = (props: Props) => {
   const {
   const {

+ 1 - 0
apps/app/src/components/Common/PagePathNav/index.ts

@@ -0,0 +1 @@
+export * from './PagePathNav';

+ 1 - 1
apps/app/src/components/Page/PageView.tsx

@@ -18,10 +18,10 @@ import { useIsMobile } from '~/stores/ui';
 
 
 
 
 import type { CommentsProps } from '../Comments';
 import type { CommentsProps } from '../Comments';
+import { PagePathNav } from '../Common/PagePathNav';
 import { PageViewLayout } from '../Layout/PageViewLayout';
 import { PageViewLayout } from '../Layout/PageViewLayout';
 import { PageAlerts } from '../PageAlert/PageAlerts';
 import { PageAlerts } from '../PageAlert/PageAlerts';
 import { PageContentFooter } from '../PageContentFooter';
 import { PageContentFooter } from '../PageContentFooter';
-import { PagePathNav } from '../PagePathNav';
 import type { PageSideContentsProps } from '../PageSideContents';
 import type { PageSideContentsProps } from '../PageSideContents';
 import { UserInfo } from '../User/UserInfo';
 import { UserInfo } from '../User/UserInfo';
 import type { UsersHomepageFooterProps } from '../UsersHomepageFooter';
 import type { UsersHomepageFooterProps } from '../UsersHomepageFooter';

+ 1 - 1
apps/app/src/components/PageAccessoriesModal/ShareLink/ShareLinkList.tsx

@@ -3,7 +3,7 @@ import React from 'react';
 import dateFnsFormat from 'date-fns/format';
 import dateFnsFormat from 'date-fns/format';
 import { useTranslation } from 'next-i18next';
 import { useTranslation } from 'next-i18next';
 
 
-import CopyDropdown from '../../Page/CopyDropdown';
+import { CopyDropdown } from '../../Common/CopyDropdown';
 
 
 
 
 type ShareLinkTrProps = {
 type ShareLinkTrProps = {

+ 1 - 1
apps/app/src/components/PageList/PageListItemL.tsx

@@ -33,7 +33,7 @@ import { useIsDeviceSmallerThanLg } from '~/stores/ui';
 
 
 import { useSWRMUTxPageInfo, useSWRxPageInfo } from '../../stores/page';
 import { useSWRMUTxPageInfo, useSWRxPageInfo } from '../../stores/page';
 import { ForceHideMenuItems, PageItemControl } from '../Common/Dropdown/PageItemControl';
 import { ForceHideMenuItems, PageItemControl } from '../Common/Dropdown/PageItemControl';
-import { PagePathHierarchicalLink } from '../PagePathHierarchicalLink';
+import { PagePathHierarchicalLink } from '../Common/PagePathHierarchicalLink';
 
 
 type Props = {
 type Props = {
   page: IPageWithSearchMeta | IPageWithMeta<IPageInfoForListing & IPageSearchMeta>,
   page: IPageWithSearchMeta | IPageWithMeta<IPageInfoForListing & IPageSearchMeta>,

+ 1 - 0
apps/app/src/components/ShareLinkPageView.tsx

@@ -11,6 +11,7 @@ import { useIsNotFound } from '~/stores/page';
 import { useViewOptions } from '~/stores/renderer';
 import { useViewOptions } from '~/stores/renderer';
 import loggerFactory from '~/utils/logger';
 import loggerFactory from '~/utils/logger';
 
 
+import { PagePathNav } from './Common/PagePathNav';
 import { PageViewLayout } from './Layout/PageViewLayout';
 import { PageViewLayout } from './Layout/PageViewLayout';
 import RevisionRenderer from './Page/RevisionRenderer';
 import RevisionRenderer from './Page/RevisionRenderer';
 import ShareLinkAlert from './Page/ShareLinkAlert';
 import ShareLinkAlert from './Page/ShareLinkAlert';

+ 1 - 1
apps/app/src/components/Sidebar/RecentChanges/RecentChangesSubstance.tsx

@@ -7,9 +7,9 @@ import { DevidedPagePath } from '@growi/core/dist/models';
 import { UserPicture, FootstampIcon } from '@growi/ui/dist/components';
 import { UserPicture, FootstampIcon } from '@growi/ui/dist/components';
 
 
 import { useKeywordManager } from '~/client/services/search-operation';
 import { useKeywordManager } from '~/client/services/search-operation';
+import { PagePathHierarchicalLink } from '~/components/Common/PagePathHierarchicalLink';
 import FormattedDistanceDate from '~/components/FormattedDistanceDate';
 import FormattedDistanceDate from '~/components/FormattedDistanceDate';
 import InfiniteScroll from '~/components/InfiniteScroll';
 import InfiniteScroll from '~/components/InfiniteScroll';
-import { PagePathHierarchicalLink } from '~/components/PagePathHierarchicalLink';
 import LinkedPagePath from '~/models/linked-page-path';
 import LinkedPagePath from '~/models/linked-page-path';
 import { useSWRINFxRecentlyUpdated } from '~/stores/page-listing';
 import { useSWRINFxRecentlyUpdated } from '~/stores/page-listing';
 import loggerFactory from '~/utils/logger';
 import loggerFactory from '~/utils/logger';