@telus-uds/components-base 3.26.0 → 3.28.0

package/lib/esm/Carousel/Carousel.js

@@ -22,7 +22,7 @@ import CarouselTabsPanel from './CarouselTabs/CarouselTabsPanel';
 import CarouselTabsPanelItem from './CarouselTabs/CarouselTabsPanelItem';
 import dictionary from './dictionary';
 import Box from '../Box';
-import { ITEMS_PER_VIEWPORT_XS_SM, ITEMS_PER_VIEWPORT_MD, ITEMS_PER_VIEWPORT_LG_XL, DEFAULT_POSITION_OFFSET, LARGE_VIEWPORT_MARGIN, DEFAULT_VIEWPORT_MARGIN, PEEKING_MULTIPLIER, ACTIVE_INDEX_OFFSET_MULTIPLIER, NEGATIVE_MULTIPLIER, TRANSITION_MODES, SWIPE_RELEASE_STYLES, INSTANT_ANIMATION_DURATION, DEFAULT_SWIPE_RELEASE_DURATION } from './Constants';
+import { ITEMS_PER_VIEWPORT_XS_SM, ITEMS_PER_VIEWPORT_MD, ITEMS_PER_VIEWPORT_LG_XL, DEFAULT_POSITION_OFFSET, LARGE_VIEWPORT_MARGIN, DEFAULT_VIEWPORT_MARGIN, PEEKING_MULTIPLIER, NEGATIVE_MULTIPLIER, TRANSITION_MODES, SWIPE_RELEASE_STYLES, INSTANT_ANIMATION_DURATION, DEFAULT_SWIPE_RELEASE_DURATION, POSITION_VARIANTS, POSITION_PROPERTIES } from './Constants';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const staticStyles = StyleSheet.create({
   root: {
@@ -72,7 +72,7 @@ const selectHeroContainerStyles = (width, hidden) => ({
   width,
   visibility: hidden ? 'hidden' : 'visible'
 });
-const getDynamicPositionProperty = areStylesAppliedOnPreviousButton => areStylesAppliedOnPreviousButton ? 'left' : 'right';
+const getDynamicPositionProperty = areStylesAppliedOnPreviousButton => areStylesAppliedOnPreviousButton ? POSITION_PROPERTIES.LEFT : POSITION_PROPERTIES.RIGHT;
 const selectControlButtonPositionStyles = _ref => {
   let {
     positionVariant,
@@ -82,23 +82,36 @@ const selectControlButtonPositionStyles = _ref => {
     enablePeeking,
     enableDisplayMultipleItemsPerSlide,
     isAutoPlayEnabled,
-    viewport
+    viewport,
+    maxWidth,
+    viewportWidth
   } = _ref;
   const styles = {};
-  if (positionVariant === 'edge') {
-    styles[positionProperty] = -1 * (buttonWidth / 2);
-  } else if (positionVariant === 'inside') {
-    styles[positionProperty] = DEFAULT_POSITION_OFFSET;
-  } else if (positionVariant === 'outside') {
+  let positionOffset = 0;
+  if (positionVariant === POSITION_VARIANTS.EDGE) {
+    positionOffset = -1 * (buttonWidth / 2);
+  } else if (positionVariant === POSITION_VARIANTS.INSIDE) {
+    positionOffset = DEFAULT_POSITION_OFFSET;
+  } else if (positionVariant === POSITION_VARIANTS.OUTSIDE) {
     if (enablePeeking || enableDisplayMultipleItemsPerSlide || isAutoPlayEnabled && viewport === 'xs') {
-      styles[positionProperty] = 0;
+      positionOffset = 0;
     } else {
-      styles[positionProperty] = -1 * (spaceBetweenSlideAndButton + buttonWidth);
+      positionOffset = -1 * (spaceBetweenSlideAndButton + buttonWidth);
+    }
+  }
+  if (enablePeeking) {
+    if (positionProperty === POSITION_PROPERTIES.RIGHT) {
+      const rightMargin = (viewportWidth - maxWidth) / 2;
+      positionOffset += rightMargin;
+    } else if (positionProperty === POSITION_PROPERTIES.LEFT) {
+      const leftMargin = (viewportWidth - maxWidth) / 2;
+      positionOffset += leftMargin;
     }
   }
+  styles[positionProperty] = positionOffset;
   return styles;
 };
-const selectPreviousNextNavigationButtonStyles = (previousNextNavigationButtonWidth, previousNextNavigationPosition, spaceBetweenSlideAndPreviousNextNavigation, isFirstSlide, isLastSlide, areStylesAppliedOnPreviousButton, enablePeeking, enableDisplayMultipleItemsPerSlide, isAutoPlayEnabled, viewport) => {
+const selectPreviousNextNavigationButtonStyles = (previousNextNavigationButtonWidth, previousNextNavigationPosition, spaceBetweenSlideAndPreviousNextNavigation, isFirstSlide, isLastSlide, areStylesAppliedOnPreviousButton, enablePeeking, enableDisplayMultipleItemsPerSlide, isAutoPlayEnabled, viewport, maxWidth, viewportWidth) => {
   const styles = {
     zIndex: 1,
     position: 'absolute'
@@ -120,7 +133,9 @@ const selectPreviousNextNavigationButtonStyles = (previousNextNavigationButtonWi
       enablePeeking,
       enableDisplayMultipleItemsPerSlide,
       isAutoPlayEnabled,
-      viewport
+      viewport,
+      maxWidth,
+      viewportWidth
     })
   };
 };
@@ -186,7 +201,7 @@ const getMaximumItemsForSlide = (enableDisplayMultipleItemsPerSlide, viewport) =
   }
   return ITEMS_PER_VIEWPORT_XS_SM;
 };
-const selectRootContainerStyles = (enableHero, viewport) => {
+const selectRootContainerStyles = (enableHero, viewport, enablePeeking) => {
   if (enableHero && viewport === 'xl' && Platform.OS === 'web') {
     return {
       alignItems: 'center'
@@ -197,15 +212,25 @@ const selectRootContainerStyles = (enableHero, viewport) => {
       paddingHorizontal: 16
     };
   }
+  if (enablePeeking) {
+    return {
+      width: '100%'
+    };
+  }
   return {};
 };
-const selectMainContainerStyles = (enableHero, viewport, maxWidth) => {
-  if (enableHero && viewport === 'xl' && Platform.OS === 'web') {
+const selectMainContainerStyles = (enableHero, viewport, maxWidth, enablePeeking) => {
+  if (enableHero && viewport === 'xl' && Platform.OS === 'web' && !enablePeeking) {
     return {
       width: '100%',
       maxWidth: maxWidth || 1200
     };
   }
+  if (enablePeeking) {
+    return {
+      width: '100%'
+    };
+  }
   if (maxWidth !== null && maxWidth !== undefined) {
     return {
       maxWidth,
@@ -215,14 +240,20 @@ const selectMainContainerStyles = (enableHero, viewport, maxWidth) => {
   }
   return {};
 };
-const selectNavigationStyles = (tabs, enableHero, viewport) => {
+const selectNavigationStyles = (tabs, enableHero, viewport, enablePeeking, maxWidth) => {
   let marginHorizontal = 0;
   if (enableHero && tabs) {
     marginHorizontal = viewport === 'xl' ? LARGE_VIEWPORT_MARGIN : DEFAULT_VIEWPORT_MARGIN;
   }
-  return {
+  const styles = {
     marginHorizontal
   };
+  if (enablePeeking && maxWidth) {
+    styles.maxWidth = maxWidth;
+    styles.alignSelf = 'center';
+    styles.width = '100%';
+  }
+  return styles;
 };
 
 /**
@@ -231,23 +262,18 @@ const selectNavigationStyles = (tabs, enableHero, viewport) => {
  * @param {number} containerWidth - The width of the carousel container.
  * @param {boolean} enablePeeking - Flag indicating whether peeking is enabled.
  * @param {Object} viewport - The viewport configuration object used to determine peeking properties.
- * @param {React.MutableRefObject<number>} activeIndexRef - A ref object holding the current active index of the carousel.
+ * @param {number} maxWidth - The maximum width constraint for the carousel content.
  * @returns {number} The calculated final width of the carousel container.
  */
-const calculateFinalWidth = (containerWidth, enablePeeking, viewport, activeIndexRef) => {
+const calculateFinalWidth = (containerWidth, enablePeeking, viewport, maxWidth) => {
   let finalWidth = containerWidth;
   if (enablePeeking) {
     const {
       peekingGap,
-      peekingMiddleSpace,
-      peekingMarginLeft
+      peekingMiddleSpace
     } = getPeekingProps(viewport);
-    const slideWide = containerWidth - (peekingMiddleSpace * PEEKING_MULTIPLIER + peekingGap * PEEKING_MULTIPLIER);
-    if (activeIndexRef.current === 0) {
-      finalWidth = slideWide + peekingMarginLeft - peekingMiddleSpace;
-    } else {
-      finalWidth = slideWide + peekingGap;
-    }
+    const baseWidth = maxWidth || containerWidth;
+    finalWidth = baseWidth - peekingMiddleSpace * PEEKING_MULTIPLIER + peekingGap;
   }
   return finalWidth;
 };
@@ -370,7 +396,10 @@ const Carousel = /*#__PURE__*/React.forwardRef((_ref3, ref) => {
   } = useTheme();
   const contentMaxWidthValue = useResponsiveProp(contentMaxWidth);
   const responsiveWidth = useResponsiveProp(themeOptions?.contentMaxWidth);
-  const maxWidth = resolveContentMaxWidth(contentMaxWidthValue, responsiveWidth);
+  let maxWidth = null;
+  if (enablePeeking || contentMaxWidth !== undefined) {
+    maxWidth = contentMaxWidthValue === undefined ? responsiveWidth : resolveContentMaxWidth(contentMaxWidthValue, responsiveWidth);
+  }
   const totalItems = getTotalItems(enableDisplayMultipleItemsPerSlide, childrenArray, viewport);
   const autoPlayFeatureEnabled = autoPlay && slideDuration > 0 && transitionDuration > 0 && totalItems > 1;
   // if `Carousel` only has one `Carousel.Item`, convert this to a single-item array
@@ -433,8 +462,16 @@ const Carousel = /*#__PURE__*/React.forwardRef((_ref3, ref) => {
   const [isCarouselPlaying, setisCarouselPlaying] = React.useState(autoPlayFeatureEnabled);
   const isSwiping = React.useRef(false);
   const autoPlayRef = React.useRef(null);
+  const [rootContainerLayout, setRootContainerLayout] = React.useState({
+    x: 0,
+    y: 0,
+    width: 0,
+    height: 0
+  });
+  const rootContainerLayoutRef = React.useRef(rootContainerLayout);
   const isFirstSlide = !activeIndex;
   const isLastSlide = activeIndex + 1 >= totalItems;
+  const currentViewportWidth = rootContainerLayout.width;
   const handleAnimationStart = React.useCallback(function () {
     if (typeof onAnimationStart === 'function') onAnimationStart(...arguments);
     setIsAnimating(true);
@@ -452,15 +489,15 @@ const Carousel = /*#__PURE__*/React.forwardRef((_ref3, ref) => {
     if (enablePeeking) {
       const {
         peekingGap,
-        peekingMiddleSpace,
-        peekingMarginLeft
+        peekingMiddleSpace
       } = getPeekingProps(viewport);
       let finalWidth;
-      const slideWide = containerLayoutRef.current.width - (peekingMiddleSpace * PEEKING_MULTIPLIER + peekingGap * PEEKING_MULTIPLIER);
+      const baseWidth = maxWidth || containerLayoutRef.current.width;
+      const slideWide = baseWidth - peekingMiddleSpace * PEEKING_MULTIPLIER;
       if (activeIndexRef.current === 0) {
         finalWidth = 0;
       } else {
-        finalWidth = slideWide + peekingMarginLeft - peekingMiddleSpace + (slideWide + peekingGap) * (activeIndexRef.current - ACTIVE_INDEX_OFFSET_MULTIPLIER);
+        finalWidth = (slideWide + peekingGap) * activeIndexRef.current;
       }
       animatedX.current = finalWidth * NEGATIVE_MULTIPLIER;
     } else {
@@ -487,7 +524,7 @@ const Carousel = /*#__PURE__*/React.forwardRef((_ref3, ref) => {
         y: 0
       });
     }
-  }, [pan, animatedX, heroPan, heroAnimatedX, enableHero, viewport, enablePeeking]);
+  }, [pan, animatedX, heroPan, heroAnimatedX, enableHero, viewport, enablePeeking, maxWidth]);
   const animate = React.useCallback(function (panToAnimate, toValue, toIndex) {
     let isSwipeRelease = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
     const applicableTransitionDuration = isLastSlide && toIndex === 0 ? loopDuration : transitionDuration;
@@ -579,7 +616,7 @@ const Carousel = /*#__PURE__*/React.forwardRef((_ref3, ref) => {
     }
     stopAutoplay();
     setActiveIndex(index);
-    const finalWidth = calculateFinalWidth(containerLayoutRef.current.width, enablePeeking, viewport, activeIndexRef);
+    const finalWidth = calculateFinalWidth(containerLayoutRef.current.width, enablePeeking, viewport, maxWidth);
     toValue.x = finalWidth * -1 * calcDelta;
     const heroToValue = {
       x: 0,
@@ -606,7 +643,7 @@ const Carousel = /*#__PURE__*/React.forwardRef((_ref3, ref) => {
     }
     if (onIndexChanged) onIndexChanged(calcDelta, index);
     return calcDelta;
-  }, [handleAnimationStart, triggerRefocus, slideDuration, updateOffset, animate, totalItems, onIndexChanged, isCarouselPlaying, stopAutoplay, isAutoPlayEnabled, viewport, enablePeeking, pan, heroPan, enableHero]);
+  }, [handleAnimationStart, triggerRefocus, slideDuration, updateOffset, animate, totalItems, onIndexChanged, isCarouselPlaying, stopAutoplay, isAutoPlayEnabled, viewport, enablePeeking, pan, heroPan, enableHero, maxWidth]);
   const startAutoplay = React.useCallback(() => {
     stopAutoplay();
     if (isAutoPlayEnabled) {
@@ -641,6 +678,9 @@ const Carousel = /*#__PURE__*/React.forwardRef((_ref3, ref) => {
   React.useEffect(() => {
     heroContainerLayoutRef.current = heroContainerLayout;
   }, [heroContainerLayout]);
+  React.useEffect(() => {
+    rootContainerLayoutRef.current = rootContainerLayout;
+  }, [rootContainerLayout]);
   React.useEffect(() => {
     pan.x.addListener(_ref5 => {
       let {
@@ -749,6 +789,25 @@ const Carousel = /*#__PURE__*/React.forwardRef((_ref3, ref) => {
     } = _ref11;
     return setPreviousNextNavigationButtonWidth(width);
   };
+  const onRootContainerLayout = _ref12 => {
+    let {
+      nativeEvent: {
+        layout: {
+          x,
+          y,
+          width,
+          height
+        }
+      }
+    } = _ref12;
+    return setRootContainerLayout(prevState => ({
+      ...prevState,
+      x,
+      y,
+      width,
+      height
+    }));
+  };
   const isSwipeAllowed = React.useCallback(() => {
     if (totalItems === 1) {
       return false;
@@ -914,9 +973,10 @@ const Carousel = /*#__PURE__*/React.forwardRef((_ref3, ref) => {
     }
   }, [isTransitioningRef]);
   return /*#__PURE__*/_jsxs(View, {
-    style: selectRootContainerStyles(enableHero, viewport),
+    style: selectRootContainerStyles(enableHero, viewport, enablePeeking),
+    onLayout: onRootContainerLayout,
     children: [/*#__PURE__*/_jsx(View, {
-      style: selectMainContainerStyles(enableHero, viewport, maxWidth),
+      style: selectMainContainerStyles(enableHero, viewport, maxWidth, enablePeeking),
       children: /*#__PURE__*/_jsxs(CarouselProvider, {
         activeIndex: activeIndex,
         goTo: goTo,
@@ -928,6 +988,8 @@ const Carousel = /*#__PURE__*/React.forwardRef((_ref3, ref) => {
         refocus: refocus,
         width: containerLayout.width,
         maximumItemsForSlide: getMaximumItemsForSlide(enableDisplayMultipleItemsPerSlide, viewport),
+        maxWidth: maxWidth,
+        viewportWidth: currentViewportWidth,
         children: [/*#__PURE__*/_jsxs(View, {
           style: [staticStyles.root, {
             ...(Platform.OS === 'web' ? {
@@ -950,7 +1012,9 @@ const Carousel = /*#__PURE__*/React.forwardRef((_ref3, ref) => {
               enablePeeking,
               enableDisplayMultipleItemsPerSlide,
               isAutoPlayEnabled,
-              viewport
+              viewport,
+              maxWidth,
+              viewportWidth: currentViewportWidth
             })],
             children: /*#__PURE__*/_jsx(IconButton, {
               icon: isCarouselPlaying ? pauseIcon : playIcon,
@@ -959,7 +1023,7 @@ const Carousel = /*#__PURE__*/React.forwardRef((_ref3, ref) => {
               onPress: onAnimationControlButtonPress
             })
           }) : null, showPreviousNextNavigation && totalItems > 1 ? /*#__PURE__*/_jsx(View, {
-            style: selectPreviousNextNavigationButtonStyles(previousNextNavigationButtonWidth, previousNextNavigationPosition, spaceBetweenSlideAndPreviousNextNavigation, isFirstSlide, isLastSlide, true, enablePeeking, enableDisplayMultipleItemsPerSlide, isAutoPlayEnabled, viewport),
+            style: selectPreviousNextNavigationButtonStyles(previousNextNavigationButtonWidth, previousNextNavigationPosition, spaceBetweenSlideAndPreviousNextNavigation, isFirstSlide, isLastSlide, true, enablePeeking, enableDisplayMultipleItemsPerSlide, isAutoPlayEnabled, viewport, maxWidth, currentViewportWidth),
             testID: "previous-button-container",
             children: /*#__PURE__*/_jsx(IconButton, {
               onLayout: onPreviousNextNavigationButtonLayout,
@@ -997,16 +1061,7 @@ const Carousel = /*#__PURE__*/React.forwardRef((_ref3, ref) => {
               children: childrenArray.map((element, index) => {
                 let hidden = !isAnimating && index !== activeIndex;
                 if (enablePeeking && !isAnimating) {
-                  if (enableDisplayMultipleItemsPerSlide) {
-                    const maxItemsForSlide = getMaximumItemsForSlide(enableDisplayMultipleItemsPerSlide, viewport);
-                    if (index >= activeIndex * maxItemsForSlide - 1 && index < activeIndex * maxItemsForSlide + maxItemsForSlide + 1) {
-                      hidden = false;
-                    } else {
-                      hidden = true;
-                    }
-                  } else if (index >= activeIndex - 1 && index <= activeIndex + 1) {
-                    hidden = false;
-                  }
+                  hidden = false;
                 } else if (!enablePeeking && enableDisplayMultipleItemsPerSlide && !isAnimating) {
                   const maxItemsForSlide = getMaximumItemsForSlide(enableDisplayMultipleItemsPerSlide, viewport);
                   if (index >= activeIndex * maxItemsForSlide && index < activeIndex * maxItemsForSlide + maxItemsForSlide) {
@@ -1028,7 +1083,7 @@ const Carousel = /*#__PURE__*/React.forwardRef((_ref3, ref) => {
               })
             })
           }), showPreviousNextNavigation && totalItems > 1 ? /*#__PURE__*/_jsx(View, {
-            style: selectPreviousNextNavigationButtonStyles(previousNextNavigationButtonWidth, previousNextNavigationPosition, spaceBetweenSlideAndPreviousNextNavigation, isFirstSlide, isLastSlide, false, enablePeeking, enableDisplayMultipleItemsPerSlide, isAutoPlayEnabled, viewport),
+            style: selectPreviousNextNavigationButtonStyles(previousNextNavigationButtonWidth, previousNextNavigationPosition, spaceBetweenSlideAndPreviousNextNavigation, isFirstSlide, isLastSlide, false, enablePeeking, enableDisplayMultipleItemsPerSlide, isAutoPlayEnabled, viewport, maxWidth, currentViewportWidth),
             testID: "next-button-container",
             children: /*#__PURE__*/_jsx(IconButton, {
               onLayout: onPreviousNextNavigationButtonLayout,
@@ -1040,7 +1095,7 @@ const Carousel = /*#__PURE__*/React.forwardRef((_ref3, ref) => {
             })
           }) : null]
         }), /*#__PURE__*/_jsx(View, {
-          style: selectNavigationStyles(tabs, enableHero, viewport),
+          style: selectNavigationStyles(tabs, enableHero, viewport, enablePeeking, maxWidth),
           children: showPanelNavigation ? activePanelNavigation : null
         })]
       })

package/lib/esm/Carousel/CarouselContext.js

@@ -14,7 +14,9 @@ const CarouselProvider = _ref => {
     themeTokens,
     totalItems,
     width,
-    maximumItemsForSlide
+    maximumItemsForSlide,
+    maxWidth,
+    viewportWidth
   } = _ref;
   const value = React.useMemo(() => ({
     activeIndex,
@@ -25,8 +27,10 @@ const CarouselProvider = _ref => {
     themeTokens,
     totalItems,
     width,
-    maximumItemsForSlide
-  }), [activeIndex, goTo, getCopyWithPlaceholders, itemLabel, refocus, totalItems, themeTokens, width, maximumItemsForSlide]);
+    maximumItemsForSlide,
+    maxWidth,
+    viewportWidth
+  }), [activeIndex, goTo, getCopyWithPlaceholders, itemLabel, refocus, totalItems, themeTokens, width, maximumItemsForSlide, maxWidth, viewportWidth]);
   return /*#__PURE__*/_jsx(CarouselContext.Provider, {
     value: value,
     children: children
@@ -49,6 +53,8 @@ CarouselProvider.propTypes = {
   themeTokens: getTokensPropType('Carousel'),
   totalItems: PropTypes.number.isRequired,
   width: PropTypes.number.isRequired,
-  maximumItemsForSlide: PropTypes.number
+  maximumItemsForSlide: PropTypes.number,
+  maxWidth: PropTypes.number,
+  viewportWidth: PropTypes.number
 };
 export { CarouselProvider, useCarousel };

package/lib/esm/Carousel/CarouselItem/CarouselItem.js

@@ -12,26 +12,26 @@ const selectContainerStyle = _ref => {
     width,
     elementIndex,
     enablePeeking,
-    peekingMarginLeft,
     peekingGap,
     hidden,
     enableDisplayMultipleItemsPerSlide,
     viewport,
-    peekingMiddleSpace
+    peekingMiddleSpace,
+    maxWidth,
+    viewportWidth
   } = _ref;
   let adjustedWidth = width;
   let marginLeft = 0;
   if (enablePeeking) {
     const isFirst = elementIndex === 0;
-    adjustedWidth = width - (peekingMiddleSpace * 2 + peekingGap * 2);
+    const baseWidth = maxWidth || width;
+    adjustedWidth = baseWidth - peekingMiddleSpace * 2;
     if (isFirst) {
-      marginLeft = peekingMarginLeft;
+      marginLeft = peekingMiddleSpace + (viewportWidth - maxWidth) / 2;
     } else {
       marginLeft = peekingGap;
     }
   }
-
-  // Adjust width and margins for multiple items per slide.
   if (enableDisplayMultipleItemsPerSlide) {
     switch (viewport) {
       case 'xs':
@@ -89,7 +89,9 @@ const CarouselItem = /*#__PURE__*/React.forwardRef((_ref2, ref) => {
     width,
     activeIndex,
     goTo,
-    maximumItemsForSlide
+    maximumItemsForSlide,
+    maxWidth,
+    viewportWidth
   } = useCarousel();
   const selectedProps = selectProps({
     ...rest,
@@ -132,6 +134,8 @@ const CarouselItem = /*#__PURE__*/React.forwardRef((_ref2, ref) => {
       enablePeeking,
       enableDisplayMultipleItemsPerSlide,
       viewport,
+      maxWidth,
+      viewportWidth,
       ...peekingProps
     }),
     ...selectedProps,

package/lib/esm/Carousel/Constants.js

@@ -19,4 +19,13 @@ export const SWIPE_RELEASE_STYLES = {
   EASE_OUT: 'ease-out'
 };
 export const INSTANT_ANIMATION_DURATION = 1;
-export const DEFAULT_SWIPE_RELEASE_DURATION = 500;
+export const DEFAULT_SWIPE_RELEASE_DURATION = 500;
+export const POSITION_VARIANTS = {
+  EDGE: 'edge',
+  INSIDE: 'inside',
+  OUTSIDE: 'outside'
+};
+export const POSITION_PROPERTIES = {
+  LEFT: 'left',
+  RIGHT: 'right'
+};

package/lib/esm/Checkbox/Checkbox.js

@@ -114,6 +114,32 @@ const selectFeedbackTokens = _ref5 => {
     feedbackMarginTop
   };
 };
+const selectPressableStyles = _ref6 => {
+  let {
+    padding,
+    paddingLeft,
+    paddingRight,
+    paddingTop,
+    paddingBottom
+  } = _ref6;
+  return {
+    padding,
+    paddingLeft,
+    paddingRight,
+    paddingTop,
+    paddingBottom
+  };
+};
+const selectContainerStyles = _ref7 => {
+  let {
+    iconContainerHeight,
+    iconContainerWidth
+  } = _ref7;
+  return {
+    height: iconContainerHeight,
+    width: iconContainerWidth
+  };
+};
 
 /**
  * Basic Checkbox component.
@@ -150,7 +176,7 @@ const selectFeedbackTokens = _ref5 => {
  * or the internal state in case of uncontrolled checkbox.
  *
  */
-const Checkbox = /*#__PURE__*/React.forwardRef((_ref6, ref) => {
+const Checkbox = /*#__PURE__*/React.forwardRef((_ref8, ref) => {
   let {
     checked,
     defaultChecked,
@@ -165,8 +191,9 @@ const Checkbox = /*#__PURE__*/React.forwardRef((_ref6, ref) => {
     tokens,
     value,
     variant,
+    testID,
     ...rest
-  } = _ref6;
+  } = _ref8;
   const {
     currentValue: isChecked,
     setValue: setIsChecked,
@@ -223,17 +250,18 @@ const Checkbox = /*#__PURE__*/React.forwardRef((_ref6, ref) => {
       direction: feedbackPosition === 'top' ? 'column-reverse' : 'column',
       space: 0,
       children: [/*#__PURE__*/_jsx(Pressable, {
+        testID: testID && `${testID}-pressable`,
         disabled: inactive,
         onKeyDown: handleKeyDown,
         onPress: handleChange,
         ...selectedProps,
-        style: staticStyles.removeOutline,
-        children: _ref7 => {
+        style: [staticStyles.removeOutline, selectPressableStyles(defaultTokens)],
+        children: _ref9 => {
           let {
             focused: focus,
             hovered: hover,
             pressed
-          } = _ref7;
+          } = _ref9;
           const {
             icon: IconComponent,
             ...stateTokens
@@ -244,15 +272,12 @@ const Checkbox = /*#__PURE__*/React.forwardRef((_ref6, ref) => {
           });
           const iconTokens = selectIconTokens(stateTokens);
           const labelStyles = selectLabelStyles(stateTokens, themeOptions);
-          const alignWithLabel = label ? [staticStyles.alignWithLabel, {
-            height: labelStyles.lineHeight
-          }] : null;
           return /*#__PURE__*/_jsxs(StackView, {
             space: 0,
             children: [/*#__PURE__*/_jsxs(View, {
               style: staticStyles.container,
               children: [/*#__PURE__*/_jsx(View, {
-                style: alignWithLabel,
+                style: [staticStyles.iconContainer, selectContainerStyles(stateTokens)],
                 children: /*#__PURE__*/_jsxs(View, {
                   style: [staticStyles.defaultInputStyles, selectInputStyles(stateTokens, isChecked)],
                   testID: "Checkbox-Input",
@@ -351,7 +376,11 @@ Checkbox.propTypes = {
   /**
    * An optional Checkbox description.
    */
-  description: PropTypes.string
+  description: PropTypes.string,
+  /**
+   * A identifier for testing purposes.
+   */
+  testID: PropTypes.string
 };
 export default Checkbox;
 const staticStyles = StyleSheet.create({
@@ -366,9 +395,10 @@ const staticStyles = StyleSheet.create({
     alignItems: 'center',
     justifyContent: 'center'
   },
-  alignWithLabel: {
-    alignSelf: 'flex-start',
-    justifyContent: 'center'
+  iconContainer: {
+    display: 'flex',
+    justifyContent: 'center',
+    alignItems: 'center'
   },
   removeOutline: {
     outlineStyle: 'none'

package/lib/esm/ExpandCollapse/Control.js

@@ -57,7 +57,11 @@ function selectIconContainerStyles(_ref2) {
   const paddingSide = iconPosition === 'right' ? 'paddingLeft' : 'paddingRight';
   return {
     [paddingSide]: iconGap,
-    paddingTop: iconPaddingTop
+    ...(iconPaddingTop && {
+      transform: [{
+        translateY: iconPaddingTop
+      }]
+    })
   };
 }
 function selectTextContainerStyles(_ref3) {

package/lib/esm/ExpandCollapse/ExpandCollapse.js

@@ -6,13 +6,22 @@ import { useThemeTokens } from '../ThemeProvider';
 import { a11yProps, getTokensPropType, selectSystemProps, useMultipleInputValues, variantProp, viewProps, contentfulProps, useUniqueId } from '../utils';
 import { jsx as _jsx } from "react/jsx-runtime";
 const [selectProps, selectedSystemPropTypes] = selectSystemProps([a11yProps, viewProps, contentfulProps]);
-function selectBorderStyles(tokens) {
+const selectWrapperStyles = _ref => {
+  let {
+    borderWidth,
+    borderTopWidth,
+    borderStyle,
+    borderColor
+  } = _ref;
   return {
-    borderBottomWidth: tokens.borderWidth,
-    borderBottomStyle: tokens.borderStyle,
-    borderBottomColor: tokens.borderColor
+    borderStyle,
+    borderColor,
+    borderTopWidth,
+    borderBottomWidth: borderWidth,
+    borderBottomStyle: borderStyle,
+    borderBottomColor: borderColor
   };
-}
+};
 
 /**
  * Flexible base component for lists where some or all items are collapsible headers.
@@ -21,7 +30,7 @@ function selectBorderStyles(tokens) {
  * <ExpandCollapse.Panel> children, and assign the panels explicit `panelId` props. The panels may be
  * nested (they do not need to be direct children), and non-interactive items may be included too.
  */
-const ExpandCollapse = /*#__PURE__*/React.forwardRef((_ref, ref) => {
+const ExpandCollapse = /*#__PURE__*/React.forwardRef((_ref2, ref) => {
   let {
     children,
     tokens,
@@ -32,7 +41,7 @@ const ExpandCollapse = /*#__PURE__*/React.forwardRef((_ref, ref) => {
     onChange,
     dataSet,
     ...rest
-  } = _ref;
+  } = _ref2;
   const instanceId = useUniqueId('ExpandCollapse');
   const {
     currentValues: openIds,
@@ -53,7 +62,7 @@ const ExpandCollapse = /*#__PURE__*/React.forwardRef((_ref, ref) => {
     ...selectProps(rest),
     dataSet: dataSet,
     children: /*#__PURE__*/_jsx(View, {
-      style: selectBorderStyles(themeTokens),
+      style: selectWrapperStyles(themeTokens),
       children: typeof children === 'function' ? children({
         openIds,
         onToggle,

package/lib/esm/ExpandCollapse/Panel.js

@@ -103,6 +103,7 @@ const ExpandCollapsePanel = /*#__PURE__*/React.forwardRef((_ref5, ref) => {
     controlRef,
     content,
     copy = 'en',
+    disableMobileScrollBuffer = false,
     ...rest
   } = _ref5;
   const [containerHeight, setContainerHeight] = React.useState(null);
@@ -124,7 +125,7 @@ const ExpandCollapsePanel = /*#__PURE__*/React.forwardRef((_ref5, ref) => {
 
   // on mobile devices we require a scroll buffer equal to the font size
   // to avoid triggering scrolling unnecessarily
-  const mobileScrollBuffer = Platform.OS === 'web' ? 0 : selectTextStyles(themeTokens)?.fontSize;
+  const mobileScrollBuffer = Platform.OS === 'web' || disableMobileScrollBuffer ? 0 : selectTextStyles(themeTokens)?.fontSize;
   const handleControlPress = event => {
     onToggle?.(panelId, event);
     if (onPress) onPress(panelId, event);
@@ -271,6 +272,10 @@ ExpandCollapsePanel.propTypes = {
   /**
    * A boolean prop to determine if the panel is a content panel or not. If true, the panel will not have a control
    */
-  content: PropTypes.bool
+  content: PropTypes.bool,
+  /**
+   * A boolean prop to disable the extra scroll buffer on mobile devices (only applicable on iOS/Android, ignored on web)
+   */
+  disableMobileScrollBuffer: PropTypes.bool
 };
 export default ExpandCollapsePanel;