@gympass/yoga 7.44.0 → 7.45.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.
- package/cjs/BottomSheet/web/BottomSheet.js +5 -1
- package/cjs/BottomSheet/web/BottomSheet.test.js +15 -0
- package/cjs/Dialog/web/Dialog.js +8 -2
- package/cjs/Dialog/web/Dialog.test.js +8 -0
- package/esm/BottomSheet/web/BottomSheet.js +5 -1
- package/esm/BottomSheet/web/BottomSheet.test.js +15 -0
- package/esm/Dialog/web/Dialog.js +8 -2
- package/esm/Dialog/web/Dialog.test.js +8 -0
- package/package.json +3 -3
|
@@ -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,
|
|
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
|
});
|
package/cjs/Dialog/web/Dialog.js
CHANGED
|
@@ -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),
|
|
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
|
});
|
|
@@ -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,
|
|
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
|
});
|
package/esm/Dialog/web/Dialog.js
CHANGED
|
@@ -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),
|
|
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
|
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gympass/yoga",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.45.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.
|
|
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": "
|
|
54
|
+
"gitHead": "4e607bdc60a2d1a57338f2294debb4be08341573",
|
|
55
55
|
"module": "./esm",
|
|
56
56
|
"private": false,
|
|
57
57
|
"react-native": "./cjs/index.native.js"
|