From 9edc12d6568725ea262452a113c19898c88f85e7 Mon Sep 17 00:00:00 2001
From: Pedro Oliveira <poliveira@subvisual.co>
Date: Mon, 12 Dec 2022 16:28:39 +0000
Subject: [PATCH] feat: input focus on edit

---
 renderer/src/components/FilAddressForm.tsx | 23 +++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/renderer/src/components/FilAddressForm.tsx b/renderer/src/components/FilAddressForm.tsx
index cbf9fb8a2..936b5ded6 100644
--- a/renderer/src/components/FilAddressForm.tsx
+++ b/renderer/src/components/FilAddressForm.tsx
@@ -1,4 +1,4 @@
-import { FC, useState, useEffect } from 'react'
+import { FC, useState, useEffect, useRef } from 'react'
 import { checkAddressString } from '@glif/filecoin-address'
 import { ReactComponent as Warning } from '../assets/img/icons/error.svg'
 import { ReactComponent as EditIcon } from '../assets/img/icons/edit.svg'
@@ -15,12 +15,20 @@ const FilAddressForm: FC<FilAddressFormProps> = ({ destinationAddress = '', save
   const [addressIsValid, setAddressIsValid] = useState<boolean | undefined>()
   const [inputAddr, setInputAddr] = useState<string>(destinationAddress)
   const [internalEditMode, setInternalEditMode] = useState<boolean>(false)
+  const ref = useRef(null)
 
   useEffect(() => {
     setInternalEditMode(editMode || destinationAddress === '')
     setInputAddr(destinationAddress)
   }, [editMode, destinationAddress])
 
+  useEffect(() => {
+    if (internalEditMode && ref.current) {
+      ref.current.setSelectionRange(destinationAddress.length, destinationAddress.length)
+      ref.current.focus()
+    }
+  }, [internalEditMode, destinationAddress])
+
   useEffect(() => {
     if (inputAddr === '') {
       setAddressIsValid(true)
@@ -77,8 +85,8 @@ const FilAddressForm: FC<FilAddressFormProps> = ({ destinationAddress = '', save
           title="save address" type="submit" value="connect" onClick={handleSubmit}>
           <span className="text-xs px-4">Save</span>
         </button>
-        <button className={`flex flex-row items-end h-[30px] cursor-pointer group absolute mb-2 ml-4 left-[100px] ease-[cubic-bezier(0.85,0,0.15,1)] duration-500 ${(!internalEditMode && !transferMode) ? 'visible' : 'opacity-0'}`}
-          tabIndex={0} onClick={() => enableEditMode()}
+        <button className={`flex flex-row items-end h-[30px] cursor-pointer group absolute mb-1 ml-4 ease-[cubic-bezier(0.85,0,0.15,1)] duration-500 ${destinationAddress.length > 30 ? 'left-[460px]' : 'left-[70px]'} ${(!internalEditMode && !transferMode) ? 'visible' : 'opacity-0'}`}
+          tabIndex={0} onClick={() => enableEditMode() }
           disabled={transferMode}>
           <EditIcon className="btn-icon-primary mr-1" />
           <span className='text-white hidden group-hover:block opacity-80 not-italic text-body-m font-body leading-[1.5rem]'>Edit</span>
@@ -90,15 +98,16 @@ const FilAddressForm: FC<FilAddressFormProps> = ({ destinationAddress = '', save
   return (
     <>
       <div className='relative flex w-full items-end ease-in-out pb-[15px] justify-between'>
-        <div className='relative z-0 flex flex-col mt-[20px] w-fit'>
+        <div className={`relative flex flex-col mt-[20px] w-fit ${internalEditMode ? 'z-10' : 'z-0'}`}>
           <input
-            spellCheck="false" autoComplete="off" type="text" name="address" size={internalEditMode ? 200 : destinationAddress.length}
+            ref={ref}
+            autoFocus={true}
+            spellCheck="false" autoComplete="off" type="text" name="address"
             placeholder=" "
             disabled={!internalEditMode}
             tabIndex={0} value={inputAddr}
             onChange={(event) => { setInputAddr(event.target.value) }}
-            className='input fil-address mt-[7px] min-w-[90px] w-[460px] ease-in-out transition duration-300'
-            onFocus={() => { enableEditMode() }}/>
+            className='input fil-address mt-[7px] min-w-[90px] w-[460px] ease-in-out transition duration-300'/>
           <label htmlFor="address"
             className="absolute duration-300 top-3 origin-top-lef pointer-events-none text-white opacity-80 font-body text-body-2xs uppercase mb-3">
             Your FIL Address</label>