Skip to content

fix(components): Cleanup circular dep in Autocomplete #2861

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

Open
scotttjob wants to merge 3 commits into
base: master
Choose a base branch
from
+12 −13
Open

fix(components): Cleanup circular dep in Autocomplete #2861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a441fd
fixing circular dep
scotttjob Jan 5, 2026
b9e5d81
adding proper import
scotttjob Jan 5, 2026
f3c2f57
fixing type
scotttjob Jan 5, 2026
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
9 changes: 9 additions & 0 deletions packages/components/src/Autocomplete/Autocomplete.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,3 +668,12 @@ export function defineMenu<
>(menu: MenuItem<T, S, A>[]): MenuItem<T, S, A>[] {
return menu;
}

export type RenderItem<
T extends OptionLike,
S extends object = Record<string, unknown>,
A extends object = Record<string, unknown>,
> =
| { kind: "option"; value: T }
| { kind: "action"; action: MenuAction<A>; origin?: ActionOrigin }
| { kind: "section"; section: MenuSection<T, S, A> };
2 changes: 1 addition & 1 deletion packages/components/src/Autocomplete/components/MenuList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import type {
MenuAction,
MenuSection,
OptionLike,
RenderItem,
} from "../Autocomplete.types";
import styles from "../AutocompleteRebuilt.module.css";
import type { RenderItem } from "../useAutocomplete";
import { preventDefaultPointerDown } from "../utils/interactionUtils";
import { Heading } from "../../Heading";
import { Text } from "../../Text";
Expand Down
12 changes: 1 addition & 11 deletions packages/components/src/Autocomplete/useAutocomplete.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useCallbackRef, useDebounce } from "@jobber/hooks";
import type {
ActionConfig,
ActionOrigin,
AutocompleteRebuiltProps,
AutocompleteValue,
MenuAction,
MenuSection,
OptionLike,
RenderItem,
} from "./Autocomplete.types";
import {
buildRenderableList,
Expand All @@ -19,15 +18,6 @@ import {
import { useAutocompleteListNav } from "./hooks/useAutocompleteListNav";
import { createInteractionPointerDownHandler } from "./utils/interactionUtils";

export type RenderItem<
T extends OptionLike,
S extends object = Record<string, unknown>,
A extends object = Record<string, unknown>,
> =
| { kind: "option"; value: T }
| { kind: "action"; action: MenuAction<A>; origin?: ActionOrigin }
| { kind: "section"; section: MenuSection<T, S, A> };

// Keeping this hook cohesive improves readability by centralizing related
// interactions and state transitions.
// eslint-disable-next-line max-statements
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/Autocomplete/utils/menuModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import type {
MenuOptions,
MenuSection,
OptionLike,
RenderItem,
} from "../Autocomplete.types";
import type { RenderItem } from "../useAutocomplete";

export function flattenMenu<
Value extends OptionLike,
Expand Down
Loading