@sis-cc/dotstatsuite-visions 12.19.0 → 12.20.2

package/lib/DynamicDrawer/DynamicDrawer.js

@@ -16,6 +16,10 @@ var _ramda = require('ramda');
 
 var R = _interopRequireWildcard(_ramda);
 
+var _classnames = require('classnames');
+
+var _classnames2 = _interopRequireDefault(_classnames);
+
 var _Box = require('@mui/material/Box');
 
 var _Box2 = _interopRequireDefault(_Box);
@@ -38,6 +42,10 @@ var _Button = require('@mui/material/Button');
 
 var _Button2 = _interopRequireDefault(_Button);
 
+var _ArrowBack = require('@mui/icons-material/ArrowBack');
+
+var _ArrowBack2 = _interopRequireDefault(_ArrowBack);
+
 var _ = require('..');
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
@@ -52,6 +60,20 @@ var useStyles = (0, _makeStyles2.default)(function (theme) {
       textTransform: 'none',
       color: theme.palette.grey[700]
     }, R.pathOr({}, ['mixins', 'expansionPanel', 'title'], theme)),
+    labelSelected: {
+      color: theme.palette.primary.main
+    },
+    tabSelected: {
+      backgroundColor: theme.palette.action.hover + ' !important',
+      '&:hover': {
+        backgroundColor: theme.palette.action.selected + ' !important'
+      }
+    },
+    tab: {
+      '&:hover': {
+        backgroundColor: '' + theme.palette.action.selected
+      }
+    },
     tabPanel: {
       backgroundColor: theme.palette.background.default,
       position: 'absolute',
@@ -71,7 +93,9 @@ var TabPanel = function TabPanel(props) {
       classes = props.classes,
       labels = props.labels,
       onClose = props.onClose,
-      other = _objectWithoutProperties(props, ['children', 'open', 'item', 'classes', 'labels', 'onClose']);
+      isNarrow = props.isNarrow,
+      setOpen = props.setOpen,
+      other = _objectWithoutProperties(props, ['children', 'open', 'item', 'classes', 'labels', 'onClose', 'isNarrow', 'setOpen']);
 
   return _react2.default.createElement(
     'div',
@@ -80,11 +104,27 @@ var TabPanel = function TabPanel(props) {
       hidden: !open,
       id: 'vertical-tabpanel-' + item.index,
       'aria-labelledby': 'vertical-tab-' + item.index,
-      className: classes.tabPanel
+      className: isNarrow ? classes.tabPanelNarrow : classes.tabPanel
     }, other),
     open && _react2.default.createElement(
       _Box2.default,
       { sx: { p: 3 } },
+      isNarrow && _react2.default.createElement(
+        _Button2.default,
+        {
+          onClick: function onClick() {
+            return setOpen(false);
+          },
+          'data-testid': 'back_button',
+          'aria-label': R.prop('cancel', labels),
+          sx: {
+            padding: 0,
+            float: 'left'
+          },
+          size: 'large'
+        },
+        _react2.default.createElement(_ArrowBack2.default, null)
+      ),
       _react2.default.createElement(
         _Button2.default,
         {
@@ -109,31 +149,44 @@ TabPanel.propTypes = process.env.NODE_ENV !== "production" ? {
   classes: _propTypes2.default.object,
   labels: _propTypes2.default.object,
   onClose: _propTypes2.default.func,
-  children: _propTypes2.default.node
+  children: _propTypes2.default.node,
+  isNarrow: _propTypes2.default.bool,
+  setOpen: _propTypes2.default.func
 } : {};
 
 var PaperComponent = function PaperComponent(props) {
+  var _cx;
+
   var classes = useStyles();
-  // const Chip = R.isNil(props.tag) ? InternalTag : props.tag;
   return _react2.default.createElement(
     _material.Paper,
     props,
     _react2.default.createElement(
-      _material.Typography,
-      { noWrap: true, variant: 'body2', title: props.label, className: classes.label },
-      props.label
+      _Box2.default,
+      { sx: { display: 'flex', justifyContent: 'space-between', width: '100%' } },
+      _react2.default.createElement(
+        _material.Typography,
+        {
+          noWrap: true,
+          variant: 'body2',
+          title: props.label,
+          className: (0, _classnames2.default)(classes.label, (_cx = {}, _cx[classes.labelSelected] = props.selected, _cx))
+        },
+        props.label
+      ),
+      props.tag
     )
   );
 };
 PaperComponent.propTypes = process.env.NODE_ENV !== "production" ? {
   label: _propTypes2.default.string,
   tag: _propTypes2.default.elementType,
-  items: _propTypes2.default.array,
-  tagValueLabel: _propTypes2.default.func,
-  tagValue: _propTypes2.default.string
+  selected: _propTypes2.default.bool
 } : {};
 
 var DynamicDrawer = function DynamicDrawer(props) {
+  var classNames = useStyles();
+
   var _useState = (0, _react.useState)(false),
       open = _useState[0],
       setOpen = _useState[1];
@@ -150,6 +203,22 @@ var DynamicDrawer = function DynamicDrawer(props) {
       allSelection = _useState4[0],
       setAllSelection = _useState4[1];
 
+  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 acc;
+    }, [], items);
+    var itemsIds = R.pluck('id', items);
+    var count = R.pipe(R.uniq, R.length)(selectedItemsIds);
+    var total = R.pipe(R.uniq, R.length)(itemsIds);
+    if (R.is(Function, tagAccessor)) {
+      return tagAccessor(count, total);
+    }
+    return count + '/' + total;
+  };
+
   var list = props.list,
       labelRenderer = props.labelRenderer,
       onClick = props.onClick,
@@ -164,11 +233,12 @@ var DynamicDrawer = function DynamicDrawer(props) {
       allItems = props.allItems,
       periodPanel = props.periodPanel,
       classes = props.classes,
-      tag = props.tag,
       _props$testId = props.testId,
       testId = _props$testId === undefined ? 'tabs' : _props$testId,
+      tagAccessor = props.tagAccessor,
+      tagAriaLabel = props.tagAriaLabel,
       children = props.children,
-      rest = _objectWithoutProperties(props, ['list', 'labelRenderer', 'onClick', 'handleChangePanel', 'isNarrow', 'labels', 'disableAccessor', 'expandAll', 'collapseAll', 'expandedIds', 'allItems', 'periodPanel', 'classes', 'tag', 'testId', 'children']);
+      rest = _objectWithoutProperties(props, ['list', 'labelRenderer', 'onClick', 'handleChangePanel', 'isNarrow', 'labels', 'disableAccessor', 'expandAll', 'collapseAll', 'expandedIds', 'allItems', 'periodPanel', 'classes', 'testId', 'tagAccessor', 'tagAriaLabel', 'children']);
 
   var handleChange = function handleChange(e, item) {
     console.log({ item: item, selection: selection, allSelection: allSelection });
@@ -183,6 +253,13 @@ var DynamicDrawer = function DynamicDrawer(props) {
     setSelection({});
     setOpen(false);
   };
+  var handleClose = function handleClose() {
+    setOpen(false);
+    setAllSelection({});
+    setSelection({});
+  };
+  var isHidden = open && isNarrow;
+  var isNotHiddenButton = !R.isEmpty(allSelection) && isNarrow;
 
   return _react2.default.createElement(
     'div',
@@ -196,25 +273,59 @@ var DynamicDrawer = function DynamicDrawer(props) {
         onChange: handleChange,
         'aria-label': 'filters',
         'data-testid': testId,
-        sx: { width: '100%', height: '100%', borderRight: 1, borderColor: 'divider' }
+        sx: {
+          display: isHidden ? 'none' : 'flex',
+          width: '100%',
+          height: '100%',
+          borderRight: 1,
+          borderColor: 'divider'
+        }
       },
       R.map(function (item) {
+        var _cx2;
+
+        var Chip = R.isNil(item.tag) ? _.Tag : item.tag;
+        var tagValueLabel = R.isNil(item.tag) && getCounter(item.values, tagAriaLabel);
+
         return _react2.default.createElement(_material.Tab, {
           key: item.id,
           id: filter.id,
           'data-testid': item.id + '-tab',
           component: function component(props) {
-            return PaperComponent(_extends({ label: labelRenderer(item), tag: tag }, props));
+            return PaperComponent(_extends({
+              label: labelRenderer(item),
+              selected: filter.id === item.id,
+              tag: R.isNil(item.tag) ? _react2.default.createElement(
+                Chip,
+                { items: item.values, tagValueLabel: tagValueLabel },
+                getCounter(item.values, tagAccessor)
+              ) : item.tag
+            }, props));
           },
           label: labelRenderer(item),
           'aria-label': labelRenderer(item),
-          sx: { alignItems: 'start', maxWidth: '100%' },
           value: item,
           'aria-selected': filter.id === item.id,
+          className: (0, _classnames2.default)(classNames.tab, (_cx2 = {}, _cx2[classNames.tabSelected] = filter.id === item.id, _cx2)),
+          sx: {
+            alignItems: 'start',
+            maxWidth: '100%'
+          },
           wrapped: true
         });
       })(list),
-      open && _react2.default.createElement(
+      open && !isNarrow && _react2.default.createElement(
+        _.Button,
+        {
+          sx: { float: 'bottom', margin: '10px' },
+          'aria-label': R.prop('apply', labels),
+          id: 'apply_button',
+          variant: 'contained',
+          onClick: handleSubmit
+        },
+        R.prop('apply', labels)
+      ),
+      isNotHiddenButton && _react2.default.createElement(
         _.Button,
         {
           sx: { float: 'bottom', margin: '10px' },
@@ -234,9 +345,9 @@ var DynamicDrawer = function DynamicDrawer(props) {
         open: open,
         labels: labels,
         classes: classes,
-        onClose: function onClose() {
-          return setOpen(false);
-        }
+        onClose: handleClose,
+        isNarrow: isNarrow,
+        setOpen: setOpen
       },
       R.equals(filter.id, periodPanel) ? children : _react2.default.createElement(_AdvancedSelection2.default, _extends({
         id: filter.id,

package/lib/DynamicDrawer/SelectionModesMobile.js

@@ -10,10 +10,6 @@ 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);
@@ -28,74 +24,68 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 var mapIndexed = R.addIndex(R.map);
 var ButtonCarousel = function ButtonCarousel(_ref) {
-  var _cx;
-
   var selectionModes = _ref.selectionModes,
       selectionMode = _ref.selectionMode,
       setSelectionMode = _ref.setSelectionMode,
-      isNarrow = _ref.isNarrow,
       classes = _ref.classes;
 
   return _react2.default.createElement(
     _material.Box,
     {
       sx: {
-        display: 'flex',
         overflowX: 'auto',
-        gap: 2,
-        padding: 2,
-        scrollSnapType: 'x mandatory',
-        '&::-webkit-scrollbar': { display: 'none' }, // Hide scrollbar on Webkit
-        scrollbarWidth: 'none' // Hide scrollbar on Firefox
+        overflowY: 'hidden',
+        whiteSpace: 'nowrap',
+        display: 'block', // allow horizontal scrolling
+        width: '100%',
+        maxWidth: '100%',
+        '&::-webkit-scrollbar': { display: 'none' }, // optional: hide scrollbar
+        scrollbarWidth: 'none'
       }
     },
-    _react2.default.createElement(
-      'div',
-      { className: (0, _classnames2.default)(classes.selectModeContainer, (_cx = {}, _cx[classes.narrowHeader] = isNarrow, _cx)) },
-      mapIndexed(function (_ref2) {
-        var value = _ref2.value,
-            label = _ref2.label,
-            img = _ref2.img;
-        return _react2.default.createElement(
-          _.Tooltip,
+    mapIndexed(function (_ref2) {
+      var value = _ref2.value,
+          label = _ref2.label,
+          img = _ref2.img;
+      return _react2.default.createElement(
+        _.Tooltip,
+        {
+          key: value,
+          classes: { tooltip: classes.tooltip },
+          title: _react2.default.createElement('img', { style: { width: '72px', height: '90px' }, src: img, alt: value }),
+          tabIndex: -1
+        },
+        _react2.default.createElement(
+          _material.Button,
           {
-            key: value,
-            classes: { tooltip: classes.tooltip },
-            title: _react2.default.createElement('img', { style: { width: '72px', height: '90px' }, src: img, alt: value }),
-            tabIndex: -1
+            className: classes.selectButton,
+            selected: value === selectionMode,
+            onClick: function onClick() {
+              setSelectionMode(value);
+            },
+            'aria-pressed': value === selectionMode,
+            'aria-label': label,
+            tabIndex: 0,
+            sx: {
+              flex: '0 0 auto', // Prevents buttons from shrinking
+              scrollSnapAlign: 'center',
+              minWidth: 120, // Minimum width for buttons
+              whiteSpace: 'nowrap'
+            }
           },
           _react2.default.createElement(
-            _material.Button,
-            {
-              className: classes.selectButton,
-              selected: value === selectionMode,
-              onClick: function onClick() {
-                setSelectionMode(value);
-              },
-              'aria-pressed': value === selectionMode,
-              'aria-label': label,
-              tabIndex: 0,
-              sx: {
-                flex: '0 0 auto', // Prevents buttons from shrinking
-                scrollSnapAlign: 'center',
-                minWidth: 120, // Minimum width for buttons
-                whiteSpace: 'nowrap'
-              }
-            },
+            _material.Paper,
+            { elevation: 0, className: classes.selectModeItem, key: value },
             _react2.default.createElement(
-              _material.Paper,
-              { elevation: 0, className: classes.selectModeItem, key: value },
-              _react2.default.createElement(
-                _material.Typography,
-                null,
-                label
-              ),
-              !R.isNil(img) && R.is(String, img) && _react2.default.createElement('img', { src: img, alt: value })
-            )
+              _material.Typography,
+              null,
+              label
+            ),
+            !R.isNil(img) && R.is(String, img) && _react2.default.createElement('img', { src: img, alt: value })
           )
-        );
-      }, selectionModes)
-    )
+        )
+      );
+    }, selectionModes)
   );
 };
 
@@ -110,7 +100,6 @@ ButtonCarousel.propTypes = process.env.NODE_ENV !== "production" ? {
   })).isRequired,
   selectionMode: _propTypes2.default.string.isRequired,
   setSelectionMode: _propTypes2.default.func.isRequired,
-  classes: _propTypes2.default.object.isRequired,
-  isNarrow: _propTypes2.default.bool.isRequired
+  classes: _propTypes2.default.object.isRequired
 } : {};
 module.exports = exports['default'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sis-cc/dotstatsuite-visions",
-  "version": "12.19.0",
+  "version": "12.20.2",
   "description": "Library of visual components",
   "author": "OECD",
   "homepage": "https://visions-qa.siscc.org/#o",
@@ -37,7 +37,6 @@
     "@mui/styles": "^5.16.5",
     "@react-hook/size": "^2.1.1",
     "classnames": "^2.2.6",
-    "cross-env": "^7.0.3",
     "date-fns": "^1.30.1",
     "isemail": "^3.2.0",
     "numeral": "^2.0.6",