Yuki Takei 3 лет назад
Родитель
Сommit
79b23ddad2

+ 0 - 0
packages/app/src/client/services/ContextExtractor.tsx → packages/app/_obsolete/src/client/services/ContextExtractor.tsx


+ 4 - 4
packages/app/src/components/ContentLinkButtons.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 
-import { IUser } from '@growi/core';
+import { IUserHasId } from '@growi/core';
 
 import { smoothScrollIntoView } from '~/client/util/smooth-scroll';
 import { RecentlyCreatedIcon } from '~/components/Icons/RecentlyCreatedIcon';
@@ -54,11 +54,11 @@ const RecentlyCreatedLinkButton = React.memo(() => {
 RecentlyCreatedLinkButton.displayName = 'RecentlyCreatedLinkButton';
 
 
-type Props = {
-  author?: IUser,
+export type ContentLinkButtonsProps = {
+  author?: IUserHasId,
 }
 
-export const ContentLinkButtons = (props: Props): JSX.Element => {
+export const ContentLinkButtons = (props: ContentLinkButtonsProps): JSX.Element => {
 
   const { author } = props;
 

+ 4 - 2
packages/app/src/components/Page/DisplaySwitcher.tsx

@@ -13,10 +13,12 @@ import { useSWRxCurrentPage } from '~/stores/page';
 import { EditorMode, useEditorMode } from '~/stores/ui';
 
 import CountBadge from '../Common/CountBadge';
+import { ContentLinkButtonsProps } from '../ContentLinkButtons';
 import CustomTabContent from '../CustomNavigation/CustomTabContent';
 import PageListIcon from '../Icons/PageListIcon';
 import { Page } from '../Page';
 import TableOfContents from '../TableOfContents';
+import { UserInfoProps } from '../User/UserInfo';
 
 import styles from './DisplaySwitcher.module.scss';
 
@@ -27,9 +29,9 @@ const PageEditor = dynamic(() => import('../PageEditor'), { ssr: false });
 const PageEditorByHackmd = dynamic(() => import('../PageEditorByHackmd').then(mod => mod.PageEditorByHackmd), { ssr: false });
 const EditorNavbarBottom = dynamic(() => import('../PageEditor/EditorNavbarBottom'), { ssr: false });
 const HashChanged = dynamic(() => import('../EventListeneres/HashChanged'), { ssr: false });
-const ContentLinkButtons = dynamic(() => import('../ContentLinkButtons').then(mod => mod.ContentLinkButtons), { ssr: false });
+const ContentLinkButtons = dynamic<ContentLinkButtonsProps>(() => import('../ContentLinkButtons').then(mod => mod.ContentLinkButtons), { ssr: false });
 const NotFoundPage = dynamic(() => import('../NotFoundPage'), { ssr: false });
-const UserInfo = dynamic(() => import('../User/UserInfo').then(mod => mod.UserInfo), { ssr: false });
+const UserInfo = dynamic<UserInfoProps>(() => import('../User/UserInfo').then(mod => mod.UserInfo), { ssr: false });
 
 
 const PageView = React.memo((): JSX.Element => {

+ 4 - 4
packages/app/src/components/User/UserInfo.tsx

@@ -1,16 +1,16 @@
 import React from 'react';
 
-import { IUser } from '@growi/core';
+import { IUserHasId } from '@growi/core';
 import { UserPicture } from '@growi/ui';
 
 import styles from './UserInfo.module.scss';
 
 
-type Props = {
-  author?: IUser,
+export type UserInfoProps = {
+  author?: IUserHasId,
 }
 
-export const UserInfo = (props: Props): JSX.Element => {
+export const UserInfo = (props: UserInfoProps): JSX.Element => {
 
   const { author } = props;
 

+ 1 - 1
packages/app/src/stores/context.tsx

@@ -11,7 +11,7 @@ import { GrowiThemes } from '~/interfaces/theme';
 import InterceptorManager from '~/services/interceptor-manager';
 
 import { TargetAndAncestors } from '../interfaces/page-listing-results';
-import { IUser, IUserHasId } from '../interfaces/user';
+import { IUser } from '../interfaces/user';
 
 import { useStaticSWR } from './use-static-swr';