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.

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

Upgrade to Swiper 11 #76

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
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
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@
"react-bootstrap": "^2.5.0",
"react-dom": "^16.14.0",
"react-i18next": "^11.14.2",
"react-id-swiper": "^4.0.0",
"react-router-dom": "^5.1.2",
"react-scripts": "5.0.1",
"sass": "^1.43.4",
"swiper": "^8.0.0"
"swiper": "^11.0.0"
},
"resolutions": {
"autoprefixer": "10.4.5"
Expand Down
56 changes: 29 additions & 27 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import sinsdb from "./data/sinsdb";
import Container from "react-bootstrap/Container";
import Row from "react-bootstrap/Row";
import Col from "react-bootstrap/Col";
import Swiper from "react-id-swiper";
import Navbar from "react-bootstrap/Navbar";
import Nav from "react-bootstrap/Nav";
import { BrowserRouter, Switch, Route } from "react-router-dom";
Expand All @@ -19,18 +18,13 @@ import { withTranslation } from "react-i18next";
import LoadingComponent from "./LoadingComponent";
import WelcomeModal from "./WelcomeModal";

class AppComponent extends React.Component {
swiperParams = {
slidesPerView: 1,
spaceBetween: 5,
breakpoints: {
1024: {
slidesPerView: 3,
spaceBetween: 10,
},
},
};
// Swiper stuff
import { Pagination } from "swiper/modules";
import { Swiper, SwiperSlide } from "swiper/react";
import "swiper/css";
import "swiper/css/pagination";

class AppComponent extends React.Component {
constructor(props) {
super(props);

Expand Down Expand Up @@ -176,26 +170,34 @@ class AppComponent extends React.Component {
<Container fluid={true} className="column-container">
<Row className="h-100">
<Col xs="12" className="h-100">
<Swiper {...this.swiperParams}>
<div className="col-scroll overflow-auto">
<ExamineList
sinsdb={sinsdb}
selectedSinIds={this.state.selectedSinIds}
onAddSinId={this.addSinId}
onRemoveSinItem={this.removeSinItem}
customSins={this.state.customSins}
onRemoveCustomSin={this.removeCustomSin}
/>
</div>
<div className="col-scroll overflow-auto">
<Swiper
modules={[Pagination]}
slidesPerView={1}
spaceBetween={5}
breakpoints={{ 1024: { slidesPerView: 3 } }}
pagination={{ clickable: true }}
>
<SwiperSlide>
<div className="col-scroll overflow-auto">
<ExamineList
sinsdb={sinsdb}
selectedSinIds={this.state.selectedSinIds}
onAddSinId={this.addSinId}
onRemoveSinItem={this.removeSinItem}
customSins={this.state.customSins}
onRemoveCustomSin={this.removeCustomSin}
/>
</div>
</SwiperSlide>
<SwiperSlide className="col-scroll overflow-auto">
<SinsList
sinsList={sinsList}
onRemoveSinItem={this.removeSinItem}
/>
</div>
<div className="col-scroll overflow-auto">
</SwiperSlide>
<SwiperSlide className="col-scroll overflow-auto">
<Walkthrough sinsList={sinsList} />
</div>
</SwiperSlide>
</Swiper>
</Col>
</Row>
Expand Down
43 changes: 5 additions & 38 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4651,11 +4651,10 @@ __metadata:
react-bootstrap: ^2.5.0
react-dom: ^16.14.0
react-i18next: ^11.14.2
react-id-swiper: ^4.0.0
react-router-dom: ^5.1.2
react-scripts: 5.0.1
sass: ^1.43.4
swiper: ^8.0.0
swiper: ^11.0.0
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -5404,15 +5403,6 @@ __metadata:
languageName: node
linkType: hard

"dom7@npm:^4.0.4":
version: 4.0.6
resolution: "dom7@npm:4.0.6"
dependencies:
ssr-window: ^4.0.0
checksum: d58dd54feec147c9993f8defe37acb6caefc397a430db360d50e9b88bea4072e795fa3cbdbf54a5ba95bfe66c841967125f9c88ba72d928cd1b69b7d11b60548
languageName: node
linkType: hard

"domelementtype@npm:1":
version: 1.3.1
resolution: "domelementtype@npm:1.3.1"
Expand Down Expand Up @@ -11363,19 +11353,6 @@ __metadata:
languageName: node
linkType: hard

"react-id-swiper@npm:^4.0.0":
version: 4.0.0
resolution: "react-id-swiper@npm:4.0.0"
dependencies:
object-assign: ^4.1.1
peerDependencies:
react: ">=16.8.0"
react-dom: ">=16.8.0"
swiper: ">=5.0.0"
checksum: e2ecd37e12a18b09029d543818aae0e4306567094fcde72033ba2c40abb505eed17240dd01903ce627b82ef79175f876064f7699c773b097b6314dcaebff43b0
languageName: node
linkType: hard

"react-is@npm:^16.13.1, react-is@npm:^16.3.2, react-is@npm:^16.6.0, react-is@npm:^16.7.0, react-is@npm:^16.8.6":
version: 16.13.1
resolution: "react-is@npm:16.13.1"
Expand Down Expand Up @@ -12573,13 +12550,6 @@ resolve@^2.0.0-next.3:
languageName: node
linkType: hard

"ssr-window@npm:^4.0.0, ssr-window@npm:^4.0.2":
version: 4.0.2
resolution: "ssr-window@npm:4.0.2"
checksum: 53fc0ec81d5792ad34cfaaaa4bb2a5fa071a8198ed3da7d415101e181e351d1f7a56c36134706855e03b749968a7761467535d3a01493b13f7d4595380d091f9
languageName: node
linkType: hard

"ssri@npm:^9.0.0":
version: 9.0.1
resolution: "ssri@npm:9.0.1"
Expand Down Expand Up @@ -12939,13 +12909,10 @@ resolve@^2.0.0-next.3:
languageName: node
linkType: hard

"swiper@npm:^8.0.0":
version: 8.4.7
resolution: "swiper@npm:8.4.7"
dependencies:
dom7: ^4.0.4
ssr-window: ^4.0.2
checksum: a3760a1150cfd6e0aedb59f62fe771d6f34bc72aad7d786c611b48f6f8ba426d6434e3703f4c3f6a5435225b0a0e21a0e791a96ba8d17cffbb66948f2b5ad038
"swiper@npm:^11.0.0":
version: 11.0.4
resolution: "swiper@npm:11.0.4"
checksum: 0c31feb37f00ade28db778f1dd0c496f4879b1b465ad078a9103a79cc82a7288993850622cb25eeeab31a99f61da42dd569e1e68358664e2970bf9349170a86d
languageName: node
linkType: hard

Expand Down
Loading