@citygross/components 0.13.11 → 0.13.13

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/build/cjs/components/src/components/Accordion/Accordion.js +20 -11
  2. package/build/cjs/components/src/components/Accordion/Accordion.js.map +1 -1
  3. package/build/es/components/src/components/Accordion/Accordion.js +20 -11
  4. package/build/es/components/src/components/Accordion/Accordion.js.map +1 -1
  5. package/package.json +3 -3
package/build/cjs/components/src/components/Accordion/Accordion.js CHANGED
@@ -22,26 +22,34 @@ var Accordion = function (_a) {
22
22
  var contentRef = React.useRef(null);
23
23
  var headerId = "".concat(id, "-header");
24
24
  var contentId = "".concat(id, "-content");
25
+ var measureContent = function () {
26
+ if (contentRef.current) {
27
+ setContentHeight(contentRef.current.scrollHeight);
28
+ }
29
+ };
25
30
  React.useLayoutEffect(function () {
26
- if (!contentRef.current)
31
+ if (!contentRef.current || !isOpen)
27
32
  return;
28
- var measure = function () {
29
- if (contentRef.current) {
30
- setContentHeight(contentRef.current.scrollHeight);
31
- }
32
- };
33
- measure();
33
+ measureContent();
34
34
  if (typeof ResizeObserver === 'undefined')
35
35
  return;
36
- var observer = new ResizeObserver(measure);
36
+ var observer = new ResizeObserver(measureContent);
37
37
  observer.observe(contentRef.current);
38
38
  return function () { return observer.disconnect(); };
39
- }, [children]);
39
+ }, [children, isOpen]);
40
40
  React.useEffect(function () {
41
- if (isOpen) {
41
+ if (isOpen)
42
42
  setIsCollapsed(false);
43
- }
44
43
  }, [isOpen]);
44
+ React.useEffect(function () {
45
+ if (defaultOpen) {
46
+ measureContent();
47
+ setIsCollapsed(false);
48
+ setIsOpen(true);
49
+ }
50
+ else if (isOpen)
51
+ setIsOpen(false);
52
+ }, [defaultOpen]);
45
53
  return (React__default["default"].createElement(Accordion_styles.Container, null,
46
54
  React__default["default"].createElement(Accordion_styles.Header, { "aria-controls": contentId, "aria-expanded": isOpen, id: headerId, onClick: function () {
47
55
  if (isOpen) {
@@ -49,6 +57,7 @@ var Accordion = function (_a) {
49
57
  onToggle === null || onToggle === void 0 ? void 0 : onToggle(false);
50
58
  return;
51
59
  }
60
+ measureContent();
52
61
  setIsCollapsed(false);
53
62
  setIsOpen(true);
54
63
  onToggle === null || onToggle === void 0 ? void 0 : onToggle(true);
package/build/cjs/components/src/components/Accordion/Accordion.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Accordion.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
1
+ {"version":3,"file":"Accordion.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
package/build/es/components/src/components/Accordion/Accordion.js CHANGED
@@ -14,26 +14,34 @@ var Accordion = function (_a) {
14
14
  var contentRef = useRef(null);
15
15
  var headerId = "".concat(id, "-header");
16
16
  var contentId = "".concat(id, "-content");
17
+ var measureContent = function () {
18
+ if (contentRef.current) {
19
+ setContentHeight(contentRef.current.scrollHeight);
20
+ }
21
+ };
17
22
  useLayoutEffect(function () {
18
- if (!contentRef.current)
23
+ if (!contentRef.current || !isOpen)
19
24
  return;
20
- var measure = function () {
21
- if (contentRef.current) {
22
- setContentHeight(contentRef.current.scrollHeight);
23
- }
24
- };
25
- measure();
25
+ measureContent();
26
26
  if (typeof ResizeObserver === 'undefined')
27
27
  return;
28
- var observer = new ResizeObserver(measure);
28
+ var observer = new ResizeObserver(measureContent);
29
29
  observer.observe(contentRef.current);
30
30
  return function () { return observer.disconnect(); };
31
- }, [children]);
31
+ }, [children, isOpen]);
32
32
  useEffect(function () {
33
- if (isOpen) {
33
+ if (isOpen)
34
34
  setIsCollapsed(false);
35
- }
36
35
  }, [isOpen]);
36
+ useEffect(function () {
37
+ if (defaultOpen) {
38
+ measureContent();
39
+ setIsCollapsed(false);
40
+ setIsOpen(true);
41
+ }
42
+ else if (isOpen)
43
+ setIsOpen(false);
44
+ }, [defaultOpen]);
37
45
  return (React.createElement(Container, null,
38
46
  React.createElement(Header, { "aria-controls": contentId, "aria-expanded": isOpen, id: headerId, onClick: function () {
39
47
  if (isOpen) {
@@ -41,6 +49,7 @@ var Accordion = function (_a) {
41
49
  onToggle === null || onToggle === void 0 ? void 0 : onToggle(false);
42
50
  return;
43
51
  }
52
+ measureContent();
44
53
  setIsCollapsed(false);
45
54
  setIsOpen(true);
46
55
  onToggle === null || onToggle === void 0 ? void 0 : onToggle(true);
package/build/es/components/src/components/Accordion/Accordion.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Accordion.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
1
+ {"version":3,"file":"Accordion.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@citygross/components",
3
- "version": "0.13.11",
3
+ "version": "0.13.13",
4
4
  "license": "ISC",
5
5
  "sideEffects": false,
6
6
  "main": "./build/cjs/components/src/index.js",
@@ -65,7 +65,7 @@
65
65
  },
66
66
  "dependencies": {
67
67
  "@citygross/design-tokens": "^0.2.80",
68
- "@citygross/icons": "^0.3.0",
68
+ "@citygross/icons": "^0.3.1",
69
69
  "@citygross/react-use-bg-wizard": "^0.0.8",
70
70
  "@citygross/typography": "^0.0.116",
71
71
  "@citygross/utils": "^0.0.43",
@@ -75,5 +75,5 @@
75
75
  "react-slick": "^0.30.1",
76
76
  "slick-carousel": "^1.8.1"
77
77
  },
78
- "gitHead": "cb6ad77d612b43e19b5e5dbc7eb8c1edc19c12a6"
78
+ "gitHead": "0af0b90362bb3cd412329c8739c41e550cc6ddcd"
79
79
  }