@sb1/ffe-accordion-react 12.0.16 → 13.0.0

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/AccordionItem.js +5 -6
  2. package/lib/AccordionItem.js +4 -5
  3. package/package.json +9 -10
package/es/AccordionItem.js CHANGED
@@ -20,8 +20,7 @@ var __rest = (this && this.__rest) || function (s, e) {
20
20
  }
21
21
  return t;
22
22
  };
23
- import React, { useEffect, useRef, useState, useContext } from 'react';
24
- import { v4 as uuid } from 'uuid';
23
+ import React, { useEffect, useState, useContext, useId } from 'react';
25
24
  import { Icon } from '@sb1/ffe-icons-react';
26
25
  import { Collapse } from '@sb1/ffe-collapse-react';
27
26
  import classNames from 'classnames';
@@ -31,8 +30,8 @@ export var AccordionItem = function (_a) {
31
30
  var _c = useState(defaultOpen), isExpanded = _c[0], setIsExpanded = _c[1];
32
31
  var _d = useState(false), isAnimating = _d[0], setIsAnimating = _d[1];
33
32
  var _e = useState(false), isFocused = _e[0], setFocus = _e[1];
34
- var buttonId = useRef(uuid());
35
- var contentId = useRef(uuid());
33
+ var buttonId = useId();
34
+ var contentId = useId();
36
35
  var headingLevel = useContext(AccordionContext).headingLevel;
37
36
  var expandMoreIcon = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iMjQiIHZpZXdCb3g9IjAgLTk2MCA5NjAgOTYwIiB3aWR0aD0iMjQiPjxwYXRoIGQ9Ik00ODAtMzczLjUzOXEtNy4yMzEgMC0xMy40NjEtMi4zMDgtNi4yMzEtMi4zMDgtMTEuODQ2LTcuOTIzTDI3NC45MjQtNTYzLjUzOXEtOC4zMDgtOC4zMDctOC41LTIwLjg4NC0uMTkzLTEyLjU3NyA4LjUtMjEuMjY5IDguNjkyLTguNjkyIDIxLjA3Ni04LjY5MnQyMS4wNzYgOC42OTJMNDgwLTQ0Mi43NjhsMTYyLjkyNC0xNjIuOTI0cTguMzA3LTguMzA3IDIwLjg4NC04LjUgMTIuNTc2LS4xOTIgMjEuMjY4IDguNSA4LjY5MyA4LjY5MiA4LjY5MyAyMS4wNzcgMCAxMi4zODQtOC42OTMgMjEuMDc2TDUwNS4zMDctMzgzLjc3cS01LjYxNSA1LjYxNS0xMS44NDYgNy45MjMtNi4yMyAyLjMwOC0xMy40NjEgMi4zMDhaIi8+PC9zdmc+';
38
37
  useEffect(function () {
@@ -53,12 +52,12 @@ export var AccordionItem = function (_a) {
53
52
  'ffe-accordion-item--open': isExpanded,
54
53
  'ffe-accordion-item--focus': isFocused,
55
54
  }) }, rest),
