@vkontakte/vkui 4.32.0 → 4.33.0

package/dist/components/Gallery/Gallery.js

@@ -1,574 +1,27 @@
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _extends from "@babel/runtime/helpers/extends";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _createSuper from "@babel/runtime/helpers/createSuper";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-var _excluded = ["children", "slideWidth", "slideIndex", "isDraggable", "onDragStart", "onDragEnd", "onChange", "onEnd", "align", "bullets", "platform", "hasMouse", "showArrows", "window", "document", "getRef", "getRootRef"],
-    _excluded2 = ["initialSlideIndex", "children", "timeout", "onChange"];
+var _excluded = ["initialSlideIndex", "children", "timeout", "onChange", "bullets"];
 import { createScopedElement } from "../../lib/jsxRuntime";
 import * as React from "react";
-import { getClassName } from "../../helpers/getClassName";
-import { Touch } from "../Touch/Touch";
-import { classNames } from "../../lib/classNames";
-import { withPlatform } from "../../hoc/withPlatform";
-import { withDOM } from "../../lib/dom";
-import { setRef } from "../../lib/utils";
-import { withAdaptivity } from "../../hoc/withAdaptivity";
-import HorizontalScrollArrow from "../HorizontalScroll/HorizontalScrollArrow";
 import { clamp } from "../../helpers/math";
 import { useTimeout } from "../../hooks/useTimeout";
+import { BaseGallery } from "../BaseGallery/BaseGallery";
 
