@gympass/yoga 7.54.0 → 7.54.2
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/cjs/Datepicker/web/Datepicker.js +7 -7
- package/cjs/Datepicker/web/Datepicker.test.js +7 -5
- package/cjs/Tag/native/Informative.js +1 -1
- package/cjs/Tag/native/Tag.test.js +1 -1
- package/esm/Datepicker/web/Datepicker.js +7 -7
- package/esm/Datepicker/web/Datepicker.test.js +6 -5
- package/esm/Tag/native/Informative.js +3 -2
- package/esm/Tag/native/Tag.test.js +2 -0
- package/package.json +2 -2
|
@@ -117,7 +117,7 @@ var ErrorWrapper = (0, _styledComponents["default"])(_yoga.Text.Small)(_template
|
|
|
117
117
|
});
|
|
118
118
|
|
|
119
119
|
var toUTC = function toUTC(date) {
|
|
120
|
-
return new Date(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate()
|
|
120
|
+
return new Date(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate());
|
|
121
121
|
};
|
|
122
122
|
|
|
123
123
|
exports.toUTC = toUTC;
|
|
@@ -213,8 +213,8 @@ function Datepicker(_ref8) {
|
|
|
213
213
|
}
|
|
214
214
|
};
|
|
215
215
|
|
|
216
|
-
var renderInput = function renderInput() {
|
|
217
|
-
if (!
|
|
216
|
+
var renderInput = function renderInput(start, end) {
|
|
217
|
+
if (!start && !end || displayEndDateOnly && !end) {
|
|
218
218
|
return /*#__PURE__*/_react["default"].createElement(InputPlaceholder, {
|
|
219
219
|
disabled: disabled
|
|
220
220
|
}, placeholder != null ? placeholder : "Select Date");
|
|
@@ -223,10 +223,10 @@ function Datepicker(_ref8) {
|
|
|
223
223
|
var dateFormat = 'MMM d, yyyy';
|
|
224
224
|
if (displayEndDateOnly) return /*#__PURE__*/_react["default"].createElement(Input, {
|
|
225
225
|
disabled: disabled
|
|
226
|
-
},
|
|
227
|
-
return
|
|
226
|
+
}, end && (0, _dateFns.format)(toUTC(end), dateFormat));
|
|
227
|
+
return start && /*#__PURE__*/_react["default"].createElement(Input, {
|
|
228
228
|
disabled: disabled
|
|
229
|
-
}, (0, _dateFns.format)(
|
|
229
|
+
}, (0, _dateFns.format)(toUTC(start), dateFormat), end && " - " + (0, _dateFns.format)(toUTC(end), dateFormat));
|
|
230
230
|
};
|
|
231
231
|
|
|
232
232
|
return /*#__PURE__*/_react["default"].createElement(Wrapper, {
|
|
@@ -237,7 +237,7 @@ function Datepicker(_ref8) {
|
|
|
237
237
|
disabled: disabled,
|
|
238
238
|
error: error,
|
|
239
239
|
inputFilled: inputFilled
|
|
240
|
-
}, renderInput(), /*#__PURE__*/_react["default"].createElement(TButton, {
|
|
240
|
+
}, renderInput(type === 'range' && !customOnSelectRange ? startDateLocal : startDate, type === 'range' && !customOnSelectRange ? endDateLocal : endDate), /*#__PURE__*/_react["default"].createElement(TButton, {
|
|
241
241
|
onClick: function onClick() {
|
|
242
242
|
if (!disabled) {
|
|
243
243
|
setOpen((open !== 'true').toString());
|
|
@@ -8,10 +8,12 @@ var _dateFns = require("date-fns");
|
|
|
8
8
|
|
|
9
9
|
var _ = require("../..");
|
|
10
10
|
|
|
11
|
+
var _Datepicker = require("./Datepicker");
|
|
12
|
+
|
|
11
13
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
12
14
|
|
|
13
15
|
describe('<Datepicker />', function () {
|
|
14
|
-
var testDate = new Date(2022, 7, 3);
|
|
16
|
+
var testDate = new Date(2022, 7, 3, 14, 0, 0);
|
|
15
17
|
describe('Snapshots', function () {
|
|
16
18
|
it('should match with single Datepicker', function () {
|
|
17
19
|
var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_.ThemeProvider, null, /*#__PURE__*/_react["default"].createElement(_.Datepicker, {
|
|
@@ -168,15 +170,15 @@ describe('<Datepicker />', function () {
|
|
|
168
170
|
type: "single",
|
|
169
171
|
startDate: currentDate
|
|
170
172
|
})));
|
|
171
|
-
var formattedDate = (0, _dateFns.format)(currentDate, dateFormat);
|
|
173
|
+
var formattedDate = (0, _dateFns.format)((0, _Datepicker.toUTC)(currentDate), dateFormat);
|
|
172
174
|
expect(_react2.screen.getByText(formattedDate)).toBeVisible();
|
|
173
175
|
});
|
|
174
176
|
it('should display default date range on range Datepicker', function () {
|
|
175
177
|
var currentDate = new Date();
|
|
176
178
|
var end = new Date();
|
|
177
179
|
end.setDate(currentDate.getDate() + 15);
|
|
178
|
-
var formattedStartDate = (0, _dateFns.format)(currentDate, dateFormat);
|
|
179
|
-
var formattedEndDate = (0, _dateFns.format)(end, dateFormat);
|
|
180
|
+
var formattedStartDate = (0, _dateFns.format)((0, _Datepicker.toUTC)(currentDate), dateFormat);
|
|
181
|
+
var formattedEndDate = (0, _dateFns.format)((0, _Datepicker.toUTC)(end), dateFormat);
|
|
180
182
|
(0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_.ThemeProvider, null, /*#__PURE__*/_react["default"].createElement(_.Datepicker, {
|
|
181
183
|
type: "range",
|
|
182
184
|
startDate: currentDate,
|
|
@@ -266,7 +268,7 @@ describe('<Datepicker />', function () {
|
|
|
266
268
|
startDate: testDate,
|
|
267
269
|
disabled: true
|
|
268
270
|
})));
|
|
269
|
-
var formattedDate = (0, _dateFns.format)(testDate, dateFormat);
|
|
271
|
+
var formattedDate = (0, _dateFns.format)((0, _Datepicker.toUTC)(testDate), dateFormat);
|
|
270
272
|
|
|
271
273
|
var datepickerInput = _react2.screen.getByText(formattedDate);
|
|
272
274
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports["default"]=void 0;var _extends2=_interopRequireDefault(require("@babel/runtime/helpers/extends"));var _objectWithoutProperties2=_interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));var _taggedTemplateLiteralLoose2=_interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteralLoose"));var _react=_interopRequireDefault(require("react"));var _styledComponents=_interopRequireWildcard(require("styled-components"));var _propTypes=require("prop-types");var _yogaSystem=require("@gympass/yoga-system");var _Tag=require("./Tag");var _Icon=_interopRequireDefault(require("../../Icon"));var _excluded=["children","icon","theme","small"];var _templateObject,_templateObject2,_templateObject3;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;}var Informative=(0,_styledComponents["default"])(_Tag.StyledTag)(_templateObject||(_templateObject=(0,_taggedTemplateLiteralLoose2["default"])(["\n ","\n\n ","\n"])),function(_ref){var variant=_ref.variant,_ref$theme$yoga=_ref.theme.yoga,_ref$theme$yoga$color=_ref$theme$yoga.colors,text=_ref$theme$yoga$color.text,_ref$theme$yoga$color2=_ref$theme$yoga$color.feedback[variant],color=_ref$theme$yoga$color2===void 0?{light:text.secondary}:_ref$theme$yoga$color2,tag=_ref$theme$yoga.components.tag;return"\n background-color: "+color.light+";\n border-color: "+color.light+";\n border-radius: "+tag.border.radius+"px;\n ";},_yogaSystem.margins);var Wrapper=_styledComponents["default"].View(_templateObject2||(_templateObject2=(0,_taggedTemplateLiteralLoose2["default"])(["\n flex-direction: row;\n justify-content: center;\n align-items: center;\n"])));var StyledTextInformative=(0,_styledComponents["default"])(_Tag.StyledText)(_templateObject3||(_templateObject3=(0,_taggedTemplateLiteralLoose2["default"])(["\n ","\n"])),function(_ref2){var _ref2$theme$yoga=_ref2.theme.yoga,text=_ref2$theme$yoga.colors.text,tag=_ref2$theme$yoga.components.tag;return"\n color: "+text.primary+";\n\n font-size: "+tag.font.size+"px;\n line-height: "+tag.font.lineHeight+"px;\n font-weight: "+tag.font.weight+";\n ";});var TagInformative=function TagInformative(_ref3){var children=_ref3.children,icon=_ref3.icon,_ref3$theme$yoga=_ref3.theme.yoga,text=_ref3$theme$yoga.colors.text,tag=_ref3$theme$yoga.components.tag,small=_ref3.small,props=(0,_objectWithoutProperties2["default"])(_ref3,_excluded);return _react["default"].createElement(Informative,(0,_extends2["default"])({small:small},props),_react["default"].createElement(Wrapper,null,icon&&_react["default"].createElement(_Icon["default"],{as:icon,size:small?tag.icon.size.small:tag.icon.size["default"],fill:text.primary,marginRight:tag.icon.margin.right}),_react["default"].createElement(StyledTextInformative,null,children)));};TagInformative.propTypes={variant:(0,_propTypes.oneOf)(['success','informative','attention'])
|
|
1
|
+
var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports["default"]=void 0;var _extends2=_interopRequireDefault(require("@babel/runtime/helpers/extends"));var _objectWithoutProperties2=_interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));var _taggedTemplateLiteralLoose2=_interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteralLoose"));var _react=_interopRequireDefault(require("react"));var _styledComponents=_interopRequireWildcard(require("styled-components"));var _propTypes=require("prop-types");var _yogaSystem=require("@gympass/yoga-system");var _Tag=require("./Tag");var _Icon=_interopRequireDefault(require("../../Icon"));var _excluded=["children","icon","theme","small"];var _templateObject,_templateObject2,_templateObject3;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;}var Informative=(0,_styledComponents["default"])(_Tag.StyledTag)(_templateObject||(_templateObject=(0,_taggedTemplateLiteralLoose2["default"])(["\n ","\n\n ","\n"])),function(_ref){var variant=_ref.variant,_ref$theme$yoga=_ref.theme.yoga,_ref$theme$yoga$color=_ref$theme$yoga.colors,text=_ref$theme$yoga$color.text,_ref$theme$yoga$color2=_ref$theme$yoga$color.feedback[variant],color=_ref$theme$yoga$color2===void 0?{light:text.secondary}:_ref$theme$yoga$color2,tag=_ref$theme$yoga.components.tag;return"\n background-color: "+color.light+";\n border-color: "+color.light+";\n border-radius: "+tag.border.radius+"px;\n ";},_yogaSystem.margins);var Wrapper=_styledComponents["default"].View(_templateObject2||(_templateObject2=(0,_taggedTemplateLiteralLoose2["default"])(["\n flex-direction: row;\n justify-content: center;\n align-items: center;\n"])));var StyledTextInformative=(0,_styledComponents["default"])(_Tag.StyledText)(_templateObject3||(_templateObject3=(0,_taggedTemplateLiteralLoose2["default"])(["\n ","\n"])),function(_ref2){var _ref2$theme$yoga=_ref2.theme.yoga,text=_ref2$theme$yoga.colors.text,tag=_ref2$theme$yoga.components.tag;return"\n color: "+text.primary+";\n\n font-size: "+tag.font.size+"px;\n line-height: "+tag.font.lineHeight+"px;\n font-weight: "+tag.font.weight+";\n ";});var TagInformative=function TagInformative(_ref3){var children=_ref3.children,icon=_ref3.icon,_ref3$theme$yoga=_ref3.theme.yoga,text=_ref3$theme$yoga.colors.text,tag=_ref3$theme$yoga.components.tag,small=_ref3.small,props=(0,_objectWithoutProperties2["default"])(_ref3,_excluded);return _react["default"].createElement(Informative,(0,_extends2["default"])({small:small},props),_react["default"].createElement(Wrapper,null,icon&&_react["default"].createElement(_Icon["default"],{as:icon,size:small?tag.icon.size.small:tag.icon.size["default"],fill:text.primary,marginRight:tag.icon.margin.right}),_react["default"].createElement(StyledTextInformative,null,children)));};TagInformative.propTypes={variant:(0,_propTypes.oneOf)(['neutral','success','informative','attention']),icon:_propTypes.func,children:_propTypes.node.isRequired,small:_propTypes.bool};TagInformative.defaultProps={variant:'neutral',icon:undefined,small:false};TagInformative.displayName='Tag.Informative';var _default=(0,_styledComponents.withTheme)(TagInformative);exports["default"]=_default;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");var _react=_interopRequireDefault(require("react"));var _reactNative=require("@testing-library/react-native");var _yogaIcons=require("@gympass/yoga-icons");var _=require("../..");describe('<Tag />',function(){it('should match snapshot',function(){var _render=(0,_reactNative.render)(_react["default"].createElement(_.ThemeProvider,null,_react["default"].createElement(_.Tag,null,"default"))),toJSON=_render.toJSON;expect(toJSON()).toMatchSnapshot();});it('should match snapshot with custom icon and informative type',function(){var _render2=(0,_reactNative.render)(_react["default"].createElement(_.ThemeProvider,null,_react["default"].createElement(_.Tag.Informative,{variant:"success",icon:_yogaIcons.Building},"success with custom icon"),_react["default"].createElement(_.Tag.Informative,{variant:"success",icon:_yogaIcons.Building,small:true},"success with custom icon"))),toJSON=_render2.toJSON;expect(toJSON()).toMatchSnapshot();});it('should match snapshot with without icon and informative type',function(){var _render3=(0,_reactNative.render)(_react["default"].createElement(_.ThemeProvider,null,_react["default"].createElement(_.Tag.Informative,{variant:"success"},"success without icon"),_react["default"].createElement(_.Tag.Informative,{variant:"success",small:true},"success without icon"))),toJSON=_render3.toJSON;expect(toJSON()).toMatchSnapshot();});it('should match snapshot with variant prop',function(){var _render4=(0,_reactNative.render)(_react["default"].createElement(_.ThemeProvider,null,_react["default"].createElement(_.Tag,{variant:"success"},"success"),_react["default"].createElement(_.Tag,{variant:"informative"},"informative"),_react["default"].createElement(_.Tag,{variant:"attention"},"attention"),_react["default"].createElement(_.Tag,{variant:"attention",small:true},"attention small"))),toJSON=_render4.toJSON;expect(toJSON()).toMatchSnapshot();});it('should match snapshot with variant prop and informative type',function(){var _render5=(0,_reactNative.render)(_react["default"].createElement(_.ThemeProvider,null,_react["default"].createElement(_.Tag.Informative,{variant:"success"},"success"),_react["default"].createElement(_.Tag.Informative,{variant:"informative"},"informative"),_react["default"].createElement(_.Tag.Informative,{variant:"attention"},"attention"),_react["default"].createElement(_.Tag.Informative,{variant:"attention",small:true},"attention small"))),toJSON=_render5.toJSON;expect(toJSON()).toMatchSnapshot();});it('should match snapshot with variant and margin prop ',function(){var _render6=(0,_reactNative.render)(_react["default"].createElement(_.ThemeProvider,null,_react["default"].createElement(_.Tag,{variant:"success"},"success"),_react["default"].createElement(_.Tag,{mv:"medium",variant:"informative"},"informative"),_react["default"].createElement(_.Tag,{variant:"attention"},"attention"))),toJSON=_render6.toJSON;expect(toJSON()).toMatchSnapshot();});it('should match snapshot with variant prop and informative type with margin prop',function(){var _render7=(0,_reactNative.render)(_react["default"].createElement(_.ThemeProvider,null,_react["default"].createElement(_.Tag.Informative,{variant:"success"},"success"),_react["default"].createElement(_.Tag.Informative,{mv:"medium",variant:"informative"},"informative"),_react["default"].createElement(_.Tag.Informative,{variant:"attention"},"attention"))),toJSON=_render7.toJSON;expect(toJSON()).toMatchSnapshot();});});
|
|
1
|
+
var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");var _react=_interopRequireDefault(require("react"));var _reactNative=require("@testing-library/react-native");var _yogaIcons=require("@gympass/yoga-icons");var _=require("../..");describe('<Tag />',function(){it('should match snapshot',function(){var _render=(0,_reactNative.render)(_react["default"].createElement(_.ThemeProvider,null,_react["default"].createElement(_.Tag,null,"default"))),toJSON=_render.toJSON;expect(toJSON()).toMatchSnapshot();});it('should match snapshot with custom icon and informative type',function(){var _render2=(0,_reactNative.render)(_react["default"].createElement(_.ThemeProvider,null,_react["default"].createElement(_.Tag.Informative,{variant:"success",icon:_yogaIcons.Building},"success with custom icon"),_react["default"].createElement(_.Tag.Informative,{variant:"success",icon:_yogaIcons.Building,small:true},"success with custom icon"))),toJSON=_render2.toJSON;expect(toJSON()).toMatchSnapshot();});it('should match snapshot with without icon and informative type',function(){var _render3=(0,_reactNative.render)(_react["default"].createElement(_.ThemeProvider,null,_react["default"].createElement(_.Tag.Informative,{variant:"success"},"success without icon"),_react["default"].createElement(_.Tag.Informative,{variant:"success",small:true},"success without icon"))),toJSON=_render3.toJSON;expect(toJSON()).toMatchSnapshot();});it('should match snapshot with variant prop',function(){var _render4=(0,_reactNative.render)(_react["default"].createElement(_.ThemeProvider,null,_react["default"].createElement(_.Tag,{variant:"success"},"success"),_react["default"].createElement(_.Tag,{variant:"informative"},"informative"),_react["default"].createElement(_.Tag,{variant:"attention"},"attention"),_react["default"].createElement(_.Tag,{variant:"attention",small:true},"attention small"))),toJSON=_render4.toJSON;expect(toJSON()).toMatchSnapshot();});it('should match snapshot with variant prop and informative type',function(){var _render5=(0,_reactNative.render)(_react["default"].createElement(_.ThemeProvider,null,_react["default"].createElement(_.Tag.Informative,{variant:"neutral"},"neutral"),_react["default"].createElement(_.Tag.Informative,{variant:"success"},"success"),_react["default"].createElement(_.Tag.Informative,{variant:"informative"},"informative"),_react["default"].createElement(_.Tag.Informative,{variant:"attention"},"attention"),_react["default"].createElement(_.Tag.Informative,{variant:"attention",small:true},"attention small"))),toJSON=_render5.toJSON;expect(toJSON()).toMatchSnapshot();});it('should match snapshot with variant and margin prop ',function(){var _render6=(0,_reactNative.render)(_react["default"].createElement(_.ThemeProvider,null,_react["default"].createElement(_.Tag,{variant:"success"},"success"),_react["default"].createElement(_.Tag,{mv:"medium",variant:"informative"},"informative"),_react["default"].createElement(_.Tag,{variant:"attention"},"attention"))),toJSON=_render6.toJSON;expect(toJSON()).toMatchSnapshot();});it('should match snapshot with variant prop and informative type with margin prop',function(){var _render7=(0,_reactNative.render)(_react["default"].createElement(_.ThemeProvider,null,_react["default"].createElement(_.Tag.Informative,{variant:"success"},"success"),_react["default"].createElement(_.Tag.Informative,{mv:"medium",variant:"informative"},"informative"),_react["default"].createElement(_.Tag.Informative,{variant:"attention"},"attention"))),toJSON=_render7.toJSON;expect(toJSON()).toMatchSnapshot();});});
|
|
@@ -94,7 +94,7 @@ var ErrorWrapper = styled(Text.Small)(_templateObject9 || (_templateObject9 = _t
|
|
|
94
94
|
return "\n margin-top: " + components.input.helper.margin.top + "px;\n font-size: " + components.input.helper.font.size + "px;\n color: " + colors.feedback.attention[1] + ";\n position: absolute;\n ";
|
|
95
95
|
});
|
|
96
96
|
export var toUTC = function toUTC(date) {
|
|
97
|
-
return new Date(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate()
|
|
97
|
+
return new Date(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate());
|
|
98
98
|
};
|
|
99
99
|
|
|
100
100
|
function Datepicker(_ref8) {
|
|
@@ -188,8 +188,8 @@ function Datepicker(_ref8) {
|
|
|
188
188
|
}
|
|
189
189
|
};
|
|
190
190
|
|
|
191
|
-
var renderInput = function renderInput() {
|
|
192
|
-
if (!
|
|
191
|
+
var renderInput = function renderInput(start, end) {
|
|
192
|
+
if (!start && !end || displayEndDateOnly && !end) {
|
|
193
193
|
return /*#__PURE__*/React.createElement(InputPlaceholder, {
|
|
194
194
|
disabled: disabled
|
|
195
195
|
}, placeholder != null ? placeholder : "Select Date");
|
|
@@ -198,10 +198,10 @@ function Datepicker(_ref8) {
|
|
|
198
198
|
var dateFormat = 'MMM d, yyyy';
|
|
199
199
|
if (displayEndDateOnly) return /*#__PURE__*/React.createElement(Input, {
|
|
200
200
|
disabled: disabled
|
|
201
|
-
},
|
|
202
|
-
return
|
|
201
|
+
}, end && format(toUTC(end), dateFormat));
|
|
202
|
+
return start && /*#__PURE__*/React.createElement(Input, {
|
|
203
203
|
disabled: disabled
|
|
204
|
-
}, format(
|
|
204
|
+
}, format(toUTC(start), dateFormat), end && " - " + format(toUTC(end), dateFormat));
|
|
205
205
|
};
|
|
206
206
|
|
|
207
207
|
return /*#__PURE__*/React.createElement(Wrapper, {
|
|
@@ -212,7 +212,7 @@ function Datepicker(_ref8) {
|
|
|
212
212
|
disabled: disabled,
|
|
213
213
|
error: error,
|
|
214
214
|
inputFilled: inputFilled
|
|
215
|
-
}, renderInput(), /*#__PURE__*/React.createElement(TButton, {
|
|
215
|
+
}, renderInput(type === 'range' && !customOnSelectRange ? startDateLocal : startDate, type === 'range' && !customOnSelectRange ? endDateLocal : endDate), /*#__PURE__*/React.createElement(TButton, {
|
|
216
216
|
onClick: function onClick() {
|
|
217
217
|
if (!disabled) {
|
|
218
218
|
setOpen((open !== 'true').toString());
|
|
@@ -2,8 +2,9 @@ import React from 'react';
|
|
|
2
2
|
import { fireEvent, render, screen } from '@testing-library/react';
|
|
3
3
|
import { format } from 'date-fns';
|
|
4
4
|
import { ThemeProvider, Datepicker } from '../..';
|
|
5
|
+
import { toUTC } from './Datepicker';
|
|
5
6
|
describe('<Datepicker />', function () {
|
|
6
|
-
var testDate = new Date(2022, 7, 3);
|
|
7
|
+
var testDate = new Date(2022, 7, 3, 14, 0, 0);
|
|
7
8
|
describe('Snapshots', function () {
|
|
8
9
|
it('should match with single Datepicker', function () {
|
|
9
10
|
var _render = render( /*#__PURE__*/React.createElement(ThemeProvider, null, /*#__PURE__*/React.createElement(Datepicker, {
|
|
@@ -142,15 +143,15 @@ describe('<Datepicker />', function () {
|
|
|
142
143
|
type: "single",
|
|
143
144
|
startDate: currentDate
|
|
144
145
|
})));
|
|
145
|
-
var formattedDate = format(currentDate, dateFormat);
|
|
146
|
+
var formattedDate = format(toUTC(currentDate), dateFormat);
|
|
146
147
|
expect(screen.getByText(formattedDate)).toBeVisible();
|
|
147
148
|
});
|
|
148
149
|
it('should display default date range on range Datepicker', function () {
|
|
149
150
|
var currentDate = new Date();
|
|
150
151
|
var end = new Date();
|
|
151
152
|
end.setDate(currentDate.getDate() + 15);
|
|
152
|
-
var formattedStartDate = format(currentDate, dateFormat);
|
|
153
|
-
var formattedEndDate = format(end, dateFormat);
|
|
153
|
+
var formattedStartDate = format(toUTC(currentDate), dateFormat);
|
|
154
|
+
var formattedEndDate = format(toUTC(end), dateFormat);
|
|
154
155
|
render( /*#__PURE__*/React.createElement(ThemeProvider, null, /*#__PURE__*/React.createElement(Datepicker, {
|
|
155
156
|
type: "range",
|
|
156
157
|
startDate: currentDate,
|
|
@@ -230,7 +231,7 @@ describe('<Datepicker />', function () {
|
|
|
230
231
|
startDate: testDate,
|
|
231
232
|
disabled: true
|
|
232
233
|
})));
|
|
233
|
-
var formattedDate = format(testDate, dateFormat);
|
|
234
|
+
var formattedDate = format(toUTC(testDate), dateFormat);
|
|
234
235
|
var datepickerInput = screen.getByText(formattedDate);
|
|
235
236
|
expect(datepickerInput).toHaveAttribute('disabled');
|
|
236
237
|
expect(datepickerInput.closest('div')).toHaveAttribute('disabled');
|
|
@@ -55,8 +55,8 @@ var TagInformative = function TagInformative(_ref3) {
|
|
|
55
55
|
};
|
|
56
56
|
|
|
57
57
|
TagInformative.propTypes = {
|
|
58
|
-
/** style the tag following the theme (success, informative, attention) */
|
|
59
|
-
variant: oneOf(['success', 'informative', 'attention'])
|
|
58
|
+
/** style the tag following the theme (neutral, success, informative, attention) */
|
|
59
|
+
variant: oneOf(['neutral', 'success', 'informative', 'attention']),
|
|
60
60
|
icon: func,
|
|
61
61
|
children: node.isRequired,
|
|
62
62
|
|
|
@@ -64,6 +64,7 @@ TagInformative.propTypes = {
|
|
|
64
64
|
small: bool
|
|
65
65
|
};
|
|
66
66
|
TagInformative.defaultProps = {
|
|
67
|
+
variant: 'neutral',
|
|
67
68
|
icon: undefined,
|
|
68
69
|
small: false
|
|
69
70
|
};
|
|
@@ -50,6 +50,8 @@ describe('<Tag />', function () {
|
|
|
50
50
|
});
|
|
51
51
|
it('should match snapshot with variant prop and informative type', function () {
|
|
52
52
|
var _render5 = render( /*#__PURE__*/React.createElement(ThemeProvider, null, /*#__PURE__*/React.createElement(Tag.Informative, {
|
|
53
|
+
variant: "neutral"
|
|
54
|
+
}, "neutral"), /*#__PURE__*/React.createElement(Tag.Informative, {
|
|
53
55
|
variant: "success"
|
|
54
56
|
}, "success"), /*#__PURE__*/React.createElement(Tag.Informative, {
|
|
55
57
|
variant: "informative"
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gympass/yoga",
|
|
3
|
-
"version": "7.54.
|
|
3
|
+
"version": "7.54.2",
|
|
4
4
|
"description": "Gympass component library",
|
|
5
5
|
"main": "./cjs",
|
|
6
6
|
"sideEffects": false,
|
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
"react": ">=16",
|
|
53
53
|
"styled-components": "^4.4.0"
|
|
54
54
|
},
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "47d8327806dfc5b3a215f20322614a9a0ea28255",
|
|
56
56
|
"module": "./esm",
|
|
57
57
|
"private": false,
|
|
58
58
|
"react-native": "./cjs/index.native.js"
|