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

example with react-router #25

Merged
merged 11 commits into from
Jan 30, 2024
Merged

example with react-router #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
493e96e
initial commit
Flirre Jan 24, 2024
07aea1a
update to typescript
Flirre Jan 24, 2024
fda5819
align package.json
Flirre Jan 24, 2024
480239b
fix naming
Flirre Jan 25, 2024
85435c0
move to subscribe function
Flirre Jan 25, 2024
e04767c
working, more concise solution
Flirre Jan 26, 2024
957c5f1
fix eslint errors
Flirre Jan 27, 2024
e1de39a
Merge branch 'main' of github.com:jotaijs/jotai-location into jotai-l…
Flirre Jan 27, 2024
eff86d0
rename import according to suggestion
Flirre Jan 27, 2024
b98343b
add dependencies to package.json and pnpm-lock
Flirre Jan 28, 2024
83ecd15
add skipLibCheck to tsconfig
Flirre Jan 30, 2024
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
24 changes: 24 additions & 0 deletions examples/04_react_router/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"name": "jotai-location-example",
"version": "0.1.0",
"private": true,
"dependencies": {
"@types/react": "latest",
"@types/react-dom": "latest",
"history": "5.1.0",
"jotai": "latest",
"jotai-location": "latest",
"react": "latest",
"react-dom": "latest",
"react-router-dom": "6.8.0",
"react-scripts": "latest",
"typescript": "latest"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
"browserslist": [">0.2%", "not dead", "not ie <= 11", "not op_mini all"]
}
8 changes: 8 additions & 0 deletions examples/04_react_router/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<html>
<head>
<title>jotai-location example</title>
</head>
<body>
<div id="app"></div>
</body>
</html>
51 changes: 51 additions & 0 deletions examples/04_react_router/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import {
unstable_HistoryRouter as HistoryRouter,
Routes,
Route,
Link,
} from 'react-router-dom';
import { atomWithLocation } from 'jotai-location';
import { useAtomValue } from 'jotai';
import * as React from 'react';
import history from './routerHistory';

const Route1 = <h1>Hello</h1>;
const Route2 = <h1>World</h1>;
const location = atomWithLocation({
getLocation: () => ({
searchParams: new URLSearchParams(history.location.search),
...history.location,
}),
subscribe: (callback) => history.listen(callback),
});

const App = () => {
const loc = useAtomValue(location);
return (
<div
className="App"
style={{
textAlign: 'center',
display: 'flex',
flexDirection: 'column',
gap: '16px',
}}
>
{/* @ts-expect-error: https://github.com/remix-run/react-router/issues/9630#issuecomment-1341643731 */}
<HistoryRouter history={history}>
current pathname in atomWithLocation: &quot;{loc.pathname}&quot;
<div style={{ display: 'flex', gap: '16px', placeContent: 'center' }}>
<Link to="/1"> to 1</Link>
<Link to="/1/123"> to 1/123</Link>
<Link to="/2"> to 2</Link>
<Link to="/2/123"> to 2/123</Link>
</div>
<Routes>
<Route path="/1" element={Route1} />
<Route path="/2" element={Route2} />
</Routes>
</HistoryRouter>
</div>
);
};
export default App;
9 changes: 9 additions & 0 deletions examples/04_react_router/src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import * as React from 'react';
import { createRoot } from 'react-dom/client';

import App from './App';

const ele = document.getElementById('app');
if (ele) {
createRoot(ele).render(<App />);
}
4 changes: 4 additions & 0 deletions examples/04_react_router/src/routerHistory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { createBrowserHistory } from 'history';

const routerHistory = createBrowserHistory();
export default routerHistory;
5 changes: 4 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
"tsc-test": "tsc --project . --noEmit",
"examples:01_minimal": "DIR=01_minimal EXT=js webpack serve",
"examples:02_typescript": "DIR=02_typescript EXT=tsx webpack serve",
"examples:03_hash": "DIR=03_hash EXT=tsx webpack serve"
"examples:03_hash": "DIR=03_hash EXT=tsx webpack serve",
"examples:04_react_router": "DIR=04_react_router EXT=tsx webpack serve"
},
"jest": {
"testEnvironment": "jsdom",
Expand Down Expand Up @@ -63,6 +64,7 @@
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-react": "^7.33.2",
"history": "5.1.0",
"html-webpack-plugin": "^5.5.3",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
Expand All @@ -73,6 +75,7 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-error-boundary": "^4.0.11",
"react-router-dom": "6.8.0",
"ts-jest": "^29.1.1",
"ts-loader": "^9.5.0",
"typescript": "^5.2.2",
Expand Down
40 changes: 40 additions & 0 deletions pnpm-lock.yaml
View file
Open in desktop

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

3 changes: 2 additions & 1 deletion tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"baseUrl": ".",
"paths": {
"jotai-location": ["./src"]
}
},
"skipLibCheck": true
}
}
Loading