Comment improvements

This commit is contained in:
Gordon 2021-05-07 21:46:49 +01:00
parent 29650724a9
commit 48609769ba
2 changed files with 12 additions and 7 deletions

View File

@ -5,6 +5,7 @@ import VSCodeApi from './VSCodeApi';
import { paramCase } from 'param-case'; import { paramCase } from 'param-case';
import gitUsername from 'git-user-name'; import gitUsername from 'git-user-name';
import ReactMarkdown from 'react-markdown'; import ReactMarkdown from 'react-markdown';
import TextareaAutosize from 'react-textarea-autosize';
interface KanbnTaskValidationOutput { interface KanbnTaskValidationOutput {
name: string, name: string,
@ -246,7 +247,7 @@ const TaskEditor = ({ task, tasks, columnName, columnNames, dateFormat, panelUui
? <Field ? <Field
className="kanbn-task-editor-field-textarea" className="kanbn-task-editor-field-textarea"
id="description-input" id="description-input"
as="textarea" as={TextareaAutosize}
name="description" name="description"
/> />
: <ReactMarkdown className="kanbn-task-editor-description-preview"> : <ReactMarkdown className="kanbn-task-editor-description-preview">
@ -419,12 +420,16 @@ const TaskEditor = ({ task, tasks, columnName, columnNames, dateFormat, panelUui
<button <button
type="button" type="button"
className="kanbn-task-editor-button kanbn-task-editor-button-edit" className="kanbn-task-editor-button kanbn-task-editor-button-edit"
title="Edit comment" title={editingComment === index ? "View comment" : "Edit comment"}
onClick={() => { onClick={() => {
setEditingComment(editingComment !== index ? index : -1); setEditingComment(editingComment !== index ? index : -1);
}} }}
> >
<i className="codicon codicon-edit"></i> {
editingComment === index
? <i className="codicon codicon-preview"></i>
: <i className="codicon codicon-edit"></i>
}
</button> </button>
</div> </div>
</div> </div>
@ -435,7 +440,7 @@ const TaskEditor = ({ task, tasks, columnName, columnNames, dateFormat, panelUui
? <React.Fragment> ? <React.Fragment>
<Field <Field
className="kanbn-task-editor-field-textarea" className="kanbn-task-editor-field-textarea"
as="textarea" as={TextareaAutosize}
name={`comments.${index}.text`} name={`comments.${index}.text`}
/> />
<ErrorMessage <ErrorMessage
@ -444,9 +449,9 @@ const TaskEditor = ({ task, tasks, columnName, columnNames, dateFormat, panelUui
name={`comments.${index}.text`} name={`comments.${index}.text`}
/> />
</React.Fragment> </React.Fragment>
: <div className="kanbn-task-editor-comment-text"> : <ReactMarkdown className="kanbn-task-editor-comment-text">
{comment.text} {comment.text}
</div> </ReactMarkdown>
} }
</div> </div>
</div> </div>

View File

@ -364,7 +364,7 @@ body.vscode-dark .kanbn-task-editor-field-input[type="date"]::-webkit-calendar-p
} }
.kanbn-task-editor-field-textarea { .kanbn-task-editor-field-textarea {
min-height: 200px; min-height: 90px;
resize: vertical; resize: vertical;
} }