Skip to content

Fix highlight moves to top when opening a workspace selector page #35870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amyevans merged 3 commits into from
Feb 6, 2024
Merged

Fix highlight moves to top when opening a workspace selector page #35870

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3aa35d2
memoize the sections
bernhardoj Feb 6, 2024
9c0ea43
remove unused import
bernhardoj Feb 6, 2024
424b239
Merge branch 'main' into fix/35649-highlight-moves-to-top
bernhardoj Feb 6, 2024
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
10 changes: 4 additions & 6 deletions src/components/ValuePicker/ValueSelectorModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import _ from 'lodash';
import PropTypes from 'prop-types';
import React, {useEffect, useState} from 'react';
import React, {useMemo} from 'react';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import Modal from '@components/Modal';
import ScreenWrapper from '@components/ScreenWrapper';
Expand Down Expand Up @@ -42,11 +42,9 @@ const defaultProps = {

function ValueSelectorModal({items, selectedItem, label, isVisible, onClose, onItemSelected, shouldShowTooltips}) {
const styles = useThemeStyles();
const [sectionsData, setSectionsData] = useState([]);

useEffect(() => {
const sections = useMemo(() => {
const itemsData = _.map(items, (item) => ({value: item.value, alternateText: item.description, keyForList: item.value, text: item.label, isSelected: item === selectedItem}));
setSectionsData(itemsData);
return [{data: itemsData}];
}, [items, selectedItem]);

return (
Expand All @@ -69,7 +67,7 @@ function ValueSelectorModal({items, selectedItem, label, isVisible, onClose, onI
onBackButtonPress={onClose}
/>
<SelectionList
sections={[{data: sectionsData}]}
sections={sections}
onSelectRow={onItemSelected}
initiallyFocusedOptionKey={selectedItem.value}
shouldStopPropagation
Expand Down