Skip to content
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

Jump to bottom

Fix #6027: Dropdown filter and editable #6032

Merged
merged 1 commit into from
Mar 18, 2024
Merged

Fix #6027: Dropdown filter and editable #6032

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 8 additions & 10 deletions components/lib/dropdown/Dropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ export const Dropdown = React.memo(
const context = React.useContext(PrimeReactContext);
const props = DropdownBase.getProps(inProps, context);
const [filterState, setFilterState] = React.useState('');
const [clicked, setClicked] = React.useState(false);
const [focusedState, setFocusedState] = React.useState(false);
const [focusedOptionIndex, setFocusedOptionIndex] = React.useState(-1);
const [overlayVisibleState, setOverlayVisibleState] = React.useState(false);
const clickedRef = React.useRef(false);
const elementRef = React.useRef(null);
const overlayRef = React.useRef(null);
const firstHiddenFocusableElementOnOverlay = React.useRef(null);
Expand Down Expand Up @@ -117,7 +117,7 @@ export const Dropdown = React.memo(
overlayVisibleState ? hide() : show();
}

setClicked(true);
clickedRef.current = true;
};

const onInputFocus = (event) => {
Expand Down Expand Up @@ -240,14 +240,14 @@ export const Dropdown = React.memo(

default:
if (!metaKey && ObjectUtils.isPrintableCharacter(event.key)) {
!overlayVisibleState && show();
!overlayVisibleState && !props.editable && show();
!props.editable && searchOptions(event, event.key);
}

break;
}

setClicked(false);
clickedRef.current = false;
};

const onFilterInputKeyDown = (event) => {
Expand Down Expand Up @@ -386,7 +386,7 @@ export const Dropdown = React.memo(
show();
props.editable && changeFocusedOptionIndex(event, findSelectedOptionIndex());
} else {
const optionIndex = focusedOptionIndex !== -1 ? findNextOptionIndex(focusedOptionIndex) : clicked ? findFirstOptionIndex() : findFirstFocusedOptionIndex();
const optionIndex = focusedOptionIndex !== -1 ? findNextOptionIndex(focusedOptionIndex) : clickedRef.current ? findFirstOptionIndex() : findFirstFocusedOptionIndex();

changeFocusedOptionIndex(event, optionIndex);
}
Expand All @@ -403,7 +403,7 @@ export const Dropdown = React.memo(
state.overlayVisible && hide();
event.preventDefault();
} else {
const optionIndex = focusedOptionIndex !== -1 ? findPrevOptionIndex(focusedOptionIndex) : clicked ? findLastOptionIndex() : findLastFocusedOptionIndex();
const optionIndex = focusedOptionIndex !== -1 ? findPrevOptionIndex(focusedOptionIndex) : clickedRef.current ? findLastOptionIndex() : findLastFocusedOptionIndex();

changeFocusedOptionIndex(event, optionIndex);

Expand Down Expand Up @@ -627,8 +627,6 @@ export const Dropdown = React.memo(
};

const onEditableInputChange = (event) => {
!overlayVisibleState && show();

let searchIndex = null;

if (event.target.value) {
Expand Down Expand Up @@ -788,11 +786,11 @@ export const Dropdown = React.memo(

const hide = () => {
setOverlayVisibleState(false);
setClicked(false);
clickedRef.current = false;
};

const onFocus = () => {
if (props.editable) {
if (props.editable && !overlayVisibleState && clickedRef.current === false) {
DomHandler.focus(inputRef.current);
}
};
Expand Down
Loading