Skip to content

fix issue by Ctrl + number selection #25

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
mpfeil merged 1 commit into from
Apr 28, 2023
Merged

fix issue by Ctrl + number selection #25

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
2 changes: 1 addition & 1 deletion app/components/search/OverlaySearch.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default function OverlaySearch(props: OverlaySearchProps) {
/>
<div
data-state="open"
className="fixed top-[20%] left-[50%] z-50 w-1/2 translate-x-[-50%] items-center rounded-[1.25rem] bg-white p-1 shadow-xl focus:outline-none data-[state=open]:animate-contentShow border border-gray-200"
className="fixed top-[20%] left-[50%] z-50 w-1/2 translate-x-[-50%] items-center rounded-[1.25rem] border border-gray-200 bg-white p-1 shadow-xl focus:outline-none data-[state=open]:animate-contentShow"
>
<Search
devices={props.devices}
Expand Down
56 changes: 30 additions & 26 deletions app/components/search/SearchList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,63 +23,64 @@ export default function SearchList(props: SearchListProps) {

const useKeyPress = function (targetKey: string) {
const [keyPressed, setKeyPressed] = useState(false);

useEffect(() => {
const downHandler = ({ key }: { key: string }) => {
if (key === targetKey) {
setKeyPressed(true);
}
};

const upHandler = ({ key }: { key: string }) => {
if (key === targetKey) {
setKeyPressed(false);
}
};

window.addEventListener("keydown", downHandler);
window.addEventListener("keyup", upHandler);

return () => {
window.removeEventListener("keydown", downHandler);
window.removeEventListener("keyup", upHandler);
};
}, [targetKey]);

return keyPressed;
};

const downPress = useKeyPress("ArrowDown");
const upPress = useKeyPress("ArrowUp");
const enterPress = useKeyPress("Enter");
const controlPress = useKeyPress("Control")
const controlPress = useKeyPress("Control");
const [cursor, setCursor] = useState(0);

var searchResultsDeviceIndex = -1;
var searchResultsLocationIndex = props.searchResultsDevice.length - 1;
var length = props.searchResultsDevice.length + props.searchResultsLocation.length;
var searchResultsAll = props.searchResultsDevice.concat(props.searchResultsLocation);
var length =
props.searchResultsDevice.length + props.searchResultsLocation.length;
var searchResultsAll = props.searchResultsDevice.concat(
props.searchResultsLocation
);
var selected = searchResultsAll[cursor];


const setShowSearchCallback = useCallback((state: boolean) => {
props.setShowSearch(state)
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [])

props.setShowSearch(state);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);

useEffect(() => {
if ((length !== 0) && downPress) {
if (length !== 0 && downPress) {
setCursor((prevState) => (prevState < length - 1 ? prevState + 1 : 0));
}
}, [downPress, length]);
useEffect(() => {
if ((length !== 0) && upPress) {
if (length !== 0 && upPress) {
setCursor((prevState) => (prevState > 0 ? prevState - 1 : length - 1));
}
}, [upPress, length]);
useEffect(() => {
if ((length !== 0) && enterPress) {
if (length !== 0 && enterPress) {
goTo(osem, selected);
setShowSearchCallback(false);
navigate(
Expand All @@ -91,30 +92,33 @@ export default function SearchList(props: SearchListProps) {
}, [enterPress, length, osem, navigate, selected, setShowSearchCallback]);

const handleDigitPress = (event: any) => {
console.log(typeof Number(event.key))
console.log(event.ctrlKey)
if (typeof Number(event.key) === "number" && Number(event.key) <= length && event.ctrlKey ) {
if (
typeof Number(event.key) === "number" &&
Number(event.key) <= length &&
event.ctrlKey
) {
selected = searchResultsAll[Number(event.key) - 1];
event.preventDefault();
setCursor(Number(event.key)-1);
goTo(osem, searchResultsAll[Number(event.key)-1]);
setCursor(Number(event.key) - 1);
goTo(osem, selected);
setTimeout(() => setShowSearchCallback(false), 500);
navigate(
selected.type === "device"
? `/explore/${selected.deviceId}`
: "/explore"
);
}
}
};

useEffect(() => {
// attach the event listener
window.addEventListener('keydown', handleDigitPress);
window.addEventListener("keydown", handleDigitPress);

// remove the event listener
return () => {
window.removeEventListener('keydown', handleDigitPress);
window.removeEventListener("keydown", handleDigitPress);
};
})
});

return (
<div className="w-full overflow-visible rounded-[1.25rem] bg-white pb-2">
Expand Down