Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
ed8a0ff
fix: Arrow key navigation not working in Columns selection
TaduJR Jan 5, 2026
9932670
chore: formatting using prettier
TaduJR Jan 5, 2026
0136871
fix: lint errors in DraggableList keyboard navigation
TaduJR Jan 5, 2026
1614dbd
fix: resolve tabIndex override and remove conflicting role in Sortabl…
TaduJR Jan 6, 2026
45c804c
fix: add eslint-disable for tabIndex in SortableItem
TaduJR Jan 6, 2026
5c2f16e
fix: use explicit role instead of eslint-disable in SortableItem
TaduJR Jan 6, 2026
cf27c80
Merge branch 'Expensify:main' into fix-Arrow-key-navigation-not-worki…
TaduJR Jan 7, 2026
20b12b5
Merge branch 'main' of https://github.com/TaduJR/App into fix-Arrow-k…
TaduJR Jan 7, 2026
60da1ac
Merge branch 'fix-Arrow-key-navigation-not-working-in-Columns-selecti…
TaduJR Jan 7, 2026
84e8667
refactor: remove useMemo, and use flatMap
TaduJR Jan 7, 2026
632ced7
fix: revert isDisabled variable name to original
TaduJR Jan 7, 2026
1392f4a
Merge branch 'Expensify:main' into fix-Arrow-key-navigation-not-worki…
TaduJR Jan 8, 2026
1b19484
Merge branch 'Expensify:main' into fix-Arrow-key-navigation-not-worki…
TaduJR Jan 12, 2026
76828a5
Merge branch 'main' of https://github.com/TaduJR/App into fix-Arrow-k…
TaduJR Jan 12, 2026
618254d
feat: add Enter key support to select focused item in DraggableList
TaduJR Jan 12, 2026
18f1a5d
Merge branch 'fix-Arrow-key-navigation-not-working-in-Columns-selecti…
TaduJR Jan 12, 2026
bcb150e
revert: Unwanted Changes
TaduJR Jan 12, 2026
251a751
Merge branch 'main' of https://github.com/TaduJR/App into fix-Arrow-k…
TaduJR Jan 14, 2026
8fbc853
fix: prevent keyboard navigation conflicts between multiple Draggable…
TaduJR Jan 14, 2026
b0f092b
Merge branch 'main' of https://github.com/TaduJR/App into fix-Arrow-k…
TaduJR Jan 14, 2026
e020848
Merge branch 'fix-Arrow-key-navigation-not-working-in-Columns-selecti…
TaduJR Jan 16, 2026
85827a2
Merge branch 'main' of https://github.com/TaduJR/App into fix-Arrow-k…
TaduJR Jan 24, 2026
1c82cdf
fix: Tab navigation accessibility in DraggableList columns selection
TaduJR Jan 24, 2026
0f4123a
fix: resolve TypeScript and ESLint errors in DraggableList accessibil…
TaduJR Jan 24, 2026
7e99148
Merge branch 'Expensify:main' into fix-Arrow-key-navigation-not-worki…
TaduJR Jan 26, 2026
52f75be
testing
TaduJR Jan 26, 2026
5490f2a
Merge branch 'main' of https://github.com/TaduJR/App into fix-Arrow-k…
TaduJR Jan 28, 2026
f6a0236
refactor: use named functions for pointer enter handlers in SearchCol…
TaduJR Jan 28, 2026
5144f2b
Merge branch 'main' of https://github.com/TaduJR/App into fix-Arrow-k…
TaduJR Jan 29, 2026
530ef97
Merge branch 'main' of https://github.com/TaduJR/App into fix-Arrow-k…
TaduJR Feb 6, 2026
5d5ade5
Merge branch 'main' of https://github.com/TaduJR/App into fix-Arrow-k…
TaduJR Feb 10, 2026
aade6c2
chore: remove redundant useCallback/useMemo and restore tabIndex comment
TaduJR Feb 10, 2026
78dbb2b
chore: remove unnecessary comments
TaduJR Feb 10, 2026
b679f55
fix: add onFocus handlers for keyboard-only list switching and Save b…
TaduJR Feb 10, 2026
081337b
fix: default isKeyboardActive to false to avoid regressions in other …
TaduJR Feb 10, 2026
1b23ac9
fix: add eslint-disable for props spreading in SortableItem
TaduJR Feb 10, 2026
70e36e5
feat: add seamless arrow key navigation across grouped lists per W3C APG
TaduJR Feb 10, 2026
4a48d21
Merge branch 'main' of https://github.com/TaduJR/App into fix-Arrow-k…
TaduJR Feb 11, 2026
9b6557d
fix: preserve tabIndex=-1 default for non-keyboard lists and deactiva…
TaduJR Feb 11, 2026
24d9539
fix: correct JSDoc for overflow callback props
TaduJR Feb 11, 2026
e102359
fix: add role=listbox/option only when keyboard-managed to fix ARIA v…
TaduJR Feb 11, 2026
a179a0f
refactor: use CONST.ROLE for ARIA roles and clean up conditional props
TaduJR Feb 11, 2026
9552836
fix: add keyboard navigation to DraggableList using W3C grouped listb…
TaduJR Feb 12, 2026
516fe1f
fix: reset focus on Tab-out and sync Tab position with arrow key navi…
TaduJR Feb 12, 2026
1fb54e3
fix: guard focusout listener for web and sync Tab with arrow key focus
TaduJR Feb 12, 2026
b8927ce
Merge branch 'main' of https://github.com/TaduJR/App into fix-Arrow-k…
TaduJR Feb 12, 2026
07a642f
Merge branch 'main' of https://github.com/TaduJR/App into fix-Arrow-k…
TaduJR Feb 22, 2026
0e5af12
refactor: extract focusout logic into platform-specific useResetFocus…
TaduJR Feb 22, 2026
d9b12fe
fix: scroll focused item into view during arrow key navigation
TaduJR Feb 22, 2026
a2fe0e8
fix: reset focus after column toggle to prevent acting on wrong item
TaduJR Feb 22, 2026
13b600c
refactor: pass isFocused through renderItem params and extract useMul…
TaduJR Feb 22, 2026
141edd3
fix: match useResetFocusOnBlur native signature with web and add miss…
TaduJR Feb 22, 2026
5f42d7d
fix: guard against negative pending focus index in useMultiListFocusM…
TaduJR Feb 22, 2026
5b477e5
fix: handle Space key to prevent dnd-kit drag activation during colum…
TaduJR Feb 23, 2026
7a61b5b
Merge branch 'main' of https://github.com/TaduJR/App into fix-Arrow-k…
TaduJR Feb 24, 2026
efbee38
fix: Simplify DraggableList keyboard nav to be self-contained
TaduJR Feb 24, 2026
ee1145b
fix: arrow key handlers to only activate when list has DOM focus
TaduJR Feb 24, 2026
dcd3491
Merge branch 'main' of https://github.com/TaduJR/App into fix-Arrow-k…
TaduJR Feb 24, 2026
20ccd42
fix: Preserve focusedIndex during transient focus loss from React re-…
TaduJR Feb 24, 2026
c0e778b
chore: Remove unnecessary useCallback and redundant ReactNode union type
TaduJR Feb 24, 2026
450d32d
fix: narrow focusedKey type to satisfy TypeScript indexOf signature
TaduJR Feb 24, 2026
934551e
Merge branch 'main' of https://github.com/TaduJR/App into fix-Arrow-k…
TaduJR Feb 26, 2026
2a459f8
Merge branch 'main' of https://github.com/TaduJR/App into fix-Arrow-k…
TaduJR Mar 5, 2026
e7d26f5
fix: Extract useListKeyboardNav hook and add cross-group keyboard nav…
TaduJR Mar 5, 2026
ea6df52
fix: arrow key hijacking on pages using DraggableList without selection
TaduJR Mar 5, 2026
03a326a
fix: Prevent double-toggle by disabling Enter/Space shortcuts when Pr…
TaduJR Mar 5, 2026
34186d4
fix: Restore comments from main branch in DraggableList and SortableItem
TaduJR Mar 5, 2026
07e62e2
fix: Restore main-branch comments lost in conflict resolution, useCal…
TaduJR Mar 5, 2026
dc2658a
fix: Return explicit booleans from getDraggableItemFlags
TaduJR Mar 5, 2026
4a0e911
fix: Combine reorder-tracking and bounds-clamping effects to avoid ex…
TaduJR Mar 5, 2026
52a3715
test: Add unit tests for useListKeyboardNav hook
TaduJR Mar 5, 2026
d634952
Merge branch 'main' of https://github.com/TaduJR/App into fix-Arrow-k…
TaduJR Mar 5, 2026
0e1fd7d
fix: Align focus behavior with W3C APG: stay at same index on toggle,…
TaduJR Mar 5, 2026
238bbf5
Merge branch 'main' of https://github.com/TaduJR/App into fix-Arrow-k…
TaduJR Mar 10, 2026
7642bbb
Merge branch 'main' of https://github.com/TaduJR/App into fix-Arrow-k…
TaduJR Mar 12, 2026
ecd14c8
chore: Add comment explaining tabIndex={-1} on MultiSelectListItem ch…
TaduJR Mar 12, 2026
615b2b8
fix: sync focusedIndex on Tab entry to match arrow-key toggle behavior
TaduJR Mar 12, 2026
e15829d
test: add focusin sync test for Tab-focused items
TaduJR Mar 12, 2026
0e3b08e
Merge branch 'main' of https://github.com/TaduJR/App into fix-Arrow-k…
TaduJR Mar 12, 2026
79430df
Merge remote-tracking branch 'upstream/main' into fix-Arrow-key-navig…
TaduJR Mar 12, 2026
462b92e
Merge branch 'Expensify:main' into fix-Arrow-key-navigation-not-worki…
TaduJR Mar 12, 2026
7414dae
Merge branch 'main' of https://github.com/TaduJR/App into fix-Arrow-k…
TaduJR Mar 16, 2026
1de1c39
Merge branch 'main' of https://github.com/TaduJR/App into fix-Arrow-k…
TaduJR Mar 17, 2026
38da420
fix: replace getDraggableItemFlags with typed callback props
TaduJR Mar 17, 2026
db1bcf5
refactor: remove Enter/Space shortcuts from useListKeyboardNav — hand…
TaduJR Mar 17, 2026
813dd06
chore: CI restart
TaduJR Mar 17, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/components/Checkbox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ type CheckboxProps = Partial<ChildrenProps> &

