development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-10-31 11:07:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix keyboard navigation of flat filter list

Browse source
This commit is contained in:
Sergio Padrino 2023-08-30 23:31:28 +02:00
parent e7607116b1
commit cfb53226b4
1 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/src/ui/lib/filter-list.tsx
View file

@ -194,13 +194,6 @@ export class FilterList<T extends IFilterListItem> extends React.Component<
IFilterListProps<T>, IFilterListProps<T>,
IFilterListState<T> IFilterListState<T>
> { > {
public static getDerivedStateFromProps(
props: IFilterListProps<IFilterListItem>,
state: IFilterListState<IFilterListItem>
) {
return createStateUpdate(props, state)
}
private list: List | null = null private list: List | null = null
private filterTextBox: TextBox | null = null private filterTextBox: TextBox | null = null
@ -211,14 +204,11 @@ export class FilterList<T extends IFilterListItem> extends React.Component<
this.filterTextBox = props.filterTextBox this.filterTextBox = props.filterTextBox
} }
const filterValue = (props.filterText || '').toLowerCase() this.state = createStateUpdate(props, null)
this.state = {
rows: new Array<IFilterListRow<T>>(),
selectedRow: -1,
filterValue,
filterValueChanged: filterValue.length > 0,
} }
public componentWillReceiveProps(nextProps: IFilterListProps<T>) {
this.setState(createStateUpdate(nextProps, this.state))
} }
public componentDidUpdate( public componentDidUpdate(
@ -598,7 +588,7 @@ export function getText<T extends IFilterListItem>(
function createStateUpdate<T extends IFilterListItem>( function createStateUpdate<T extends IFilterListItem>(
props: IFilterListProps<T>, props: IFilterListProps<T>,
state: IFilterListState<T> state: IFilterListState<T> | null
) { ) {
const flattenedRows = new Array<IFilterListRow<T>>() const flattenedRows = new Array<IFilterListRow<T>>()
const filter = (props.filterText || '').toLowerCase() const filter = (props.filterText || '').toLowerCase()
@ -640,7 +630,9 @@ function createStateUpdate<T extends IFilterListItem>(
} }
// Stay true if already set, otherwise become true if the filter has content // Stay true if already set, otherwise become true if the filter has content
const filterValueChanged = state.filterValueChanged ? true : filter.length > 0 const filterValueChanged = state?.filterValueChanged
? true
: filter.length > 0
return { return {
rows: flattenedRows, rows: flattenedRows,