@canonical/react-components 2.7.3 → 2.7.5

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 (7) hide show
  1. package/dist/components/ActionButton/ActionButton.js +27 -5
  2. package/dist/components/ConfirmationModal/ConfirmationModal.js +2 -0
  3. package/dist/components/Modal/Modal.js +1 -0
  4. package/dist/esm/components/ActionButton/ActionButton.js +27 -5
  5. package/dist/esm/components/ConfirmationModal/ConfirmationModal.js +2 -0
  6. package/dist/esm/components/Modal/Modal.js +1 -0
  7. package/package.json +1 -1
package/dist/components/ActionButton/ActionButton.js CHANGED
@@ -30,7 +30,7 @@ const ActionButton = _ref => {
30
30
  appearance,
31
31
  children,
32
32
  className,
33
- disabled = false,
33
+ disabled = null,
34
34
  inline = false,
35
35
  loading = false,
36
36
  success = false,
@@ -41,11 +41,18 @@ const ActionButton = _ref => {
41
41
  const [showLoader, setShowLoader] = (0, _react.useState)(false);
42
42
  const [showSuccess, setShowSuccess] = (0, _react.useState)(false);
43
43
  const ref = (0, _react.useRef)(null);
44
+ const startLoadTime = (0, _react.useRef)(undefined);
44
45
 
45
46
  // Set up loader timer
46
47
  (0, _react.useEffect)(() => {
47
48
  let loaderTimeout;
48
49
  if (loading) {
50
+ // add a condition to prevent double set startLoadTime
51
+ // when showLoader changes.
52
+ if (startLoadTime.current === undefined) {
53
+ // Keep track of the time when loading starts
54
+ startLoadTime.current = new Date();
55
+ }
49
56
  // Explicitly set button dimensions
50
57
  if (ref.current && !!ref.current.getBoundingClientRect()) {
51
58
  setHeight(ref.current.getBoundingClientRect().height);
@@ -54,12 +61,27 @@ const ActionButton = _ref => {
54
61
  setShowLoader(true);
55
62
  }
56
63
  if (!loading && showLoader) {
57
- loaderTimeout = window.setTimeout(() => {
64
+ var _startLoadTime$curren;
65
+ const now = new Date();
66
+ // calculate elapsed loading time
67
+ const loadingMilliseconds = now.getTime() - ((_startLoadTime$curren = startLoadTime.current) !== null && _startLoadTime$curren !== void 0 ? _startLoadTime$curren : now).getTime();
68
+
69
+ // and subtract it from LOADER_MIN_DURATION,
70
+
71
+ // also add an edge case when time diff is less than 0 to be 0.
72
+ const timeoutDuration = Math.max(LOADER_MIN_DURATION - loadingMilliseconds, 0);
73
+ const loadFinishHandler = () => {
74
+ startLoadTime.current = undefined;
58
75
  setShowLoader(false);
59
76
  if (success) {
60
77
  setShowSuccess(true);
61
78
  }
62
- }, LOADER_MIN_DURATION);
79
+ };
80
+ if (timeoutDuration > 0) {
81
+ loaderTimeout = window.setTimeout(loadFinishHandler, timeoutDuration);
82
+ } else {
83
+ loadFinishHandler();
84
+ }
63
85
  }
64
86
  if (!loading && !showLoader) {
65
87
  setHeight(null);
@@ -82,7 +104,7 @@ const ActionButton = _ref => {
82
104
  }, [showSuccess]);
83
105
  const buttonClasses = (0, _classnames.default)(className, "p-action-button", appearance ? "p-button--".concat(appearance) : "p-button", {
84
106
  "is-processing": showLoader || showSuccess,
85
- "is-disabled": disabled,
107
+ "is-disabled": disabled === null ? showLoader : disabled,
86
108
  "is-inline": inline
87
109
  });
88
110
  const showIcon = showLoader || showSuccess;
@@ -95,7 +117,7 @@ const ActionButton = _ref => {
95
117
  // typescript generics.
96
118
  return /*#__PURE__*/_react.default.createElement("button", _extends({
97
119
  className: buttonClasses,
98
- disabled: disabled,
120
+ disabled: disabled === null ? showLoader : disabled,
99
121
  ref: ref,
100
122
  style: height && width ? {
101
123
  height: "".concat(height, "px"),
package/dist/components/ConfirmationModal/ConfirmationModal.js CHANGED
@@ -14,6 +14,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
14
14
  * `ConfirmationModal` is a specialised version of the [Modal](?path=/docs/modal--default-story) component to prompt a confirmation from the user before executing an action.
15
15
  */
16
16
  const ConfirmationModal = _ref => {
17
+ var _cancelButtonProps$ty;
17
18
  let {
18
19
  cancelButtonLabel = "Cancel",
19
20
  cancelButtonProps,
@@ -37,6 +38,7 @@ const ConfirmationModal = _ref => {
37
38
  };
38
39
  return /*#__PURE__*/_react.default.createElement(_Modal.default, _extends({
39
40
  buttonRow: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, confirmExtra, /*#__PURE__*/_react.default.createElement(_Button.default, _extends({}, cancelButtonProps, {
41
+ type: (_cancelButtonProps$ty = cancelButtonProps === null || cancelButtonProps === void 0 ? void 0 : cancelButtonProps.type) !== null && _cancelButtonProps$ty !== void 0 ? _cancelButtonProps$ty : "button",
40
42
  className: "u-no-margin--bottom",
41
43
  onClick: handleClick(props.close)
42
44
  }), cancelButtonLabel), /*#__PURE__*/_react.default.createElement(_ActionButton.default, _extends({}, confirmButtonProps, {
package/dist/components/Modal/Modal.js CHANGED
@@ -130,6 +130,7 @@ const Modal = _ref => {
130
130
  className: "p-modal__title",
131
131
  id: titleId
132
132
  }, title), !!close && /*#__PURE__*/_react.default.createElement("button", {
133
+ type: "button",
133
134
  className: "p-modal__close",
134
135
  "aria-label": "Close active modal",
135
136
  onClick: handleClose
package/dist/esm/components/ActionButton/ActionButton.js CHANGED
@@ -25,7 +25,7 @@ var ActionButton = _ref => {
25
25
  appearance,
26
26
  children,
27
27
  className,
28
- disabled = false,
28
+ disabled = null,
29
29
  inline = false,
30
30
  loading = false,
31
31
  success = false
@@ -36,11 +36,18 @@ var ActionButton = _ref => {
36
36
  var [showLoader, setShowLoader] = useState(false);
37
37
  var [showSuccess, setShowSuccess] = useState(false);
38
38
  var ref = useRef(null);
39
+ var startLoadTime = useRef(undefined);
39
40
 
40
41
  // Set up loader timer
41
42
  useEffect(() => {
42
43
  var loaderTimeout;
43
44
  if (loading) {
45
+ // add a condition to prevent double set startLoadTime
46
+ // when showLoader changes.
47
+ if (startLoadTime.current === undefined) {
48
+ // Keep track of the time when loading starts
49
+ startLoadTime.current = new Date();
50
+ }
44
51
  // Explicitly set button dimensions
45
52
  if (ref.current && !!ref.current.getBoundingClientRect()) {
46
53
  setHeight(ref.current.getBoundingClientRect().height);
@@ -49,12 +56,27 @@ var ActionButton = _ref => {
49
56
  setShowLoader(true);
50
57
  }
51
58
  if (!loading && showLoader) {
52
- loaderTimeout = window.setTimeout(() => {
59
+ var _startLoadTime$curren;
60
+ var now = new Date();
61
+ // calculate elapsed loading time
62
+ var loadingMilliseconds = now.getTime() - ((_startLoadTime$curren = startLoadTime.current) !== null && _startLoadTime$curren !== void 0 ? _startLoadTime$curren : now).getTime();
63
+
64
+ // and subtract it from LOADER_MIN_DURATION,
65
+
66
+ // also add an edge case when time diff is less than 0 to be 0.
67
+ var timeoutDuration = Math.max(LOADER_MIN_DURATION - loadingMilliseconds, 0);
68
+ var loadFinishHandler = () => {
69
+ startLoadTime.current = undefined;
53
70
  setShowLoader(false);
54
71
  if (success) {
55
72
  setShowSuccess(true);
56
73
  }
57
- }, LOADER_MIN_DURATION);
74
+ };
75
+ if (timeoutDuration > 0) {
76
+ loaderTimeout = window.setTimeout(loadFinishHandler, timeoutDuration);
77
+ } else {
78
+ loadFinishHandler();
79
+ }
58
80
  }
59
81
  if (!loading && !showLoader) {
60
82
  setHeight(null);
@@ -77,7 +99,7 @@ var ActionButton = _ref => {
77
99
  }, [showSuccess]);
78
100
  var buttonClasses = classNames(className, "p-action-button", appearance ? "p-button--".concat(appearance) : "p-button", {
79
101
  "is-processing": showLoader || showSuccess,
80
- "is-disabled": disabled,
102
+ "is-disabled": disabled === null ? showLoader : disabled,
81
103
  "is-inline": inline
82
104
  });
83
105
  var showIcon = showLoader || showSuccess;
@@ -90,7 +112,7 @@ var ActionButton = _ref => {
90
112
  // typescript generics.
91
113
  return /*#__PURE__*/React.createElement("button", _extends({
92
114
  className: buttonClasses,
93
- disabled: disabled,
115
+ disabled: disabled === null ? showLoader : disabled,
94
116
  ref: ref,
95
117
  style: height && width ? {
96
118
  height: "".concat(height, "px"),
package/dist/esm/components/ConfirmationModal/ConfirmationModal.js CHANGED
@@ -10,6 +10,7 @@ import ActionButton from "../ActionButton";
10
10
  * `ConfirmationModal` is a specialised version of the [Modal](?path=/docs/modal--default-story) component to prompt a confirmation from the user before executing an action.
11
11
  */
12
12
  export var ConfirmationModal = _ref => {
13
+ var _cancelButtonProps$ty;
13
14
  var {
14
15
  cancelButtonLabel = "Cancel",
15
16
  cancelButtonProps,
@@ -33,6 +34,7 @@ export var ConfirmationModal = _ref => {
33
34
  };
34
35
  return /*#__PURE__*/React.createElement(Modal, _extends({
35
36
  buttonRow: /*#__PURE__*/React.createElement(React.Fragment, null, confirmExtra, /*#__PURE__*/React.createElement(Button, _extends({}, cancelButtonProps, {
37
+ type: (_cancelButtonProps$ty = cancelButtonProps === null || cancelButtonProps === void 0 ? void 0 : cancelButtonProps.type) !== null && _cancelButtonProps$ty !== void 0 ? _cancelButtonProps$ty : "button",
36
38
  className: "u-no-margin--bottom",
37
39
  onClick: handleClick(props.close)
38
40
  }), cancelButtonLabel), /*#__PURE__*/React.createElement(ActionButton, _extends({}, confirmButtonProps, {
package/dist/esm/components/Modal/Modal.js CHANGED
@@ -124,6 +124,7 @@ export var Modal = _ref => {
124
124
  className: "p-modal__title",
125
125
  id: titleId
126
126
  }, title), !!close && /*#__PURE__*/React.createElement("button", {
127
+ type: "button",
127
128
  className: "p-modal__close",
128
129
  "aria-label": "Close active modal",
129
130
  onClick: handleClose
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@canonical/react-components",
3
- "version": "2.7.3",
3
+ "version": "2.7.5",
4
4
  "main": "dist/index.js",
5
5
  "module": "dist/index.js",
6
6
  "author": {