@sis-cc/dotstatsuite-visions 12.33.0 → 12.35.0

package/es/CollapseButtons/CollapseButtons.js

@@ -2,6 +2,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 
 import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
+import cx from 'classnames';
 import * as R from 'ramda';
 import makeStyles from '@mui/styles/makeStyles';
 import useMediaQuery from '@mui/material/useMediaQuery';
@@ -15,15 +16,25 @@ import Paper from './Paper';
 export var MAX_COLUMNS = 12;
 export var COLUMNS = [12, 12, 6, 4, 3, 3, 2, 2, 2, 2, 2, 2, 1];
 
-var useStyles = makeStyles(function () {
+var useStyles = makeStyles(function (theme) {
   return {
     collapseContainer: {
       width: '100%'
+    },
+    container: {
+      '&:focus': {
+        outlineColor: theme.palette.highlight.hl1,
+        outlineWidth: 2,
+        outlineStyle: 'auto',
+        paddingBottom: 16
+      }
     }
   };
 });
 
 var CollapseButtons = function CollapseButtons(props) {
+  var _cx;
+
   var _props$items = props.items,
       items = _props$items === undefined ? [] : _props$items,
       _props$action = props.action,
@@ -43,7 +54,8 @@ var CollapseButtons = function CollapseButtons(props) {
       _props$textTransform = props.textTransform,
       textTransform = _props$textTransform === undefined ? 'none' : _props$textTransform,
       _props$labelAccessor = props.labelAccessor,
-      labelAccessor = _props$labelAccessor === undefined ? R.prop('label') : _props$labelAccessor;
+      labelAccessor = _props$labelAccessor === undefined ? R.prop('label') : _props$labelAccessor,
+      accessibility = props.accessibility;
 
 
   var classes = useStyles();
@@ -76,7 +88,14 @@ var CollapseButtons = function CollapseButtons(props) {
 
   return React.createElement(
     Grid,
-    { container: true, spacing: 2, 'data-testid': testId, justifyContent: justify },
+    {
+      container: true,
+      spacing: 2,
+      'data-testid': testId,
+      justifyContent: justify,
+      className: cx((_cx = {}, _cx[classes.container] = accessibility, _cx)),
+      tabIndex: 0
+    },
     R.map(function (_ref) {
       var id = _ref.id,
           label = _ref.label,
@@ -164,7 +183,8 @@ CollapseButtons.propTypes = process.env.NODE_ENV !== "production" ? {
   gridButtonsProps: PropTypes.object,
   justify: PropTypes.string,
   textTransform: PropTypes.string,
-  labelAccessor: PropTypes.func
+  labelAccessor: PropTypes.func,
+  accessibility: PropTypes.bool
 } : {};
 
 export default CollapseButtons;

package/es/CollapseButtons/Item.js

@@ -106,6 +106,13 @@ var Item = function Item(_ref) {
                   action(parentId, id);
                   e.stopPropagation();
                 },
+                onKeyDown: function onKeyDown(e) {
+                  if (e.key === 'Enter' || e.key === ' ') {
+                    if (R.not(R.is(Function)(action))) return;
+                    action(parentId, id);
+                    e.stopPropagation();
+                  }
+                },
                 tabIndex: 0,
                 underline: 'none',
                 style: { display: 'list-item' }

package/es/DynamicDrawer/DynamicDrawer.js

@@ -52,7 +52,7 @@ var useStyles = makeStyles(function (theme) {
 var getCounter = function getCounter(items, tagAccessor) {
   var selectedItemsIds = R.reduce(function (acc, item) {
     if (R.prop('isSelected', item)) {
-      return R.append(item.id, acc);
+      return R.append(R.prop('id', item), acc);
     }
     return acc;
   }, [], items);
@@ -84,8 +84,8 @@ var TabPanel = function TabPanel(props) {
     _extends({
       role: 'tabpanel',
       hidden: !open,
-      id: 'vertical-tabpanel-' + item.index,
-      'aria-labelledby': 'vertical-tab-' + item.index,
+      id: 'vertical-tabpanel-' + R.prop('index', item),
+      'aria-labelledby': 'vertical-tab-' + R.prop('index', item),
       className: isNarrow ? classes.tabPanelNarrow : classes.tabPanel,
       style: styles
     }, other),
@@ -178,7 +178,8 @@ var PaperComponent = React.forwardRef(function (_ref, ref) {
       tagValueLabel = _ref.tagValueLabel,
       rest = _objectWithoutProperties(_ref, ['label', 'selected', 'item', 'tagAccessor', 'tagValueLabel']);
 
-  var Chip = R.isNil(item.tag) ? InternalTag : item.tag;
+  var tag = R.prop('tag', item);
+  var Chip = R.isNil(tag) ? InternalTag : tag;
   var classes = useStyles();
   return React.createElement(
     Paper,
@@ -196,11 +197,11 @@ var PaperComponent = React.forwardRef(function (_ref, ref) {
         },
         label
       ),
-      R.isNil(item.tag) ? React.createElement(
+      R.isNil(tag) ? React.createElement(
         Chip,
-        { items: item.values, tagValueLabel: tagValueLabel },
-        getCounter(item.values, tagAccessor)
-      ) : item.tag
+        { items: R.prop('values', item), tagValueLabel: tagValueLabel },
+        getCounter(R.prop('values', item), tagAccessor)
+      ) : tag
     )
   );
 });
@@ -258,12 +259,13 @@ var DynamicDrawer = function DynamicDrawer(props) {
       rest = _objectWithoutProperties(props, ['list', 'labelRenderer', 'onClick', 'handleChangePanel', 'onClosePanel', 'isNarrow', 'labels', 'disableAccessor', 'isApplyHiddenNarrow', 'expandAll', 'collapseAll', 'expandedIds', 'allItems', 'periodPanel', 'classes', 'testId', 'tagAccessor', 'tagAriaLabel', 'children', 'styles']);
 
   var handleChange = function handleChange(e, item) {
-    var filterSelection = R.pipe(R.propOr([], item.id), function (arr) {
+    var id = R.prop('id', item);
+    var filterSelection = R.pipe(R.propOr([], id), function (arr) {
       return R.zipObj(arr, arr);
     })(allSelection);
     setSelection(_extends({}, filterSelection));
-    handleChangePanel(item.id, selection, allSelection);
-    setSelectedId(item.id);
+    handleChangePanel(id, selection, allSelection);
+    setSelectedId(id);
     setOpen(true);
   };
   var handleSubmit = function handleSubmit() {
@@ -285,7 +287,7 @@ var DynamicDrawer = function DynamicDrawer(props) {
   var filter = useMemo(function () {
     if (!selectedId) return {};
     return R.find(function (item) {
-      return item.id === selectedId;
+      return R.prop('id', item) === selectedId;
     })(list);
   }, [selectedId, list]);
 
@@ -342,18 +344,18 @@ var DynamicDrawer = function DynamicDrawer(props) {
       R.map(function (item) {
         var _cx2;
 
-        var tagValueLabel = R.isNil(item.tag) && getCounter(item.values, tagAriaLabel);
+        var tagValueLabel = R.isNil(R.prop('tag', item)) && getCounter(R.prop('values', item), tagAriaLabel);
 
         return React.createElement(Tab, {
-          key: item.id,
-          id: filter.id,
-          'data-testid': item.id + '-tab',
+          key: R.prop('id', item),
+          id: R.prop('id', filter),
+          'data-testid': R.prop('id', item) + '-tab',
           component: React.forwardRef(function TabPaper(tabProps, ref) {
             return React.createElement(PaperComponent, _extends({
               ref: ref
             }, tabProps, {
               label: labelRenderer(item),
-              selected: selectedId === item.id,
+              selected: selectedId === R.prop('id', item),
               item: item,
               tagAccessor: tagAccessor,
               tagValueLabel: tagValueLabel
@@ -362,8 +364,8 @@ var DynamicDrawer = function DynamicDrawer(props) {
           label: labelRenderer(item),
           'aria-label': labelRenderer(item),
           value: item,
-          'aria-selected': filter.id === item.id,
-          className: cx(classNames.tab, (_cx2 = {}, _cx2[classNames.tabSelected] = filter.id === item.id, _cx2)),
+          'aria-selected': R.prop('id', filter) === R.prop('id', item),
+          className: cx(classNames.tab, (_cx2 = {}, _cx2[classNames.tabSelected] = R.prop('id', filter) === R.prop('id', item), _cx2)),
           sx: {
             alignItems: 'start',
             maxWidth: '100%'
@@ -410,9 +412,9 @@ var DynamicDrawer = function DynamicDrawer(props) {
         labelRenderer: labelRenderer,
         styles: styles
       },
-      R.equals(filter.id, periodPanel) ? children : React.createElement(AdvancedSelection, _extends({
+      R.equals(R.prop('id', filter), periodPanel) ? children : React.createElement(AdvancedSelection, _extends({
         id: selectedId,
-        items: filter.values || [],
+        items: R.prop('values', filter) || [],
         isOpen: open,
         labelRenderer: labelRenderer,
         disableAccessor: disableAccessor ? R.pipe(R.prop('isEnabled'), R.not) : undefined,

package/es/Logo/Logo.js

@@ -31,7 +31,7 @@ var Logo = function Logo(_ref) {
   var classes = useStyles();
   return React.createElement(
     'span',
-    { className: classes.container, role: 'button', tabIndex: 0 },
+    { className: classes.container, role: 'presentation' },
     React.createElement('img', {
       className: cx(classes.logo, classes.alternativeBrowserLogo),
       style: { maxHeight: maxHeight },

package/es/Spotlight/Spotlight.js

@@ -102,7 +102,6 @@ var Spotlight = function Spotlight(_ref) {
       R.gt(size(R.prop('fields', spotlight)), 1) ? React.createElement(
         Fragment,
         null,
-        React.createElement(Divider, { className: classes.divider, 'aria-hidden': 'true' }),
         React.createElement(Field, {
           spotlight: spotlight,
           onChangeField: onChangeField,

package/es/theme.js

@@ -55,9 +55,9 @@ export var sisccTheme = function sisccTheme(_ref) {
         },
         styleOverrides: {
           root: _extends({
-            '&:focus': {
-              outline: 'none'
-            }
+            '&:focus': _extends({
+              outline: !isA11y && 'none'
+            }, isA11y && focus)
           }, buttonBaseFocus)
         }
       },
@@ -103,9 +103,9 @@ export var sisccTheme = function sisccTheme(_ref) {
         styleOverrides: {
           root: {
             textTransform: 'none',
-            '&:focus': {
-              outline: 'none'
-            }
+            '&:focus': _extends({
+              outline: !isA11y && 'none'
+            }, isA11y && focus)
           },
           textPrimary: {
             '&:hover': {
@@ -142,14 +142,14 @@ export var sisccTheme = function sisccTheme(_ref) {
       MuiOutlinedInput: {
         styleOverrides: {
           root: {
-            '&.Mui-focused': isA11y && focus
+            '&.Mui-focusVisible': isA11y && focus
           }
         }
       },
       MuiTypography: {
         styleOverrides: {
           root: {
-            '&.Mui-focused': isA11y && focus
+            '&:focus': isA11y && focus
           }
         }
       },
@@ -164,7 +164,7 @@ export var sisccTheme = function sisccTheme(_ref) {
               color: outerPalette.primaryLight || innerPalette.primaryLight,
               textDecoration: 'underline'
             },
-            '&.Mui-focused': isA11y && focus
+            '&:focus': isA11y && focus
           },
           button: {
             '&:focus': isA11y && focus

package/lib/CollapseButtons/CollapseButtons.js

@@ -13,6 +13,10 @@ var _propTypes = require('prop-types');
 
 var _propTypes2 = _interopRequireDefault(_propTypes);
 
+var _classnames = require('classnames');
+
+var _classnames2 = _interopRequireDefault(_classnames);
+
 var _ramda = require('ramda');
 
 var R = _interopRequireWildcard(_ramda);
@@ -54,15 +58,25 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 var MAX_COLUMNS = exports.MAX_COLUMNS = 12;
 var COLUMNS = exports.COLUMNS = [12, 12, 6, 4, 3, 3, 2, 2, 2, 2, 2, 2, 1];
 
-var useStyles = (0, _makeStyles2.default)(function () {
+var useStyles = (0, _makeStyles2.default)(function (theme) {
   return {
     collapseContainer: {
       width: '100%'
+    },
+    container: {
+      '&:focus': {
+        outlineColor: theme.palette.highlight.hl1,
+        outlineWidth: 2,
+        outlineStyle: 'auto',
+        paddingBottom: 16
+      }
     }
   };
 });
 
 var CollapseButtons = function CollapseButtons(props) {
+  var _cx;
+
   var _props$items = props.items,
       items = _props$items === undefined ? [] : _props$items,
       _props$action = props.action,
@@ -82,7 +96,8 @@ var CollapseButtons = function CollapseButtons(props) {
       _props$textTransform = props.textTransform,
       textTransform = _props$textTransform === undefined ? 'none' : _props$textTransform,
       _props$labelAccessor = props.labelAccessor,
-      labelAccessor = _props$labelAccessor === undefined ? R.prop('label') : _props$labelAccessor;
+      labelAccessor = _props$labelAccessor === undefined ? R.prop('label') : _props$labelAccessor,
+      accessibility = props.accessibility;
 
 
   var classes = useStyles();
@@ -115,7 +130,14 @@ var CollapseButtons = function CollapseButtons(props) {
 
   return _react2.default.createElement(
     _Grid2.default,
-    { container: true, spacing: 2, 'data-testid': testId, justifyContent: justify },
+    {
+      container: true,
+      spacing: 2,
+      'data-testid': testId,
+      justifyContent: justify,
+      className: (0, _classnames2.default)((_cx = {}, _cx[classes.container] = accessibility, _cx)),
+      tabIndex: 0
+    },
     R.map(function (_ref) {
       var id = _ref.id,
           label = _ref.label,
@@ -203,7 +225,8 @@ CollapseButtons.propTypes = process.env.NODE_ENV !== "production" ? {
   gridButtonsProps: _propTypes2.default.object,
   justify: _propTypes2.default.string,
   textTransform: _propTypes2.default.string,
-  labelAccessor: _propTypes2.default.func
+  labelAccessor: _propTypes2.default.func,
+  accessibility: _propTypes2.default.bool
 } : {};
 
 exports.default = CollapseButtons;

package/lib/CollapseButtons/Item.js

@@ -137,6 +137,13 @@ var Item = function Item(_ref) {
                   action(parentId, id);
                   e.stopPropagation();
                 },
+                onKeyDown: function onKeyDown(e) {
+                  if (e.key === 'Enter' || e.key === ' ') {
+                    if (R.not(R.is(Function)(action))) return;
+                    action(parentId, id);
+                    e.stopPropagation();
+                  }
+                },
                 tabIndex: 0,
                 underline: 'none',
                 style: { display: 'list-item' }

package/lib/DynamicDrawer/DynamicDrawer.js

@@ -102,7 +102,7 @@ var useStyles = (0, _makeStyles2.default)(function (theme) {
 var getCounter = function getCounter(items, tagAccessor) {
   var selectedItemsIds = R.reduce(function (acc, item) {
     if (R.prop('isSelected', item)) {
-      return R.append(item.id, acc);
+      return R.append(R.prop('id', item), acc);
     }
     return acc;
   }, [], items);
@@ -134,8 +134,8 @@ var TabPanel = function TabPanel(props) {
     _extends({
       role: 'tabpanel',
       hidden: !open,
-      id: 'vertical-tabpanel-' + item.index,
-      'aria-labelledby': 'vertical-tab-' + item.index,
+      id: 'vertical-tabpanel-' + R.prop('index', item),
+      'aria-labelledby': 'vertical-tab-' + R.prop('index', item),
       className: isNarrow ? classes.tabPanelNarrow : classes.tabPanel,
       style: styles
     }, other),
@@ -228,7 +228,8 @@ var PaperComponent = _react2.default.forwardRef(function (_ref, ref) {
       tagValueLabel = _ref.tagValueLabel,
       rest = _objectWithoutProperties(_ref, ['label', 'selected', 'item', 'tagAccessor', 'tagValueLabel']);
 
-  var Chip = R.isNil(item.tag) ? _.Tag : item.tag;
+  var tag = R.prop('tag', item);
+  var Chip = R.isNil(tag) ? _.Tag : tag;
   var classes = useStyles();
   return _react2.default.createElement(
     _Paper2.default,
@@ -246,11 +247,11 @@ var PaperComponent = _react2.default.forwardRef(function (_ref, ref) {
         },
         label
       ),
-      R.isNil(item.tag) ? _react2.default.createElement(
+      R.isNil(tag) ? _react2.default.createElement(
         Chip,
-        { items: item.values, tagValueLabel: tagValueLabel },
-        getCounter(item.values, tagAccessor)
-      ) : item.tag
+        { items: R.prop('values', item), tagValueLabel: tagValueLabel },
+        getCounter(R.prop('values', item), tagAccessor)
+      ) : tag
     )
   );
 });
@@ -308,12 +309,13 @@ var DynamicDrawer = function DynamicDrawer(props) {
       rest = _objectWithoutProperties(props, ['list', 'labelRenderer', 'onClick', 'handleChangePanel', 'onClosePanel', 'isNarrow', 'labels', 'disableAccessor', 'isApplyHiddenNarrow', 'expandAll', 'collapseAll', 'expandedIds', 'allItems', 'periodPanel', 'classes', 'testId', 'tagAccessor', 'tagAriaLabel', 'children', 'styles']);
 
   var handleChange = function handleChange(e, item) {
-    var filterSelection = R.pipe(R.propOr([], item.id), function (arr) {
+    var id = R.prop('id', item);
+    var filterSelection = R.pipe(R.propOr([], id), function (arr) {
       return R.zipObj(arr, arr);
     })(allSelection);
     setSelection(_extends({}, filterSelection));
-    handleChangePanel(item.id, selection, allSelection);
-    setSelectedId(item.id);
+    handleChangePanel(id, selection, allSelection);
+    setSelectedId(id);
     setOpen(true);
   };
   var handleSubmit = function handleSubmit() {
@@ -335,7 +337,7 @@ var DynamicDrawer = function DynamicDrawer(props) {
   var filter = (0, _react.useMemo)(function () {
     if (!selectedId) return {};
     return R.find(function (item) {
-      return item.id === selectedId;
+      return R.prop('id', item) === selectedId;
     })(list);
   }, [selectedId, list]);
 
@@ -392,18 +394,18 @@ var DynamicDrawer = function DynamicDrawer(props) {
       R.map(function (item) {
         var _cx2;
 
-        var tagValueLabel = R.isNil(item.tag) && getCounter(item.values, tagAriaLabel);
+        var tagValueLabel = R.isNil(R.prop('tag', item)) && getCounter(R.prop('values', item), tagAriaLabel);
 
         return _react2.default.createElement(_Tab2.default, {
-          key: item.id,
-          id: filter.id,
-          'data-testid': item.id + '-tab',
+          key: R.prop('id', item),
+          id: R.prop('id', filter),
+          'data-testid': R.prop('id', item) + '-tab',
           component: _react2.default.forwardRef(function TabPaper(tabProps, ref) {
             return _react2.default.createElement(PaperComponent, _extends({
               ref: ref
             }, tabProps, {
               label: labelRenderer(item),
-              selected: selectedId === item.id,
+              selected: selectedId === R.prop('id', item),
               item: item,
               tagAccessor: tagAccessor,
               tagValueLabel: tagValueLabel
@@ -412,8 +414,8 @@ var DynamicDrawer = function DynamicDrawer(props) {
           label: labelRenderer(item),
           'aria-label': labelRenderer(item),
           value: item,
-          'aria-selected': filter.id === item.id,
-          className: (0, _classnames2.default)(classNames.tab, (_cx2 = {}, _cx2[classNames.tabSelected] = filter.id === item.id, _cx2)),
+          'aria-selected': R.prop('id', filter) === R.prop('id', item),
+          className: (0, _classnames2.default)(classNames.tab, (_cx2 = {}, _cx2[classNames.tabSelected] = R.prop('id', filter) === R.prop('id', item), _cx2)),
           sx: {
             alignItems: 'start',
             maxWidth: '100%'
@@ -460,9 +462,9 @@ var DynamicDrawer = function DynamicDrawer(props) {
         labelRenderer: labelRenderer,
         styles: styles
       },
-      R.equals(filter.id, periodPanel) ? children : _react2.default.createElement(_AdvancedSelection2.default, _extends({
+      R.equals(R.prop('id', filter), periodPanel) ? children : _react2.default.createElement(_AdvancedSelection2.default, _extends({
         id: selectedId,
-        items: filter.values || [],
+        items: R.prop('values', filter) || [],
         isOpen: open,
         labelRenderer: labelRenderer,
         disableAccessor: disableAccessor ? R.pipe(R.prop('isEnabled'), R.not) : undefined,

package/lib/Logo/Logo.js

@@ -48,7 +48,7 @@ var Logo = function Logo(_ref) {
   var classes = useStyles();
   return _react2.default.createElement(
     'span',
-    { className: classes.container, role: 'button', tabIndex: 0 },
+    { className: classes.container, role: 'presentation' },
     _react2.default.createElement('img', {
       className: (0, _classnames2.default)(classes.logo, classes.alternativeBrowserLogo),
       style: { maxHeight: maxHeight },

package/lib/Spotlight/Spotlight.js

@@ -149,7 +149,6 @@ var Spotlight = function Spotlight(_ref) {
       R.gt(size(R.prop('fields', spotlight)), 1) ? _react2.default.createElement(
         _react.Fragment,
         null,
-        _react2.default.createElement(_Divider2.default, { className: classes.divider, 'aria-hidden': 'true' }),
         _react2.default.createElement(_Fields.Field, {
           spotlight: spotlight,
           onChangeField: onChangeField,

package/lib/theme.js

@@ -59,9 +59,9 @@ var sisccTheme = exports.sisccTheme = function sisccTheme(_ref) {
         },
         styleOverrides: {
           root: _extends({
-            '&:focus': {
-              outline: 'none'
-            }
+            '&:focus': _extends({
+              outline: !isA11y && 'none'
+            }, isA11y && focus)
           }, buttonBaseFocus)
         }
       },
@@ -107,9 +107,9 @@ var sisccTheme = exports.sisccTheme = function sisccTheme(_ref) {
         styleOverrides: {
           root: {
             textTransform: 'none',
-            '&:focus': {
-              outline: 'none'
-            }
+            '&:focus': _extends({
+              outline: !isA11y && 'none'
+            }, isA11y && focus)
           },
           textPrimary: {
             '&:hover': {
@@ -146,14 +146,14 @@ var sisccTheme = exports.sisccTheme = function sisccTheme(_ref) {
       MuiOutlinedInput: {
         styleOverrides: {
           root: {
-            '&.Mui-focused': isA11y && focus
+            '&.Mui-focusVisible': isA11y && focus
           }
         }
       },
       MuiTypography: {
         styleOverrides: {
           root: {
-            '&.Mui-focused': isA11y && focus
+            '&:focus': isA11y && focus
           }
         }
       },
@@ -168,7 +168,7 @@ var sisccTheme = exports.sisccTheme = function sisccTheme(_ref) {
               color: outerPalette.primaryLight || innerPalette.primaryLight,
               textDecoration: 'underline'
             },
-            '&.Mui-focused': isA11y && focus
+            '&:focus': isA11y && focus
           },
           button: {
             '&:focus': isA11y && focus

package/package.json

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