Skip to content

feat: allow to pass an array as is param #2

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
HugoPerard wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: allow to pass an array as is param #2

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
26 changes: 10 additions & 16 deletions packages/ui-state/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ type UiState<
Status extends AvailableStatus,
Data extends Record<string, unknown>,
> = {
is: <S extends Status>(status: S) => boolean;
is: <S extends Status>(status: S | S[]) => boolean;
state: {
__status: Status;
} & Data;
Expand All @@ -34,7 +34,7 @@ type UiState<
"__status"
>,
>(
status: S | Array<S>,
status: S | S[],
handler: (
data: SData,
) => React.ReactNode | ((...args: ExplicitAny[]) => React.ReactNode),
Expand All @@ -48,7 +48,7 @@ type UiState<
"__status"
>,
>(
status: S | Array<S>,
status: S | S[],
handler: (
data: SData,
) => React.ReactNode | ((...args: ExplicitAny[]) => React.ReactNode),
Expand Down Expand Up @@ -92,32 +92,26 @@ export const getUiState = <

const isMatchingArray = <S extends Status>(
status: Array<Status>,
): status is Array<S> => status.includes(state.__status);
): status is S[] => status.some(s => s === state.__status);

const isMatchingStatus = <S extends Status>(status: S | S[]) =>
typeof status === "string" ? isMatching(status) : isMatchingArray(status)

const uiState: UiState<Status, Data> = {
state,
is: (status) => {
return state.__status === status;
return isMatchingStatus(status);
},
when: (status, handler) => {
if (
typeof status === "string"
? isMatching(status)
: isMatchingArray(status as Array<Status>)
) {
if (isMatchingStatus(status)) {
return handler(state as ExplicitAny) as React.ReactNode;
}
return null;
},
nonExhaustive: () => null,
exhaustive: () => null,
match: (status, handler, __matched = false, render = () => null) => {
if (
!__matched &&
(typeof status === "string"
? isMatching(status)
: isMatchingArray(status as Array<Status>))
) {
if (!__matched && isMatchingStatus(status)) {
return {
exhaustive: () => handler(state as ExplicitAny) as React.ReactNode,
nonExhaustive: () => handler(state as ExplicitAny) as React.ReactNode,
Expand Down