@gympass/yoga 7.43.0 → 7.46.0

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.
@@ -15,6 +15,8 @@ var _templateObject;
15
15
 
16
16
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
17
17
 
18
+ 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); }
19
+
18
20
  function _taggedTemplateLiteralLoose(strings, raw) { if (!raw) { raw = strings.slice(0); } strings.raw = raw; return strings; }
19
21
 
20
22
  var StyledBottomSheet = (0, _styledComponents["default"])(_Dialog["default"])(_templateObject || (_templateObject = _taggedTemplateLiteralLoose(["\n ", "\n align-self: flex-end;\n animation: content;\n animation-duration: 400ms;\n animation-fill-mode: forwards;\n @keyframes content {\n 0% {\n transform: translateY(100vh);\n }\n 100% {\n transform: translateY(0);\n }\n }\n"])), function (_ref) {
@@ -23,7 +25,9 @@ var StyledBottomSheet = (0, _styledComponents["default"])(_Dialog["default"])(_t
23
25
  });
24
26
 
25
27
  var BottomSheet = function BottomSheet(props) {
26
- return /*#__PURE__*/_react["default"].createElement(StyledBottomSheet, props);
28
+ return /*#__PURE__*/_react["default"].createElement(StyledBottomSheet, _extends({
29
+ hideCloseButton: true
30
+ }, props));
27
31
  };
28
32
 
29
33
  BottomSheet.propTypes = {
@@ -43,4 +43,19 @@ describe('<BottomSheet />', function () {
43
43
 
44
44
  expect(onActionMock).toHaveBeenCalledTimes(1);
45
45
  });
46
+ it('should hide the close button', function () {
47
+ (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_.ThemeProvider, null, /*#__PURE__*/_react["default"].createElement(_2["default"], {
48
+ isOpen: true,
49
+ onClose: function onClose() {}
50
+ }, /*#__PURE__*/_react["default"].createElement(_2["default"].Header, null, "Title"))));
51
+ expect(_react2.screen.queryByRole('button')).toBeNull();
52
+ });
53
+ it('should show the close button', function () {
54
+ (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_.ThemeProvider, null, /*#__PURE__*/_react["default"].createElement(_2["default"], {
55
+ isOpen: true,
56
+ hideCloseButton: false,
57
+ onClose: function onClose() {}
58
+ }, /*#__PURE__*/_react["default"].createElement(_2["default"].Header, null, "Title"))));
59
+ expect(_react2.screen.getByRole('button')).not.toBeNull();
60
+ });
46
61
  });
@@ -34,7 +34,7 @@ exports.List = List;
34
34
 
35
35
  var IconWrapper = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteralLoose(["\n display: flex;\n margin-right: ", "px;\n"])), cardweb.plan.list.item.icon.margin.right);
36
36
 
37
- var Item = _styledComponents["default"].li(_templateObject4 || (_templateObject4 = _taggedTemplateLiteralLoose(["\n margin-bottom: ", "px;\n"])), card.plan.list.item.margin.bottom);
37
+ var Item = _styledComponents["default"].li(_templateObject4 || (_templateObject4 = _taggedTemplateLiteralLoose(["\n :not(:last-child) {\n margin-bottom: ", "px;\n }\n"])), card.plan.list.item.margin.bottom);
38
38
 
39
39
  var Wrapper = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = _taggedTemplateLiteralLoose(["\n display: flex;\n min-width: 0;\n align-items: center;\n\n svg {\n flex-shrink: 0;\n }\n"])));
40
40
 
@@ -17,7 +17,7 @@ var _hooks = require("../../hooks");
17
17
 
18
18
  var _ = require("../..");
19
19
 
20
- var _excluded = ["isOpen", "children", "onClose"];
20
+ var _excluded = ["isOpen", "hideCloseButton", "children", "onClose"];
21
21
 
22
22
  var _templateObject, _templateObject2;
23
23
 
