Skip to content

Commit 43103c1

Browse files
authored
Merge pull request #11 from itseasy21/next
Update to 0.12.2
2 parents a600f5d + c906b63 commit 43103c1

4 files changed

Lines changed: 39 additions & 68 deletions

File tree

demoApp/src/DemoApp.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { useState, useRef, useEffect } from "react";
2-
import Carousel from "../../src/react-elastic-carousel/components/Carousel";
2+
import Carousel from "../../src/@itseasy21/react-elastic-carousel/components/Carousel";
33
import styled from "styled-components";
44

55
const Item = styled.div`
@@ -33,9 +33,9 @@ const StyledControlFields = styled.div`
3333

3434
const breakPoints = [
3535
{ width: 200, itemsToShow: 1 },
36-
{ width: 600, itemsToShow: 2 },
36+
{ width: 600, itemsToShow: 2 }
3737
];
38-
const toggle = (updater) => () => updater((o) => !o);
38+
const toggle = updater => () => updater(o => !o);
3939

4040
const CheckBox = ({ label, onToggle, ...rest }) => {
4141
return (
@@ -59,11 +59,11 @@ const DemoApp = () => {
5959
const carouselRef = useRef();
6060

6161
const addItem = () => {
62-
setItems((currentItems) => [...currentItems, currentItems.length + 1]);
62+
setItems(currentItems => [...currentItems, currentItems.length + 1]);
6363
};
6464

6565
const removeItem = () => {
66-
setItems((currentItems) => currentItems.slice(0, currentItems.length - 1));
66+
setItems(currentItems => currentItems.slice(0, currentItems.length - 1));
6767
};
6868

6969
const updateItemsToShow = ({ target }) =>
@@ -81,7 +81,7 @@ const DemoApp = () => {
8181
<Layout>
8282
<ControlsLayout>
8383
<StyledControlFields>
84-
<button onClick={() => setShow((o) => !o)}>
84+
<button onClick={() => setShow(o => !o)}>
8585
{`${show ? "Hide" : "Show"} Carousel`}
8686
</button>
8787
</StyledControlFields>
@@ -131,7 +131,7 @@ const DemoApp = () => {
131131
showArrows={showArrows}
132132
pagination={pagination}
133133
>
134-
{items.map((item) => (
134+
{items.map(item => (
135135
<Item key={item}>{item}</Item>
136136
))}
137137
</Carousel>

package.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@itseasy21/react-elastic-carousel",
3-
"version": "0.12.1",
3+
"version": "0.12.2",
44
"description": "A flexible and responsive carousel component for react",
55
"author": "itseasy21",
66
"contributors": [
@@ -43,14 +43,14 @@
4343
"@uiw/react-only-when": "^1.0.6",
4444
"classnames": "^2.2.6",
4545
"prop-types": "^15.5.4",
46-
"react-swipeable": "^5.5.1",
47-
"resize-observer-polyfill": "1.5.0"
46+
"react-swipeable": "^7.0.0",
47+
"resize-observer-polyfill": "~1.5.0"
4848
},
4949
"peerDependencies": {
5050
"prop-types": "^15.5.4",
51-
"react": "15 - 18",
52-
"react-dom": "15 - 18",
53-
"styled-components": "^5.1.0"
51+
"react": "16.8.3 - 18",
52+
"react-dom": "16.8.3 - 18",
53+
"styled-components": "^5.0.0"
5454
},
5555
"devDependencies": {
5656
"@babel/core": "^7.3.4",
@@ -100,7 +100,6 @@
100100
"prettier-eslint": "^8.8.2",
101101
"react": "^16.12.0",
102102
"react-dom": "^16.12.0",
103-
"react-resizable": "^1.7.5",
104103
"react-scripts": "^2.1.8",
105104
"react-test-renderer": "^16.5.2",
106105
"rollup": "^0.64.1",

src/@itseasy21/react-elastic-carousel/components/Track.js

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22
import PropTypes from "prop-types";
3-
import { Swipeable } from "react-swipeable";
3+
import { useSwipeable } from "react-swipeable";
44
import { cssPrefix } from "../utils/helpers";
55
import ItemWrapperContainer from "./ItemWrapperContainer";
66

@@ -61,21 +61,26 @@ const Track = ({
6161
</div>
6262
);
6363
});
64+
65+
const swipeHandler = useSwipeable({
66+
stopPropagation: true,
67+
preventDefaultTouchmoveEvent,
68+
trackMouse: enableMouseSwipe,
69+
onSwiped,
70+
onSwiping
71+
});
72+
6473
const toRender = enableSwipe ? (
65-
<Swipeable
74+
<div
6675
style={{
6776
display: "flex",
6877
flexDirection: verticalMode ? "column" : "row"
6978
}}
70-
stopPropagation
71-
preventDefaultTouchmoveEvent={preventDefaultTouchmoveEvent}
72-
trackMouse={enableMouseSwipe}
73-
onSwiped={onSwiped}
74-
onSwiping={onSwiping}
7579
className={cssPrefix("swipable")}
80+
{...swipeHandler}
7681
>
7782
{originalChildren}
78-
</Swipeable>
83+
</div>
7984
) : (
8085
originalChildren
8186
);

yarn.lock

Lines changed: 13 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -2212,11 +2212,10 @@ __metadata:
22122212
prop-types: ^15.5.4
22132213
react: ^16.12.0
22142214
react-dom: ^16.12.0
2215-
react-resizable: ^1.7.5
22162215
react-scripts: ^2.1.8
2217-
react-swipeable: ^5.5.1
2216+
react-swipeable: ^7.0.0
22182217
react-test-renderer: ^16.5.2
2219-
resize-observer-polyfill: 1.5.0
2218+
resize-observer-polyfill: ~1.5.0
22202219
rollup: ^0.64.1
22212220
rollup-plugin-alias: ^1.4.0
22222221
rollup-plugin-auto-external: ^2.0.0
@@ -2231,9 +2230,9 @@ __metadata:
22312230
styled-components: ^5.1.0
22322231
peerDependencies:
22332232
prop-types: ^15.5.4
2234-
react: 15 - 18
2235-
react-dom: 15 - 18
2236-
styled-components: ^5.1.0
2233+
react: 16.8.3 - 18
2234+
react-dom: 16.8.3 - 18
2235+
styled-components: ^5.0.0
22372236
languageName: unknown
22382237
linkType: soft
22392238

@@ -6541,7 +6540,7 @@ __metadata:
65416540
languageName: node
65426541
linkType: hard
65436542

6544-
"classnames@npm:^2.2.5, classnames@npm:^2.2.6":
6543+
"classnames@npm:^2.2.6":
65456544
version: 2.2.6
65466545
resolution: "classnames@npm:2.2.6"
65476546
checksum: 09a4fda780158aa8399079898eabeeca0c48c28641d9e4de140db7412e5e346843039ded1af0152f755afc2cc246ff8c3d6f227bf0dcb004e070b7fa14ec54cc
@@ -20497,7 +20496,7 @@ __metadata:
2049720496
languageName: node
2049820497
linkType: hard
2049920498

20500-
"prop-types@npm:15.x, prop-types@npm:^15.5.10, prop-types@npm:^15.5.8, prop-types@npm:^15.6.0, prop-types@npm:^15.6.1, prop-types@npm:^15.6.2, prop-types@npm:^15.7.2":
20499+
"prop-types@npm:^15.5.10, prop-types@npm:^15.5.8, prop-types@npm:^15.6.1, prop-types@npm:^15.6.2, prop-types@npm:^15.7.2":
2050120500
version: 15.7.2
2050220501
resolution: "prop-types@npm:15.7.2"
2050320502
dependencies:
@@ -21054,16 +21053,6 @@ __metadata:
2105421053
languageName: node
2105521054
linkType: hard
2105621055

21057-
"react-draggable@npm:^4.0.3":
21058-
version: 4.4.3
21059-
resolution: "react-draggable@npm:4.4.3"
21060-
dependencies:
21061-
classnames: ^2.2.5
21062-
prop-types: ^15.6.0
21063-
checksum: 94d3d5f0e7fd5920894915f069e393d55b46de114570a613ca56bd1f46bb5fc8dc9dbd1a254d8e09153e8261589122d1c725f722b37d454da883d0ffcc1a68bf
21064-
languageName: node
21065-
linkType: hard
21066-
2106721056
"react-error-overlay@npm:^3.0.0":
2106821057
version: 3.0.0
2106921058
resolution: "react-error-overlay@npm:3.0.0"
@@ -21280,19 +21269,6 @@ __metadata:
2128021269
languageName: node
2128121270
linkType: hard
2128221271

21283-
"react-resizable@npm:^1.7.5":
21284-
version: 1.10.1
21285-
resolution: "react-resizable@npm:1.10.1"
21286-
dependencies:
21287-
prop-types: 15.x
21288-
react-draggable: ^4.0.3
21289-
peerDependencies:
21290-
react: 0.14.x || 15.x || 16.x
21291-
react-dom: 0.14.x || 15.x || 16.x
21292-
checksum: be6c557caf671f740adf0b285b4f12b3aa9535220db57fc3e04397002870422cdf3ecadf22bd5b021463420aec76a1e19ef6f2a2b538c6d0e1c62e9967ba2a9f
21293-
languageName: node
21294-
linkType: hard
21295-
2129621272
"react-resize-detector@npm:^4.2.1":
2129721273
version: 4.2.3
2129821274
resolution: "react-resize-detector@npm:4.2.3"
@@ -21396,14 +21372,12 @@ __metadata:
2139621372
languageName: node
2139721373
linkType: hard
2139821374

21399-
"react-swipeable@npm:^5.5.1":
21400-
version: 5.5.1
21401-
resolution: "react-swipeable@npm:5.5.1"
21402-
dependencies:
21403-
prop-types: ^15.6.2
21375+
"react-swipeable@npm:^7.0.0":
21376+
version: 7.0.0
21377+
resolution: "react-swipeable@npm:7.0.0"
2140421378
peerDependencies:
21405-
react: ^16.0.0-0
21406-
checksum: 474e281c619a4ca61cede4a1c9acb712241c16c1d226145cc3af66ac77525b585b510739879dc5404ead280fcd606e5b3ed26ddd76d9eb853bf4b11578201d4b
21379+
react: ^16.8.3 || ^17 || ^18
21380+
checksum: 54d15933483f7aea8f69e6a9930e220fb3bd98f314cae89a8b797e8a3bb959b68e777fe199cd7729edfe65edfcb5d933c7312ea08626f1613a6fd5d30e646598
2140721381
languageName: node
2140821382
linkType: hard
2140921383

@@ -22373,14 +22347,7 @@ __metadata:
2237322347
languageName: node
2237422348
linkType: hard
2237522349

22376-
"resize-observer-polyfill@npm:1.5.0":
22377-
version: 1.5.0
22378-
resolution: "resize-observer-polyfill@npm:1.5.0"
22379-
checksum: ecc6aab5d4f967f1b76cee0748c1967c8b6b5d8c4393764ca3b788dbd15c0f846326c4ebff9f4f39aba45fea8016cd42bb95e28e8fab1d14349e173790c58133
22380-
languageName: node
22381-
linkType: hard
22382-
22383-
"resize-observer-polyfill@npm:^1.5.1":
22350+
"resize-observer-polyfill@npm:^1.5.1, resize-observer-polyfill@npm:~1.5.0":
2238422351
version: 1.5.1
2238522352
resolution: "resize-observer-polyfill@npm:1.5.1"
2238622353
checksum: 57e7f79489867b00ba43c9c051524a5c8f162a61d5547e99333549afc23e15c44fd43f2f318ea0261ea98c0eb3158cca261e6f48d66e1ed1cd1f340a43977094

0 commit comments

Comments
 (0)