@gympass/yoga 7.72.0 → 7.72.2

package/cjs/Datepicker/web/Calendar.js

@@ -66,6 +66,10 @@ var toUTCDate = function toUTCDate(date) {
   return new Date(Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate())).getTime();
 };
 
+var isSameDate = function isSameDate(firstDate, secondDate) {
+  return firstDate.getDate() === secondDate.getDate() && firstDate.getMonth() === secondDate.getMonth() && firstDate.getFullYear() === secondDate.getFullYear();
+};
+
 var getDayFieldRadius = function getDayFieldRadius(aux, radii) {
   var _Date;
 
@@ -153,19 +157,20 @@ function Calendar(_ref6) {
   };
 
   var isEqual = function isEqual(day) {
-    return startDate && toUTCDate(startDate) === toUTCDateDay(day) || endDate && toUTCDate(endDate) === toUTCDateDay(day);
+    var utcDate = new Date(Date.UTC(year, month, day));
+    return startDate && isSameDate(startDate, utcDate) || endDate && isSameDate(endDate, utcDate);
   };
 
   var inRange = function inRange(day) {
-    return startDate && toUTCDate(startDate) <= toUTCDateDay(day) && endDate && toUTCDate(endDate) >= toUTCDateDay(day);
+    return startDate && startDate.getTime() <= toUTCDateDay(day) && endDate && endDate.getTime() >= toUTCDateDay(day);
   };
 
   var isDisabled = function isDisabled(day) {
     var local = new Date(Date.UTC(year, month, day));
     var now = new Date();
     var nowUTC = Date.UTC(now.getFullYear(), now.getMonth(), now.getDate());
-    var pastDatesDisabled = disablePastDates && local.getTime() < nowUTC || disablePastFrom && local.getTime() < new Date(Date.UTC(disablePastFrom.getFullYear(), disablePastFrom.getMonth(), disablePastFrom.getDate()));
-    var futureDateDisabled = disableFutureDates && local.getTime() > nowUTC || disableFutureFrom && local.getTime() > new Date(Date.UTC(disableFutureFrom.getFullYear(), disableFutureFrom.getMonth(), disableFutureFrom.getDate()));
+    var pastDatesDisabled = disablePastDates && local.getTime() < nowUTC || disablePastFrom && local.getTime() < new Date(disablePastFrom.getFullYear(), disablePastFrom.getMonth(), disablePastFrom.getDate());
+    var futureDateDisabled = disableFutureDates && local.getTime() > nowUTC || disableFutureFrom && local.getTime() > new Date(disableFutureFrom.getFullYear(), disableFutureFrom.getMonth(), disableFutureFrom.getDate());
     return pastDatesDisabled || futureDateDisabled;
   };
 

package/cjs/Dropdown/web/Dropdown.js

@@ -3,7 +3,7 @@
 exports.__esModule = true;
 exports["default"] = void 0;
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
@@ -22,12 +22,12 @@ var _excluded = ["isOpen", "selected"],
 
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12;
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -103,15 +103,8 @@ var ArrowIcon = (0, _styledComponents["default"])(function (_ref8) {
       dropdown = _ref9.theme.yoga.components.dropdown;
   return "\n    fill: " + dropdown.arrow.fill + ";\n    " + (disabled ? "fill: " + dropdown.disabled.arrow.fill + ";" : '') + ";\n    " + (selected && !disabled ? "fill: " + dropdown.selected.arrow.fill + ";" : '') + ";\n    transform: rotate(" + (isOpen ? '180deg' : '0') + ");\n  ";
 });
-
-var getSelectedOption = function getSelectedOption(options) {
-  return options.find(function (item) {
-    return item.selected === true;
-  });
-};
 /** Gympass Dropdown is a multiple choice type of menu. */
 
-
 var Dropdown = /*#__PURE__*/_react["default"].forwardRef(function (_ref10, ref) {
   var error = _ref10.error,
       label = _ref10.label,
@@ -123,15 +116,31 @@ var Dropdown = /*#__PURE__*/_react["default"].forwardRef(function (_ref10, ref)
 
   var inputRef = ref || _react["default"].useRef(null);
 
+  var selectedOption = options.find(function (item) {
+    return item.selected === true;
+  });
+
+  var _useState = (0, _react.useState)(selectedOption),
+      localSelectedItem = _useState[0],
+      setLocalSelectedItem = _useState[1];
+
+  (0, _react.useEffect)(function () {
+    setLocalSelectedItem(selectedOption);
+  }, [options]);
+  var onLocalChange = (0, _react.useCallback)(function (opt) {
+    setLocalSelectedItem(opt);
+    onChange(opt);
+  }, [onChange]);
   return /*#__PURE__*/_react["default"].createElement(_downshift["default"], {
-    initialSelectedItem: getSelectedOption(options),
+    initialSelectedItem: selectedOption,
     selectedItemChanged: function selectedItemChanged(prevItem, item) {
       return prevItem !== item;
     },
     itemToString: function itemToString(item) {
       return item ? item.label : '';
     },
-    onChange: onChange
+    onChange: onLocalChange,
+    selectedItem: localSelectedItem
   }, function (_ref11) {
     var getInputProps = _ref11.getInputProps,
         getItemProps = _ref11.getItemProps,

package/esm/Datepicker/web/Calendar.js

@@ -47,6 +47,10 @@ var toUTCDate = function toUTCDate(date) {
   return new Date(Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate())).getTime();
 };
 
+var isSameDate = function isSameDate(firstDate, secondDate) {
+  return firstDate.getDate() === secondDate.getDate() && firstDate.getMonth() === secondDate.getMonth() && firstDate.getFullYear() === secondDate.getFullYear();
+};
+
 var getDayFieldRadius = function getDayFieldRadius(aux, radii) {
   var _Date;
 
@@ -133,19 +137,20 @@ function Calendar(_ref6) {
   };
 
   var isEqual = function isEqual(day) {
-    return startDate && toUTCDate(startDate) === toUTCDateDay(day) || endDate && toUTCDate(endDate) === toUTCDateDay(day);
+    var utcDate = new Date(Date.UTC(year, month, day));
+    return startDate && isSameDate(startDate, utcDate) || endDate && isSameDate(endDate, utcDate);
   };
 
   var inRange = function inRange(day) {
-    return startDate && toUTCDate(startDate) <= toUTCDateDay(day) && endDate && toUTCDate(endDate) >= toUTCDateDay(day);
+    return startDate && startDate.getTime() <= toUTCDateDay(day) && endDate && endDate.getTime() >= toUTCDateDay(day);
   };
 
   var isDisabled = function isDisabled(day) {
     var local = new Date(Date.UTC(year, month, day));
     var now = new Date();
     var nowUTC = Date.UTC(now.getFullYear(), now.getMonth(), now.getDate());
-    var pastDatesDisabled = disablePastDates && local.getTime() < nowUTC || disablePastFrom && local.getTime() < new Date(Date.UTC(disablePastFrom.getFullYear(), disablePastFrom.getMonth(), disablePastFrom.getDate()));
-    var futureDateDisabled = disableFutureDates && local.getTime() > nowUTC || disableFutureFrom && local.getTime() > new Date(Date.UTC(disableFutureFrom.getFullYear(), disableFutureFrom.getMonth(), disableFutureFrom.getDate()));
+    var pastDatesDisabled = disablePastDates && local.getTime() < nowUTC || disablePastFrom && local.getTime() < new Date(disablePastFrom.getFullYear(), disablePastFrom.getMonth(), disablePastFrom.getDate());
+    var futureDateDisabled = disableFutureDates && local.getTime() > nowUTC || disableFutureFrom && local.getTime() > new Date(disableFutureFrom.getFullYear(), disableFutureFrom.getMonth(), disableFutureFrom.getDate());
     return pastDatesDisabled || futureDateDisabled;
   };
 

package/esm/Dropdown/web/Dropdown.js

@@ -9,7 +9,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 function _taggedTemplateLiteralLoose(strings, raw) { if (!raw) { raw = strings.slice(0); } strings.raw = raw; return strings; }
 
-import React from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import styled, { css } from 'styled-components';
 import Downshift from 'downshift';
 import { arrayOf, func, shape, string, number, bool, oneOfType } from 'prop-types';
@@ -78,15 +78,8 @@ var ArrowIcon = styled(function (_ref8) {
       dropdown = _ref9.theme.yoga.components.dropdown;
   return "\n    fill: " + dropdown.arrow.fill + ";\n    " + (disabled ? "fill: " + dropdown.disabled.arrow.fill + ";" : '') + ";\n    " + (selected && !disabled ? "fill: " + dropdown.selected.arrow.fill + ";" : '') + ";\n    transform: rotate(" + (isOpen ? '180deg' : '0') + ");\n  ";
 });
-
-var getSelectedOption = function getSelectedOption(options) {
-  return options.find(function (item) {
-    return item.selected === true;
-  });
-};
 /** Gympass Dropdown is a multiple choice type of menu. */
 
-
 var Dropdown = /*#__PURE__*/React.forwardRef(function (_ref10, ref) {
   var error = _ref10.error,
       label = _ref10.label,
@@ -97,15 +90,31 @@ var Dropdown = /*#__PURE__*/React.forwardRef(function (_ref10, ref) {
       rest = _objectWithoutPropertiesLoose(_ref10, _excluded2);
 
   var inputRef = ref || React.useRef(null);
+  var selectedOption = options.find(function (item) {
+    return item.selected === true;
+  });
+
+  var _useState = useState(selectedOption),
+      localSelectedItem = _useState[0],
+      setLocalSelectedItem = _useState[1];
+
+  useEffect(function () {
+    setLocalSelectedItem(selectedOption);
+  }, [options]);
+  var onLocalChange = useCallback(function (opt) {
+    setLocalSelectedItem(opt);
+    onChange(opt);
+  }, [onChange]);
   return /*#__PURE__*/React.createElement(Downshift, {
-    initialSelectedItem: getSelectedOption(options),
+    initialSelectedItem: selectedOption,
     selectedItemChanged: function selectedItemChanged(prevItem, item) {
       return prevItem !== item;
     },
     itemToString: function itemToString(item) {
       return item ? item.label : '';
     },
-    onChange: onChange
+    onChange: onLocalChange,
+    selectedItem: localSelectedItem
   }, function (_ref11) {
     var getInputProps = _ref11.getInputProps,
         getItemProps = _ref11.getItemProps,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gympass/yoga",
-  "version": "7.72.0",
+  "version": "7.72.2",
   "description": "Gympass component library",
   "main": "./cjs",
   "sideEffects": false,
@@ -53,7 +53,7 @@
     "react": ">=16",
     "styled-components": "^4.4.0"
   },
-  "gitHead": "9231980c252bc0f14c5c37da6cec98d6070ba14f",
+  "gitHead": "b7d7d085f0f2c59c3ae24ed8d0ba3d0be8ca48f7",
   "module": "./esm",
   "private": false,
   "react-native": "./cjs/index.native.js"