-var BaseGallery = /*#__PURE__*/function (_React$Component) {
-  _inherits(BaseGallery, _React$Component);
-
-  var _super = _createSuper(BaseGallery);
-
-  function BaseGallery(props) {
-    var _this;
-
-    _classCallCheck(this, BaseGallery);
-
-    _this = _super.call(this, props);
-
-    _defineProperty(_assertThisInitialized(_this), "container", null);
-
-    _defineProperty(_assertThisInitialized(_this), "slidesStore", void 0);
-
-    _defineProperty(_assertThisInitialized(_this), "viewport", null);
-
-    _defineProperty(_assertThisInitialized(_this), "onStart", function () {
-      _this.setState({
-        animation: false
-      });
-    });
-
-    _defineProperty(_assertThisInitialized(_this), "onMoveX", function (e) {
-      if (_this.props.isDraggable && !_this.isFullyVisible) {
-        e.originalEvent.preventDefault();
-
-        if (e.isSlideX) {
-          _this.props.onDragStart && _this.props.onDragStart(e);
-
-          if (_this.state.deltaX !== e.shiftX || _this.state.dragging !== e.isSlideX) {
-            _this.setState({
-              deltaX: e.shiftX,
-              dragging: e.isSlideX
-            });
-          }
-        }
-      }
-    });
-
-    _defineProperty(_assertThisInitialized(_this), "onEnd", function (e) {
-      var _this$props$slideInde;
-
-      var targetIndex = e.isSlide ? _this.getTarget(e) : (_this$props$slideInde = _this.props.slideIndex) !== null && _this$props$slideInde !== void 0 ? _this$props$slideInde : 0;
-      _this.props.onDragEnd && _this.props.onDragEnd(e);
-
-      _this.setState({
-        deltaX: 0,
-        animation: true
-      }, function () {
-        var _this$props$onChange, _this$props;
-
-        return (_this$props$onChange = (_this$props = _this.props).onChange) === null || _this$props$onChange === void 0 ? void 0 : _this$props$onChange.call(_this$props, targetIndex);
-      });
-
-      if (_this.props.onEnd) {
-        _this.props.onEnd({
-          targetIndex: targetIndex
-        });
-      }
-    });
-
-    _defineProperty(_assertThisInitialized(_this), "onResize", function () {
-      return _this.initializeSlides({
-        animation: false
-      });
-    });
-
-    _defineProperty(_assertThisInitialized(_this), "slideLeft", function () {
-      var _this$props2 = _this.props,
-          _this$props2$slideInd = _this$props2.slideIndex,
-          slideIndex = _this$props2$slideInd === void 0 ? 0 : _this$props2$slideInd,
-          onChange = _this$props2.onChange,
-          onPrevClick = _this$props2.onPrevClick;
-
-      if (_this.canSlideLeft) {
-        _this.setState({
-          deltaX: 0,
-          animation: true
-        }, function () {
-          return onChange === null || onChange === void 0 ? void 0 : onChange(slideIndex - 1);
-        });
-
-        onPrevClick === null || onPrevClick === void 0 ? void 0 : onPrevClick();
-      }
-    });
-
-    _defineProperty(_assertThisInitialized(_this), "slideRight", function () {
-      var _this$props3 = _this.props,
-          _this$props3$slideInd = _this$props3.slideIndex,
-          slideIndex = _this$props3$slideInd === void 0 ? 0 : _this$props3$slideInd,
-          onChange = _this$props3.onChange,
-          onNextClick = _this$props3.onNextClick;
-
-      if (_this.canSlideRight) {
-        _this.setState({
-          deltaX: 0,
-          animation: true
-        }, function () {
-          return onChange === null || onChange === void 0 ? void 0 : onChange(slideIndex + 1);
-        });
-
-        onNextClick === null || onNextClick === void 0 ? void 0 : onNextClick();
-      }
-    });
-
-    _defineProperty(_assertThisInitialized(_this), "getSlideRef", function (id) {
-      return function (slide) {
-        _this.slidesStore["slide-".concat(id)] = slide;
-      };
-    });
-
-    _defineProperty(_assertThisInitialized(_this), "getViewportRef", function (viewport) {
-      _this.viewport = viewport;
-
-      if (_this.props.getRef) {
-        setRef(viewport, _this.props.getRef);
-      }
-    });
-
-    _defineProperty(_assertThisInitialized(_this), "getRootRef", function (container) {
-      _this.container = container;
-
-      if (_this.props.getRootRef) {
-        setRef(container, _this.props.getRootRef);
-      }
-    });
-
-    _this.state = {
-      containerWidth: 0,
-      deltaX: 0,
-      shiftX: 0,
-      slides: [],
-      animation: true,
-      duration: 0.24
-    };
-    _this.slidesStore = {};
-    return _this;
-  }
-
-  _createClass(BaseGallery, [{
-    key: "isCenterWithCustomWidth",
-    get: function get() {
-      return this.props.slideWidth === "custom" && this.props.align === "center";
-    }
-  }, {
-    key: "initializeSlides",
-    value: function initializeSlides() {
-      var _React$Children$map,
-          _this2 = this,
-          _this$container$offse,
-          _this$container;
-
-      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      var slides = (_React$Children$map = React.Children.map(this.props.children, function (_item, i) {
-        var _elem$offsetLeft, _elem$offsetWidth;
-
-        var elem = _this2.slidesStore["slide-".concat(i)];
-
-        return {
-          coordX: (_elem$offsetLeft = elem === null || elem === void 0 ? void 0 : elem.offsetLeft) !== null && _elem$offsetLeft !== void 0 ? _elem$offsetLeft : 0,
-          width: (_elem$offsetWidth = elem === null || elem === void 0 ? void 0 : elem.offsetWidth) !== null && _elem$offsetWidth !== void 0 ? _elem$offsetWidth : 0
-        };
-      })) !== null && _React$Children$map !== void 0 ? _React$Children$map : [];
-      var containerWidth = (_this$container$offse = (_this$container = this.container) === null || _this$container === void 0 ? void 0 : _this$container.offsetWidth) !== null && _this$container$offse !== void 0 ? _this$container$offse : 0;
-      var layerWidth = slides.reduce(function (val, slide) {
-        return slide.width + val;
-      }, 0);
-      var min = this.calcMin({
-        containerWidth: containerWidth,
-        layerWidth: layerWidth,
-        slides: slides
-      });
-      var max = this.calcMax({
-        slides: slides
-      });
-      this.setState({
-        min: min,
-        max: max,
-        layerWidth: layerWidth,
-        containerWidth: containerWidth,
-        slides: slides
-      }, function () {
-        if (_this2.props.slideIndex !== undefined) {
-          var shiftX = _this2.calculateIndent(_this2.props.slideIndex);
-
-          if (_this2.state.shiftX === shiftX) {
-            return;
-          }
-
-          var isValidShift = _this2.state.shiftX === _this2.validateIndent(_this2.state.shiftX);
-
-          var _options$animation = options.animation,
-              animation = _options$animation === void 0 ? isValidShift : _options$animation;
-
-          _this2.setState({
-            shiftX: shiftX,
-            animation: animation
-          }, function () {
-            if (!_this2.state.animation) {
-              var _this2$props$window;
-
-              (_this2$props$window = _this2.props.window) === null || _this2$props$window === void 0 ? void 0 : _this2$props$window.requestAnimationFrame(function () {
-                return _this2.setState({
-                  animation: true
-                });
-              });
-            }
-          });
-        }
-      });
-    }
-  }, {
-    key: "calcMin",
-    value: function calcMin(_ref) {
-      var _this$viewport$offset, _this$viewport;
-
-      var containerWidth = _ref.containerWidth,
-          _ref$layerWidth = _ref.layerWidth,
-          layerWidth = _ref$layerWidth === void 0 ? 0 : _ref$layerWidth,
-          slides = _ref.slides;
-      var viewportWidth = (_this$viewport$offset = (_this$viewport = this.viewport) === null || _this$viewport === void 0 ? void 0 : _this$viewport.offsetWidth) !== null && _this$viewport$offset !== void 0 ? _this$viewport$offset : 0;
-
-      switch (this.props.align) {
-        case "left":
-          return containerWidth - layerWidth;
-
-        case "right":
-          return viewportWidth - layerWidth;
-
-        case "center":
-          if (this.isCenterWithCustomWidth && slides.length) {
-            var _slides = slides[slides.length - 1],
-                coordX = _slides.coordX,
-                width = _slides.width;
-            return viewportWidth / 2 - coordX - width / 2;
-          } else {
-            return viewportWidth - (containerWidth - viewportWidth) / 2 - layerWidth;
-          }
-
-      }
-
-      return undefined;
-    }
-  }, {
-    key: "calcMax",
-    value: function calcMax(_ref2) {
-      var _this$viewport$offset2, _this$viewport2;
-
-      var slides = _ref2.slides;
-      var viewportWidth = (_this$viewport$offset2 = (_this$viewport2 = this.viewport) === null || _this$viewport2 === void 0 ? void 0 : _this$viewport2.offsetWidth) !== null && _this$viewport$offset2 !== void 0 ? _this$viewport$offset2 : 0;
-
-      if (this.isCenterWithCustomWidth && slides.length) {
-        var _slides$ = slides[0],
-            width = _slides$.width,
-            coordX = _slides$.coordX;
-        return viewportWidth / 2 - coordX - width / 2;
-      } else {
-        return 0;
-      }
-    }
-    /*
-     * Считает отступ слоя галереи
-     */
-
-  }, {
-    key: "calculateIndent",
-    value: function calculateIndent(targetIndex) {
-      var slides = this.state.slides;
-
-      if (this.isFullyVisible) {
-        return 0;
-      }
-
-      var targetSlide = slides.length ? slides[targetIndex] : null;
-
-      if (targetSlide) {
-        var coordX = targetSlide.coordX,
-            width = targetSlide.width;
-
-        if (this.isCenterWithCustomWidth) {
-          var _this$viewport$offset3, _this$viewport3;
-
-          var viewportWidth = (_this$viewport$offset3 = (_this$viewport3 = this.viewport) === null || _this$viewport3 === void 0 ? void 0 : _this$viewport3.offsetWidth) !== null && _this$viewport$offset3 !== void 0 ? _this$viewport$offset3 : 0;
-          return viewportWidth / 2 - coordX - width / 2;
-        }
-
-        return this.validateIndent(-1 * coordX);
-      } else {
-        return 0;
-      }
-    }
-    /*
-     * Считает отступ слоя галереи во время драга
-     */
-
-  }, {
-    key: "calculateDragIndent",
-    value: function calculateDragIndent() {
-      var _this$state = this.state,
-          shiftX = _this$state.shiftX,
-          deltaX = _this$state.deltaX,
-          _this$state$min = _this$state.min,
-          min = _this$state$min === void 0 ? 0 : _this$state$min,
-          _this$state$max = _this$state.max,
-          max = _this$state$max === void 0 ? 0 : _this$state$max;
-      var indent = shiftX + deltaX;
-
-      if (indent > max) {
-        return max + Number((indent - max) / 3);
-      } else if (indent < min) {
-        return min + Number((indent - min) / 3);
-      }
-
-      return indent;
-    }
-  }, {
-    key: "validateIndent",
-    value: function validateIndent(value) {
-      var _this$state2 = this.state,
-          _this$state2$min = _this$state2.min,
-          min = _this$state2$min === void 0 ? 0 : _this$state2$min,
-          _this$state2$max = _this$state2.max,
-          max = _this$state2$max === void 0 ? 0 : _this$state2$max;
-
-      if (value < min) {
-        return min;
-      } else if (value > max) {
-        return max;
-      }
-
-      return value;
-    }
-  }, {
-    key: "isFullyVisible",
-    get: function get() {
-      var _this$state$layerWidt;
-
-      return ((_this$state$layerWidt = this.state.layerWidth) !== null && _this$state$layerWidt !== void 0 ? _this$state$layerWidt : 0) <= this.state.containerWidth;
-    }
-    /*
-     * Получает индекс слайда, к которому будет осуществлен переход
-     */
-
-  }, {
-    key: "getTarget",
-    value: function getTarget(e) {
-      var _this$state3 = this.state,
-          slides = _this$state3.slides,
-          deltaX = _this$state3.deltaX,
-          shiftX = _this$state3.shiftX,
-          _this$state3$max = _this$state3.max,
-          max = _this$state3$max === void 0 ? 0 : _this$state3$max;
-      var _this$props$slideInde2 = this.props.slideIndex,
-          slideIndex = _this$props$slideInde2 === void 0 ? 0 : _this$props$slideInde2;
-      var expectDeltaX = deltaX / e.duration * 240 * 0.6;
-      var shift = shiftX + deltaX + expectDeltaX - max;
-      var direction = deltaX < 0 ? 1 : -1; // Находим ближайшую границу слайда к текущему отступу
-
-      var targetIndex = slides.reduce(function (val, item, index) {
-        var previousValue = Math.abs(slides[val].coordX + shift);
-        var currentValue = Math.abs(item.coordX + shift);
-        return previousValue < currentValue ? val : index;
-      }, slideIndex);
-
-      if (targetIndex === slideIndex) {
-        var targetSlide = slideIndex + direction;
-
-        if (targetSlide >= 0 && targetSlide < slides.length) {
-          if (Math.abs(deltaX) > slides[targetSlide].width * 0.05) {
-            targetIndex = targetSlide;
-          }
-        }
-      }
-
-      return targetIndex;
-    }
-  }, {
-    key: "canSlideLeft",
-    get: function get() {
-      // shiftX is negative number <= 0, we can swipe back only if it is < 0
-      return !this.isFullyVisible && this.state.shiftX < 0;
-    }
-  }, {
-    key: "canSlideRight",
-    get: function get() {
-      var _this$state4 = this.state,
-          containerWidth = _this$state4.containerWidth,
-          _this$state4$layerWid = _this$state4.layerWidth,
-          layerWidth = _this$state4$layerWid === void 0 ? 0 : _this$state4$layerWid,
-          shiftX = _this$state4.shiftX,
-          slides = _this$state4.slides;
-      var _this$props4 = this.props,
-          align = _this$props4.align,
-          _this$props4$slideInd = _this$props4.slideIndex,
-          slideIndex = _this$props4$slideInd === void 0 ? 0 : _this$props4$slideInd;
-      return !this.isFullyVisible && ( // we can't move right when gallery layer fully scrolled right, if gallery aligned by left side
-      align === "left" && containerWidth - shiftX < layerWidth || // otherwise we need to check current slide index (align = right or align = center)
-      align !== "left" && slideIndex < slides.length - 1);
-    }
-  }, {
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      this.initializeSlides({
-        animation: false
-      });
-      this.props.window.addEventListener("resize", this.onResize);
-    }
-  }, {
-    key: "componentDidUpdate",
-    value: function componentDidUpdate(prevProps) {
-      var widthChanged = this.props.slideWidth !== prevProps.slideWidth;
-      var isPropUpdate = this.props !== prevProps;
-      var slideCountChanged = React.Children.count(this.props.children) !== React.Children.count(prevProps.children);
-      var isCustomWidth = this.props.slideWidth === "custom"; // в любом из этих случаев позиция могла поменяться
-
-      if (widthChanged || slideCountChanged || isCustomWidth && isPropUpdate) {
-        this.initializeSlides();
-      } else if (this.props.slideIndex !== prevProps.slideIndex) {
-        var _this$props$slideInde3;
-
-        this.setState({
-          animation: true,
-          deltaX: 0,
-          shiftX: this.calculateIndent((_this$props$slideInde3 = this.props.slideIndex) !== null && _this$props$slideInde3 !== void 0 ? _this$props$slideInde3 : 0)
-        });
-      }
-    }
-  }, {
-    key: "componentWillUnmount",
-    value: function componentWillUnmount() {
-      this.props.window.removeEventListener("resize", this.onResize);
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this3 = this;
-
-      var _this$state5 = this.state,
-          animation = _this$state5.animation,
-          duration = _this$state5.duration,
-          dragging = _this$state5.dragging;
-
-      var _this$props5 = this.props,
-          children = _this$props5.children,
-          slideWidth = _this$props5.slideWidth,
-          _this$props5$slideInd = _this$props5.slideIndex,
-          slideIndex = _this$props5$slideInd === void 0 ? 0 : _this$props5$slideInd,
-          isDraggable = _this$props5.isDraggable,
-          onDragStart = _this$props5.onDragStart,
-          onDragEnd = _this$props5.onDragEnd,
-          onChange = _this$props5.onChange,
-          onEnd = _this$props5.onEnd,
-          align = _this$props5.align,
-          bullets = _this$props5.bullets,
-          platform = _this$props5.platform,
-          hasMouse = _this$props5.hasMouse,
-          showArrows = _this$props5.showArrows,
-          window = _this$props5.window,
-          document = _this$props5.document,
-          getRef = _this$props5.getRef,
-          getRootRef = _this$props5.getRootRef,
-          restProps = _objectWithoutProperties(_this$props5, _excluded);
-
-      var indent = dragging ? this.calculateDragIndent() : this.calculateIndent(slideIndex);
-      var layerStyle = {
-        WebkitTransform: "translateX(".concat(indent, "px)"),
-        transform: "translateX(".concat(indent, "px)"),
-        WebkitTransition: animation ? "-webkit-transform ".concat(duration, "s cubic-bezier(.1, 0, .25, 1)") : "none",
-        transition: animation ? "transform ".concat(duration, "s cubic-bezier(.1, 0, .25, 1)") : "none"
-      };
-      return createScopedElement("div", _extends({}, restProps, {
-        // eslint-disable-next-line vkui/no-object-expression-in-arguments
-        vkuiClass: classNames(getClassName("Gallery", platform), "Gallery--".concat(align), {
-          "Gallery--dragging": dragging,
-          "Gallery--custom-width": slideWidth === "custom"
-        }),
-        ref: this.getRootRef
-      }), createScopedElement(Touch, {
-        vkuiClass: "Gallery__viewport",
-        onStartX: this.onStart,
-        onMoveX: this.onMoveX,
-        onEnd: this.onEnd,
-        noSlideClick: true,
-        style: {
-          width: slideWidth === "custom" ? "100%" : slideWidth
-        },
-        getRootRef: this.getViewportRef
-      }, createScopedElement("div", {
-        vkuiClass: "Gallery__layer",
-        style: layerStyle
-      }, React.Children.map(children, function (item, i) {
-        return createScopedElement("div", {
-          vkuiClass: "Gallery__slide",
-          key: "slide-".concat(i),
-          ref: _this3.getSlideRef(i)
-        }, item);
-      }))), bullets && createScopedElement("div", {
-        "aria-hidden": "true",
-        vkuiClass: classNames("Gallery__bullets", "Gallery__bullets--".concat(bullets))
-      }, React.Children.map(children, function (_item, index) {
-        return createScopedElement("div", {
-          // eslint-disable-next-line vkui/no-object-expression-in-arguments
-          vkuiClass: classNames("Gallery__bullet", {
-            "Gallery__bullet--active": index === slideIndex
-          }),
-          key: index
-        });
-      })), showArrows && hasMouse && this.canSlideLeft && createScopedElement(HorizontalScrollArrow, {
-        direction: "left",
-        onClick: this.slideLeft
-      }), showArrows && hasMouse && this.canSlideRight && createScopedElement(HorizontalScrollArrow, {
-        direction: "right",
-        onClick: this.slideRight
-      }));
-    }
-  }]);
-
-  return BaseGallery;
-}(React.Component);
-
-_defineProperty(BaseGallery, "defaultProps", {
-  slideWidth: "100%",
-  children: "",
-  align: "left",
-  bullets: false,
-  isDraggable: true
-});
-
-var BaseGalleryAdaptive = withAdaptivity(withDOM(BaseGallery), {
-  hasMouse: true
-});
 /**
  * @see https://vkcom.github.io/VKUI/#/Gallery
  */
