contentoh-components-library 21.1.70 → 21.1.73

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 (5) hide show
  1. package/dist/components/organisms/VersionSelector/index.js +8 -16
  2. package/dist/global-files/customHooks.js +12 -8
  3. package/package.json +1 -1
  4. package/src/components/organisms/VersionSelector/index.js +8 -3
  5. package/src/global-files/customHooks.js +15 -13
package/dist/components/organisms/VersionSelector/index.js CHANGED
@@ -43,7 +43,7 @@ var VersionSelector = function VersionSelector(_ref) {
43
43
  currentVersion = _ref.currentVersion,
44
44
  setShowCreateVersion = _ref.setShowCreateVersion;
45
45
 
46
- var _useState = (0, _react.useState)(),
46
+ var _useState = (0, _react.useState)([]),
47
47
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
48
48
  versions = _useState2[0],
49
49
  setVersions = _useState2[1];
@@ -84,21 +84,13 @@ var VersionSelector = function VersionSelector(_ref) {
84
84
  };
85
85
  }();
86
86
 
87
- (0, _react.useEffect)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
88
- return _regenerator.default.wrap(function _callee2$(_context2) {
89
- while (1) {
90
- switch (_context2.prev = _context2.next) {
91
- case 0:
92
- _context2.next = 2;
93
- return loadProductVersions(articleId);
94
-
95
- case 2:
96
- case "end":
97
- return _context2.stop();
98
- }
99
- }
100
- }, _callee2);
101
- })), []);
87
+ (0, _react.useEffect)(function () {
88
+ loadProductVersions(articleId);
89
+ return function () {
90
+ setVersions([]);
91
+ setShowCreateVersion(false);
92
+ };
93
+ }, []);
102
94
  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_styles.Container, {
103
95
  id: modalId,
104
96
  children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
package/dist/global-files/customHooks.js CHANGED
@@ -17,17 +17,21 @@ var closeModals = function closeModals(id) {
17
17
  showModal = _useState2[0],
18
18
  setShowModal = _useState2[1];
19
19
 
20
- (0, _react.useEffect)(function () {
21
- var closeModal = function closeModal(e) {
22
- if ((!e.target.closest("#".concat(id)) || e.target.closest("#close-button") || e.target.closest("#add-version")) && showModal) {
23
- document.removeEventListener("click", closeModal);
24
- setShowModal(false);
25
- }
26
- };
20
+ var closeModal = function closeModal(e) {
21
+ if ((!e.target.closest("#".concat(id)) || e.target.closest("#close-button") || e.target.closest("#add-version")) && showModal) {
22
+ document.removeEventListener("click", closeModal, false);
23
+ setShowModal(false);
24
+ }
25
+ };
27
26
 
27
+ (0, _react.useEffect)(function () {
28
28
  if (showModal) {
29
- document.addEventListener("click", closeModal);
29
+ document.addEventListener("click", closeModal, false);
30
30
  }
31
+
32
+ return function () {
33
+ document.removeEventListener("click", closeModal, false);
34
+ };
31
35
  }, [showModal]);
32
36
  return [showModal, setShowModal];
33
37
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "contentoh-components-library",
3
- "version": "21.1.70",
3
+ "version": "21.1.73",
4
4
  "dependencies": {
5
5
  "@aws-amplify/auth": "^4.5.3",
6
6
  "@aws-amplify/datastore": "^3.11.0",
package/src/components/organisms/VersionSelector/index.js CHANGED
@@ -17,7 +17,7 @@ export const VersionSelector = ({
17
17
  currentVersion,
18
18
  setShowCreateVersion,
19
19
  }) => {
20
- const [versions, setVersions] = useState();
20
+ const [versions, setVersions] = useState([]);
21
21
 
22
22
  const loadProductVersions = async (articleId) => {
23
23
  try {
@@ -32,8 +32,13 @@ export const VersionSelector = ({
32
32
  }
33
33
  };
34
34
 
35
- useEffect(async () => {
36
- await loadProductVersions(articleId);
35
+ useEffect(() => {
36
+ loadProductVersions(articleId);
37
+
38
+ return () => {
39
+ setVersions([]);
40
+ setShowCreateVersion(false);
41
+ };
37
42
  }, []);
38
43
 
39
44
  return (
package/src/global-files/customHooks.js CHANGED
@@ -4,22 +4,24 @@ import { useEffect } from "react";
4
4
  export const closeModals = (id) => {
5
5
  const [showModal, setShowModal] = useState(false);
6
6
 
7
+ const closeModal = (e) => {
8
+ if (
9
+ (!e.target.closest(`#${id}`) ||
10
+ e.target.closest("#close-button") ||
11
+ e.target.closest("#add-version")) &&
12
+ showModal
13
+ ) {
14
+ document.removeEventListener("click", closeModal, false);
15
+ setShowModal(false);
16
+ }
17
+ };
7
18
  useEffect(() => {
8
- const closeModal = (e) => {
9
- if (
10
- (!e.target.closest(`#${id}`) ||
11
- e.target.closest("#close-button") ||
12
- e.target.closest("#add-version")) &&
13
- showModal
14
- ) {
15
- document.removeEventListener("click", closeModal);
16
- setShowModal(false);
17
- }
18
- };
19
-
20
19
  if (showModal) {
21
- document.addEventListener("click", closeModal);
20
+ document.addEventListener("click", closeModal, false);
22
21
  }
22
+ return () => {
23
+ document.removeEventListener("click", closeModal, false);
24
+ };
23
25
  }, [showModal]);
24
26
 
25
27
  return [showModal, setShowModal];