Skip to content

Commit 29e11ee

Browse files
committed
Fixed a bug where the size prop does not work as expected with 'extra-small', 'small', 'medium', 'large'
1 parent e8a193d commit 29e11ee

File tree

7 files changed

+32
-8
lines changed

7 files changed

+32
-8
lines changed

dist/react-modal.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/react-modal.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/bundle.js

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20491,13 +20491,26 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
2049120491

2049220492
function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
2049320493

20494+
var mapSizeToStyle = function mapSizeToStyle(size) {
20495+
return {
20496+
'xs': _index2.default.xs,
20497+
'sm': _index2.default.sm,
20498+
'md': _index2.default.md,
20499+
'lg': _index2.default.lg,
20500+
'extra-small': _index2.default.xs,
20501+
'small': _index2.default.sm,
20502+
'medium': _index2.default.md,
20503+
'large': _index2.default.lg
20504+
}[size];
20505+
};
20506+
2049420507
var ModalContent = function ModalContent(_ref) {
2049520508
var className = _ref.className,
2049620509
size = _ref.size,
2049720510
props = _objectWithoutProperties(_ref, ['className', 'size']);
2049820511

2049920512
return _react2.default.createElement('div', _extends({}, props, {
20500-
className: (0, _classnames2.default)(className, _index2.default.modalContent, _index2.default[size])
20513+
className: (0, _classnames2.default)(className, _index2.default.modalContent, mapSizeToStyle(size))
2050120514
}));
2050220515
};
2050320516

@@ -21585,4 +21598,4 @@ exports.default = function (Component) {
2158521598
/***/ })
2158621599

2158721600
/******/ });
21588-
//# sourceMappingURL=bundle.js.map?6a3b71b90cc56bdeeff3
21601+
//# sourceMappingURL=bundle.js.map?236fcad81b67ac2c0fcc

docs/bundle.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@
4242
</nav>
4343
<div id="container"></div>
4444
<script src="https://cdn.polyfill.io/v2/polyfill.min.js"></script>
45-
<script type="text/javascript" src="bundle.js?6a3b71b90cc56bdeeff3"></script></body>
45+
<script type="text/javascript" src="bundle.js?236fcad81b67ac2c0fcc"></script></body>
4646
</html>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@trendmicro/react-modal",
3-
"version": "2.0.4",
3+
"version": "2.0.5",
44
"description": "React Modal component",
55
"main": "lib/index.js",
66
"files": [

src/ModalContent.jsx

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,24 @@ import PropTypes from 'prop-types';
33
import React from 'react';
44
import styles from './index.styl';
55

6+
const mapSizeToStyle = (size) => ({
7+
'xs': styles.xs,
8+
'sm': styles.sm,
9+
'md': styles.md,
10+
'lg': styles.lg,
11+
'extra-small': styles.xs,
12+
'small': styles.sm,
13+
'medium': styles.md,
14+
'large': styles.lg
15+
}[size]);
16+
617
const ModalContent = ({ className, size, ...props }) => (
718
<div
819
{...props}
920
className={cx(
1021
className,
1122
styles.modalContent,
12-
styles[size]
23+
mapSizeToStyle(size)
1324
)}
1425
/>
1526
);

0 commit comments

Comments
 (0)