@@ -47,12 +47,14 @@ var Overlay = _styledComponents["default"].div(_templateObject2 || (_templateObj
47
47
 
48
48
  var Dialog = function Dialog(_ref3) {
49
49
  var isOpen = _ref3.isOpen,
50
+ hideCloseButton = _ref3.hideCloseButton,
50
51
  children = _ref3.children,
51
52
  onClose = _ref3.onClose,
52
53
  props = _objectWithoutPropertiesLoose(_ref3, _excluded);
53
54
 
54
55
  var dialogRef = (0, _react.useRef)(null);
55
56
  var dialogElement = (0, _hooks.usePortal)('dialog');
57
+ var isCloseButtonVisible = onClose && !hideCloseButton;
56
58
  var closeDialog = (0, _react.useCallback)(function (e) {
57
59
  if (dialogRef.current === e.target && isOpen && onClose) {
58
60
  onClose(e);
@@ -79,7 +81,7 @@ var Dialog = function Dialog(_ref3) {
79
81
  ref: dialogRef
80
82
  }, /*#__PURE__*/_react["default"].createElement(StyledDialog, _extends({
81
83
  onClose: onClose
82
- }, props), onClose && /*#__PURE__*/_react["default"].createElement(_.Box, {
84
+ }, props), isCloseButtonVisible && /*#__PURE__*/_react["default"].createElement(_.Box, {
83
85
  d: "flex",
84
86
  justifyContent: "flex-end",
85
87
  w: "100%"
@@ -94,12 +96,16 @@ Dialog.propTypes = {
94
96
  /** Control the dialog visibility. */
95
97
  isOpen: _propTypes.bool,
96
98
 
99
+ /** Hide the close button when onClose prop is defined. */
100
+ hideCloseButton: _propTypes.bool,
101
+
97
102
  /** Function to close the dialog. */
98
103
  onClose: _propTypes.func,
99
104
  children: _propTypes.node.isRequired
100
105
  };
101
106
  Dialog.defaultProps = {
102
107
  isOpen: false,
108
+ hideCloseButton: false,
103
109
  onClose: undefined
104
110
  };
105
111
  Dialog.displayName = 'Dialog';
@@ -67,4 +67,12 @@ describe('<Dialog />', function () {
67
67
 
68
68
  expect(onCloseMock).toHaveBeenCalledTimes(1);
69
69
  });
70
+ it('should hide the close button when hideCloseButton prop is true', function () {
71
+ (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_.ThemeProvider, null, /*#__PURE__*/_react["default"].createElement(_2["default"], {
72
+ isOpen: true,
73
+ hideCloseButton: true,
74
+ onClose: function onClose() {}
75
+ }, /*#__PURE__*/_react["default"].createElement(_2["default"].Header, null, "Title"))));
76
+ expect(_react2.screen.queryByRole('button')).toBeNull();
77
+ });
70
78
  });
@@ -31,25 +31,43 @@ var StyledMenuList = (0, _styledComponents["default"])(_reactDropdownMenu.Conten
31
31
  });
32
32
  var MenuList = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
33
33
  var children = _ref2.children,
34
- align = _ref2.align;
34
+ align = _ref2.align,
35
+ alignOffset = _ref2.alignOffset,
36
+ side = _ref2.side,
37
+ sideOffset = _ref2.sideOffset;
35
38
  return /*#__PURE__*/_react["default"].createElement(StyledMenuList, {
36
39
  asChild: true,
37
- sideOffset: 2,
38
- alignOffset: -5,
39
- align: align
40
+ side: side,
41
+ sideOffset: sideOffset,
42
+ align: align,
43
+ alignOffset: alignOffset
40
44
  }, /*#__PURE__*/_react["default"].createElement(_Box["default"], {
41
45
  as: "ul",
46
+ m: "zero",
42
47
  ref: ref
43
48
  }, children));
44
49
  });
45
50
  MenuList.propTypes = {
51
+ /** Component to be rendered inside the Menu.List container */
46
52
  children: _propTypes.node.isRequired,
47
53
 
48
- /** Align Menu is a alignement that menu will appear on the screen | start | center | end */
49
- align: _propTypes.string
54
+ /** Setup the vertical placement relative to Menu.Action component */
55
+ align: (0, _propTypes.oneOf)(['start', 'center', 'end']),
56
+
57
+ /** Add vertical space between the Menu.Action and the Menu.List */
58
+ alignOffset: _propTypes.number,
59
+
60
+ /** Setup the horizontal placement relative to Menu.Action component */
61
+ side: (0, _propTypes.oneOf)(['top', 'right', 'bottom', 'left']),
62
+
63
+ /** Add horizontal space between the Menu.Action and the Menu.List */
64
+ sideOffset: _propTypes.number
50
65
  };
51
66
  MenuList.defaultProps = {
52
- align: 'start'
67
+ align: 'start',
68
+ alignOffset: 0,
69
+ side: 'bottom',
70
+ sideOffset: 4
53
71
  };
54
72
  MenuList.displayName = 'Menu.List';
55
73
  var _default = MenuList;
@@ -1,5 +1,7 @@
1
1
  var _templateObject;
2
2
 
3
+ 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); }
4
+
3
5
  function _taggedTemplateLiteralLoose(strings, raw) { if (!raw) { raw = strings.slice(0); } strings.raw = raw; return strings; }
4
6
 
5
7
  import React from 'react';
@@ -12,7 +14,9 @@ var StyledBottomSheet = styled(Dialog)(_templateObject || (_templateObject = _ta
12
14
  });
13
15
 
14
16
  var BottomSheet = function BottomSheet(props) {
15
- return /*#__PURE__*/React.createElement(StyledBottomSheet, props);
17
+ return /*#__PURE__*/React.createElement(StyledBottomSheet, _extends({
18
+ hideCloseButton: true
19
+ }, props));
16
20
  };
17
21
 
18
22
  BottomSheet.propTypes = {
@@ -30,4 +30,19 @@ describe('<BottomSheet />', function () {
30
30
  fireEvent.click(button);
31
31
  expect(onActionMock).toHaveBeenCalledTimes(1);
32
32
  });
33
+ it('should hide the close button', function () {
34
+ render( /*#__PURE__*/React.createElement(ThemeProvider, null, /*#__PURE__*/React.createElement(BottomSheet, {
35
+ isOpen: true,
36
+ onClose: function onClose() {}
37
+ }, /*#__PURE__*/React.createElement(BottomSheet.Header, null, "Title"))));
38
+ expect(screen.queryByRole('button')).toBeNull();
39
+ });
40
+ it('should show the close button', function () {
41
+ render( /*#__PURE__*/React.createElement(ThemeProvider, null, /*#__PURE__*/React.createElement(BottomSheet, {
42
+ isOpen: true,
43
+ hideCloseButton: false,
44
+ onClose: function onClose() {}
45
+ }, /*#__PURE__*/React.createElement(BottomSheet.Header, null, "Title"))));
46
+ expect(screen.getByRole('button')).not.toBeNull();
47
+ });
33
48
  });
