Skip to content

Commit

Permalink
Merge pull request #9 from vectara/chore/remove_react_router_dom
Browse files Browse the repository at this point in the history
chore: Remove react-router-dom dependency
  • Loading branch information
mrderyk authored Jan 16, 2024
2 parents fc66e24 + 961a6d9 commit 2f26465
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 141 deletions.
74 changes: 3 additions & 71 deletions package-lock.json

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

4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,11 @@
"live-server": "^1.2.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.21.0",
"rimraf": "^5.0.5",
"typescript": "^5.3.3"
},
"peerDependencies": {
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.21.0"
"react-dom": "^18.2.0"
}
}
131 changes: 64 additions & 67 deletions src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
useRef,
useEffect,
useMemo,
ReactNode,
} from "react";
import { BiSearch } from "react-icons/bi";
import getUuid from "uuid-by-string";
Expand All @@ -23,7 +24,6 @@ import { SearchResult } from "./SearchResult";
import { SearchModal } from "./SearchModal";
import { useSearchHistory } from "./useSearchHistory";
import "./_index.scss";
import { BrowserRouter } from "react-router-dom";
import { SearchInput } from "SearchInput";

const getQueryParam = (urlParams: URLSearchParams, key: string) => {
Expand Down Expand Up @@ -246,73 +246,70 @@ export const ReactSearch: FC<Props> = ({

return (
<>
<BrowserRouter>
<div className="styleWrapper">
<div ref={buttonRef}>
<button className="searchButton" onClick={() => setIsOpen(true)}>
<VuiFlexContainer
alignItems="center"
spacing="none"
justifyContent="spaceBetween"
className="searchButton__inner"
>
<VuiFlexItem>
<VuiFlexContainer alignItems="center" spacing="xs">
<VuiFlexItem>
<VuiIcon>
<BiSearch />
</VuiIcon>
</VuiFlexItem>

<VuiFlexItem>
<VuiText>
<div>Search</div>
</VuiText>
</VuiFlexItem>
</VuiFlexContainer>
</VuiFlexItem>

<div className="searchButtonShortcut">Ctrl + K</div>
</VuiFlexContainer>
</button>
</div>

<SearchModal isOpen={isOpen} onClose={closeModalAndResetResults}>
<form>
<div className="searchForm">
<SearchInput
isLoading={isLoading}
value={searchValue}
onChange={onChange}
onKeyDown={onKeyDown}
placeholder={placeholder}
/>
{isLoading ? (
<div className="submitButtonWrapper">
<VuiSpinner size="xs" />
</div>
) : (
<div className="submitButtonWrapper">
<button
className="submitButton"
onClick={(e: React.MouseEvent<HTMLButtonElement>) => {
e.preventDefault();
sendSearchQuery(searchValue);
}}
>
<BiSearch size="20px" />
</button>
</div>
)}
</div>
</form>

{resultsList && (
<div className="searchModalResults">{resultsList}</div>
)}
</SearchModal>
<div className="styleWrapper">
<div ref={buttonRef}>
<button className="searchButton" onClick={() => setIsOpen(true)}>
<VuiFlexContainer
alignItems="center"
spacing="none"
justifyContent="spaceBetween"
className="searchButton__inner"
>
<VuiFlexItem>
<VuiFlexContainer alignItems="center" spacing="xs">
<VuiFlexItem>
<VuiIcon>
<BiSearch />
</VuiIcon>
</VuiFlexItem>

<VuiFlexItem>
<VuiText>
<div>Search</div>
</VuiText>
</VuiFlexItem>
</VuiFlexContainer>
</VuiFlexItem>

<div className="searchButtonShortcut">Ctrl + K</div>
</VuiFlexContainer>
</button>
</div>
</BrowserRouter>
<SearchModal isOpen={isOpen} onClose={closeModalAndResetResults}>
<form>
<div className="searchForm">
<SearchInput
isLoading={isLoading}
value={searchValue}
onChange={onChange}
onKeyDown={onKeyDown}
placeholder={placeholder}
/>
{isLoading ? (
<div className="submitButtonWrapper">
<VuiSpinner size="xs" />
</div>
) : (
<div className="submitButtonWrapper">
<button
className="submitButton"
onClick={(e: React.MouseEvent<HTMLButtonElement>) => {
e.preventDefault();
sendSearchQuery(searchValue);
}}
>
<BiSearch size="20px" />
</button>
</div>
)}
</div>
</form>

{resultsList && (
<div className="searchModalResults">{resultsList}</div>
)}
</SearchModal>
</div>
</>
);
};

0 comments on commit 2f26465

Please sign in to comment.