Skip to content
Open
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
27 changes: 12 additions & 15 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
},
"dependencies": {
"react": "^19.2.0",
"react-dom": "^19.2.0"
"react-dom": "^19.2.0",
"react-window": "^2.2.7"
},
"devDependencies": {
"@eslint/js": "^9.39.1",
Expand Down
80 changes: 49 additions & 31 deletions src/components/app/app.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useState } from 'react';
import { useCallback, useMemo, useState } from 'react';
import { useCo2Data } from '../../hooks/useCo2Data';
import { LoadingSpinner } from '../loading-spinner/loading-spinner';
import { SearchBar } from '../search-bar/search-bar';
Expand Down Expand Up @@ -32,36 +32,54 @@ export const App = () => {
isColumnModalOpen: false,
});

const years = data ? getAvailableYears(data) : [];
const availableColumns = getAvailableColumns();

const handleSearch = (value: string) => {
setState({ ...state, searchQuery: value });
};

const handleYearChange = (year: number) => {
setState({ ...state, selectedYear: year });
};

const handleSortFieldChange = (field: 'name' | 'population') => {
setState({ ...state, sortField: field });
};

const handleSortOrderToggle = () => {
setState({
...state,
sortOrder: state.sortOrder === 'asc' ? 'desc' : 'asc',
});
};

const handleColumnToggle = (column: string) => {
setState({
...state,
selectedColumns: state.selectedColumns.includes(column)
? state.selectedColumns.filter((c) => c !== column)
: [...state.selectedColumns, column],
});
};
const years = useMemo(() => {
return data ? getAvailableYears(data) : [];
}, [data]);


const availableColumns = useMemo(() => {
return getAvailableColumns();
}, []);

const handleSearch = useCallback((value: string) => {
setState(prev => ({
...prev,
searchQuery: value,
}));
}, []);

const handleYearChange = useCallback((year: number) => {
setState(prev => ({
...prev,
selectedYear: year,
}));
}, []);

const handleSortFieldChange = useCallback(
(field: 'name' | 'population') => {
setState(prev => ({
...prev,
sortField: field,
}));
},
[]
);

const handleSortOrderToggle = useCallback(() => {
setState(prev => ({
...prev,
sortOrder: prev.sortOrder === 'asc' ? 'desc' : 'asc',
}));
}, []);

const handleColumnToggle = useCallback((column: string) => {
setState(prev => ({
...prev,
selectedColumns: prev.selectedColumns.includes(column)
? prev.selectedColumns.filter(c => c !== column)
: [...prev.selectedColumns, column],
}));
}, []);

const handleModalToggle = () => {
setState({ ...state, isColumnModalOpen: !state.isColumnModalOpen });
Expand Down
71 changes: 47 additions & 24 deletions src/components/country-card/country-card.tsx
Original file line number Diff line number Diff line change
@@ -1,30 +1,49 @@
import type { Country } from '../../types';
import { DataTable } from '../data-table/data-table';
import {
getPopulationForYear,
getCo2ForYear,
createYearDataMap,
} from '../../utils/data-transformers';
import { formatNumber } from '../../utils/format-utils';

import styles from './country-card.module.css';

type CountryCardProps = {
country: Country;
selectedYear: number;
selectedColumns: string[];
};

export const CountryCard = ({ country, selectedYear, selectedColumns }: CountryCardProps) => {
const yearDataMap = createYearDataMap(country.data);
const population = getPopulationForYear(yearDataMap, selectedYear);
const co2 = getCo2ForYear(yearDataMap, selectedYear);
import React, { useMemo } from "react";
import { formatNumber } from "../../utils/format-utils";
import styles from "./country-card.module.css";
import { createYearDataMap, getCo2ForYear, getPopulationForYear } from "../../utils/data-transformers";
import { DataTable } from "../data-table/data-table";
import type { Country } from "../../types";

// Component Status
// CountryList ✅ useMemo + sort
// CountryCard ✅ useMemo + memo
// DataTable 🔜 add memo + ke


// CountryList ⭐⭐⭐⭐⭐
// CountryCard ⭐⭐⭐⭐⭐
// DataTable ⭐⭐⭐⭐
// Parent handlers ⭐⭐⭐
// Virtualization ⭐⭐⭐⭐ (bonus)


type CountryCardProps = { country: Country; selectedYear: number; selectedColumns: string[] };

export const CountryCard = React.memo(function CountryCard({
country,
selectedYear,
selectedColumns,
}: CountryCardProps) {
const yearDataMap = useMemo(() => {
return createYearDataMap(country.data);
}, [country.data]);

const population = useMemo(() => {
return getPopulationForYear(yearDataMap, selectedYear);
}, [yearDataMap, selectedYear]);

const co2 = useMemo(() => {
return getCo2ForYear(yearDataMap, selectedYear);
}, [yearDataMap, selectedYear]);

return (
<div className={styles.card}>
<div className={styles.header}>
<h3 className={styles.title}>{country.id}</h3>
{country.iso_code && <span className={styles.isoCode}>{country.iso_code}</span>}
{country.iso_code && (
<span className={styles.isoCode}>{country.iso_code}</span>
)}
</div>

<div className={styles.stats}>
Expand All @@ -36,7 +55,11 @@ export const CountryCard = ({ country, selectedYear, selectedColumns }: CountryC
</div>
</div>

<DataTable data={country.data} year={selectedYear} columns={selectedColumns} />
<DataTable
data={country.data}
year={selectedYear}
columns={selectedColumns}
/>
</div>
);
};
});
Loading