Add auto-complete support when withdrawing to ln addr

adds auto-complete support for other stacker.news users when withdrawing
to a lightning address

implemented via adding an optional `transformUser` prop to the `UserSuggest` and `InputUserSuggest`
components, which allows you to transform fetched user results before displaying in the suggestion
dropdown

this is used to transform a user nym to nym@stacker.news, the corresponding
lightning address

by default, `transformUser` is an identity fn aka no transformation

this change also clears suggestions when the surrounding input field is blurred, which
is a better UX IMO
This commit is contained in:
Satoshi Nakamoto 2023-10-10 11:15:59 -04:00
parent 8ace053be5
commit 6d3482a288
2 changed files with 13 additions and 9 deletions

View File

@ -157,7 +157,7 @@ export function MarkdownInput ({ label, topLevel, groupClassName, onChange, setH
query={mentionQuery} query={mentionQuery}
onSelect={insertMention} onSelect={insertMention}
dropdownStyle={userSuggestDropdownStyle} dropdownStyle={userSuggestDropdownStyle}
>{({ onKeyDown: userSuggestOnKeyDown }) => ( >{({ onKeyDown: userSuggestOnKeyDown, resetSuggestions }) => (
<InputInner <InputInner
{...props} onChange={(formik, e) => { {...props} onChange={(formik, e) => {
if (onChange) onChange(formik, e) if (onChange) onChange(formik, e)
@ -229,6 +229,7 @@ export function MarkdownInput ({ label, topLevel, groupClassName, onChange, setH
if (onKeyDown) onKeyDown(e) if (onKeyDown) onKeyDown(e)
}} }}
onBlur={resetSuggestions}
/>)} />)}
</UserSuggest> </UserSuggest>
</div> </div>
@ -393,15 +394,15 @@ function InputInner ({
) )
} }
export function UserSuggest ({ query, onSelect, dropdownStyle, children }) { export function UserSuggest ({ query, onSelect, dropdownStyle, children, transformUser = user => user }) {
const [getUsers] = useLazyQuery(TOP_USERS, { const [getUsers] = useLazyQuery(TOP_USERS, {
onCompleted: data => { onCompleted: data => {
setSuggestions({ array: data.topUsers.users, index: 0 }) setSuggestions({ array: data.topUsers.users.map(transformUser), index: 0 })
} }
}) })
const [getSuggestions] = useLazyQuery(USER_SEARCH, { const [getSuggestions] = useLazyQuery(USER_SEARCH, {
onCompleted: data => { onCompleted: data => {
setSuggestions({ array: data.searchUsers, index: 0 }) setSuggestions({ array: data.searchUsers.map(transformUser), index: 0 })
} }
}) })
@ -465,7 +466,7 @@ export function UserSuggest ({ query, onSelect, dropdownStyle, children }) {
}, [onSelect, resetSuggestions, suggestions]) }, [onSelect, resetSuggestions, suggestions])
return ( return (
<> <>
{children?.({ onKeyDown })} {children?.({ onKeyDown, resetSuggestions })}
<Dropdown show={suggestions.array.length > 0} style={dropdownStyle}> <Dropdown show={suggestions.array.length > 0} style={dropdownStyle}>
<Dropdown.Menu className={styles.suggestionsMenu}> <Dropdown.Menu className={styles.suggestionsMenu}>
{suggestions.array.map((v, i) => {suggestions.array.map((v, i) =>
@ -485,16 +486,17 @@ export function UserSuggest ({ query, onSelect, dropdownStyle, children }) {
) )
} }
export function InputUserSuggest ({ label, groupClassName, ...props }) { export function InputUserSuggest ({ label, groupClassName, transformUser, ...props }) {
const [ovalue, setOValue] = useState() const [ovalue, setOValue] = useState()
const [query, setQuery] = useState() const [query, setQuery] = useState()
return ( return (
<FormGroup label={label} className={groupClassName}> <FormGroup label={label} className={groupClassName}>
<UserSuggest <UserSuggest
transformUser={transformUser}
onSelect={setOValue} onSelect={setOValue}
query={query} query={query}
> >
{({ onKeyDown }) => ( {({ onKeyDown, resetSuggestions }) => (
<InputInner <InputInner
{...props} {...props}
autoComplete='off' autoComplete='off'
@ -504,6 +506,7 @@ export function InputUserSuggest ({ label, groupClassName, ...props }) {
}} }}
overrideValue={ovalue} overrideValue={ovalue}
onKeyDown={onKeyDown} onKeyDown={onKeyDown}
onBlur={resetSuggestions}
/> />
)} )}
</UserSuggest> </UserSuggest>

View File

@ -1,5 +1,5 @@
import { useRouter } from 'next/router' import { useRouter } from 'next/router'
import { Checkbox, Form, Input, SubmitButton } from '../components/form' import { Checkbox, Form, Input, InputUserSuggest, SubmitButton } from '../components/form'
import Link from 'next/link' import Link from 'next/link'
import Button from 'react-bootstrap/Button' import Button from 'react-bootstrap/Button'
import { gql, useMutation, useQuery } from '@apollo/client' import { gql, useMutation, useQuery } from '@apollo/client'
@ -349,12 +349,13 @@ export function LnAddrWithdrawal () {
router.push(`/withdrawals/${data.sendToLnAddr.id}`) router.push(`/withdrawals/${data.sendToLnAddr.id}`)
}} }}
> >
<Input <InputUserSuggest
label='lightning address' label='lightning address'
name='addr' name='addr'
required required
autoFocus autoFocus
onChange={onAddrChange} onChange={onAddrChange}
transformUser={user => ({ ...user, name: `${user.name}@stacker.news` })}
/> />
<Input <Input
label='amount' label='amount'