Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Comment transitions - first draft from sidebar #3729

Closed
wants to merge 2 commits into from
Closed

Comment transitions - first draft from sidebar #3729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4dbf33a
first draft
siddharthkp Mar 20, 2020
5db4ae4
transition from sidebar
siddharthkp Mar 23, 2020
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
212 changes: 107 additions & 105 deletions packages/app/src/app/pages/Sandbox/Editor/Workspace/screens/CommentThreads/CommentThread.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,121 +14,123 @@ import { useOvermind } from 'app/overmind';
import { formatDistance } from 'date-fns';
import React from 'react';

export const CommentThread = React.memo<{ commentThread: TCommentThread }>(
({ commentThread }) => {
const { state, actions } = useOvermind();
export const CommentThread = React.memo<{
commentThread: TCommentThread;
innerRef: React.RefObject<any>;
}>(({ commentThread, innerRef }) => {
const { state, actions } = useOvermind();

const truncateText = {
maxHeight: 52,
overflow: 'hidden',
textOverflow: 'ellipsis',
maxWidth: '100%',
display: 'block',
// @ts-ignore
// eslint-disable-next-line no-dupe-keys
display: '-webkit-box',
'-webkit-line-clamp': '3',
'-webkit-box-orient': 'vertical',
};
const truncateText = {
maxHeight: 52,
overflow: 'hidden',
textOverflow: 'ellipsis',
maxWidth: '100%',
display: 'block',
// @ts-ignore
// eslint-disable-next-line no-dupe-keys
display: '-webkit-box',
'-webkit-line-clamp': '3',
'-webkit-box-orient': 'vertical',
};

return (
<ListAction
key={commentThread.id}
paddingTop={4}
css={css({
display: 'block',
color: 'inherit',
transition: 'opacity',
transitionDuration: theme => theme.speeds[1],
opacity: commentThread.isResolved ? 0.2 : 1,
paddingRight: 0, // the actions menu should be at the edge
})}
>
<Stack align="flex-start" justify="space-between" marginBottom={4}>
<Stack
gap={2}
align="center"
onClick={() => actions.editor.selectCommentThread(commentThread.id)}
>
<Avatar user={commentThread.initialComment.user} />
<Stack direction="vertical" justify="center">
<Link
size={3}
weight="bold"
href={`/u/${commentThread.initialComment.user.username}`}
variant="body"
>
{commentThread.initialComment.user.username}
</Link>
<Text size={2} variant="muted">
{formatDistance(
new Date(commentThread.insertedAt),
new Date(),
{
addSuffix: true,
}
)}
</Text>
</Stack>
return (
<ListAction
ref={innerRef}
key={commentThread.id}
paddingTop={4}
css={css({
display: 'block',
color: 'inherit',
transition: 'opacity',
transitionDuration: theme => theme.speeds[1],
opacity: commentThread.isResolved ? 0.2 : 1,
paddingRight: 0, // the actions menu should be at the edge
})}
onClick={event => {
const target = event.target as HTMLElement;
// don't trigger comment if you click on the menu
// we have to handle this because of an upstream
// bug in reach/menu-button
if (target.tagName === 'button' || target.tagName === 'svg') {
return;
}

actions.editor.selectCommentThread(commentThread.id);
}}
>
<Stack align="flex-start" justify="space-between" marginBottom={4}>
<Stack gap={2} align="center">
<Avatar user={commentThread.initialComment.user} />
<Stack direction="vertical" justify="center">
<Link
size={3}
weight="bold"
href={`/u/${commentThread.initialComment.user.username}`}
variant="body"
>
{commentThread.initialComment.user.username}
</Link>
<Text size={2} variant="muted">
{formatDistance(new Date(commentThread.insertedAt), new Date(), {
addSuffix: true,
})}
</Text>
</Stack>
<Stack align="center">
{commentThread.isResolved && (
<Icon name="check" title="Resolved" color="green" />
)}
<Menu>
<Menu.IconButton name="more" title="Comment actions" size={12} />
<Menu.List>
</Stack>
<Stack align="center">
{commentThread.isResolved && (
<Icon name="check" title="Resolved" color="green" />
)}
<Menu>
<Menu.IconButton name="more" title="Comment actions" size={12} />
<Menu.List>
<Menu.Item
onSelect={() =>
actions.editor.resolveCommentThread({
commentThreadId: commentThread.id,
isResolved: !commentThread.isResolved,
})
}
>
Mark as {commentThread.isResolved ? 'Unr' : 'r'}esolved
</Menu.Item>
<Menu.Item onSelect={() => {}}>Share Comment</Menu.Item>
{state.user.id === commentThread.initialComment.user.id && (
<Menu.Item
onSelect={() =>
actions.editor.resolveCommentThread({
commentThreadId: commentThread.id,
isResolved: !commentThread.isResolved,
actions.editor.deleteComment({
threadId: commentThread.id,
commentId: commentThread.initialComment.id,
})
}
>
Mark as {commentThread.isResolved ? 'Unr' : 'r'}esolved
Delete
</Menu.Item>
<Menu.Item onSelect={() => {}}>Share Comment</Menu.Item>
{state.user.id === commentThread.initialComment.user.id && (
<Menu.Item
onSelect={() =>
actions.editor.deleteComment({
threadId: commentThread.id,
commentId: commentThread.initialComment.id,
})
}
>
Delete
</Menu.Item>
)}
</Menu.List>
</Menu>
</Stack>
)}
</Menu.List>
</Menu>
</Stack>
<Element
onClick={() => actions.editor.selectCommentThread(commentThread.id)}
as="p"
marginY={0}
marginRight={2 /** Adjust for the missing margin in ListAction */}
paddingBottom={
6 /** Use padding instead of margin for inset border */
}
css={css({
borderBottom: '1px solid',
borderColor: 'sideBar.border',
})}
>
<Text block css={truncateText} marginBottom={2}>
{commentThread.initialComment.content}
</Text>
<Text variant="muted" size={2}>
{getRepliesString(commentThread.comments.length)}
</Text>
</Element>
</ListAction>
);
}
);
</Stack>
<Element
as="p"
marginY={0}
marginRight={2 /** Adjust for the missing margin in ListAction */}
paddingBottom={6 /** Use padding instead of margin for inset border */}
css={css({
borderBottom: '1px solid',
borderColor: 'sideBar.border',
})}
>
<Text block css={truncateText} marginBottom={2}>
{commentThread.initialComment.content}
</Text>
<Text variant="muted" size={2}>
{getRepliesString(commentThread.comments.length)}
</Text>
</Element>
</ListAction>
);
});

const getRepliesString = length => {
if (length === 0) return 'No Replies';
Expand Down
Loading