From 9a428943416ebfaf275eed7a740c398f62ae0f24 Mon Sep 17 00:00:00 2001 From: Varun Raj Date: Sun, 18 Aug 2024 01:21:35 +0530 Subject: [PATCH] fix: improved ux for renaming and merging Signed-off-by: Varun Raj --- src/components/people/PersonHideCell.tsx | 2 +- src/components/people/PersonItem.tsx | 15 ++++++++++++++- src/components/people/PersonMergeDropdown.tsx | 3 ++- src/types/person.d.ts | 1 + 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/components/people/PersonHideCell.tsx b/src/components/people/PersonHideCell.tsx index 3bf43ce..81971d1 100644 --- a/src/components/people/PersonHideCell.tsx +++ b/src/components/people/PersonHideCell.tsx @@ -37,7 +37,7 @@ export default function PersonHideCell({ person, onUpdate }: IProps) { return ( diff --git a/src/components/people/PersonItem.tsx b/src/components/people/PersonItem.tsx index 0d52b67..e5efb52 100644 --- a/src/components/people/PersonItem.tsx +++ b/src/components/people/PersonItem.tsx @@ -6,6 +6,8 @@ import { PersonMergeDropdown } from "./PersonMergeDropdown"; import PersonBirthdayCell from "./PersonBirthdayCell"; import PersonHideCell from "./PersonHideCell"; import clsx from "clsx"; +import Link from "next/link"; +import { ENV } from "@/config/environment"; interface IProps { person: IPerson; @@ -42,7 +44,12 @@ export default function PersonItem({ person }: IProps) { src={person.thumbnailPath} alt={person.name} /> -
+
+ + View + +
+
{ @@ -50,6 +57,7 @@ export default function PersonItem({ person }: IProps) { }} />
+
{!editMode ? (

{ setFormData({ ...formData, name: e.target.value }); }} + onKeyDown={(e) => { + if (e.key === "Enter") { + handleEdit(); + } + }} disabled={loading} onBlur={handleEdit} /> diff --git a/src/components/people/PersonMergeDropdown.tsx b/src/components/people/PersonMergeDropdown.tsx index 118fa41..c95d2d9 100644 --- a/src/components/people/PersonMergeDropdown.tsx +++ b/src/components/people/PersonMergeDropdown.tsx @@ -84,9 +84,10 @@ export function PersonMergeDropdown( }; const handleSelect = (value: IPerson) => { + setOpen(false); return mergePerson(person.id, value.id) .then(() => { - setOpen(false); + }) }; diff --git a/src/types/person.d.ts b/src/types/person.d.ts index 8c711a3..9be8a8d 100644 --- a/src/types/person.d.ts +++ b/src/types/person.d.ts @@ -5,6 +5,7 @@ export interface IPerson { thumbnailPath: string; isHidden: boolean; updatedAt: Date; + } interface IPeopleListResponse extends IListData{