@faststore/components 2.2.0-alpha.9 → 2.2.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/molecules/Carousel/Carousel.js +20 -14
- package/dist/cjs/molecules/Carousel/Carousel.js.map +1 -1
- package/dist/cjs/molecules/Carousel/CarouselItem.d.ts +2 -1
- package/dist/cjs/molecules/Carousel/CarouselItem.js +8 -6
- package/dist/cjs/molecules/Carousel/CarouselItem.js.map +1 -1
- package/dist/esm/molecules/Carousel/Carousel.js +21 -15
- package/dist/esm/molecules/Carousel/Carousel.js.map +1 -1
- package/dist/esm/molecules/Carousel/CarouselItem.d.ts +2 -1
- package/dist/esm/molecules/Carousel/CarouselItem.js +8 -6
- package/dist/esm/molecules/Carousel/CarouselItem.js.map +1 -1
- package/package.json +4 -4
- package/src/molecules/Carousel/Carousel.tsx +30 -13
- package/src/molecules/Carousel/CarouselItem.tsx +12 -6
|
@@ -16,10 +16,13 @@ const createTransformValues = (infinite, totalItems) => {
|
|
|
16
16
|
}
|
|
17
17
|
return transformMap;
|
|
18
18
|
};
|
|
19
|
-
function Carousel({ children, className, 'aria-label': ariaLabel, infiniteMode =
|
|
19
|
+
function Carousel({ children, className, 'aria-label': ariaLabel, infiniteMode = false, controls = 'complete', testId = 'fs-carousel', transition = {
|
|
20
20
|
duration: 400,
|
|
21
21
|
property: 'transform',
|
|
22
|
-
}, id = 'fs-carousel', variant = '
|
|
22
|
+
}, id = 'fs-carousel', variant = 'scroll', itemsPerPage = 1, navigationIcons = undefined, ...swipeableConfigOverrides }) {
|
|
23
|
+
if (itemsPerPage < 1) {
|
|
24
|
+
throw new Error('itemsPerPage must be greater than or equal to 1');
|
|
25
|
+
}
|
|
23
26
|
const carouselTrackRef = (0, react_1.useRef)(null);
|
|
24
27
|
const isSlideCarousel = variant === 'slide';
|
|
25
28
|
const isScrollCarousel = variant === 'scroll';
|
|
@@ -35,6 +38,15 @@ function Carousel({ children, className, 'aria-label': ariaLabel, infiniteMode =
|
|
|
35
38
|
...swipeableConfigOverrides,
|
|
36
39
|
});
|
|
37
40
|
const pagesCount = Math.ceil(childrenCount / sliderState.itemsPerPage);
|
|
41
|
+
const [marginRight, setMarginRight] = (0, react_1.useState)('16px');
|
|
42
|
+
const [carouselItemsWidth, setCarouselItemsWidth] = (0, react_1.useState)(0);
|
|
43
|
+
(0, react_1.useEffect)(() => {
|
|
44
|
+
const item = carouselTrackRef.current?.firstElementChild;
|
|
45
|
+
if (item) {
|
|
46
|
+
setMarginRight(getComputedStyle(item).getPropertyValue('margin-right'));
|
|
47
|
+
setCarouselItemsWidth(Number(item.clientWidth) + parseInt(marginRight, 10) + 1);
|
|
48
|
+
}
|
|
49
|
+
}, [carouselItemsWidth]);
|
|
38
50
|
const showNavigationArrows = pagesCount !== 1 &&
|
|
39
51
|
(controls === 'complete' || controls === 'navigationArrows');
|
|
40
52
|
const showPaginationBullets = pagesCount !== 1 &&
|
|
@@ -116,14 +128,7 @@ function Carousel({ children, className, 'aria-label': ariaLabel, infiniteMode =
|
|
|
116
128
|
sliderState.currentPage === sliderState.totalPages - 1) {
|
|
117
129
|
return;
|
|
118
130
|
}
|
|
119
|
-
let scrollOffset;
|
|
120
|
-
const carouselItemsWidth = Number(carouselTrackRef.current?.firstElementChild?.clientWidth);
|
|
121
|
-
if (itemsPerPage > 1) {
|
|
122
|
-
scrollOffset = index * carouselItemsWidth * itemsPerPage;
|
|
123
|
-
}
|
|
124
|
-
else {
|
|
125
|
-
scrollOffset = index * carouselItemsWidth - carouselItemsWidth * 0.125;
|
|
126
|
-
}
|
|
131
|
+
let scrollOffset = index * carouselItemsWidth * itemsPerPage;
|
|
127
132
|
carouselTrackRef.current?.scrollTo({
|
|
128
133
|
left: scrollOffset,
|
|
129
134
|
behavior: 'smooth',
|
|
@@ -156,20 +161,21 @@ function Carousel({ children, className, 'aria-label': ariaLabel, infiniteMode =
|
|
|
156
161
|
default:
|
|
157
162
|
}
|
|
158
163
|
};
|
|
159
|
-
return (react_1.default.createElement("section", { id: id, "data-fs-carousel": true, className: className, "data-testid": testId, "aria-label": ariaLabel },
|
|
164
|
+
return (react_1.default.createElement("section", { id: id, "data-fs-carousel": true, "data-fs-carousel-variant": variant, className: className, "data-testid": testId, "aria-label": ariaLabel },
|
|
160
165
|
react_1.default.createElement("div", { "data-fs-carousel-track-container": true, style: {
|
|
161
166
|
width: '100%',
|
|
162
167
|
overflow: 'hidden',
|
|
163
168
|
display: isScrollCarousel ? 'block' : undefined,
|
|
164
169
|
}, ...handlers },
|
|
165
|
-
react_1.default.createElement("ul", { "aria-live": "polite", ref: carouselTrackRef, style: carouselTrackStyle, "data-fs-carousel-track": true, onScroll: onScrollTrack, onTransitionEnd: onTransitionTrackEnd }, slides.map((currentSlide, idx) => (react_1.default.createElement(CarouselItem_1.default, { id: id, index: idx, key: String(idx), state: sliderState, totalItems: childrenCount, infiniteMode: infiniteMode, isScrollCarousel: isScrollCarousel }, currentSlide))))),
|
|
170
|
+
react_1.default.createElement("ul", { "aria-live": "polite", ref: carouselTrackRef, style: carouselTrackStyle, "data-fs-carousel-track": true, onScroll: onScrollTrack, onTransitionEnd: onTransitionTrackEnd }, slides.map((currentSlide, idx) => (react_1.default.createElement(CarouselItem_1.default, { id: id, index: idx, key: String(idx), state: sliderState, totalItems: childrenCount, infiniteMode: infiniteMode, isScrollCarousel: isScrollCarousel, marginRightValue: marginRight }, currentSlide))))),
|
|
166
171
|
showNavigationArrows && (react_1.default.createElement("div", { "data-fs-carousel-controls": true },
|
|
167
|
-
react_1.default.createElement(__1.IconButton, { "data-fs-carousel-control": "left", "aria-controls": id, "aria-label": "previous", icon: navigationIcons?.left ?? (react_1.default.createElement(__1.Icon, { name: "ArrowLeft", width: 20, height: 20, weight: "bold" })), onClick: () => {
|
|
172
|
+
react_1.default.createElement(__1.IconButton, { "data-fs-carousel-control": "left", "aria-controls": id, disabled: !infiniteMode && sliderState.currentPage === 0, "aria-label": "previous", icon: navigationIcons?.left ?? (react_1.default.createElement(__1.Icon, { name: "ArrowLeft", width: 20, height: 20, weight: "bold" })), onClick: () => {
|
|
168
173
|
isSlideCarousel && slidePrevious();
|
|
169
174
|
isScrollCarousel &&
|
|
170
175
|
onScrollPagination(sliderState.currentPage - 1, 'previous');
|
|
171
176
|
} }),
|
|
172
|
-
react_1.default.createElement(__1.IconButton, { "data-fs-carousel-control": "right", "aria-controls": id,
|
|
177
|
+
react_1.default.createElement(__1.IconButton, { "data-fs-carousel-control": "right", "aria-controls": id, disabled: !infiniteMode &&
|
|
178
|
+
sliderState.currentPage === sliderState.totalPages - 1, "aria-label": "next", icon: navigationIcons?.right ?? (react_1.default.createElement(__1.Icon, { name: "ArrowRight", width: 20, height: 20, weight: "bold" })), onClick: () => {
|
|
173
179
|
isSlideCarousel && slideNext();
|
|
174
180
|
isScrollCarousel &&
|
|
175
181
|
onScrollPagination(sliderState.currentPage + 1, 'next');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Carousel.js","sourceRoot":"","sources":["../../../../src/molecules/Carousel/Carousel.tsx"],"names":[],"mappings":";;;AAQA,
|
|
1
|
+
{"version":3,"file":"Carousel.js","sourceRoot":"","sources":["../../../../src/molecules/Carousel/Carousel.tsx"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ export interface CarouselItemProps extends HTMLAttributes<HTMLLIElement> {
|
|
|
6
6
|
state: SliderState;
|
|
7
7
|
infiniteMode: boolean;
|
|
8
8
|
isScrollCarousel: boolean;
|
|
9
|
+
marginRightValue: string;
|
|
9
10
|
}
|
|
10
|
-
declare function CarouselItem({ id, index, state, children, totalItems, infiniteMode, isScrollCarousel, }: PropsWithChildren<CarouselItemProps>): JSX.Element;
|
|
11
|
+
declare function CarouselItem({ id, index, state, children, totalItems, infiniteMode, isScrollCarousel, marginRightValue, }: PropsWithChildren<CarouselItemProps>): JSX.Element;
|
|
11
12
|
export default CarouselItem;
|
|
@@ -3,17 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const react_1 = tslib_1.__importDefault(require("react"));
|
|
5
5
|
const hooks_1 = require("../../hooks");
|
|
6
|
-
function CarouselItem({ id, index, state, children, totalItems, infiniteMode, isScrollCarousel, }) {
|
|
6
|
+
function CarouselItem({ id, index, state, children, totalItems, infiniteMode, isScrollCarousel, marginRightValue, }) {
|
|
7
7
|
const { isItemVisible, shouldRenderItem } = (0, hooks_1.useSlideVisibility)({
|
|
8
8
|
totalItems,
|
|
9
9
|
currentSlide: state.currentItem,
|
|
10
10
|
itemsPerPage: state.itemsPerPage,
|
|
11
11
|
});
|
|
12
|
-
const
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
12
|
+
const defaultStyle = { width: '100%' };
|
|
13
|
+
const scrollCarouselStyle = {
|
|
14
|
+
width: `calc((100% - ${marginRightValue} * ${state.itemsPerPage - 1}) / ${state.itemsPerPage})`,
|
|
15
|
+
};
|
|
16
|
+
const style = isScrollCarousel && state.itemsPerPage > 1
|
|
17
|
+
? { ...scrollCarouselStyle }
|
|
18
|
+
: { ...defaultStyle };
|
|
17
19
|
const shouldDisplayItem = isScrollCarousel || shouldRenderItem(index - Number(infiniteMode));
|
|
18
20
|
return (react_1.default.createElement("li", { style: style, id: `${id}-carousel-item-${index}`, "data-fs-carousel-item": true, "data-fs-carousel-item-visible": isItemVisible(index - Number(infiniteMode)) || undefined }, shouldDisplayItem ? children : null));
|
|
19
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CarouselItem.js","sourceRoot":"","sources":["../../../../src/molecules/Carousel/CarouselItem.tsx"],"names":[],"mappings":";;;AACA,0DAAyB;AACzB,uCAA6D;
|
|
1
|
+
{"version":3,"file":"CarouselItem.js","sourceRoot":"","sources":["../../../../src/molecules/Carousel/CarouselItem.tsx"],"names":[],"mappings":";;;AACA,0DAAyB;AACzB,uCAA6D;AAW7D,SAAS,YAAY,CAAC,EACpB,EAAE,EACF,KAAK,EACL,KAAK,EACL,QAAQ,EACR,UAAU,EACV,YAAY,EACZ,gBAAgB,EAChB,gBAAgB,GACqB;IACrC,MAAM,EAAE,aAAa,EAAE,gBAAgB,EAAE,GAAG,IAAA,0BAAkB,EAAC;QAC7D,UAAU;QACV,YAAY,EAAE,KAAK,CAAC,WAAW;QAC/B,YAAY,EAAE,KAAK,CAAC,YAAY;KACjC,CAAC,CAAA;IAEF,MAAM,YAAY,GAAG,EAAE,KAAK,EAAE,MAAM,EAAmB,CAAA;IACvD,MAAM,mBAAmB,GAAG;QAC1B,KAAK,EAAE,gBAAgB,gBAAgB,MAAM,KAAK,CAAC,YAAY,GAAG,CAAC,OACjE,KAAK,CAAC,YACR,GAAG;KACa,CAAA;IAElB,MAAM,KAAK,GAAG,gBAAgB,IAAI,KAAK,CAAC,YAAY,GAAG,CAAC;QACtD,CAAC,CAAC,EAAE,GAAG,mBAAmB,EAAE;QAC5B,CAAC,CAAC,EAAE,GAAG,YAAY,EAAE,CAAA;IAEvB,MAAM,iBAAiB,GACrB,gBAAgB,IAAI,gBAAgB,CAAC,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAA;IAEpE,OAAO,CACL,sCACE,KAAK,EAAE,KAAK,EACZ,EAAE,EAAE,GAAG,EAAE,kBAAkB,KAAK,EAAE,kEAGhC,aAAa,CAAC,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,SAAS,IAGzD,iBAAiB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CACjC,CACN,CAAA;AACH,CAAC;AAED,kBAAe,YAAY,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, { useMemo, useRef } from 'react';
|
|
1
|
+
import React, { useEffect, useMemo, useRef, useState } from 'react';
|
|
2
2
|
import { Icon, IconButton } from '../..';
|
|
3
3
|
import { useSlider } from '../../hooks';
|
|
4
4
|
import CarouselBullets from './CarouselBullets';
|
|
@@ -13,10 +13,13 @@ const createTransformValues = (infinite, totalItems) => {
|
|
|
13
13
|
}
|
|
14
14
|
return transformMap;
|
|
15
15
|
};
|
|
16
|
-
function Carousel({ children, className, 'aria-label': ariaLabel, infiniteMode =
|
|
16
|
+
function Carousel({ children, className, 'aria-label': ariaLabel, infiniteMode = false, controls = 'complete', testId = 'fs-carousel', transition = {
|
|
17
17
|
duration: 400,
|
|
18
18
|
property: 'transform',
|
|
19
|
-
}, id = 'fs-carousel', variant = '
|
|
19
|
+
}, id = 'fs-carousel', variant = 'scroll', itemsPerPage = 1, navigationIcons = undefined, ...swipeableConfigOverrides }) {
|
|
20
|
+
if (itemsPerPage < 1) {
|
|
21
|
+
throw new Error('itemsPerPage must be greater than or equal to 1');
|
|
22
|
+
}
|
|
20
23
|
const carouselTrackRef = useRef(null);
|
|
21
24
|
const isSlideCarousel = variant === 'slide';
|
|
22
25
|
const isScrollCarousel = variant === 'scroll';
|
|
@@ -32,6 +35,15 @@ function Carousel({ children, className, 'aria-label': ariaLabel, infiniteMode =
|
|
|
32
35
|
...swipeableConfigOverrides,
|
|
33
36
|
});
|
|
34
37
|
const pagesCount = Math.ceil(childrenCount / sliderState.itemsPerPage);
|
|
38
|
+
const [marginRight, setMarginRight] = useState('16px');
|
|
39
|
+
const [carouselItemsWidth, setCarouselItemsWidth] = useState(0);
|
|
40
|
+
useEffect(() => {
|
|
41
|
+
const item = carouselTrackRef.current?.firstElementChild;
|
|
42
|
+
if (item) {
|
|
43
|
+
setMarginRight(getComputedStyle(item).getPropertyValue('margin-right'));
|
|
44
|
+
setCarouselItemsWidth(Number(item.clientWidth) + parseInt(marginRight, 10) + 1);
|
|
45
|
+
}
|
|
46
|
+
}, [carouselItemsWidth]);
|
|
35
47
|
const showNavigationArrows = pagesCount !== 1 &&
|
|
36
48
|
(controls === 'complete' || controls === 'navigationArrows');
|
|
37
49
|
const showPaginationBullets = pagesCount !== 1 &&
|
|
@@ -113,14 +125,7 @@ function Carousel({ children, className, 'aria-label': ariaLabel, infiniteMode =
|
|
|
113
125
|
sliderState.currentPage === sliderState.totalPages - 1) {
|
|
114
126
|
return;
|
|
115
127
|
}
|
|
116
|
-
let scrollOffset;
|
|
117
|
-
const carouselItemsWidth = Number(carouselTrackRef.current?.firstElementChild?.clientWidth);
|
|
118
|
-
if (itemsPerPage > 1) {
|
|
119
|
-
scrollOffset = index * carouselItemsWidth * itemsPerPage;
|
|
120
|
-
}
|
|
121
|
-
else {
|
|
122
|
-
scrollOffset = index * carouselItemsWidth - carouselItemsWidth * 0.125;
|
|
123
|
-
}
|
|
128
|
+
let scrollOffset = index * carouselItemsWidth * itemsPerPage;
|
|
124
129
|
carouselTrackRef.current?.scrollTo({
|
|
125
130
|
left: scrollOffset,
|
|
126
131
|
behavior: 'smooth',
|
|
@@ -153,20 +158,21 @@ function Carousel({ children, className, 'aria-label': ariaLabel, infiniteMode =
|
|
|
153
158
|
default:
|
|
154
159
|
}
|
|
155
160
|
};
|
|
156
|
-
return (React.createElement("section", { id: id, "data-fs-carousel": true, className: className, "data-testid": testId, "aria-label": ariaLabel },
|
|
161
|
+
return (React.createElement("section", { id: id, "data-fs-carousel": true, "data-fs-carousel-variant": variant, className: className, "data-testid": testId, "aria-label": ariaLabel },
|
|
157
162
|
React.createElement("div", { "data-fs-carousel-track-container": true, style: {
|
|
158
163
|
width: '100%',
|
|
159
164
|
overflow: 'hidden',
|
|
160
165
|
display: isScrollCarousel ? 'block' : undefined,
|
|
161
166
|
}, ...handlers },
|
|
162
|
-
React.createElement("ul", { "aria-live": "polite", ref: carouselTrackRef, style: carouselTrackStyle, "data-fs-carousel-track": true, onScroll: onScrollTrack, onTransitionEnd: onTransitionTrackEnd }, slides.map((currentSlide, idx) => (React.createElement(CarouselItem, { id: id, index: idx, key: String(idx), state: sliderState, totalItems: childrenCount, infiniteMode: infiniteMode, isScrollCarousel: isScrollCarousel }, currentSlide))))),
|
|
167
|
+
React.createElement("ul", { "aria-live": "polite", ref: carouselTrackRef, style: carouselTrackStyle, "data-fs-carousel-track": true, onScroll: onScrollTrack, onTransitionEnd: onTransitionTrackEnd }, slides.map((currentSlide, idx) => (React.createElement(CarouselItem, { id: id, index: idx, key: String(idx), state: sliderState, totalItems: childrenCount, infiniteMode: infiniteMode, isScrollCarousel: isScrollCarousel, marginRightValue: marginRight }, currentSlide))))),
|
|
163
168
|
showNavigationArrows && (React.createElement("div", { "data-fs-carousel-controls": true },
|
|
164
|
-
React.createElement(IconButton, { "data-fs-carousel-control": "left", "aria-controls": id, "aria-label": "previous", icon: navigationIcons?.left ?? (React.createElement(Icon, { name: "ArrowLeft", width: 20, height: 20, weight: "bold" })), onClick: () => {
|
|
169
|
+
React.createElement(IconButton, { "data-fs-carousel-control": "left", "aria-controls": id, disabled: !infiniteMode && sliderState.currentPage === 0, "aria-label": "previous", icon: navigationIcons?.left ?? (React.createElement(Icon, { name: "ArrowLeft", width: 20, height: 20, weight: "bold" })), onClick: () => {
|
|
165
170
|
isSlideCarousel && slidePrevious();
|
|
166
171
|
isScrollCarousel &&
|
|
167
172
|
onScrollPagination(sliderState.currentPage - 1, 'previous');
|
|
168
173
|
} }),
|
|
169
|
-
React.createElement(IconButton, { "data-fs-carousel-control": "right", "aria-controls": id,
|
|
174
|
+
React.createElement(IconButton, { "data-fs-carousel-control": "right", "aria-controls": id, disabled: !infiniteMode &&
|
|
175
|
+
sliderState.currentPage === sliderState.totalPages - 1, "aria-label": "next", icon: navigationIcons?.right ?? (React.createElement(Icon, { name: "ArrowRight", width: 20, height: 20, weight: "bold" })), onClick: () => {
|
|
170
176
|
isSlideCarousel && slideNext();
|
|
171
177
|
isScrollCarousel &&
|
|
172
178
|
onScrollPagination(sliderState.currentPage + 1, 'next');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Carousel.js","sourceRoot":"","sources":["../../../../src/molecules/Carousel/Carousel.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"Carousel.js","sourceRoot":"","sources":["../../../../src/molecules/Carousel/Carousel.tsx"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ export interface CarouselItemProps extends HTMLAttributes<HTMLLIElement> {
|
|
|
6
6
|
state: SliderState;
|
|
7
7
|
infiniteMode: boolean;
|
|
8
8
|
isScrollCarousel: boolean;
|
|
9
|
+
marginRightValue: string;
|
|
9
10
|
}
|
|
10
|
-
declare function CarouselItem({ id, index, state, children, totalItems, infiniteMode, isScrollCarousel, }: PropsWithChildren<CarouselItemProps>): JSX.Element;
|
|
11
|
+
declare function CarouselItem({ id, index, state, children, totalItems, infiniteMode, isScrollCarousel, marginRightValue, }: PropsWithChildren<CarouselItemProps>): JSX.Element;
|
|
11
12
|
export default CarouselItem;
|
|
@@ -1,16 +1,18 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { useSlideVisibility } from '../../hooks';
|
|
3
|
-
function CarouselItem({ id, index, state, children, totalItems, infiniteMode, isScrollCarousel, }) {
|
|
3
|
+
function CarouselItem({ id, index, state, children, totalItems, infiniteMode, isScrollCarousel, marginRightValue, }) {
|
|
4
4
|
const { isItemVisible, shouldRenderItem } = useSlideVisibility({
|
|
5
5
|
totalItems,
|
|
6
6
|
currentSlide: state.currentItem,
|
|
7
7
|
itemsPerPage: state.itemsPerPage,
|
|
8
8
|
});
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
9
|
+
const defaultStyle = { width: '100%' };
|
|
10
|
+
const scrollCarouselStyle = {
|
|
11
|
+
width: `calc((100% - ${marginRightValue} * ${state.itemsPerPage - 1}) / ${state.itemsPerPage})`,
|
|
12
|
+
};
|
|
13
|
+
const style = isScrollCarousel && state.itemsPerPage > 1
|
|
14
|
+
? { ...scrollCarouselStyle }
|
|
15
|
+
: { ...defaultStyle };
|
|
14
16
|
const shouldDisplayItem = isScrollCarousel || shouldRenderItem(index - Number(infiniteMode));
|
|
15
17
|
return (React.createElement("li", { style: style, id: `${id}-carousel-item-${index}`, "data-fs-carousel-item": true, "data-fs-carousel-item-visible": isItemVisible(index - Number(infiniteMode)) || undefined }, shouldDisplayItem ? children : null));
|
|
16
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CarouselItem.js","sourceRoot":"","sources":["../../../../src/molecules/Carousel/CarouselItem.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAe,kBAAkB,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"CarouselItem.js","sourceRoot":"","sources":["../../../../src/molecules/Carousel/CarouselItem.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAe,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAW7D,SAAS,YAAY,CAAC,EACpB,EAAE,EACF,KAAK,EACL,KAAK,EACL,QAAQ,EACR,UAAU,EACV,YAAY,EACZ,gBAAgB,EAChB,gBAAgB,GACqB;IACrC,MAAM,EAAE,aAAa,EAAE,gBAAgB,EAAE,GAAG,kBAAkB,CAAC;QAC7D,UAAU;QACV,YAAY,EAAE,KAAK,CAAC,WAAW;QAC/B,YAAY,EAAE,KAAK,CAAC,YAAY;KACjC,CAAC,CAAA;IAEF,MAAM,YAAY,GAAG,EAAE,KAAK,EAAE,MAAM,EAAmB,CAAA;IACvD,MAAM,mBAAmB,GAAG;QAC1B,KAAK,EAAE,gBAAgB,gBAAgB,MAAM,KAAK,CAAC,YAAY,GAAG,CAAC,OACjE,KAAK,CAAC,YACR,GAAG;KACa,CAAA;IAElB,MAAM,KAAK,GAAG,gBAAgB,IAAI,KAAK,CAAC,YAAY,GAAG,CAAC;QACtD,CAAC,CAAC,EAAE,GAAG,mBAAmB,EAAE;QAC5B,CAAC,CAAC,EAAE,GAAG,YAAY,EAAE,CAAA;IAEvB,MAAM,iBAAiB,GACrB,gBAAgB,IAAI,gBAAgB,CAAC,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAA;IAEpE,OAAO,CACL,4BACE,KAAK,EAAE,KAAK,EACZ,EAAE,EAAE,GAAG,EAAE,kBAAkB,KAAK,EAAE,kEAGhC,aAAa,CAAC,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,SAAS,IAGzD,iBAAiB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CACjC,CACN,CAAA;AACH,CAAC;AAED,eAAe,YAAY,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@faststore/components",
|
|
3
|
-
"version": "2.2.
|
|
3
|
+
"version": "2.2.10",
|
|
4
4
|
"main": "dist/cjs/index.js",
|
|
5
5
|
"module": "dist/esm/index.js",
|
|
6
6
|
"typings": "dist/esm/index.d.ts",
|
|
@@ -34,8 +34,8 @@
|
|
|
34
34
|
"react-dom": "^18.2.0"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
|
-
"@faststore/eslint-config": "^2.2.0
|
|
38
|
-
"@faststore/shared": "^2.2.0
|
|
37
|
+
"@faststore/eslint-config": "^2.2.0",
|
|
38
|
+
"@faststore/shared": "^2.2.0",
|
|
39
39
|
"eslint": "7.32.0",
|
|
40
40
|
"typescript": "^4.8.4"
|
|
41
41
|
},
|
|
@@ -43,5 +43,5 @@
|
|
|
43
43
|
"node": "16.18.0",
|
|
44
44
|
"yarn": "1.19.1"
|
|
45
45
|
},
|
|
46
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "a0774a2e911ebcdf167e0456b53ef0be84c58a99"
|
|
47
47
|
}
|
|
@@ -6,7 +6,7 @@ import type {
|
|
|
6
6
|
UIEvent,
|
|
7
7
|
AriaAttributes,
|
|
8
8
|
} from 'react'
|
|
9
|
-
import React, { useMemo, useRef } from 'react'
|
|
9
|
+
import React, { useEffect, useMemo, useRef, useState } from 'react'
|
|
10
10
|
import type { SwipeableProps } from 'react-swipeable'
|
|
11
11
|
|
|
12
12
|
import { Icon, IconButton } from '../..'
|
|
@@ -88,7 +88,7 @@ function Carousel({
|
|
|
88
88
|
children,
|
|
89
89
|
className,
|
|
90
90
|
'aria-label': ariaLabel,
|
|
91
|
-
infiniteMode =
|
|
91
|
+
infiniteMode = false,
|
|
92
92
|
controls = 'complete',
|
|
93
93
|
testId = 'fs-carousel',
|
|
94
94
|
transition = {
|
|
@@ -96,11 +96,15 @@ function Carousel({
|
|
|
96
96
|
property: 'transform',
|
|
97
97
|
},
|
|
98
98
|
id = 'fs-carousel',
|
|
99
|
-
variant = '
|
|
99
|
+
variant = 'scroll',
|
|
100
100
|
itemsPerPage = 1,
|
|
101
101
|
navigationIcons = undefined,
|
|
102
102
|
...swipeableConfigOverrides
|
|
103
103
|
}: PropsWithChildren<CarouselProps>) {
|
|
104
|
+
if (itemsPerPage < 1) {
|
|
105
|
+
throw new Error('itemsPerPage must be greater than or equal to 1')
|
|
106
|
+
}
|
|
107
|
+
|
|
104
108
|
const carouselTrackRef = useRef<HTMLUListElement>(null)
|
|
105
109
|
const isSlideCarousel = variant === 'slide'
|
|
106
110
|
const isScrollCarousel = variant === 'scroll'
|
|
@@ -121,6 +125,21 @@ function Carousel({
|
|
|
121
125
|
|
|
122
126
|
const pagesCount = Math.ceil(childrenCount / sliderState.itemsPerPage)
|
|
123
127
|
|
|
128
|
+
const [marginRight, setMarginRight] = useState('16px')
|
|
129
|
+
const [carouselItemsWidth, setCarouselItemsWidth] = useState(0)
|
|
130
|
+
|
|
131
|
+
useEffect(() => {
|
|
132
|
+
const item = carouselTrackRef.current?.firstElementChild
|
|
133
|
+
|
|
134
|
+
if (item) {
|
|
135
|
+
setMarginRight(getComputedStyle(item).getPropertyValue('margin-right'))
|
|
136
|
+
|
|
137
|
+
setCarouselItemsWidth(
|
|
138
|
+
Number(item.clientWidth) + parseInt(marginRight, 10) + 1
|
|
139
|
+
)
|
|
140
|
+
}
|
|
141
|
+
}, [carouselItemsWidth])
|
|
142
|
+
|
|
124
143
|
const showNavigationArrows =
|
|
125
144
|
pagesCount !== 1 &&
|
|
126
145
|
(controls === 'complete' || controls === 'navigationArrows')
|
|
@@ -251,16 +270,7 @@ function Carousel({
|
|
|
251
270
|
return
|
|
252
271
|
}
|
|
253
272
|
|
|
254
|
-
let scrollOffset
|
|
255
|
-
const carouselItemsWidth = Number(
|
|
256
|
-
carouselTrackRef.current?.firstElementChild?.clientWidth
|
|
257
|
-
)
|
|
258
|
-
|
|
259
|
-
if (itemsPerPage > 1) {
|
|
260
|
-
scrollOffset = index * carouselItemsWidth * itemsPerPage
|
|
261
|
-
} else {
|
|
262
|
-
scrollOffset = index * carouselItemsWidth - carouselItemsWidth * 0.125
|
|
263
|
-
}
|
|
273
|
+
let scrollOffset = index * carouselItemsWidth * itemsPerPage
|
|
264
274
|
|
|
265
275
|
carouselTrackRef.current?.scrollTo({
|
|
266
276
|
left: scrollOffset,
|
|
@@ -305,6 +315,7 @@ function Carousel({
|
|
|
305
315
|
<section
|
|
306
316
|
id={id}
|
|
307
317
|
data-fs-carousel
|
|
318
|
+
data-fs-carousel-variant={variant}
|
|
308
319
|
className={className}
|
|
309
320
|
data-testid={testId}
|
|
310
321
|
aria-label={ariaLabel}
|
|
@@ -335,6 +346,7 @@ function Carousel({
|
|
|
335
346
|
totalItems={childrenCount}
|
|
336
347
|
infiniteMode={infiniteMode}
|
|
337
348
|
isScrollCarousel={isScrollCarousel}
|
|
349
|
+
marginRightValue={marginRight}
|
|
338
350
|
>
|
|
339
351
|
{currentSlide}
|
|
340
352
|
</CarouselItem>
|
|
@@ -347,6 +359,7 @@ function Carousel({
|
|
|
347
359
|
<IconButton
|
|
348
360
|
data-fs-carousel-control="left"
|
|
349
361
|
aria-controls={id}
|
|
362
|
+
disabled={!infiniteMode && sliderState.currentPage === 0}
|
|
350
363
|
aria-label="previous"
|
|
351
364
|
icon={
|
|
352
365
|
navigationIcons?.left ?? (
|
|
@@ -362,6 +375,10 @@ function Carousel({
|
|
|
362
375
|
<IconButton
|
|
363
376
|
data-fs-carousel-control="right"
|
|
364
377
|
aria-controls={id}
|
|
378
|
+
disabled={
|
|
379
|
+
!infiniteMode &&
|
|
380
|
+
sliderState.currentPage === sliderState.totalPages - 1
|
|
381
|
+
}
|
|
365
382
|
aria-label="next"
|
|
366
383
|
icon={
|
|
367
384
|
navigationIcons?.right ?? (
|
|
@@ -8,6 +8,7 @@ export interface CarouselItemProps extends HTMLAttributes<HTMLLIElement> {
|
|
|
8
8
|
state: SliderState
|
|
9
9
|
infiniteMode: boolean
|
|
10
10
|
isScrollCarousel: boolean
|
|
11
|
+
marginRightValue: string
|
|
11
12
|
}
|
|
12
13
|
|
|
13
14
|
function CarouselItem({
|
|
@@ -18,6 +19,7 @@ function CarouselItem({
|
|
|
18
19
|
totalItems,
|
|
19
20
|
infiniteMode,
|
|
20
21
|
isScrollCarousel,
|
|
22
|
+
marginRightValue,
|
|
21
23
|
}: PropsWithChildren<CarouselItemProps>) {
|
|
22
24
|
const { isItemVisible, shouldRenderItem } = useSlideVisibility({
|
|
23
25
|
totalItems,
|
|
@@ -25,12 +27,16 @@ function CarouselItem({
|
|
|
25
27
|
itemsPerPage: state.itemsPerPage,
|
|
26
28
|
})
|
|
27
29
|
|
|
28
|
-
const
|
|
29
|
-
|
|
30
|
-
((
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
30
|
+
const defaultStyle = { width: '100%' } as CSSProperties
|
|
31
|
+
const scrollCarouselStyle = {
|
|
32
|
+
width: `calc((100% - ${marginRightValue} * ${state.itemsPerPage - 1}) / ${
|
|
33
|
+
state.itemsPerPage
|
|
34
|
+
})`,
|
|
35
|
+
} as CSSProperties
|
|
36
|
+
|
|
37
|
+
const style = isScrollCarousel && state.itemsPerPage > 1
|
|
38
|
+
? { ...scrollCarouselStyle }
|
|
39
|
+
: { ...defaultStyle }
|
|
34
40
|
|
|
35
41
|
const shouldDisplayItem =
|
|
36
42
|
isScrollCarousel || shouldRenderItem(index - Number(infiniteMode))
|