@@ -13,7 +13,7 @@ var _theme$components = theme.components,
13
13
  var truncateStyle = css(_templateObject || (_templateObject = _taggedTemplateLiteralLoose(["\n white-space: nowrap;\n overflow: hidden;\n text-overflow: ellipsis;\n"])));
14
14
  var List = styled.ul(_templateObject2 || (_templateObject2 = _taggedTemplateLiteralLoose(["\n margin: ", "px 0 0;\n padding: 0;\n\n list-style: none;\n"])), cardweb.plan.list.margin.top);
15
15
  var IconWrapper = styled.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteralLoose(["\n display: flex;\n margin-right: ", "px;\n"])), cardweb.plan.list.item.icon.margin.right);
16
- var Item = styled.li(_templateObject4 || (_templateObject4 = _taggedTemplateLiteralLoose(["\n margin-bottom: ", "px;\n"])), card.plan.list.item.margin.bottom);
16
+ var Item = styled.li(_templateObject4 || (_templateObject4 = _taggedTemplateLiteralLoose(["\n :not(:last-child) {\n margin-bottom: ", "px;\n }\n"])), card.plan.list.item.margin.bottom);
17
17
  var Wrapper = styled.div(_templateObject5 || (_templateObject5 = _taggedTemplateLiteralLoose(["\n display: flex;\n min-width: 0;\n align-items: center;\n\n svg {\n flex-shrink: 0;\n }\n"])));
