glints-aries 4.0.340 → 4.0.341
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/es/@next/Bar/Bar.js +13 -3
- package/lib/@next/Bar/Bar.js +13 -3
- package/package.json +1 -1
package/es/@next/Bar/Bar.js
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import _extends from "@babel/runtime/helpers/extends";
|
|
2
|
+
import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
|
|
3
|
+
var _excluded = ["onClick", "action"];
|
|
2
4
|
import React from 'react';
|
|
3
5
|
import { Breakpoints, Colors } from '..';
|
|
4
6
|
import { Button, PrimaryButton } from '../Button';
|
|
@@ -40,6 +42,14 @@ export var Bar = /*#__PURE__*/React.forwardRef(function Bar(_ref, ref) {
|
|
|
40
42
|
width = _useWindowSize.width;
|
|
41
43
|
var breakpointWidth = parseInt(Breakpoints.large.slice(0, -2));
|
|
42
44
|
var buttonSize = width <= breakpointWidth ? 'default' : 'large';
|
|
45
|
+
function makeButtonProps(buttonAction) {
|
|
46
|
+
var onClick = buttonAction.onClick,
|
|
47
|
+
action = buttonAction.action,
|
|
48
|
+
otherProps = _objectWithoutPropertiesLoose(buttonAction, _excluded);
|
|
49
|
+
return _extends({
|
|
50
|
+
onClick: onClick || action
|
|
51
|
+
}, otherProps);
|
|
52
|
+
}
|
|
43
53
|
return /*#__PURE__*/React.createElement(StyledBar, {
|
|
44
54
|
"data-align": position,
|
|
45
55
|
ref: ref
|
|
@@ -47,11 +57,11 @@ export var Bar = /*#__PURE__*/React.forwardRef(function Bar(_ref, ref) {
|
|
|
47
57
|
onClick: onBack
|
|
48
58
|
}, /*#__PURE__*/React.createElement(Icon, {
|
|
49
59
|
name: "ri-arrow-left-line"
|
|
50
|
-
})), /*#__PURE__*/React.createElement(StyledBarHeaderWrapper, null, headerMarkup(), " "), /*#__PURE__*/React.createElement(StyledBarActionWrapper, null, customActionGroup ? customActionGroup : /*#__PURE__*/React.createElement(ButtonGroup, null, tertiaryAction && /*#__PURE__*/React.createElement(Button, _extends({}, tertiaryAction, {
|
|
60
|
+
})), /*#__PURE__*/React.createElement(StyledBarHeaderWrapper, null, headerMarkup(), " "), /*#__PURE__*/React.createElement(StyledBarActionWrapper, null, customActionGroup ? customActionGroup : /*#__PURE__*/React.createElement(ButtonGroup, null, tertiaryAction && /*#__PURE__*/React.createElement(Button, _extends({}, makeButtonProps(tertiaryAction), {
|
|
51
61
|
size: buttonSize
|
|
52
|
-
}), tertiaryAction.label), secondaryAction && /*#__PURE__*/React.createElement(Button, _extends({}, secondaryAction, {
|
|
62
|
+
}), tertiaryAction.label), secondaryAction && /*#__PURE__*/React.createElement(Button, _extends({}, makeButtonProps(secondaryAction), {
|
|
53
63
|
size: buttonSize
|
|
54
|
-
}), secondaryAction.label), primaryAction && /*#__PURE__*/React.createElement(PrimaryButton, _extends({}, primaryAction, {
|
|
64
|
+
}), secondaryAction.label), primaryAction && /*#__PURE__*/React.createElement(PrimaryButton, _extends({}, makeButtonProps(primaryAction), {
|
|
55
65
|
size: buttonSize
|
|
56
66
|
}), primaryAction.label)))));
|
|
57
67
|
});
|
package/lib/@next/Bar/Bar.js
CHANGED
|
@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
4
4
|
exports.__esModule = true;
|
|
5
5
|
exports.Bar = void 0;
|
|
6
6
|
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
7
|
+
var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
|
|
7
8
|
var _react = _interopRequireDefault(require("react"));
|
|
8
9
|
var _ = require("..");
|
|
9
10
|
var _Button = require("../Button");
|
|
@@ -12,6 +13,7 @@ var _Icon = require("../Icon");
|
|
|
12
13
|
var _Typography = require("../Typography");
|
|
13
14
|
var _BarStyle = require("./BarStyle");
|
|
14
15
|
var _useWindowSize2 = require("./useWindowSize");
|
|
16
|
+
var _excluded = ["onClick", "action"];
|
|
15
17
|
var Bar = /*#__PURE__*/_react["default"].forwardRef(function Bar(_ref, ref) {
|
|
16
18
|
var heading = _ref.heading,
|
|
17
19
|
subheading = _ref.subheading,
|
|
@@ -45,6 +47,14 @@ var Bar = /*#__PURE__*/_react["default"].forwardRef(function Bar(_ref, ref) {
|
|
|
45
47
|
width = _useWindowSize.width;
|
|
46
48
|
var breakpointWidth = parseInt(_.Breakpoints.large.slice(0, -2));
|
|
47
49
|
var buttonSize = width <= breakpointWidth ? 'default' : 'large';
|
|
50
|
+
function makeButtonProps(buttonAction) {
|
|
51
|
+
var onClick = buttonAction.onClick,
|
|
52
|
+
action = buttonAction.action,
|
|
53
|
+
otherProps = (0, _objectWithoutPropertiesLoose2["default"])(buttonAction, _excluded);
|
|
54
|
+
return (0, _extends2["default"])({
|
|
55
|
+
onClick: onClick || action
|
|
56
|
+
}, otherProps);
|
|
57
|
+
}
|
|
48
58
|
return /*#__PURE__*/_react["default"].createElement(_BarStyle.StyledBar, {
|
|
49
59
|
"data-align": position,
|
|
50
60
|
ref: ref
|
|
@@ -52,11 +62,11 @@ var Bar = /*#__PURE__*/_react["default"].forwardRef(function Bar(_ref, ref) {
|
|
|
52
62
|
onClick: onBack
|
|
53
63
|
}, /*#__PURE__*/_react["default"].createElement(_Icon.Icon, {
|
|
54
64
|
name: "ri-arrow-left-line"
|
|
55
|
-
})), /*#__PURE__*/_react["default"].createElement(_BarStyle.StyledBarHeaderWrapper, null, headerMarkup(), " "), /*#__PURE__*/_react["default"].createElement(_BarStyle.StyledBarActionWrapper, null, customActionGroup ? customActionGroup : /*#__PURE__*/_react["default"].createElement(_ButtonGroup.ButtonGroup, null, tertiaryAction && /*#__PURE__*/_react["default"].createElement(_Button.Button, (0, _extends2["default"])({}, tertiaryAction, {
|
|
65
|
+
})), /*#__PURE__*/_react["default"].createElement(_BarStyle.StyledBarHeaderWrapper, null, headerMarkup(), " "), /*#__PURE__*/_react["default"].createElement(_BarStyle.StyledBarActionWrapper, null, customActionGroup ? customActionGroup : /*#__PURE__*/_react["default"].createElement(_ButtonGroup.ButtonGroup, null, tertiaryAction && /*#__PURE__*/_react["default"].createElement(_Button.Button, (0, _extends2["default"])({}, makeButtonProps(tertiaryAction), {
|
|
56
66
|
size: buttonSize
|
|
57
|
-
}), tertiaryAction.label), secondaryAction && /*#__PURE__*/_react["default"].createElement(_Button.Button, (0, _extends2["default"])({}, secondaryAction, {
|
|
67
|
+
}), tertiaryAction.label), secondaryAction && /*#__PURE__*/_react["default"].createElement(_Button.Button, (0, _extends2["default"])({}, makeButtonProps(secondaryAction), {
|
|
58
68
|
size: buttonSize
|
|
59
|
-
}), secondaryAction.label), primaryAction && /*#__PURE__*/_react["default"].createElement(_Button.PrimaryButton, (0, _extends2["default"])({}, primaryAction, {
|
|
69
|
+
}), secondaryAction.label), primaryAction && /*#__PURE__*/_react["default"].createElement(_Button.PrimaryButton, (0, _extends2["default"])({}, makeButtonProps(primaryAction), {
|
|
60
70
|
size: buttonSize
|
|
61
71
|
}), primaryAction.label)))));
|
|
62
72
|
});
|