56
- React.createElement("h".concat(headingLevel), { className: 'ffe-h6 ffe-accordion-item__heading' }, React.createElement("button", { type: "button", id: buttonId.current, "aria-expanded": isExpanded ? 'true' : 'false', "aria-controls": contentId.current, "aria-label": ariaLabel, className: classNames('ffe-accordion-item__heading-button', {
55
+ React.createElement("h".concat(headingLevel), { className: 'ffe-h6 ffe-accordion-item__heading' }, React.createElement("button", { type: "button", id: buttonId, "aria-expanded": isExpanded ? 'true' : 'false', "aria-controls": contentId, "aria-label": ariaLabel, className: classNames('ffe-accordion-item__heading-button', {
57
56
  'ffe-accordion-item__heading-button--open': isExpanded,
58
57
  }), onClick: handleOnClick, onFocus: function () { return setFocus(true); }, onBlur: function () { return setFocus(false); } },
59
58
  React.createElement("span", { className: "ffe-accordion-item__heading-button-content" },
60
59
  heading,
61
60
  React.createElement("span", { className: "ffe-accordion-item__heading-icon-wrapper" },
62
61
  React.createElement(Icon, { className: "ffe-accordion-item__heading-icon", fileUrl: expandMoreIcon, size: "sm" }))))),
63
- React.createElement(Collapse, { isOpen: !!isExpanded, onRest: function () { return setIsAnimating(false); }, id: contentId.current, "aria-labelledby": buttonId.current, role: "region" }, !collapseHidden && (React.createElement("div", { className: "ffe-accordion-item__body" }, children)))));
62
+ React.createElement(Collapse, { isOpen: !!isExpanded, onRest: function () { return setIsAnimating(false); }, id: contentId, "aria-labelledby": buttonId, role: "region" }, !collapseHidden && (React.createElement("div", { className: "ffe-accordion-item__body" }, children)))));
64
63
  };
package/lib/AccordionItem.js CHANGED
@@ -50,7 +50,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
50
50
  Object.defineProperty(exports, "__esModule", { value: true });
51
51
  exports.AccordionItem = void 0;
52
52
  var react_1 = __importStar(require("react"));
53
- var uuid_1 = require("uuid");
54
53
  var ffe_icons_react_1 = require("@sb1/ffe-icons-react");
55
54
  var ffe_collapse_react_1 = require("@sb1/ffe-collapse-react");
56
55
  var classnames_1 = __importDefault(require("classnames"));
@@ -60,8 +59,8 @@ var AccordionItem = function (_a) {
60
59
  var _c = (0, react_1.useState)(defaultOpen), isExpanded = _c[0], setIsExpanded = _c[1];
61
60
  var _d = (0, react_1.useState)(false), isAnimating = _d[0], setIsAnimating = _d[1];
62
61
  var _e = (0, react_1.useState)(false), isFocused = _e[0], setFocus = _e[1];
63
- var buttonId = (0, react_1.useRef)((0, uuid_1.v4)());
64
- var contentId = (0, react_1.useRef)((0, uuid_1.v4)());
62
+ var buttonId = (0, react_1.useId)();
63
+ var contentId = (0, react_1.useId)();
65
64
  var headingLevel = (0, react_1.useContext)(AccordionContext_1.AccordionContext).headingLevel;
66
65
  var expandMoreIcon = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iMjQiIHZpZXdCb3g9IjAgLTk2MCA5NjAgOTYwIiB3aWR0aD0iMjQiPjxwYXRoIGQ9Ik00ODAtMzczLjUzOXEtNy4yMzEgMC0xMy40NjEtMi4zMDgtNi4yMzEtMi4zMDgtMTEuODQ2LTcuOTIzTDI3NC45MjQtNTYzLjUzOXEtOC4zMDgtOC4zMDctOC41LTIwLjg4NC0uMTkzLTEyLjU3NyA4LjUtMjEuMjY5IDguNjkyLTguNjkyIDIxLjA3Ni04LjY5MnQyMS4wNzYgOC42OTJMNDgwLTQ0Mi43NjhsMTYyLjkyNC0xNjIuOTI0cTguMzA3LTguMzA3IDIwLjg4NC04LjUgMTIuNTc2LS4xOTIgMjEuMjY4IDguNSA4LjY5MyA4LjY5MiA4LjY5MyAyMS4wNzcgMCAxMi4zODQtOC42OTMgMjEuMDc2TDUwNS4zMDctMzgzLjc3cS01LjYxNSA1LjYxNS0xMS44NDYgNy45MjMtNi4yMyAyLjMwOC0xMy40NjEgMi4zMDhaIi8+PC9zdmc+';
67
66
  (0, react_1.useEffect)(function () {
@@ -82,13 +81,13 @@ var AccordionItem = function (_a) {
82
81
  'ffe-accordion-item--open': isExpanded,
83
82
  'ffe-accordion-item--focus': isFocused,
84
83
  }) }, rest),