18
18
  var ItemText = styled(Text.Small)(_templateObject6 || (_templateObject6 = _taggedTemplateLiteralLoose(["\n display: inline-block;\n height: 100%;\n vertical-align: middle;\n\n color: ", ";\n\n ", "\n"])), card.plan.list.item.font.color, truncateStyle);
19
19
  var Button = styled.button(_templateObject7 || (_templateObject7 = _taggedTemplateLiteralLoose(["\n display: block;\n padding: 0;\n margin-top: ", "px;\n\n width: 100%;\n\n letter-spacing: normal;\n\n background-color: transparent;\n border: none;\n\n font-family: ", ";\n font-size: ", "px;\n font-weight: ", ";\n color: ", ";\n\n cursor: pointer;\n text-decoration: none;\n text-align: left;\n outline: none;\n\n ", "\n"])), card.plan.list.button.margin.top, theme.baseFont.family, card.plan.list.button.font.size, card.plan.list.button.font.weight, card.plan.list.button.font.color, truncateStyle);
@@ -1,4 +1,4 @@
1
- var _excluded = ["isOpen", "children", "onClose"];
1
+ var _excluded = ["isOpen", "hideCloseButton", "children", "onClose"];
2
2
 
3
3
  var _templateObject, _templateObject2;
4
4
 
