Skip to content

Commit e7e42dc

Browse files
authored
fix comment delete (codesandbox#3787)
* fix comment delete * change themes in code * not allow empty comments * fix ts
1 parent 327b0e1 commit e7e42dc

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

packages/app/src/app/overmind/namespaces/comments/actions.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,8 @@ export const deleteComment: AsyncAction<{
370370
const comments = state.comments.comments;
371371
const deletedComment = comments[sandboxId][commentId];
372372

373+
delete comments[sandboxId][commentId];
374+
373375
try {
374376
await effects.gql.mutations.deleteComment({
375377
commentId,

packages/app/src/app/pages/Sandbox/Editor/Workspace/screens/Comments/AddComment.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@ export const AddComment: React.FC = () => {
1010

1111
const onSubmit = e => {
1212
e.preventDefault();
13-
actions.comments.addComment({
14-
content: value,
15-
});
16-
setValue('');
13+
if (value) {
14+
actions.comments.addComment({
15+
content: value,
16+
});
17+
setValue('');
18+
}
1719
};
1820

1921
// Form elements submit on Enter, except Textarea :)

packages/app/src/app/pages/Sandbox/Editor/Workspace/screens/Comments/Dialog/Code.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export const Code = withTheme(({ value, language, theme }) => (
1313
{...defaultProps}
1414
code={value}
1515
language={language || 'js'}
16-
theme={theme.vscodeTheme.type === 'dark' ? nightOwlLight : nightOwl}
16+
theme={theme.vscodeTheme.type === 'dark' ? nightOwl : nightOwlLight}
1717
>
1818
{({ className, style, tokens, getLineProps, getTokenProps }) => (
1919
<Element

packages/app/src/app/pages/Sandbox/Editor/Workspace/screens/Comments/Dialog/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,9 @@ const CommentBody = ({ comment, editing, setEditing }) => {
285285
<Menu>
286286
<Menu.IconButton name="more" title="Comment actions" size={12} />
287287
<Menu.List>
288+
<Menu.Item onSelect={() => setEditing(true)}>
289+
Edit Comment
290+
</Menu.Item>
288291
<Menu.Item
289292
onSelect={() =>
290293
actions.comments.deleteComment({
@@ -294,9 +297,6 @@ const CommentBody = ({ comment, editing, setEditing }) => {
294297
>
295298
Delete
296299
</Menu.Item>
297-
<Menu.Item onSelect={() => setEditing(true)}>
298-
Edit Comment
299-
</Menu.Item>
300300
</Menu.List>
301301
</Menu>
302302
</Stack>

0 commit comments

Comments
 (0)