ryoji-s 3 лет назад
Родитель
Сommit
dde73dd9b0

+ 2 - 2
packages/app/src/components/PageAttachment/AttachmentDeleteModal.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useMemo } from 'react';
 
-import { HasObjectId, IAttachment } from '@growi/core';
+import { HasObjectId, IAttachment, IUser } from '@growi/core';
 import { UserPicture } from '@growi/ui';
 import {
   Button, Modal, ModalHeader, ModalBody, ModalFooter,
@@ -43,7 +43,7 @@ export const AttachmentDeleteModal: React.FC<{
           <i className={iconByFormat(attachment.fileFormat)}></i> {attachment.originalName}
         </p>
         <p>
-          uploaded by <UserPicture user={attachment.creator} size="sm"></UserPicture> <Username user={attachment.creator}></Username>
+          uploaded by <UserPicture user={attachment.creator} size="sm"></UserPicture> <Username user={attachment.creator as IUser}></Username>
         </p>
         {content}
       </div>

+ 1 - 6
packages/app/src/components/User/Username.tsx

@@ -3,12 +3,7 @@ import React from 'react';
 import type { IUser } from '@growi/core';
 import Link from 'next/link';
 
-type UsernameProps = {
- user?: IUser,
-}
-
-export const Username = (props: UsernameProps): JSX.Element => {
-  const { user } = props;
+export const Username: React.FC<{ user?: IUser }> = ({ user }): JSX.Element => {
 
   if (user == null) {
     return <span>anyone</span>;