Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 8 additions & 3 deletions src/app/configure-tasks-app/ui/TemplateDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export default function TemplateDetails({
const [updateDetail, setUpdateDetail] = useState('')
const { activeTemplate, targetTemplateId, taskName } = useSelector(selectCreateTemplate)
const [isUserTyping, setIsUserTyping] = useState(false)
const [isDescriptionFocused, setIsDescriptionFocused] = useState(false)
const [activeUploads, setActiveUploads] = useState(0)

const { showConfirmDeleteModal } = useSelector(selectTaskDetails)
Expand All @@ -61,15 +62,15 @@ export default function TemplateDetails({
const didMount = useRef(false)

useEffect(() => {
if (!isUserTyping && activeUploads === 0) {
if (!isUserTyping && !isDescriptionFocused && activeUploads === 0) {
const currentTemplate = activeTemplate?.id === template_id ? activeTemplate : template
if (currentTemplate) {
setUpdateTitle(currentTemplate.title || '')
setUpdateDetail(currentTemplate.body ?? '')
}
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [activeTemplate?.title, activeTemplate?.body, template_id, activeUploads, template])
}, [activeTemplate?.title, activeTemplate?.body, template_id, activeUploads, template, isDescriptionFocused])

const _titleUpdateDebounced = async (title: string) => updateTemplateTitle(title)
const {
Expand Down Expand Up @@ -300,8 +301,12 @@ export default function TemplateDetails({
content={updateDetail}
onFocus={() => {
lastFocusedRef.current = 'description'
setIsDescriptionFocused(true)
}}
onBlur={() => {
setIsDescriptionFocused(false)
flushDetailsUpdateDebounced()
}}
onBlur={flushDetailsUpdateDebounced}
getContent={(content: string) => {
if (updateDetail !== '') {
handleDetailChange(content)
Expand Down
11 changes: 8 additions & 3 deletions src/app/detail/ui/TaskEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
const { showConfirmDeleteModal, openImage } = useSelector(selectTaskDetails)
const { activeTask } = useSelector(selectTaskBoard)
const [isUserTyping, setIsUserTyping] = useState(false)
const [isEditorFocused, setIsEditorFocused] = useState(false)
const [activeUploads, setActiveUploads] = useState(0)

const handleImagePreview = (e: MouseEvent<unknown>) => {
Expand All @@ -76,14 +77,14 @@
const didMount = useRef(false)

useEffect(() => {
if (!isUserTyping && activeUploads === 0) {
if (!isUserTyping && !isEditorFocused && activeUploads === 0) {
const currentTask = activeTask?.id === task_id ? activeTask : task
if (currentTask) {
setUpdateTitle(currentTask.title || '')
setUpdateDetail(currentTask.body ?? '')
}
}
}, [activeTask?.title, activeTask?.body, task_id, activeUploads, task])
}, [activeTask?.title, activeTask?.body, task_id, activeUploads, task, isEditorFocused])

Check warning on line 87 in src/app/detail/ui/TaskEditor.tsx

View workflow job for this annotation

GitHub Actions / Run linters and tests

React Hook useEffect has missing dependencies: 'activeTask' and 'isUserTyping'. Either include them or remove the dependency array

const _titleUpdateDebounced = async (title: string) => updateTaskTitle(title)

Expand Down Expand Up @@ -218,7 +219,11 @@
handleDetailChange(content)
}
}}
onBlur={flushDetailsUpdateDebounced}
onFocus={() => setIsEditorFocused(true)}
onBlur={() => {
setIsEditorFocused(false)
flushDetailsUpdateDebounced()
}}
readonly={!isEditable}
editorClass="tapwrite-task-editor"
placeholder="Add description..."
Expand Down
Loading