-
-var Gallery = function Gallery(_ref3) {
+export var Gallery = function Gallery(_ref) {
   var _props$slideIndex;
 
-  var _ref3$initialSlideInd = _ref3.initialSlideIndex,
-      initialSlideIndex = _ref3$initialSlideInd === void 0 ? 0 : _ref3$initialSlideInd,
-      children = _ref3.children,
-      _ref3$timeout = _ref3.timeout,
-      timeout = _ref3$timeout === void 0 ? 0 : _ref3$timeout,
-      onChange = _ref3.onChange,
-      props = _objectWithoutProperties(_ref3, _excluded2);
+  var _ref$initialSlideInde = _ref.initialSlideIndex,
+      initialSlideIndex = _ref$initialSlideInde === void 0 ? 0 : _ref$initialSlideInde,
+      children = _ref.children,
+      _ref$timeout = _ref.timeout,
+      timeout = _ref$timeout === void 0 ? 0 : _ref$timeout,
+      onChange = _ref.onChange,
+      bullets = _ref.bullets,
+      props = _objectWithoutProperties(_ref, _excluded);
 
   var _React$useState = React.useState(initialSlideIndex),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -578,9 +31,11 @@ var Gallery = function Gallery(_ref3) {
   var isControlled = typeof props.slideIndex === "number";
   var slideIndex = isControlled ? (_props$slideIndex = props.slideIndex) !== null && _props$slideIndex !== void 0 ? _props$slideIndex : 0 : localSlideIndex;
   var isDraggable = !isControlled || Boolean(onChange);
-  var slides = React.Children.toArray(children).filter(function (item) {
-    return Boolean(item);
-  });
+  var slides = React.useMemo(function () {
+    return React.Children.toArray(children).filter(function (item) {
+      return Boolean(item);
+    });
+  }, [children]);
   var childCount = slides.length;
   var handleChange = React.useCallback(function (current) {
     if (current === slideIndex) {
@@ -605,14 +60,12 @@ var Gallery = function Gallery(_ref3) {
       onChange(safeSlideIndex);
     }
   }, [onChange, safeSlideIndex, slideIndex]);
-  return createScopedElement(BaseGalleryAdaptive, _extends({
+  return createScopedElement(BaseGallery, _extends({
     isDraggable: isDraggable
   }, props, {
+    bullets: childCount > 0 && bullets,
     slideIndex: safeSlideIndex,
     onChange: handleChange
   }), slides);
-}; // eslint-disable-next-line import/no-default-export
-
-
-export default withPlatform(Gallery);
+};
 //# sourceMappingURL=Gallery.js.map