@@ -27,12 +27,14 @@ var Overlay = styled.div(_templateObject2 || (_templateObject2 = _taggedTemplate
27
27
 
28
28
  var Dialog = function Dialog(_ref3) {
29
29
  var isOpen = _ref3.isOpen,
30
+ hideCloseButton = _ref3.hideCloseButton,
30
31
  children = _ref3.children,
31
32
  onClose = _ref3.onClose,
32
33
  props = _objectWithoutPropertiesLoose(_ref3, _excluded);
33
34
 
34
35
  var dialogRef = useRef(null);
35
36
  var dialogElement = usePortal('dialog');
37
+ var isCloseButtonVisible = onClose && !hideCloseButton;
36
38
  var closeDialog = useCallback(function (e) {
37
39
  if (dialogRef.current === e.target && isOpen && onClose) {
38
40
  onClose(e);
@@ -59,7 +61,7 @@ var Dialog = function Dialog(_ref3) {
59
61
  ref: dialogRef
60
62
  }, /*#__PURE__*/React.createElement(StyledDialog, _extends({
61
63
  onClose: onClose
62
- }, props), onClose && /*#__PURE__*/React.createElement(Box, {
64
+ }, props), isCloseButtonVisible && /*#__PURE__*/React.createElement(Box, {
63
65
  d: "flex",
64
66
  justifyContent: "flex-end",
65
67
  w: "100%"
@@ -74,12 +76,16 @@ Dialog.propTypes = {
74
76
  /** Control the dialog visibility. */
75
77
  isOpen: bool,
76
78
 
79
+ /** Hide the close button when onClose prop is defined. */
80
+ hideCloseButton: bool,
81
+
77
82
  /** Function to close the dialog. */
78
83
  onClose: func,
79
84
  children: node.isRequired
80
85
  };
81
86
  Dialog.defaultProps = {
82
87
  isOpen: false,
88
+ hideCloseButton: false,
83
89
  onClose: undefined
84
90
  };
85
91
  Dialog.displayName = 'Dialog';
@@ -51,4 +51,12 @@ describe('<Dialog />', function () {
51
51
  fireEvent.click(button);
52
52
  expect(onCloseMock).toHaveBeenCalledTimes(1);
53
53
  });
54
+ it('should hide the close button when hideCloseButton prop is true', function () {
55
+ render( /*#__PURE__*/React.createElement(ThemeProvider, null, /*#__PURE__*/React.createElement(Dialog, {
56
+ isOpen: true,
57
+ hideCloseButton: true,
58
+ onClose: function onClose() {}
59
+ }, /*#__PURE__*/React.createElement(Dialog.Header, null, "Title"))));
60
+ expect(screen.queryByRole('button')).toBeNull();
61
+ });
54
62
  });
@@ -5,7 +5,7 @@ function _taggedTemplateLiteralLoose(strings, raw) { if (!raw) { raw = strings.s
5
5
  import React, { forwardRef } from 'react';
6
6
  import styled from 'styled-components';
7
7
  import { Content as MenuListRoot } from '@radix-ui/react-dropdown-menu';
8
- import { node, string } from 'prop-types';
8
+ import { node, number, oneOf } from 'prop-types';
9
9
  import Box from '../../Box';
10
10
  var StyledMenuList = styled(MenuListRoot)(_templateObject || (_templateObject = _taggedTemplateLiteralLoose(["\n display: flex;\n flex-direction: column;\n align-items: center;\n ", "\n"])), function (_ref) {
11
11
  var _ref$theme$yoga = _ref.theme.yoga,
@@ -15,25 +15,43 @@ var StyledMenuList = styled(MenuListRoot)(_templateObject || (_templateObject =
15
15
  });
16
16
  var MenuList = /*#__PURE__*/forwardRef(function (_ref2, ref) {
17
17
  var children = _ref2.children,
18
- align = _ref2.align;
18
+ align = _ref2.align,
19
+ alignOffset = _ref2.alignOffset,
20
+ side = _ref2.side,
21
+ sideOffset = _ref2.sideOffset;
19
22
  return /*#__PURE__*/React.createElement(StyledMenuList, {
20
23
  asChild: true,
21
- sideOffset: 2,
22
- alignOffset: -5,
23
- align: align
24
+ side: side,
25
+ sideOffset: sideOffset,
26
+ align: align,
27
+ alignOffset: alignOffset
24
28
  }, /*#__PURE__*/React.createElement(Box, {
25
29
  as: "ul",
30
+ m: "zero",
26
31
  ref: ref
27
32
  }, children));
28
33
  });
29
34
  MenuList.propTypes = {
35
+ /** Component to be rendered inside the Menu.List container */
30
36
  children: node.isRequired,
31
37
 
32
- /** Align Menu is a alignement that menu will appear on the screen | start | center | end */
33
- align: string
38
+ /** Setup the vertical placement relative to Menu.Action component */
39
+ align: oneOf(['start', 'center', 'end']),
40
+
41
+ /** Add vertical space between the Menu.Action and the Menu.List */
42
+ alignOffset: number,
43
+
44
+ /** Setup the horizontal placement relative to Menu.Action component */
45
+ side: oneOf(['top', 'right', 'bottom', 'left']),
46
+
47
+ /** Add horizontal space between the Menu.Action and the Menu.List */
48
+ sideOffset: number
34
49
  };
35
50
  MenuList.defaultProps = {
36
- align: 'start'
51
+ align: 'start',
52
+ alignOffset: 0,
53
+ side: 'bottom',
54
+ sideOffset: 4
37
55
  };
38
56
  MenuList.displayName = 'Menu.List';
39
57
  export default MenuList;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gympass/yoga",
3
- "version": "7.43.0",
3
+ "version": "7.46.0",
4
4
  "description": "Gympass component library",
5
5
  "main": "./cjs",
6
6
  "sideEffects": false,
@@ -28,7 +28,7 @@
28
28
  "@gympass/yoga-common": "^1.1.1",
29
29
  "@gympass/yoga-helpers": "^1.0.3",
30
30
  "@gympass/yoga-icons": "^1.5.0",
31
- "@gympass/yoga-illustrations": "^0.1.1",
31
+ "@gympass/yoga-illustrations": "^0.5.0",
32
32
  "@gympass/yoga-system": "^0.10.2",
33
33
  "@gympass/yoga-tokens": "^3.1.4",
34
34
  "@ptomasroos/react-native-multi-slider": "^1.0.0",
@@ -51,7 +51,7 @@
51
51
  "react": ">=16",
52
52
  "styled-components": "^4.4.0"
53
53
  },
54
- "gitHead": "a914ea403b981de87e3e6ff7ae8553d534d69dd7",
54
+ "gitHead": "2bdf788e27df157afdb419bb89e78145ac147f07",
55
55
  "module": "./esm",
56
56
  "private": false,
57
57
  "react-native": "./cjs/index.native.js"