Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 13 additions & 4 deletions src/context/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,21 @@ import { useContext, createContext, useState } from "react";

type GlobalContextType = {
state: StateType;
setState: (param: StateType) => void;
/**
* Menggabung, tidak menimpa — Partial-nya menyatakan itu di tipe. Bidang yang
* tidak disebut tetap seperti semula.
*/
setState: (param: Partial<StateType>) => void;
};

/*
* Kedua bidang wajib. initialState selalu mengisi keduanya dan setState hanya
* menggabung, jadi tidak ada jalan bagi keduanya menjadi undefined; menandainya
* opsional hanya memaksa pemanggil menulis penjagaan yang tak pernah terpicu.
*/
type StateType = {
pokemonSummary?: PokemonSummaryType[];
pokemons?: PokemonType[];
pokemonSummary: PokemonSummaryType[];
pokemons: PokemonType[];
};

const initialState: StateType = {
Expand All @@ -33,7 +42,7 @@ export const useGlobalContext = () => {
export const GlobalProvider = ({ children }: { children: React.ReactNode }) => {
const [state, setGlobalContext] = useState<StateType>(initialState);

const setState = (param: StateType) => {
const setState = (param: Partial<StateType>) => {
setGlobalContext((previous) => ({ ...previous, ...param }));
};

Expand Down
8 changes: 4 additions & 4 deletions src/hooks/usePokemonList.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ export const usePokemonList = () => {
setIsLoading(true);

try {
const loaded = state.pokemons ?? [];
const loaded = state.pokemons;
const page = await getAllPokemon(PAGE_SIZE, loaded.length);

const capturedOf = (name: string) =>
state.pokemonSummary?.find((entry) => entry.name === name.toUpperCase())
state.pokemonSummary.find((entry) => entry.name === name.toUpperCase())
?.captured ?? 0;

setState({
Expand All @@ -42,11 +42,11 @@ export const usePokemonList = () => {
}, [state, setState]);

useEffect(() => {
if (hasRequested.current || state.pokemons?.length) return;
if (hasRequested.current || state.pokemons.length) return;

hasRequested.current = true;
loadMore();
}, [state.pokemons, loadMore]);

return { pokemons: state.pokemons ?? [], isLoading, hasMore, loadMore };
return { pokemons: state.pokemons, isLoading, hasMore, loadMore };
};
2 changes: 1 addition & 1 deletion src/hooks/usePokemonSearch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export const usePokemonSearch = () => {

const needle = query.trim().toLowerCase();
const capturedOf = (name: string) =>
state.pokemonSummary?.find((entry) => entry.name === name.toUpperCase())
state.pokemonSummary.find((entry) => entry.name === name.toUpperCase())
?.captured ?? 0;

return allPokemon
Expand Down