Skip to content

Commit

Permalink
add focusedId property in FocusHandler type
Browse files Browse the repository at this point in the history
  • Loading branch information
muratmerdoglu-dp committed Sep 13, 2024
1 parent 8b028fb commit eaa15da
Showing 1 changed file with 15 additions and 3 deletions.
18 changes: 15 additions & 3 deletions src/modules/data/board/BoardFocusHandler.composable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ declare type FocusHandler = {
isFocusedById: Ref<boolean>;
setFocus: (id: FocusableId) => void;
isAnythingFocused: Ref<boolean>;
focusedId: Ref<string | undefined>;
};

/**
Expand Down Expand Up @@ -61,18 +62,22 @@ export function useBoardFocusHandler(
onFocusReceived?: () => void
): Pick<
FocusHandler,
"isFocusContained" | "isFocusWithin" | "isFocused" | "isFocusedById"
| "isFocusContained"
| "isFocusWithin"
| "isFocused"
| "isFocusedById"
| "focusedId"
>;
/**
* Internal type to enable mocking of overloads
*/
export function useBoardFocusHandler(
id?: never,
id?: string,
element?: never,
onFocusReceived?: never
): Partial<FocusHandler>;
export function useBoardFocusHandler(
id?: MaybeRefOrGetter<FocusableId>,
id?: MaybeRefOrGetter<FocusableId> | string,
element?: Ref<HTMLElement | null>,
onFocusReceived?: () => void
): Partial<FocusHandler> {
Expand All @@ -93,6 +98,13 @@ export function useBoardFocusHandler(
};
}

if (id?.valueOf() && element == undefined) {
return {
setFocus,
focusedId,
};
}

const { focused: isFocused } = useFocus(element);
const { focused: isFocusWithin } = useFocusWithin(element);

Expand Down

0 comments on commit eaa15da

Please sign in to comment.