85
- react_1.default.createElement("h".concat(headingLevel), { className: 'ffe-h6 ffe-accordion-item__heading' }, react_1.default.createElement("button", { type: "button", id: buttonId.current, "aria-expanded": isExpanded ? 'true' : 'false', "aria-controls": contentId.current, "aria-label": ariaLabel, className: (0, classnames_1.default)('ffe-accordion-item__heading-button', {
84
+ react_1.default.createElement("h".concat(headingLevel), { className: 'ffe-h6 ffe-accordion-item__heading' }, react_1.default.createElement("button", { type: "button", id: buttonId, "aria-expanded": isExpanded ? 'true' : 'false', "aria-controls": contentId, "aria-label": ariaLabel, className: (0, classnames_1.default)('ffe-accordion-item__heading-button', {
86
85
  'ffe-accordion-item__heading-button--open': isExpanded,
87
86
  }), onClick: handleOnClick, onFocus: function () { return setFocus(true); }, onBlur: function () { return setFocus(false); } },
88
87
  react_1.default.createElement("span", { className: "ffe-accordion-item__heading-button-content" },
89
88
  heading,
90
89
  react_1.default.createElement("span", { className: "ffe-accordion-item__heading-icon-wrapper" },
91
90
  react_1.default.createElement(ffe_icons_react_1.Icon, { className: "ffe-accordion-item__heading-icon", fileUrl: expandMoreIcon, size: "sm" }))))),
92
- react_1.default.createElement(ffe_collapse_react_1.Collapse, { isOpen: !!isExpanded, onRest: function () { return setIsAnimating(false); }, id: contentId.current, "aria-labelledby": buttonId.current, role: "region" }, !collapseHidden && (react_1.default.createElement("div", { className: "ffe-accordion-item__body" }, children)))));
91
+ react_1.default.createElement(ffe_collapse_react_1.Collapse, { isOpen: !!isExpanded, onRest: function () { return setIsAnimating(false); }, id: contentId, "aria-labelledby": buttonId, role: "region" }, !collapseHidden && (react_1.default.createElement("div", { className: "ffe-accordion-item__body" }, children)))));
93
92
  };
94
93
  exports.AccordionItem = AccordionItem;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sb1/ffe-accordion-react",
3
- "version": "12.0.16",
3
+ "version": "13.0.0",
4
4
  "license": "MIT",
5
5
  "author": "SpareBank 1",
6
6
  "files": [
@@ -25,23 +25,22 @@
25
25
  "test:watch": "ffe-buildtool jest --watch"
26
26
  },
27
27
  "dependencies": {
28
- "@sb1/ffe-accordion": "^10.0.24",
29
- "@sb1/ffe-collapse-react": "^4.0.9",
30
- "@sb1/ffe-icons-react": "^10.0.5",
28
+ "@sb1/ffe-accordion": "^10.0.25",
29
+ "@sb1/ffe-collapse-react": "^5.0.0",
30
+ "@sb1/ffe-icons-react": "^11.0.0",
31
31
  "@types/uuid": "^9.0.0",
32
- "classnames": "^2.3.1",
33
- "uuid": "^9.0.0"
32
+ "classnames": "^2.3.1"
34
33
  },
35
34
  "devDependencies": {
36
35
  "@sb1/ffe-buildtool": "^0.6.4",
37
- "react": "^16.9.0",
38
- "react-dom": "^16.9.0"
36
+ "react": "^18.2.0",
37
+ "react-dom": "^18.2.0"
39
38
  },
40
39
  "peerDependencies": {
41
- "react": ">=16.9.0"
40
+ "react": ">=18.2.0"
42
41
  },
43
42
  "publishConfig": {
44
43
  "access": "public"
45
44
  },
46
- "gitHead": "53ab99e3064a4f4db22861457bfa5af5322058ab"
45
+ "gitHead": "7ec0994fdb87d1f4daa66d7595a22f79d17cc450"
47
46
  }