Skip to content
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

Implement Auto Suggest #32

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Implement Auto Suggest #32

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"@types/react-transition-group": "^4.4.4",
"autoprefixer": "^10.4.2",
"postcss": "^8.4.5",
"tailwindcss": "^3.0.15",
"source-map-explorer": "^2.5.2"
"source-map-explorer": "^2.5.2",
"tailwindcss": "^3.0.15"
}
}
42 changes: 40 additions & 2 deletions src/components/Guesser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import { Message } from "./Message";
import { polygonDistance } from "../util/distance";
import alternateNames from "../data/alternate_names.json";
const countryData: Country[] = require("../data/country_data.json").features;
const minGuessLength = 2;
const suggestionLimit = 3;

type Props = {
guesses: Country[];
Expand All @@ -17,6 +19,24 @@ export default function Guesser({ guesses, setGuesses, win, setWin }: Props) {
const [guessName, setGuessName] = useState("");
const [error, setError] = useState("");

function getSuggestions(value: string) {
const inputValue = value.trim().toLowerCase();
const inputLength = inputValue.length;

if (inputLength >= minGuessLength) {
let suggestions: Country[] = [];
suggestions = countryData.filter(country => {
const countryName = country.properties.NAME.toLowerCase();
if (countryName !== inputValue) {
return countryName.slice(0, inputLength) === inputValue;
}
return [];
});
return suggestions.slice(0,suggestionLimit);
}
return [];
}

function findCountry(countryName: string, list: Country[]) {
return list.find((country) => {
const { NAME, NAME_LONG, ABBREV, ADMIN, BRK_NAME, NAME_SORT } =
Expand Down Expand Up @@ -76,14 +96,14 @@ export default function Guesser({ guesses, setGuesses, win, setWin }: Props) {
<div className="mt-10 mb-6 block mx-auto text-center">
<form
onSubmit={addGuess}
className="w-80 flex space-x-4 mx-auto my-2 justify-center"
className="w-80 flex space-x-4 mx-auto my-2 justify-center flex-wrap"
>
<input
className="shadow px-2 py-1 md:py-0
text-gray-700 dark:bg-slate-300 focus:outline-none
focus:shadow-outline disabled:bg-slate-400
border rounded disabled:border-slate-400
w-full"
w-full flex-1"
type="text"
name="guesser"
id="guesser"
Expand All @@ -92,6 +112,7 @@ export default function Guesser({ guesses, setGuesses, win, setWin }: Props) {
disabled={win}
placeholder={guesses.length === 0 ? "Enter country name here" : ""}
/>

<button
className="bg-blue-700 dark:bg-purple-800 hover:bg-blue-900 dark:hover:bg-purple-900 disabled:bg-blue-900 text-white
font-bold py-1 md:py-2 px-4 rounded focus:shadow-outline "
Expand All @@ -100,6 +121,23 @@ export default function Guesser({ guesses, setGuesses, win, setWin }: Props) {
>
Enter
</button>

<div className="shadow px-2 py-0
text-gray-700 dark:bg-slate-300 focus:outline-none
focus:shadow-outline disabled:bg-slate-400
rounded disabled:border-slate-400
w-full bg-white !mx-0"
>
{getSuggestions(guessName).map(country => {
return (
<div
className="text-left"
key={country.properties.ADMIN}
onClick={() => {setGuessName(country.properties.NAME)}}
>{country.properties.NAME}</div>
)
})}
</div>
</form>
<Message win={win} error={error} guesses={guesses.length} />
</div>
Expand Down