Skip to content

Fix/improve types for Resource and For/Index/mapArray/indexArray #590

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
ryansolid merged 2 commits into from
Aug 3, 2021
Merged

Fix/improve types for Resource and For/Index/mapArray/indexArray #590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3891831
remove undefined from Resource<T> extends Accessor<T | undefined>
otonashixav Aug 2, 2021
fc1ba6d
make For and Index also accept falsy values for the each prop
otonashixav Aug 2, 2021
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
4 changes: 2 additions & 2 deletions packages/solid/src/reactive/array.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ function dispose(d: (() => void)[]) {

// Modified version of mapSample from S-array[https://github.com/adamhaile/S-array] by Adam Haile
export function mapArray<T, U>(
list: Accessor<readonly T[]>,
list: Accessor<readonly T[] | undefined | null | false>,
mapFn: (v: T, i: Accessor<number>) => U,
options: { fallback?: Accessor<any> } = {}
): () => U[] {
Expand Down Expand Up @@ -136,7 +136,7 @@ export function mapArray<T, U>(
}

export function indexArray<T, U>(
list: Accessor<readonly T[]>,
list: Accessor<readonly T[] | undefined | null | false>,
mapFn: (v: Accessor<T>, i: number) => U,
options: { fallback?: Accessor<any> } = {}
): () => U[] {
Expand Down
2 changes: 1 addition & 1 deletion packages/solid/src/reactive/signal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ export function createMemo<T>(
return readSignal.bind(c as Memo<T>);
}

export interface Resource<T> extends Accessor<T | undefined> {
export interface Resource<T> extends Accessor<T> {
loading: boolean;
error: any;
}
Expand Down
4 changes: 2 additions & 2 deletions packages/solid/src/render/flow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { mapArray, indexArray } from "../reactive/array";
import type { JSX } from "../jsx";

export function For<T, U extends JSX.Element>(props: {
each: readonly T[];
each: readonly T[] | undefined | null | false;
fallback?: JSX.Element;
children: (item: T, index: Accessor<number>) => U;
}) {
Expand All @@ -15,7 +15,7 @@ export function For<T, U extends JSX.Element>(props: {

// non-keyed
export function Index<T, U extends JSX.Element>(props: {
each: readonly T[];
each: readonly T[] | undefined | null | false;
fallback?: JSX.Element;
children: (item: Accessor<T>, index: number) => U;
}) {
Expand Down