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
5 changes: 4 additions & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ const AppContent: React.FC = () => {
searchTerm,
setSearchTerm,
searchPackage,
resetSearch,
loading,
error,
packageInfo,
Expand Down Expand Up @@ -65,6 +66,7 @@ const AppContent: React.FC = () => {
// Handle logo click to reset the app to home state
const handleLogoClick = () => {
setSearchTerm("");
resetSearch();
resetParams();
};

Expand All @@ -75,7 +77,8 @@ const AppContent: React.FC = () => {
errorMessage={error}
onReset={() => {
setSearchTerm("");
setParam("q", "");
resetSearch();
resetParams();
}}
/>
);
Expand Down
19 changes: 14 additions & 5 deletions src/hooks/usePackageSearch.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useState } from "react";
import { useCallback, useRef, useState } from "react";
import { fetchPackageInfo, PackageInfo } from "../services/npmService";

interface PackageSearchState {
Expand All @@ -9,6 +9,7 @@ interface PackageSearchState {
}

export const usePackageSearch = () => {
const requestIdRef = useRef(0);
const [searchTerm, setSearchTerm] = useState("");
const [state, setState] = useState<PackageSearchState>({
loading: false,
Expand All @@ -17,7 +18,9 @@ export const usePackageSearch = () => {
hasSearched: false,
});

const searchPackage = async (packageName: string) => {
const searchPackage = useCallback(async (packageName: string) => {
const requestId = ++requestIdRef.current;

if (!packageName.trim()) {
setState({
loading: false,
Expand All @@ -37,13 +40,17 @@ export const usePackageSearch = () => {

try {
const packageInfo = await fetchPackageInfo(packageName);
if (requestId !== requestIdRef.current) return;

setState({
loading: false,
error: null,
packageInfo,
hasSearched: true,
});
} catch (error) {
if (requestId !== requestIdRef.current) return;

setState({
loading: false,
error:
Expand All @@ -54,17 +61,19 @@ export const usePackageSearch = () => {
hasSearched: true,
});
}
};
}, []);

// Reset the search state to default values
const resetSearch = () => {
const resetSearch = useCallback(() => {
// Invalidate pending requests so they cannot restore stale results.
requestIdRef.current += 1;
setState({
loading: false,
error: null,
packageInfo: null,
hasSearched: false,
});
};
}, []);

return {
searchTerm,
Expand Down