Skip to content

task/filterclause-disable-dropdown-focus #1673

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
heswell merged 9 commits into from
Aug 13, 2025
Merged

task/filterclause-disable-dropdown-focus #1673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3086c0c
The filterclause component opens up the suggestions dropdown by defau…
anandBalachandar Aug 1, 2025
e2ba63e
- Added openDropdownOnFocus prop to the FilterClause component which …
anandBalachandar Aug 5, 2025
4658449
WIP
anandBalachandar Aug 7, 2025
2bfac96
Merge branch 'main' of https://github.com/anandBalachandar/vuu
anandBalachandar Aug 13, 2025
376ceb2
Merge branch 'main' of https://github.com/anandBalachandar/vuu
anandBalachandar Aug 13, 2025
c1fdb74
Merge branch 'main' into task/filterclause-disable-dropdown-focus
anandBalachandar Aug 13, 2025
722f7a7
Removing console.info
anandBalachandar Aug 13, 2025
d212029
Changes made as per PR feedback
anandBalachandar Aug 13, 2025
9be50ba
Updated FilterClause.examples.tsx.
anandBalachandar Aug 13, 2025
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
160 changes: 80 additions & 80 deletions vuu-ui/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions vuu-ui/packages/vuu-filters/src/__tests__/__component__/FilterClause.cy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ describe("FilterClause", () => {
container.find(".vuuFilterClauseField").should("have.length", 1);
cy.findByTestId("filterclause")
.find(".vuuFilterClauseColumn input")
.should("not.be.focused");
.should("be.focused");
cy.findAllByRole("listbox").should("not.exist");
});
});
Expand All @@ -80,7 +80,7 @@ describe("FilterClause", () => {
container.find(".vuuFilterClauseField").should("have.length", 2);
cy.findByTestId("filterclause")
.find(".vuuFilterClauseOperator input")
.should("not.be.focused");
.should("be.focused");
cy.findAllByRole("listbox").should("not.exist");
});
});
Expand All @@ -95,7 +95,7 @@ describe("FilterClause", () => {
container.find(".vuuFilterClauseField").should("have.length", 3);
cy.findByTestId("filterclause")
.find(".vuuFilterClauseValue input")
.should("not.be.focused");
.should("be.focused");
cy.findAllByRole("listbox").should("not.exist");
});
});
Expand Down
3 changes: 3 additions & 0 deletions vuu-ui/packages/vuu-filters/src/filter-clause/ColumnPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export type ColumnPickerProps = Pick<
> & {
columns: ColumnDescriptor[];
onSelect: (evt: SyntheticEvent, columnName: string) => void;
dropdownOnAutofocus?: boolean;
};

export const ColumnPicker = forwardRef(function ColumnPicker(
Expand All @@ -19,6 +20,7 @@ export const ColumnPicker = forwardRef(function ColumnPicker(
inputProps,
onSelect,
value: valueProp,
dropdownOnAutofocus = true,
}: ColumnPickerProps,
forwardedRef: ForwardedRef<HTMLDivElement>,
) {
Expand All @@ -35,6 +37,7 @@ export const ColumnPicker = forwardRef(function ColumnPicker(
data-field="column"
ref={forwardedRef}
title="column"
dropdownOnAutofocus={dropdownOnAutofocus}
>
{columns
.filter(({ name }) =>
Expand Down
5 changes: 4 additions & 1 deletion vuu-ui/packages/vuu-filters/src/filter-clause/ExpandoCombobox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const classBase = "vuuExpandoCombobox";
export interface ExpandoComboboxProps<Item = string>
extends ComboBoxProps<Item> {
itemToString?: (item: Item) => string;
dropdownOnAutofocus?: boolean;
}

export type ComboBoxOpenChangeHandler = Exclude<
Expand Down Expand Up @@ -48,6 +49,7 @@ export const ExpandoCombobox = forwardRef(function ExpandoCombobox<
onSelectionChange,
onOpenChange,
value: valueProp,
dropdownOnAutofocus = true,
...props
}: ExpandoComboboxProps<Item>,
forwardedRef: ForwardedRef<HTMLDivElement>,
Expand Down Expand Up @@ -102,13 +104,14 @@ export const ExpandoCombobox = forwardRef(function ExpandoCombobox<
...inputPropsProp,
onFocus: (evt) => {
inputPropsProp?.onFocus?.(evt);
if (!dropdownOnAutofocus) return;

setTimeout(() => {
setOpen(true);
}, 100);
},
};
}, [inputPropsProp]);
}, [inputPropsProp, dropdownOnAutofocus]);

return (
<div
Expand Down
Loading