mirror of
https://github.com/muerwre/vault-frontend.git
synced 2025-04-25 12:56:41 +07:00
feature: added image preview for comments
This commit is contained in:
parent
08f6b518e4
commit
7d3132237d
5 changed files with 80 additions and 63 deletions
|
@ -7,6 +7,7 @@ import { nodeLockComment, nodeEditComment } from '~/redux/node/actions';
|
||||||
import { INodeState } from '~/redux/node/reducer';
|
import { INodeState } from '~/redux/node/reducer';
|
||||||
import { CommentForm } from '../CommentForm';
|
import { CommentForm } from '../CommentForm';
|
||||||
import { CommendDeleted } from '../CommendDeleted';
|
import { CommendDeleted } from '../CommendDeleted';
|
||||||
|
import * as MODAL_ACTIONS from '~/redux/modal/actions';
|
||||||
|
|
||||||
type IProps = HTMLAttributes<HTMLDivElement> & {
|
type IProps = HTMLAttributes<HTMLDivElement> & {
|
||||||
is_empty?: boolean;
|
is_empty?: boolean;
|
||||||
|
@ -17,6 +18,7 @@ type IProps = HTMLAttributes<HTMLDivElement> & {
|
||||||
can_edit?: boolean;
|
can_edit?: boolean;
|
||||||
onDelete: typeof nodeLockComment;
|
onDelete: typeof nodeLockComment;
|
||||||
onEdit: typeof nodeEditComment;
|
onEdit: typeof nodeEditComment;
|
||||||
|
modalShowPhotoswipe: typeof MODAL_ACTIONS.modalShowPhotoswipe;
|
||||||
};
|
};
|
||||||
|
|
||||||
const Comment: FC<IProps> = memo(
|
const Comment: FC<IProps> = memo(
|
||||||
|
@ -30,6 +32,7 @@ const Comment: FC<IProps> = memo(
|
||||||
can_edit,
|
can_edit,
|
||||||
onDelete,
|
onDelete,
|
||||||
onEdit,
|
onEdit,
|
||||||
|
modalShowPhotoswipe,
|
||||||
...props
|
...props
|
||||||
}) => {
|
}) => {
|
||||||
return (
|
return (
|
||||||
|
@ -58,6 +61,7 @@ const Comment: FC<IProps> = memo(
|
||||||
can_edit={can_edit}
|
can_edit={can_edit}
|
||||||
onDelete={onDelete}
|
onDelete={onDelete}
|
||||||
onEdit={onEdit}
|
onEdit={onEdit}
|
||||||
|
modalShowPhotoswipe={modalShowPhotoswipe}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
|
|
|
@ -14,15 +14,18 @@ import { PRESETS } from '~/constants/urls';
|
||||||
import { COMMENT_BLOCK_RENDERERS } from '~/constants/comment';
|
import { COMMENT_BLOCK_RENDERERS } from '~/constants/comment';
|
||||||
import { nodeLockComment, nodeEditComment } from '~/redux/node/actions';
|
import { nodeLockComment, nodeEditComment } from '~/redux/node/actions';
|
||||||
import { CommentMenu } from '../CommentMenu';
|
import { CommentMenu } from '../CommentMenu';
|
||||||
|
import * as MODAL_ACTIONS from '~/redux/modal/actions';
|
||||||
|
|
||||||
interface IProps {
|
interface IProps {
|
||||||
comment: IComment;
|
comment: IComment;
|
||||||
can_edit: boolean;
|
can_edit: boolean;
|
||||||
onDelete: typeof nodeLockComment;
|
onDelete: typeof nodeLockComment;
|
||||||
onEdit: typeof nodeEditComment;
|
onEdit: typeof nodeEditComment;
|
||||||
|
modalShowPhotoswipe: typeof MODAL_ACTIONS.modalShowPhotoswipe;
|
||||||
}
|
}
|
||||||
|
|
||||||
const CommentContent: FC<IProps> = memo(({ comment, can_edit, onDelete, onEdit }) => {
|
const CommentContent: FC<IProps> = memo(
|
||||||
|
({ comment, can_edit, onDelete, onEdit, modalShowPhotoswipe }) => {
|
||||||
const groupped = useMemo<Record<keyof typeof UPLOAD_TYPES, IFile[]>>(
|
const groupped = useMemo<Record<keyof typeof UPLOAD_TYPES, IFile[]>>(
|
||||||
() =>
|
() =>
|
||||||
reduce(
|
reduce(
|
||||||
|
@ -69,8 +72,8 @@ const CommentContent: FC<IProps> = memo(({ comment, can_edit, onDelete, onEdit }
|
||||||
{menu}
|
{menu}
|
||||||
|
|
||||||
<div className={styles.images}>
|
<div className={styles.images}>
|
||||||
{groupped.image.map(file => (
|
{groupped.image.map((file, index) => (
|
||||||
<div key={file.id}>
|
<div key={file.id} onClick={() => modalShowPhotoswipe(groupped.image, index)}>
|
||||||
<img src={getURL(file, PRESETS['300'])} alt={file.name} />
|
<img src={getURL(file, PRESETS['300'])} alt={file.name} />
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
|
@ -95,6 +98,7 @@ const CommentContent: FC<IProps> = memo(({ comment, can_edit, onDelete, onEdit }
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
});
|
}
|
||||||
|
);
|
||||||
|
|
||||||
export { CommentContent };
|
export { CommentContent };
|
||||||
|
|
|
@ -11,6 +11,7 @@ import { nodeLockComment, nodeEditComment, nodeLoadMoreComments } from '~/redux/
|
||||||
import { INodeState } from '~/redux/node/reducer';
|
import { INodeState } from '~/redux/node/reducer';
|
||||||
import { COMMENTS_DISPLAY } from '~/redux/node/constants';
|
import { COMMENTS_DISPLAY } from '~/redux/node/constants';
|
||||||
import { plural } from '~/utils/dom';
|
import { plural } from '~/utils/dom';
|
||||||
|
import * as MODAL_ACTIONS from '~/redux/modal/actions';
|
||||||
|
|
||||||
interface IProps {
|
interface IProps {
|
||||||
comments?: IComment[];
|
comments?: IComment[];
|
||||||
|
@ -21,6 +22,7 @@ interface IProps {
|
||||||
onEdit: typeof nodeEditComment;
|
onEdit: typeof nodeEditComment;
|
||||||
onLoadMore: typeof nodeLoadMoreComments;
|
onLoadMore: typeof nodeLoadMoreComments;
|
||||||
order?: 'ASC' | 'DESC';
|
order?: 'ASC' | 'DESC';
|
||||||
|
modalShowPhotoswipe: typeof MODAL_ACTIONS.modalShowPhotoswipe;
|
||||||
}
|
}
|
||||||
|
|
||||||
const NodeComments: FC<IProps> = memo(
|
const NodeComments: FC<IProps> = memo(
|
||||||
|
@ -33,6 +35,7 @@ const NodeComments: FC<IProps> = memo(
|
||||||
onLoadMore,
|
onLoadMore,
|
||||||
comment_count = 0,
|
comment_count = 0,
|
||||||
order = 'DESC',
|
order = 'DESC',
|
||||||
|
modalShowPhotoswipe,
|
||||||
}) => {
|
}) => {
|
||||||
const comments_left = useMemo(() => Math.max(0, comment_count - comments.length), [
|
const comments_left = useMemo(() => Math.max(0, comment_count - comments.length), [
|
||||||
comments,
|
comments,
|
||||||
|
@ -73,6 +76,7 @@ const NodeComments: FC<IProps> = memo(
|
||||||
can_edit={canEditComment(group, user)}
|
can_edit={canEditComment(group, user)}
|
||||||
onDelete={onDelete}
|
onDelete={onDelete}
|
||||||
onEdit={onEdit}
|
onEdit={onEdit}
|
||||||
|
modalShowPhotoswipe={modalShowPhotoswipe}
|
||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,7 @@ import { NodeCommentForm } from '~/components/node/NodeCommentForm';
|
||||||
|
|
||||||
import * as NODE_ACTIONS from '~/redux/node/actions';
|
import * as NODE_ACTIONS from '~/redux/node/actions';
|
||||||
import * as AUTH_ACTIONS from '~/redux/auth/actions';
|
import * as AUTH_ACTIONS from '~/redux/auth/actions';
|
||||||
|
import * as MODAL_ACTIONS from '~/redux/modal/actions';
|
||||||
import isBefore from 'date-fns/isBefore';
|
import isBefore from 'date-fns/isBefore';
|
||||||
import { Card } from '~/components/containers/Card';
|
import { Card } from '~/components/containers/Card';
|
||||||
import { Footer } from '~/components/main/Footer';
|
import { Footer } from '~/components/main/Footer';
|
||||||
|
@ -28,6 +29,7 @@ const mapDispatchToProps = {
|
||||||
nodeEditComment: NODE_ACTIONS.nodeEditComment,
|
nodeEditComment: NODE_ACTIONS.nodeEditComment,
|
||||||
nodeLoadMoreComments: NODE_ACTIONS.nodeLoadMoreComments,
|
nodeLoadMoreComments: NODE_ACTIONS.nodeLoadMoreComments,
|
||||||
authSetUser: AUTH_ACTIONS.authSetUser,
|
authSetUser: AUTH_ACTIONS.authSetUser,
|
||||||
|
modalShowPhotoswipe: MODAL_ACTIONS.modalShowPhotoswipe,
|
||||||
};
|
};
|
||||||
|
|
||||||
type IProps = ReturnType<typeof mapStateToProps> &
|
type IProps = ReturnType<typeof mapStateToProps> &
|
||||||
|
@ -44,6 +46,7 @@ const BorisLayoutUnconnected: FC<IProps> = ({
|
||||||
nodeLockComment,
|
nodeLockComment,
|
||||||
nodeEditComment,
|
nodeEditComment,
|
||||||
nodeLoadMoreComments,
|
nodeLoadMoreComments,
|
||||||
|
modalShowPhotoswipe,
|
||||||
authSetUser,
|
authSetUser,
|
||||||
}) => {
|
}) => {
|
||||||
const title = getRandomPhrase('BORIS_TITLE');
|
const title = getRandomPhrase('BORIS_TITLE');
|
||||||
|
@ -90,6 +93,7 @@ const BorisLayoutUnconnected: FC<IProps> = ({
|
||||||
onDelete={nodeLockComment}
|
onDelete={nodeLockComment}
|
||||||
onEdit={nodeEditComment}
|
onEdit={nodeEditComment}
|
||||||
onLoadMore={nodeLoadMoreComments}
|
onLoadMore={nodeLoadMoreComments}
|
||||||
|
modalShowPhotoswipe={modalShowPhotoswipe}
|
||||||
order="ASC"
|
order="ASC"
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
|
@ -177,6 +177,7 @@ const NodeLayoutUnconnected: FC<IProps> = memo(
|
||||||
onDelete={nodeLockComment}
|
onDelete={nodeLockComment}
|
||||||
onEdit={nodeEditComment}
|
onEdit={nodeEditComment}
|
||||||
onLoadMore={nodeLoadMoreComments}
|
onLoadMore={nodeLoadMoreComments}
|
||||||
|
modalShowPhotoswipe={modalShowPhotoswipe}
|
||||||
order="DESC"
|
order="DESC"
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue