@sis-cc/dotstatsuite-visions 12.45.0 → 12.47.0

package/es/CollapseButtons/CollapseButtons.js

@@ -1,7 +1,6 @@
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
-import React, { useState, useEffect } from 'react';
-import PropTypes from 'prop-types';
+import React, { useState } from 'react';
 import cx from 'classnames';
 import * as R from 'ramda';
 import makeStyles from '@mui/styles/makeStyles';
@@ -61,30 +60,47 @@ var CollapseButtons = function CollapseButtons(props) {
   var classes = useStyles();
   var isMobileView = useMediaQuery(breakpoint);
 
-  var _useState = useState(),
+  var _useState = useState(props.selectedItemId),
       toggleId = _useState[0],
       setIsOpen = _useState[1];
 
-  useEffect(function () {
-    var _setIsOpen;
-
-    var id = props.selectedItemId;
-    if (props.selectedItemId) setIsOpen((_setIsOpen = {}, _setIsOpen[id] = true, _setIsOpen));
-  }, [props.selectedItemId]);
-
-  var getValues = function getValues(parentId) {
-    return R.map(function (item) {
-      return React.createElement(Item, {
-        key: R.prop('id')(item),
-        testId: testId + '_' + parentId + '_value_' + R.prop('id')(item),
-        parentId: parentId,
-        item: item,
-        action: action,
-        isSecondLevelClikable: isSecondLevelClikable,
-        labelAccessor: labelAccessor
-      });
-    });
+  var collapseFactory = function collapseFactory(_ref) {
+    var action = _ref.action,
+        isSecondLevelClikable = _ref.isSecondLevelClikable,
+        labelAccessor = _ref.labelAccessor,
+        testId = _ref.testId;
+    return function (_ref2) {
+      var toggleId = _ref2.toggleId,
+          id = _ref2.id,
+          values = _ref2.values,
+          isMobileView = _ref2.isMobileView;
+      return React.createElement(
+        Collapse,
+        {
+          'in': toggleId === id,
+          timeout: 'auto',
+          unmountOnExit: true,
+          className: classes.collapseContainer
+        },
+        React.createElement(
+          Paper,
+          { elevation: 10, isMobileView: isMobileView },
+          R.map(function (item) {
+            return React.createElement(Item, {
+              key: R.prop('id')(item),
+              testId: testId + '_' + id + '_value_' + R.prop('id')(item),
+              parentId: id,
+              item: item,
+              action: action,
+              isSecondLevelClikable: isSecondLevelClikable,
+              labelAccessor: labelAccessor
+            });
+          }, values)
+        )
+      );
+    };
   };
+  var collapse = collapseFactory({ action: action, isSecondLevelClikable: isSecondLevelClikable, labelAccessor: labelAccessor, testId: testId });
 
   return React.createElement(
     Grid,
@@ -96,11 +112,11 @@ var CollapseButtons = function CollapseButtons(props) {
       className: cx((_cx = {}, _cx[classes.container] = accessibility, _cx)),
       tabIndex: 0
     },
-    R.map(function (_ref) {
-      var id = _ref.id,
-          label = _ref.label,
-          _ref$values = _ref.values,
-          values = _ref$values === undefined ? [] : _ref$values;
+    R.map(function (_ref3) {
+      var id = _ref3.id,
+          label = _ref3.label,
+          _ref3$values = _ref3.values,
+          values = _ref3$values === undefined ? [] : _ref3$values;
       return React.createElement(
         Grid,
         _extends({ item: true, xs: 12, sm: 12, md: R.nth(nbColumns)(COLUMNS) }, gridButtonsProps, { key: id }),
@@ -110,81 +126,25 @@ var CollapseButtons = function CollapseButtons(props) {
           React.createElement(ToggleButton, {
             textTransform: textTransform,
             label: label,
-            tabIndex: R.isNil(toggleId) || R.prop(id)(toggleId) || R.compose(R.not, R.head, R.values)(toggleId) ? 0 : -1,
-            isOpen: R.prop(id)(toggleId),
+            tabIndex: toggleId ? 1 : 0,
+            isOpen: toggleId === id,
             toggle: function toggle() {
-              var _setIsOpen2;
-
-              return setIsOpen((_setIsOpen2 = {}, _setIsOpen2[id] = !R.prop(id)(toggleId), _setIsOpen2));
+              return setIsOpen(id === toggleId ? null : id);
             },
             testId: testId + '_' + id,
             id: id
           }),
-          isMobileView && React.createElement(
-            Collapse,
-            {
-              'in': R.prop(id)(toggleId),
-              timeout: 'auto',
-              unmountOnExit: true,
-              className: classes.collapseContainer
-            },
-            React.createElement(
-              Paper,
-              { elevation: 10, isMobileView: isMobileView },
-              getValues(id)(values)
-            )
-          )
+          isMobileView && collapse({ toggleId: toggleId, id: id, values: values, isMobileView: isMobileView })
         )
       );
     })(items),
-    !isMobileView && R.map(function (_ref2) {
-      var id = _ref2.id,
-          _ref2$values = _ref2.values,
-          values = _ref2$values === undefined ? [] : _ref2$values;
-      return React.createElement(
-        Collapse,
-        {
-          'in': R.prop(id)(toggleId),
-          timeout: 'auto',
-          unmountOnExit: true,
-          key: id,
-          className: classes.collapseContainer
-        },
-        React.createElement(
-          Paper,
-          { elevation: 10 },
-          getValues(id)(values)
-        )
-      );
-    })(items)
+    !isMobileView && R.map(function (_ref4) {
+      var id = _ref4.id,
+          _ref4$values = _ref4.values,
+          values = _ref4$values === undefined ? [] : _ref4$values;
+      return collapse({ toggleId: toggleId, id: id, values: values, isMobileView: isMobileView });
+    }, items)
   );
 };
 
-CollapseButtons.propTypes = process.env.NODE_ENV !== "production" ? {
-  testId: PropTypes.string,
-  selectedItemId: PropTypes.string,
-  items: PropTypes.arrayOf(PropTypes.shape({
-    id: PropTypes.string.isRequired,
-    label: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
-    svgPath: PropTypes.string,
-    values: PropTypes.arrayOf(PropTypes.shape({
-      id: PropTypes.string.isRequired,
-      label: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
-      subtopics: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.shape({
-        id: PropTypes.string.isRequired,
-        label: PropTypes.oneOfType([PropTypes.string, PropTypes.element])
-      }), PropTypes.string]))
-    }))
-  })),
-  action: PropTypes.func,
-  nbColumns: PropTypes.number,
-  isSecondLevelClikable: PropTypes.bool,
-  breakpoint: PropTypes.func,
-  gridButtonsProps: PropTypes.object,
-  justify: PropTypes.string,
-  textTransform: PropTypes.string,
-  labelAccessor: PropTypes.func,
-  accessibility: PropTypes.bool
-} : {};
-
 export default CollapseButtons;

package/es/Logo/Logo.js

@@ -26,7 +26,9 @@ var Logo = function Logo(_ref) {
       alt = _ref$alt === undefined ? 'logo' : _ref$alt,
       _ref$maxHeight = _ref.maxHeight,
       maxHeight = _ref$maxHeight === undefined ? 150 : _ref$maxHeight,
-      children = _ref.children;
+      children = _ref.children,
+      _ref$fetchPriority = _ref.fetchPriority,
+      fetchPriority = _ref$fetchPriority === undefined ? 'auto' : _ref$fetchPriority;
 
   var classes = useStyles();
   return React.createElement(
@@ -36,7 +38,8 @@ var Logo = function Logo(_ref) {
       className: cx(classes.logo, classes.alternativeBrowserLogo),
       style: { maxHeight: maxHeight },
       src: logo,
-      alt: alt
+      alt: alt,
+      fetchPriority: fetchPriority
     }),
     children
   );

package/lib/CollapseButtons/CollapseButtons.js

@@ -9,10 +9,6 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
-var _propTypes = require('prop-types');
-
-var _propTypes2 = _interopRequireDefault(_propTypes);
-
 var _classnames = require('classnames');
 
 var _classnames2 = _interopRequireDefault(_classnames);
@@ -103,30 +99,47 @@ var CollapseButtons = function CollapseButtons(props) {
   var classes = useStyles();
   var isMobileView = (0, _useMediaQuery2.default)(breakpoint);
 
-  var _useState = (0, _react.useState)(),
+  var _useState = (0, _react.useState)(props.selectedItemId),
       toggleId = _useState[0],
       setIsOpen = _useState[1];
 
-  (0, _react.useEffect)(function () {
-    var _setIsOpen;
-
-    var id = props.selectedItemId;
-    if (props.selectedItemId) setIsOpen((_setIsOpen = {}, _setIsOpen[id] = true, _setIsOpen));
-  }, [props.selectedItemId]);
-
-  var getValues = function getValues(parentId) {
-    return R.map(function (item) {
-      return _react2.default.createElement(_Item2.default, {
-        key: R.prop('id')(item),
-        testId: testId + '_' + parentId + '_value_' + R.prop('id')(item),
-        parentId: parentId,
-        item: item,
-        action: action,
-        isSecondLevelClikable: isSecondLevelClikable,
-        labelAccessor: labelAccessor
-      });
-    });
+  var collapseFactory = function collapseFactory(_ref) {
+    var action = _ref.action,
+        isSecondLevelClikable = _ref.isSecondLevelClikable,
+        labelAccessor = _ref.labelAccessor,
+        testId = _ref.testId;
+    return function (_ref2) {
+      var toggleId = _ref2.toggleId,
+          id = _ref2.id,
+          values = _ref2.values,
+          isMobileView = _ref2.isMobileView;
+      return _react2.default.createElement(
+        _Collapse2.default,
+        {
+          'in': toggleId === id,
+          timeout: 'auto',
+          unmountOnExit: true,
+          className: classes.collapseContainer
+        },
+        _react2.default.createElement(
+          _Paper2.default,
+          { elevation: 10, isMobileView: isMobileView },
+          R.map(function (item) {
+            return _react2.default.createElement(_Item2.default, {
+              key: R.prop('id')(item),
+              testId: testId + '_' + id + '_value_' + R.prop('id')(item),
+              parentId: id,
+              item: item,
+              action: action,
+              isSecondLevelClikable: isSecondLevelClikable,
+              labelAccessor: labelAccessor
+            });
+          }, values)
+        )
+      );
+    };
   };
+  var collapse = collapseFactory({ action: action, isSecondLevelClikable: isSecondLevelClikable, labelAccessor: labelAccessor, testId: testId });
 
   return _react2.default.createElement(
     _Grid2.default,
@@ -138,11 +151,11 @@ var CollapseButtons = function CollapseButtons(props) {
       className: (0, _classnames2.default)((_cx = {}, _cx[classes.container] = accessibility, _cx)),
       tabIndex: 0
     },
-    R.map(function (_ref) {
-      var id = _ref.id,
-          label = _ref.label,
-          _ref$values = _ref.values,
-          values = _ref$values === undefined ? [] : _ref$values;
+    R.map(function (_ref3) {
+      var id = _ref3.id,
+          label = _ref3.label,
+          _ref3$values = _ref3.values,
+          values = _ref3$values === undefined ? [] : _ref3$values;
       return _react2.default.createElement(
         _Grid2.default,
         _extends({ item: true, xs: 12, sm: 12, md: R.nth(nbColumns)(COLUMNS) }, gridButtonsProps, { key: id }),
@@ -152,81 +165,25 @@ var CollapseButtons = function CollapseButtons(props) {
           _react2.default.createElement(_.ToggleButton, {
             textTransform: textTransform,
             label: label,
-            tabIndex: R.isNil(toggleId) || R.prop(id)(toggleId) || R.compose(R.not, R.head, R.values)(toggleId) ? 0 : -1,
-            isOpen: R.prop(id)(toggleId),
+            tabIndex: toggleId ? 1 : 0,
+            isOpen: toggleId === id,
             toggle: function toggle() {
-              var _setIsOpen2;
-
-              return setIsOpen((_setIsOpen2 = {}, _setIsOpen2[id] = !R.prop(id)(toggleId), _setIsOpen2));
+              return setIsOpen(id === toggleId ? null : id);
             },
             testId: testId + '_' + id,
             id: id
           }),
-          isMobileView && _react2.default.createElement(
-            _Collapse2.default,
-            {
-              'in': R.prop(id)(toggleId),
-              timeout: 'auto',
-              unmountOnExit: true,
-              className: classes.collapseContainer
-            },
-            _react2.default.createElement(
-              _Paper2.default,
-              { elevation: 10, isMobileView: isMobileView },
-              getValues(id)(values)
-            )
-          )
+          isMobileView && collapse({ toggleId: toggleId, id: id, values: values, isMobileView: isMobileView })
         )
       );
     })(items),
-    !isMobileView && R.map(function (_ref2) {
-      var id = _ref2.id,
-          _ref2$values = _ref2.values,
-          values = _ref2$values === undefined ? [] : _ref2$values;
-      return _react2.default.createElement(
-        _Collapse2.default,
-        {
-          'in': R.prop(id)(toggleId),
-          timeout: 'auto',
-          unmountOnExit: true,
-          key: id,
-          className: classes.collapseContainer
-        },
-        _react2.default.createElement(
-          _Paper2.default,
-          { elevation: 10 },
-          getValues(id)(values)
-        )
-      );
-    })(items)
+    !isMobileView && R.map(function (_ref4) {
+      var id = _ref4.id,
+          _ref4$values = _ref4.values,
+          values = _ref4$values === undefined ? [] : _ref4$values;
+      return collapse({ toggleId: toggleId, id: id, values: values, isMobileView: isMobileView });
+    }, items)
   );
 };
 
-CollapseButtons.propTypes = process.env.NODE_ENV !== "production" ? {
-  testId: _propTypes2.default.string,
-  selectedItemId: _propTypes2.default.string,
-  items: _propTypes2.default.arrayOf(_propTypes2.default.shape({
-    id: _propTypes2.default.string.isRequired,
-    label: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.element]),
-    svgPath: _propTypes2.default.string,
-    values: _propTypes2.default.arrayOf(_propTypes2.default.shape({
-      id: _propTypes2.default.string.isRequired,
-      label: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.element]),
-      subtopics: _propTypes2.default.arrayOf(_propTypes2.default.oneOfType([_propTypes2.default.shape({
-        id: _propTypes2.default.string.isRequired,
-        label: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.element])
-      }), _propTypes2.default.string]))
-    }))
-  })),
-  action: _propTypes2.default.func,
-  nbColumns: _propTypes2.default.number,
-  isSecondLevelClikable: _propTypes2.default.bool,
-  breakpoint: _propTypes2.default.func,
-  gridButtonsProps: _propTypes2.default.object,
-  justify: _propTypes2.default.string,
-  textTransform: _propTypes2.default.string,
-  labelAccessor: _propTypes2.default.func,
-  accessibility: _propTypes2.default.bool
-} : {};
-
 exports.default = CollapseButtons;

package/lib/Logo/Logo.js

@@ -43,7 +43,9 @@ var Logo = function Logo(_ref) {
       alt = _ref$alt === undefined ? 'logo' : _ref$alt,
       _ref$maxHeight = _ref.maxHeight,
       maxHeight = _ref$maxHeight === undefined ? 150 : _ref$maxHeight,
-      children = _ref.children;
+      children = _ref.children,
+      _ref$fetchPriority = _ref.fetchPriority,
+      fetchPriority = _ref$fetchPriority === undefined ? 'auto' : _ref$fetchPriority;
 
   var classes = useStyles();
   return _react2.default.createElement(
@@ -53,7 +55,8 @@ var Logo = function Logo(_ref) {
       className: (0, _classnames2.default)(classes.logo, classes.alternativeBrowserLogo),
       style: { maxHeight: maxHeight },
       src: logo,
-      alt: alt
+      alt: alt,
+      fetchPriority: fetchPriority
     }),
     children
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sis-cc/dotstatsuite-visions",
-  "version": "12.45.0",
+  "version": "12.47.0",
   "description": "Library of visual components",
   "author": "OECD",
   "homepage": "https://visions-qa.siscc.org/#o",