@panneau/modal-dialog 2.0.59 → 2.0.67

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.
Files changed (3) hide show
  1. package/es/index.js +8 -17
  2. package/lib/index.js +9 -17
  3. package/package.json +4 -3
package/es/index.js CHANGED
@@ -3,6 +3,8 @@ import classNames from 'classnames';
3
3
  import PropTypes$1 from 'prop-types';
4
4
  import React from 'react';
5
5
  import { PropTypes } from '@panneau/core';
6
+ import { isMessage } from '@panneau/core/utils';
7
+ import Button from '@panneau/element-button';
6
8
  import Buttons from '@panneau/element-buttons';
7
9
  import Label from '@panneau/element-label';
8
10
  import Modal from '@panneau/element-modal';
@@ -15,7 +17,6 @@ var propTypes = {
15
17
  children: PropTypes$1.node,
16
18
  footer: PropTypes$1.node,
17
19
  buttons: PropTypes.buttons,
18
- // theme: PropTypes.oneOf([null, 'dark', 'light']),
19
20
  onClickClose: PropTypes$1.func,
20
21
  className: PropTypes$1.string
21
22
  };
@@ -25,7 +26,6 @@ var defaultProps = {
25
26
  children: null,
26
27
  footer: null,
27
28
  buttons: null,
28
- // theme: 'dark',
29
29
  onClickClose: null,
30
30
  className: null
31
31
  };
