From f242fcfabdf9799d5f2e7fac0f62bf6b51a76072 Mon Sep 17 00:00:00 2001 From: IgnatOffice Date: Wed, 8 Jun 2022 18:39:42 +0300 Subject: [PATCH] fix hw3 - enter --- src/s2-homeworks/hw03/GreetingContainer.tsx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/s2-homeworks/hw03/GreetingContainer.tsx b/src/s2-homeworks/hw03/GreetingContainer.tsx index d4ec924..c96d4c1 100644 --- a/src/s2-homeworks/hw03/GreetingContainer.tsx +++ b/src/s2-homeworks/hw03/GreetingContainer.tsx @@ -19,8 +19,8 @@ const GreetingContainer: React.FC = ({users, addUser setName(e.currentTarget.value) // need to fix error && setError('') } - const addUser = () => { - addUserCallback(name) + const addUser = (x?: string) => { + addUserCallback(x || name) setName('') } @@ -35,10 +35,12 @@ const GreetingContainer: React.FC = ({users, addUser const onEnter = (e: KeyboardEvent) => { if (e.key === 'Enter') { - if (name) { - addUser() - } else { + const trimmedName = name.trim() + + if (!trimmedName) { setError('name is require!') + } else { + addUser(trimmedName) } } }