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

Improve Select and SearchField, take 2 #2142

Merged
merged 8 commits into from
Feb 21, 2024
Merged

Improve Select and SearchField, take 2 #2142

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b248a0e
feat: reintroduce changes from rebase
jordankoschei-okta Feb 21, 2024
d2f4c4a
feat: reintroduce changes from rebase
jordankoschei-okta Feb 21, 2024
1cfa17d
refactor: update based on chris feedback
jordankoschei-okta Feb 21, 2024
6f04bf6
Merge branch 'main' into jk/polish-inputs-3
jordankoschei-okta Feb 21, 2024
3456c53
fix: fix linter nits
jordankoschei-okta Feb 21, 2024
5ee3323
fix: fix removeSelection
jordankoschei-okta Feb 21, 2024
b9994e0
feat: add spacer to ensure that empty multi-select maintains height
jordankoschei-okta Feb 21, 2024
f04a229
fix: remove unneccessary dependency
jordankoschei-okta Feb 21, 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
22 changes: 12 additions & 10 deletions packages/odyssey-react-mui/src/SearchField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,12 @@ import {

import { CloseCircleFilledIcon, SearchIcon } from "./icons.generated";
import { Field } from "./Field";
import {
FieldComponentProps,
FieldComponentRenderProps,
} from "./FieldComponentProps";
import { FieldComponentProps } from "./FieldComponentProps";
import type { HtmlProps } from "./HtmlProps";
import { getControlState, useInputValues } from "./inputUtils";

export const searchVariantValues = ["outline", "filled"] as const;

export type SearchFieldProps = {
/**
* This prop helps users to fill forms faster, especially on mobile devices.
Expand Down Expand Up @@ -84,17 +83,16 @@ export type SearchFieldProps = {
* The value of the `input` element, to use when controlled.
*/
value?: string;
/**
* Whether the SearchField has a gray or white background
*/
variant?: (typeof searchVariantValues)[number];
} & Pick<
FieldComponentProps,
"ariaDescribedBy" | "id" | "isDisabled" | "name" | "isFullWidth"
> &
HtmlProps;

type FieldRenderProps = Partial<
Pick<FieldComponentRenderProps, "ariaDescribedBy">
> &
Pick<FieldComponentRenderProps, "id">;

const SearchField = forwardRef<HTMLInputElement, SearchFieldProps>(
(
{
Expand All @@ -116,6 +114,7 @@ const SearchField = forwardRef<HTMLInputElement, SearchFieldProps>(
testId,
translate,
value,
variant = "outline",
},
ref,
) => {
Expand Down Expand Up @@ -144,7 +143,7 @@ const SearchField = forwardRef<HTMLInputElement, SearchFieldProps>(
});

const renderFieldComponent = useCallback(
({ ariaDescribedBy, id }: FieldRenderProps) => (
({ ariaDescribedBy, id }) => (
<InputBase
{...inputValues}
inputProps={{
Expand All @@ -170,6 +169,8 @@ const SearchField = forwardRef<HTMLInputElement, SearchFieldProps>(
)
}
id={id}
data-ods-type="search"
data-ods-variant={variant}
name={nameOverride ?? id}
onBlur={onBlur}
onChange={onChange}
Expand Down Expand Up @@ -201,6 +202,7 @@ const SearchField = forwardRef<HTMLInputElement, SearchFieldProps>(
tabIndex,
testId,
translate,
variant,
],
);

Expand Down
Loading
Loading