@@ -43,25 +43,16 @@ var ModalDialog = function ModalDialog(_ref) {
43
43
  }, /*#__PURE__*/React.createElement("div", {
44
44
  className: "modal-content"
45
45
  }, header || /*#__PURE__*/React.createElement("div", {
46
- className: classNames(['modal-header', styles.header, {
47
- // 'bg-dark': theme === 'dark',
48
- // 'border-dark': theme === 'dark',
49
- // 'text-light': theme === 'dark',
50
- }])
46
+ className: classNames(['modal-header', styles.header])
51
47
  }, /*#__PURE__*/React.createElement("h5", {
52
- className: "modal-title"
53
- }, /*#__PURE__*/React.createElement(Label, null, title)), /*#__PURE__*/React.createElement("button", {
48
+ className: "modal-title pe-2"
49
+ }, isMessage ? /*#__PURE__*/React.createElement(Label, null, title) : title), /*#__PURE__*/React.createElement(Button, {
54
50
  type: "button",
55
- className: "btn btn-secondary close text-light",
51
+ className: "btn-close close",
56
52
  "aria-label": "Close",
57
53
  onClick: onClickClose
58
- }, /*#__PURE__*/React.createElement("span", {
59
- "aria-hidden": "true"
60
- }, "\xD7"))), /*#__PURE__*/React.createElement("div", {
61
- className: classNames(['modal-body', styles.body, {
62
- // [`bg-${theme}`]: theme !== null,
63
- // 'text-light': theme === 'dark',
64
- }])
54
+ })), /*#__PURE__*/React.createElement("div", {
55
+ className: classNames(['modal-body', styles.body])
65
56
  }, children), footer !== null || buttons !== null ? /*#__PURE__*/React.createElement("div", {
66
57
  className: classNames(['modal-footer', styles.footer])
67
58
  }, footer, buttons !== null ? /*#__PURE__*/React.createElement(Buttons, {
package/lib/index.js CHANGED
@@ -7,6 +7,8 @@ var classNames = require('classnames');
7
7
  var PropTypes = require('prop-types');
8
8
  var React = require('react');
9
9
  var core = require('@panneau/core');
10
+ var utils = require('@panneau/core/utils');
11
+ var Button = require('@panneau/element-button');
10
12
  var Buttons = require('@panneau/element-buttons');
11
13
  var Label = require('@panneau/element-label');
12
14
  var Modal = require('@panneau/element-modal');
@@ -17,6 +19,7 @@ var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_definePropert
17
19
  var classNames__default = /*#__PURE__*/_interopDefaultLegacy(classNames);
18
20
  var PropTypes__default = /*#__PURE__*/_interopDefaultLegacy(PropTypes);
19
21
  var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
22
+ var Button__default = /*#__PURE__*/_interopDefaultLegacy(Button);
20
23
  var Buttons__default = /*#__PURE__*/_interopDefaultLegacy(Buttons);
21
24
  var Label__default = /*#__PURE__*/_interopDefaultLegacy(Label);
22
25
  var Modal__default = /*#__PURE__*/_interopDefaultLegacy(Modal);
@@ -29,7 +32,6 @@ var propTypes = {
29
32
  children: PropTypes__default["default"].node,
30
33
  footer: PropTypes__default["default"].node,
31
34
  buttons: core.PropTypes.buttons,
32
- // theme: PropTypes.oneOf([null, 'dark', 'light']),
33
35
  onClickClose: PropTypes__default["default"].func,
34
36
  className: PropTypes__default["default"].string
35
37
  };
@@ -39,7 +41,6 @@ var defaultProps = {
39
41
  children: null,
40
42
  footer: null,
41
43
  buttons: null,
42
- // theme: 'dark',
43
44
  onClickClose: null,
44
45
  className: null
45
46
  };
@@ -57,25 +58,16 @@ var ModalDialog = function ModalDialog(_ref) {
57
58
  }, /*#__PURE__*/React__default["default"].createElement("div", {
58
59
  className: "modal-content"
59
60
  }, header || /*#__PURE__*/React__default["default"].createElement("div", {
60
- className: classNames__default["default"](['modal-header', styles.header, {
61
- // 'bg-dark': theme === 'dark',
62
- // 'border-dark': theme === 'dark',
63
- // 'text-light': theme === 'dark',
64
- }])
61
+ className: classNames__default["default"](['modal-header', styles.header])
65
62
  }, /*#__PURE__*/React__default["default"].createElement("h5", {
66
- className: "modal-title"
67
- }, /*#__PURE__*/React__default["default"].createElement(Label__default["default"], null, title)), /*#__PURE__*/React__default["default"].createElement("button", {
63
+ className: "modal-title pe-2"
64
+ }, utils.isMessage ? /*#__PURE__*/React__default["default"].createElement(Label__default["default"], null, title) : title), /*#__PURE__*/React__default["default"].createElement(Button__default["default"], {
68
65
  type: "button",
69
- className: "btn btn-secondary close text-light",
66
+ className: "btn-close close",
70
67
  "aria-label": "Close",
71
68
  onClick: onClickClose
72
- }, /*#__PURE__*/React__default["default"].createElement("span", {
73
- "aria-hidden": "true"
74
- }, "\xD7"))), /*#__PURE__*/React__default["default"].createElement("div", {
75
- className: classNames__default["default"](['modal-body', styles.body, {
76
- // [`bg-${theme}`]: theme !== null,
77
- // 'text-light': theme === 'dark',
78
- }])
69
+ })), /*#__PURE__*/React__default["default"].createElement("div", {
70
+ className: classNames__default["default"](['modal-body', styles.body])
79
71
  }, children), footer !== null || buttons !== null ? /*#__PURE__*/React__default["default"].createElement("div", {
80
72
  className: classNames__default["default"](['modal-footer', styles.footer])
81
73
  }, footer, buttons !== null ? /*#__PURE__*/React__default["default"].createElement(Buttons__default["default"], {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@panneau/modal-dialog",
3
- "version": "2.0.59",
3
+ "version": "2.0.67",
4
4
  "description": "Default modal",
5
5
  "keywords": [
6
6
  "javascript"
@@ -54,9 +54,10 @@
54
54
  "dependencies": {
55
55
  "@babel/runtime": "^7.12.5",
56
56
  "@panneau/core": "^2.0.58",
57
+ "@panneau/element-button": "^2.0.59",
57
58
  "@panneau/element-buttons": "^2.0.59",
58
59
  "@panneau/element-label": "^2.0.58",
59
- "@panneau/element-modal": "^2.0.59",
60
+ "@panneau/element-modal": "^2.0.67",
60
61
  "@panneau/themes": "^2.0.58",
61
62
  "classnames": "^2.2.6",
62
63
  "lodash": "^4.17.21",
@@ -66,5 +67,5 @@
66
67
  "publishConfig": {
67
68
  "access": "public"
68
69
  },
69
- "gitHead": "c25e7992dd528293d08ca7de09bcda5ab93f9b43"
70
+ "gitHead": "ac972a8e66c405de1c4d4606d347f3a3f1e839e8"
70
71
  }