/** Reference to the outer element */
ref?: ForwardedRef<View>;

/** Tab index for the checkbox */
tabIndex?: 0 | -1;
};

function Checkbox({
Expand All @@ -87,6 +90,7 @@ function Checkbox({
testID,
ref,
sentryLabel,
tabIndex,
}: CheckboxProps) {
const theme = useTheme();
const styles = useThemeStyles();
Expand Down Expand Up @@ -131,6 +135,7 @@ function Checkbox({
ref={ref as PressableRef}
style={[StyleUtils.getCheckboxPressableStyle(containerBorderRadius + 2), style]} // to align outline on focus, border-radius of pressable should be 2px more than Checkbox
onKeyDown={handleSpaceOrEnterKey}
tabIndex={tabIndex}
role={CONST.ROLE.CHECKBOX}
accessibilityState={{
checked: isIndeterminate ? 'mixed' : isChecked,
Expand Down
66 changes: 53 additions & 13 deletions src/components/ColumnsSettingsList.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, {useState} from 'react';
import React, {useRef, useState} from 'react';
import {View} from 'react-native';
import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
import useListKeyboardNav from '@hooks/useListKeyboardNav';
import useLocalize from '@hooks/useLocalize';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
Expand Down Expand Up @@ -72,6 +73,8 @@ function ColumnsSettingsList({allColumns, defaultSelectedColumns, currentColumns
const icons = useMemoizedLazyExpensifyIcons(['DragHandles']);
const {translate, localeCompare} = useLocalize();

const isGrouped = !!groupBy;

const allCustomColumns = [...groupColumns, ...allColumns];
const defaultCustomColumns = new Set([...defaultGroupColumns, ...defaultSelectedColumns]);

Expand Down Expand Up @@ -171,18 +174,35 @@ function ColumnsSettingsList({allColumns, defaultSelectedColumns, currentColumns
});
};

const combinedItems = isGrouped ? [...groupColumnsList, ...typeColumnsList] : [];
Comment thread
JS00001 marked this conversation as resolved.
Resolved
const groupLength = groupColumnsList.length;
const disabledIndexes = combinedItems.flatMap((item, index) => (item.isDisabled ? [index] : []));
const containerRef = useRef<View>(null);

const {focusedIndex, setFocusedIndex} = useListKeyboardNav({
containerRef,
isActive: isGrouped,
itemKeys: combinedItems.map((item) => item.value),
disabledIndexes,
});

const groupFocusedIndex = focusedIndex >= 0 && focusedIndex < groupLength ? focusedIndex : -1;
const typeFocusedIndex = focusedIndex >= groupLength ? focusedIndex - groupLength : -1;

const onGroupDragEnd = ({data}: {data: typeof allColumnsList}) => {
const newGroupColumns = data.map((item) => ({columnId: item.value, isSelected: item.isSelected}));
const existingTypeColumns = typeColumnsList.map((item) => ({columnId: item.value, isSelected: item.isSelected}));
const newColumns = [...existingTypeColumns, ...newGroupColumns];
setColumns(newColumns);
setFocusedIndex(-1);
};

const onTypeDragEnd = ({data}: {data: typeof allColumnsList}) => {
const newTypeColumns = data.map((item) => ({columnId: item.value, isSelected: item.isSelected}));
const existingGroupColumns = groupColumnsList.map((item) => ({columnId: item.value, isSelected: item.isSelected}));
const newColumns = [...existingGroupColumns, ...newTypeColumns];
setColumns(newColumns);
setFocusedIndex(-1);
};

const resetColumns = () => {
Expand All @@ -193,10 +213,11 @@ function ColumnsSettingsList({allColumns, defaultSelectedColumns, currentColumns
onSave(selectedColumnIds);
};

const renderItem = ({item}: {item: ListItem}) => {
const renderItem = ({item, isFocused}: {item: ListItem; isFocused?: boolean}) => {
return (
<MultiSelectListItem
item={item}
isFocused={isFocused}
showTooltip={false}
onSelectRow={onSelectItem}
isDisabled={item.isDisabled}
Expand All @@ -219,8 +240,8 @@ function ColumnsSettingsList({allColumns, defaultSelectedColumns, currentColumns
style={styles.flex1}
contentContainerStyle={styles.flex1}
>
{!!groupBy && (
<>
{isGrouped ? (
<View ref={containerRef}>
<View style={[styles.ph5, styles.pb3]}>
<Text style={styles.textLabelSupporting}>{translate('search.groupColumns')}</Text>
</View>
Expand All @@ -230,24 +251,43 @@ function ColumnsSettingsList({allColumns, defaultSelectedColumns, currentColumns
data={groupColumnsList}
keyExtractor={(item) => item.value}
onDragEnd={onGroupDragEnd}
onSelectRow={onSelectItem}
isItemDragDisabled={(item) => item.isDragDisabled}
isItemDisabled={(item) => item.isDisabled}
renderItem={renderItem}
focusedIndex={groupFocusedIndex}
/>

<View style={styles.dividerLine} />

<View style={[styles.ph5, styles.pv3]}>
<Text style={styles.textLabelSupporting}>{translate('search.expenseColumns')}</Text>
</View>
</>
)}

<DraggableList
disableScroll
data={typeColumnsList}
keyExtractor={(item) => item.value}
onDragEnd={onTypeDragEnd}
renderItem={renderItem}
/>
<DraggableList
disableScroll
data={typeColumnsList}
keyExtractor={(item) => item.value}
onDragEnd={onTypeDragEnd}
onSelectRow={onSelectItem}
isItemDragDisabled={(item) => item.isDragDisabled}
isItemDisabled={(item) => item.isDisabled}
renderItem={renderItem}
focusedIndex={typeFocusedIndex}
/>
</View>
) : (
<DraggableList
disableScroll
data={typeColumnsList}
keyExtractor={(item) => item.value}
onDragEnd={onTypeDragEnd}
onSelectRow={onSelectItem}
isItemDragDisabled={(item) => item.isDragDisabled}
isItemDisabled={(item) => item.isDisabled}
renderItem={renderItem}
/>
)}
</ScrollView>
</View>
<View style={[styles.ph5, styles.pb5]}>
Expand Down
15 changes: 13 additions & 2 deletions src/components/DraggableList/SortableItem.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,29 @@
import {useSortable} from '@dnd-kit/sortable';
import {CSS} from '@dnd-kit/utilities';
import React, {useLayoutEffect} from 'react';
import React, {useEffect, useLayoutEffect} from 'react';
import CONST from '@src/CONST';
import type {SortableItemProps} from './types';

const PRESSABLE_SELECTOR = '[data-tag="pressable"]';

function SortableItem({id, children, disabled = false}: SortableItemProps) {
function SortableItem({id, children, disabled = false, isFocused = false}: SortableItemProps) {
const {attributes, listeners, setNodeRef, transform, transition, isDragging, node} = useSortable({id, disabled});

useEffect(() => {
if (!isFocused || !node.current) {
return;
}
if (!node.current.contains(document.activeElement)) {
node.current.focus();
}
node.current.scrollIntoView({block: 'nearest'});
}, [isFocused, node]);

const style = {
touchAction: 'none',
transform: CSS.Transform.toString(transform),
transition,
outline: 'none',
Comment thread
TaduJR marked this conversation as resolved.
Resolved
};

// The sortable wrapper is the single Tab stop (tabIndex: 0 via dnd-kit attributes).
Expand Down
2 changes: 1 addition & 1 deletion src/components/DraggableList/index.native.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type {FlatList} from 'react-native-gesture-handler';
import useThemeStyles from '@hooks/useThemeStyles';
import type DraggableListProps from './types';

function DraggableList<T>({ref, ...viewProps}: DraggableListProps<T> & {ref?: React.ForwardedRef<FlatList<T>>}) {
function DraggableList<T>({ref, onSelectRow, focusedIndex, isItemDragDisabled, isItemDisabled, ...viewProps}: DraggableListProps<T> & {ref?: React.ForwardedRef<FlatList<T>>}) {
const styles = useThemeStyles();
return (
<DraggableFlatList
Expand Down
83 changes: 61 additions & 22 deletions src/components/DraggableList/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ import type {DragEndEvent} from '@dnd-kit/core';
import {closestCenter, DndContext, KeyboardSensor, PointerSensor, useSensor, useSensors} from '@dnd-kit/core';
import {restrictToParentElement, restrictToVerticalAxis} from '@dnd-kit/modifiers';
import {arrayMove, SortableContext, sortableKeyboardCoordinates, verticalListSortingStrategy} from '@dnd-kit/sortable';
import React, {Fragment, useEffect, useId, useRef} from 'react';
import React, {useEffect, useId, useRef} from 'react';
// eslint-disable-next-line no-restricted-imports
import type {ScrollView as RNScrollView} from 'react-native';
import ScrollView from '@components/ScrollView';
import useListKeyboardNav from '@hooks/useListKeyboardNav';
import useThemeStyles from '@hooks/useThemeStyles';
import CONST from '@src/CONST';
import SortableItem from './SortableItem';
Expand All @@ -14,20 +15,30 @@ import type DraggableListProps from './types';
const minimumActivationDistance = 5; // pointer must move at least this much before starting to drag

/**
* Draggable (vertical) list using dnd-kit. Dragging is restricted to the vertical axis only
* Draggable (vertical) list using dnd-kit. Dragging is restricted to the vertical axis only.
*
* Supports two modes:
* - **Uncontrolled** (default): manages its own keyboard navigation internally
* - **Controlled**: when `focusedIndex` prop is provided, skips internal keyboard nav
* and uses the external value. The parent is responsible for arrow keys, Enter/Space, and focus tracking.
*/
function DraggableList<T>({
data = [],
renderItem,
keyExtractor,
onDragEnd: onDragEndCallback,
// eslint-disable-next-line @typescript-eslint/naming-convention
onSelectRow,
isItemDragDisabled,
isItemDisabled,
ListFooterComponent,
disableScroll,
focusedIndex: controlledFocusedIndex,
ref,
}: DraggableListProps<T> & {ref?: React.ForwardedRef<RNScrollView>}) {
const styles = useThemeStyles();
const isControlled = controlledFocusedIndex !== undefined;
const hasKeyboardNav = !isControlled && !!onSelectRow;
const containerRef = useRef<HTMLDivElement>(null);

// Unique ID per mount to ensure DndContext state resets when component remounts
const instanceId = useId();
Expand All @@ -51,6 +62,17 @@ function DraggableList<T>({
return keyExtractor(item, index);
});

const disabledArrowKeyIndexes = isItemDisabled ? data.flatMap((item, index) => (isItemDisabled(item) ? [index] : [])) : [];

const {focusedIndex: internalFocusedIndex, setFocusedIndex: setInternalFocusedIndex} = useListKeyboardNav({
containerRef,
isActive: hasKeyboardNav,
itemKeys: items,
disabledIndexes: disabledArrowKeyIndexes,
});

const activeFocusedIndex = isControlled ? controlledFocusedIndex : internalFocusedIndex;

const onDragStart = () => {
isDraggingRef.current = true;
};
Expand All @@ -70,6 +92,9 @@ function DraggableList<T>({

const reorderedItems = arrayMove(data, oldIndex, newIndex);
onDragEndCallback?.({data: reorderedItems});
if (!isControlled) {
setInternalFocusedIndex(-1);
}
}
};

Expand All @@ -79,20 +104,26 @@ function DraggableList<T>({

const sortableItems = data.map((item, index) => {
const key = keyExtractor(item, index);
// Check if item has a disabled property for dragging
const isDisabled = typeof item === 'object' && item !== null && 'isDragDisabled' in item ? !!(item as {isDragDisabled?: boolean}).isDragDisabled : false;
const isDragDisabled = isItemDragDisabled?.(item) ?? false;
const isDisabled = isItemDisabled?.(item) ?? false;
const isItemFocused = index === activeFocusedIndex && !isDisabled;

const renderedItem = renderItem({
item,
getIndex: () => index,
isActive: false,
drag: () => {},
isFocused: isItemFocused,
});

return (
<SortableItem
id={key}
key={key}
disabled={isDisabled}
disabled={isDragDisabled}
isFocused={isItemFocused}
>
{renderItem({
item,
getIndex: () => index,
isActive: false,
drag: () => {},
})}
{renderedItem}
</SortableItem>
);
});
Expand All @@ -113,15 +144,9 @@ function DraggableList<T>({
}),
);

const Container = disableScroll ? Fragment : ScrollView;

return (
<Container
ref={ref}
style={styles.flex1}
contentContainerStyle={styles.flex1}
>
<div>
const content = (
<>
<div ref={isControlled ? undefined : containerRef}>
<DndContext
key={instanceId}
onDragStart={onDragStart}
Expand All @@ -140,7 +165,21 @@ function DraggableList<T>({
</DndContext>
</div>
{ListFooterComponent}
</Container>
</>
);

if (disableScroll) {
return content;
}

return (
<ScrollView
ref={ref}
style={styles.flex1}
contentContainerStyle={styles.flex1}
>
{content}
</ScrollView>
);
}

Expand Down
Loading
Loading