diff --git a/shared/common-adapters/plain-input.d.ts b/shared/common-adapters/plain-input.d.ts index eb59d90d6bb1..45d5ce06f9f3 100644 --- a/shared/common-adapters/plain-input.d.ts +++ b/shared/common-adapters/plain-input.d.ts @@ -98,6 +98,7 @@ export type Props = { onKeyDown?: (event: React.KeyboardEvent) => void onKeyUp?: (event: React.KeyboardEvent) => void spellCheck?: boolean + tabIndex?: number // desktop only // Mobile only children?: React.ReactNode allowFontScaling?: boolean diff --git a/shared/common-adapters/plain-input.desktop.tsx b/shared/common-adapters/plain-input.desktop.tsx index acbffba61cbc..2ee05c107220 100644 --- a/shared/common-adapters/plain-input.desktop.tsx +++ b/shared/common-adapters/plain-input.desktop.tsx @@ -40,7 +40,7 @@ const PlainInput = React.memo( const {growAndScroll, multiline, onFocus: _onFocus, selectTextOnFocus, onChangeText} = p const {maxBytes, globalCaptureKeypress, onBlur, onClick, style, resize, maxLength} = p const {rowsMin, rowsMax, textType, padding, flexable = true, type} = p - const {autoFocus, allowKeyboardEvents, placeholder, spellCheck, disabled, value, className} = p + const {autoFocus, allowKeyboardEvents, placeholder, spellCheck, disabled, value, className, tabIndex} = p const inputRef = React.useRef(null) const isComposingIMERef = React.useRef(false) const mountedRef = React.useRef(true) @@ -216,6 +216,7 @@ const PlainInput = React.memo( placeholder, ref: inputRef, spellCheck, + tabIndex, value, ...(maxLength ? {maxLength} : {}), ...(disabled ? {readOnly: true} : {}), diff --git a/shared/common-adapters/search-filter.tsx b/shared/common-adapters/search-filter.tsx index 0590aedf9182..44ba9eeebb52 100644 --- a/shared/common-adapters/search-filter.tsx +++ b/shared/common-adapters/search-filter.tsx @@ -57,6 +57,7 @@ type Props = { onKeyDown?: (event: React.KeyboardEvent) => void onKeyUp?: (event: React.KeyboardEvent) => void onKeyPress?: (event: NativeSyntheticEvent<{key: string}>) => void + tabIndex?: number // desktop only measureRef?: React.RefObject } @@ -201,6 +202,7 @@ const SearchFilter = React.forwardRef(function SearchFil onKeyUp={props.onKeyUp} onKeyPress={props.onKeyPress} onEnterKeyDown={props.onEnterKeyDown} + tabIndex={props.tabIndex} ref={inputRef} hideBorder={true} containerStyle={styles.inputContainer}