@sis-cc/dotstatsuite-visions 7.20.3 → 7.20.5

package/lib/HierarchicalFilter/HierarchicalFilter.js

@@ -26,6 +26,8 @@ var _PlaylistAddCheck2 = _interopRequireDefault(_PlaylistAddCheck);
 
 var _ = require('../');
 
+var _withExpansionTree = require('../VirtualizedTree/withExpansionTree');
+
 var _styles = require('../ScopeList/styles');
 
 var _core = require('@material-ui/core');
@@ -62,12 +64,19 @@ var HierarchicalFilter = function HierarchicalFilter(props) {
       label = props.label,
       labels = props.labels,
       tagAccessor = props.tagAccessor,
-      displayAccessor = props.displayAccessor;
+      displayAccessor = props.displayAccessor,
+      expandedIds = props.expandedIds,
+      defaultSpotlight = props.defaultSpotlight;
 
   var _useState = (0, _react.useState)({ term: '' }),
       term = _useState[0].term,
       setSpotlight = _useState[1];
 
+  (0, _react.useEffect)(function () {
+    if (!R.isNil(defaultSpotlight) && !R.isEmpty(defaultSpotlight)) {
+      setSpotlight(defaultSpotlight);
+    }
+  }, [defaultSpotlight]);
   var classes = (0, _styles.useStyles)({ accessibility: accessibility });
   var theme = (0, _core.useTheme)();
   var isRtl = (0, _utils.getIsRtl)(theme);
@@ -94,6 +103,11 @@ var HierarchicalFilter = function HierarchicalFilter(props) {
   var onSelect = function onSelect(values) {
     changeSelection(id, values);
   };
+
+  var onAdvancedToggle = function onAdvancedToggle() {
+    toggleBulk({ expandedIds: expandedIds, spotlight: { term: term } });
+  };
+
   return _react2.default.createElement(
     _.ExpansionPanel,
     _extends({
@@ -124,7 +138,7 @@ var HierarchicalFilter = function HierarchicalFilter(props) {
             {
               'aria-label': R.prop('advancedSelection')(labels),
               classes: { root: classes.bulkSelectionIcon },
-              onClick: toggleBulk
+              onClick: onAdvancedToggle
             },
             _react2.default.createElement(_PlaylistAddCheck2.default, { color: 'primary' })
           )
@@ -162,8 +176,10 @@ HierarchicalFilter.propTypes = process.env.NODE_ENV !== "production" ? {
   testId: _propTypes2.default.string,
   expansionPanelProps: _propTypes2.default.object,
   toggleBulk: _propTypes2.default.func,
-  tagAccessor: _propTypes2.default.func
+  tagAccessor: _propTypes2.default.func,
+  expandedIds: _propTypes2.default.object,
+  defaultSpotlight: _propTypes2.default.object
 } : {};
 
-exports.default = HierarchicalFilter;
+exports.default = (0, _withExpansionTree.withExpansionTree)(HierarchicalFilter);
 module.exports = exports['default'];

package/lib/TableHtml5/flags.js

@@ -84,7 +84,7 @@ var Flags = function Flags(_ref) {
   }, []), R.join(','))(flags);
   var content = _react2.default.createElement(
     'ul',
-    { className: classes.content },
+    { 'data-testid': 'cell-flags-footnotes-content', className: classes.content },
     R.addIndex(R.map)(function (_ref2, index) {
       var label = _ref2.label;
       return _react2.default.createElement(
@@ -105,7 +105,10 @@ var Flags = function Flags(_ref) {
     },
     _react2.default.createElement(
       'span',
-      { className: (0, _classnames2.default)(classes.flags, (_cx = {}, _cx[classes.header] = isHeader, _cx)) },
+      {
+        'data-testid': 'cell-flags-footnotes-icon',
+        className: (0, _classnames2.default)(classes.flags, (_cx = {}, _cx[classes.header] = isHeader, _cx))
+      },
       R.not(R.isEmpty(codedIcons)) && codedIcons,
       R.and(R.not(R.isEmpty(codedIcons)), hasUncoded) && _react2.default.createElement(
         _react2.default.Fragment,

package/lib/TableHtml5/header.js

@@ -146,6 +146,13 @@ var Header = function Header(_ref) {
           _react2.default.createElement(
             'div',
             { className: classes.cellContentCenter },
+            !R.isEmpty(hierarchySpace) && mapIndexed(function (space, idx) {
+              return _react2.default.createElement(
+                'div',
+                { key: idx },
+                space
+              );
+            })(hierarchySpace),
             _react2.default.createElement(
               _Typography2.default,
               {
@@ -156,13 +163,6 @@ var Header = function Header(_ref) {
                 },
                 variant: 'body1'
               },
-              !R.isEmpty(hierarchySpace) && mapIndexed(function (space, idx) {
-                return _react2.default.createElement(
-                  'div',
-                  { key: idx },
-                  space
-                );
-              })(hierarchySpace),
               R.prop('label', headerItem),
               _react2.default.createElement(_flags2.default, { HTMLRenderer: HTMLRenderer, flags: flags, isHeader: true })
             )

package/lib/TableHtml5/sectionHeader.js

@@ -117,7 +117,7 @@ var SectionHeader = function SectionHeader(_ref) {
       },
       _react2.default.createElement(
         _Grid2.default,
-        { container: true, alignItems: 'center', spacing: 5 },
+        { container: true, alignItems: 'center' },
         _react2.default.createElement(
           _Grid2.default,
           { item: true },
@@ -164,7 +164,7 @@ var SectionHeader = function SectionHeader(_ref) {
         ),
         !R.isNil(SideIcon) && _react2.default.createElement(
           _Grid2.default,
-          { item: true },
+          { item: true, style: { marginLeft: 40 } },
           _react2.default.createElement(SideIcon, { sideProps: R.path([0, 'sideProps'], section) })
         )
       )

package/lib/VirtualizedTree/Item.js

@@ -125,6 +125,7 @@ var Item = function Item(_ref) {
       secondaryTypographyProps: { color: 'inherit' },
       classes: { root: classes.listItem },
       className: (0, _classnames2.default)((_cx = {}, _cx[classes.accessibilityItemHover] = accessibility, _cx[classes.listItemSelected] = R.and(isSelected, R.not(isDisabled)), _cx[classes.listItemHover] = R.not(isDisabled), _cx[classes.disabledLabel] = isDisabled, _cx)),
+      onClick: isDisabled ? null : callbacks.onClick,
       onMouseDown: isDisabled || isTooltipShown ? null : callbacks.onMouseDown,
       onMouseUp: isDisabled || isTooltipShown ? null : callbacks.onMouseUp,
       onMouseEnter: isDisabled || isTooltipShown ? null : callbacks.onMouseEnter
@@ -159,6 +160,7 @@ var Item = function Item(_ref) {
                 return e.stopPropagation();
               } }),
             enterDelay: 400,
+            enterNextDelay: 400,
             tabIndex: 0,
             'aria-label': description,
             'aria-hidden': false,

package/lib/VirtualizedTree/VirtualizedTree.js

@@ -25,10 +25,6 @@ var _List = require('react-virtualized/dist/commonjs/List');
 
 var _List2 = _interopRequireDefault(_List);
 
-var _Button = require('@material-ui/core/Button');
-
-var _Button2 = _interopRequireDefault(_Button);
-
 var _ExpandMore = require('@material-ui/icons/ExpandMore');
 
 var _ExpandMore2 = _interopRequireDefault(_ExpandMore);
@@ -103,7 +99,9 @@ var VirtualizedTree = function VirtualizedTree(props) {
       items = props.items,
       labelRenderer = props.labelRenderer,
       labels = props.labels,
-      withExpandControl = props.withExpandControl,
+      expandedIds = props.expandedIds,
+      expand = props.expand,
+      collapse = props.collapse,
       _props$maxTreeHeight = props.maxTreeHeight,
       maxTreeHeight = _props$maxTreeHeight === undefined ? 250 : _props$maxTreeHeight,
       _props$getItemScope = props.getItemScope,
@@ -111,25 +109,21 @@ var VirtualizedTree = function VirtualizedTree(props) {
 
   var theme = (0, _core.useTheme)();
 
-  var _useState = (0, _react.useState)({}),
-      expandedIds = _useState[0],
-      setExpandedIds = _useState[1];
+  var _useState = (0, _react.useState)(undefined),
+      scrollTop = _useState[0],
+      setScrollTop = _useState[1];
 
-  var _useState2 = (0, _react.useState)(undefined),
-      scrollTop = _useState2[0],
-      setScrollTop = _useState2[1];
+  var _useState2 = (0, _react.useState)([]),
+      shiftIndexes = _useState2[0],
+      setShiftIndexes = _useState2[1];
 
-  var _useState3 = (0, _react.useState)([]),
-      shiftIndexes = _useState3[0],
-      setShiftIndexes = _useState3[1];
+  var _useState3 = (0, _react.useState)({}),
+      selectIds = _useState3[0],
+      setSelectIds = _useState3[1];
 
-  var _useState4 = (0, _react.useState)({}),
-      selectIds = _useState4[0],
-      setSelectIds = _useState4[1];
-
-  var _useState5 = (0, _react.useState)(false),
-      isMouseDown = _useState5[0],
-      setIsMouseDown = _useState5[1];
+  var _useState4 = (0, _react.useState)(false),
+      isMouseDown = _useState4[0],
+      setIsMouseDown = _useState4[1];
 
   var _useMemo = (0, _react.useMemo)(function () {
     var indexedItemsById = R.indexBy(getHierarchicalId, items);
@@ -197,21 +191,26 @@ var VirtualizedTree = function VirtualizedTree(props) {
         apply();
       } : null,
       onMouseDown: function onMouseDown(e) {
-        if (e.ctrlKey) {
-          multiSelect(id);
-        } else if (e.shiftKey) {
-          shiftSelect(index);
-        } else {
-          multiSelect(id);
-          setIsMouseDown(true);
+        if (e.ctrlKey || e.shiftKey) {
+          return;
         }
+        multiSelect(id);
+        setIsMouseDown(true);
       },
       onMouseEnter: isMouseDown ? function (e) {
         if (e.ctrlKey || e.shiftKey) {
           return;
         }
         multiSelect(id);
-      } : null
+      } : null,
+      onClick: function onClick(e) {
+        e.preventDefault();
+        if (e.ctrlKey) {
+          multiSelect(id);
+        } else if (e.shiftKey) {
+          shiftSelect(index);
+        }
+      }
     };
   };
   var onKeyUp = function onKeyUp(e) {
@@ -263,99 +262,68 @@ var VirtualizedTree = function VirtualizedTree(props) {
   }, [scrollTop]);
   var maxHeight = R.pipe(R.length, R.multiply(_styles.height), R.ifElse(R.gt(maxTreeHeight), R.add(10), R.always(maxTreeHeight)))(list);
 
-  var expand = function expand(index) {
-    var parentId = R.nth(index, list);
-    setExpandedIds(R.assoc(parentId, parentId, expandedIds));
-  };
-
-  var collapse = function collapse(index) {
-    var parentId = R.nth(index, list);
-    setExpandedIds(R.dissoc(parentId, expandedIds));
-  };
-
-  var expandAll = function expandAll() {
-    setExpandedIds(indexedItemsById);
-  };
-
-  var collapseAll = function collapseAll() {
-    setExpandedIds({});
-  };
-
   if (R.isEmpty(list)) {
     return null;
   }
   var isRtl = (0, _utils.getIsRtl)(theme);
-
   return _react2.default.createElement(
-    _react.Fragment,
-    null,
+    _List4.default,
+    {
+      disablePadding: true,
+      style: { height: maxHeight + 2 },
+      onKeyUp: onKeyUp,
+      onMouseLeave: isMouseDown ? apply : null,
+      ref: ref
+    },
     _react2.default.createElement(
-      _List4.default,
-      { disablePadding: true, style: { height: maxHeight + 2 }, onKeyUp: onKeyUp, ref: ref },
-      _react2.default.createElement(
-        _AutoSizer2.default,
-        null,
-        function (_ref) {
-          var height = _ref.height,
-              width = _ref.width;
-          return _react2.default.createElement(_List2.default, {
-            overscan: 10,
-            tabIndex: -1,
-            height: height + 2,
-            width: width,
-            scrollTop: scrollTop // control scroll position with ctrl or shift key
-            , rowCount: R.length(list),
-            rowHeight: R.add(1)(_styles.height) // 1 is space between elements
-            , rowRenderer: function rowRenderer(_ref2) {
-              var index = _ref2.index,
-                  style = _ref2.style;
-
-              var itemId = R.nth(index, list);
-              var item = R.prop(itemId, indexedItemsById);
-              return _react2.default.createElement(_Item2.default, _extends({}, item, {
-                id: getHierarchicalId(item),
-                label: labelRenderer(item),
-                key: getHierarchicalId(item),
-                depth: getDepth(indexedItemsById)(item),
-                hasChild: R.has(itemId, groupedItemsByParentId),
-                hasChildrenOnLevel: getHasChildrenOnLevel(groupedItemsByParentId)(item),
-                changeList: R.has(itemId, expandedIds) ? function () {
-                  return collapse(index);
-                } : function () {
-                  return expand(index);
-                },
-                NavigateIcon: R.has(itemId, expandedIds) ? _ExpandLess2.default : _ExpandMore2.default,
-                isRtl: isRtl,
-                isDisabled: R.is(Function, disableAccessor) ? disableAccessor(item) : false,
-                eventsCallbacks: eventsCallbacks,
-                isSelected: isItemSelected(item, index),
-                HTMLRenderer: HTMLRenderer,
-                classes: classes,
-                labels: labels,
-                index: index,
-                style: style,
-                accessibility: accessibility,
-                ariaLabel: R.prop('navigateNext')(labels),
-                theme: theme
-              }));
-            }
-          });
-        }
-      )
-    ),
-    withExpandControl && _react2.default.createElement(
-      'div',
+      _AutoSizer2.default,
       null,
-      _react2.default.createElement(
-        _Button2.default,
-        { onClick: collapseAll, color: 'primary' },
-        R.prop('colapseAll', labels)
-      ),
-      _react2.default.createElement(
-        _Button2.default,
-        { onClick: expandAll, color: 'primary' },
-        R.prop('expandAll', labels)
-      )
+      function (_ref) {
+        var height = _ref.height,
+            width = _ref.width;
+        return _react2.default.createElement(_List2.default, {
+          overscan: 10,
+          tabIndex: -1,
+          height: height + 2,
+          width: width,
+          scrollTop: scrollTop // control scroll position with ctrl or shift key
+          , rowCount: R.length(list),
+          rowHeight: R.add(1)(_styles.height) // 1 is space between elements
+          , rowRenderer: function rowRenderer(_ref2) {
+            var index = _ref2.index,
+                style = _ref2.style;
+
+            var itemId = R.nth(index, list);
+            var item = R.prop(itemId, indexedItemsById);
+            return _react2.default.createElement(_Item2.default, _extends({}, item, {
+              id: getHierarchicalId(item),
+              label: labelRenderer(item),
+              key: getHierarchicalId(item),
+              depth: getDepth(indexedItemsById)(item),
+              hasChild: R.has(itemId, groupedItemsByParentId),
+              hasChildrenOnLevel: getHasChildrenOnLevel(groupedItemsByParentId)(item),
+              changeList: R.has(itemId, expandedIds) ? function () {
+                return collapse(getHierarchicalId(item));
+              } : function () {
+                return expand(getHierarchicalId(item));
+              },
+              NavigateIcon: R.has(itemId, expandedIds) ? _ExpandLess2.default : _ExpandMore2.default,
+              isRtl: isRtl,
+              isDisabled: R.is(Function, disableAccessor) ? disableAccessor(item) : false,
+              eventsCallbacks: eventsCallbacks,
+              isSelected: isItemSelected(item, index),
+              HTMLRenderer: HTMLRenderer,
+              classes: classes,
+              labels: labels,
+              index: index,
+              style: style,
+              accessibility: accessibility,
+              ariaLabel: R.prop('navigateNext')(labels),
+              theme: theme
+            }));
+          }
+        });
+      }
     )
   );
 };
@@ -375,7 +343,10 @@ VirtualizedTree.propTypes = process.env.NODE_ENV !== "production" ? {
   }),
   labelRenderer: _propTypes2.default.func,
   withExpandControl: _propTypes2.default.bool,
-  maxTreeHeight: _propTypes2.default.number
+  maxTreeHeight: _propTypes2.default.number,
+  expandedIds: _propTypes2.default.object,
+  expand: _propTypes2.default.func,
+  collapse: _propTypes2.default.func
 } : {};
 
 exports.default = VirtualizedTree;

package/lib/VirtualizedTree/withExpansionTree.js

@@ -0,0 +1,71 @@
+'use strict';
+
+exports.__esModule = true;
+exports.withExpansionTree = undefined;
+
+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; };
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _ramda = require('ramda');
+
+var R = _interopRequireWildcard(_ramda);
+
+var _VirtualizedTree = require('./VirtualizedTree');
+
+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; } }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; } /* eslint react/prop-types: 0 */
+
+
+var withExpansionTree = function withExpansionTree(Component) {
+  return function (_ref) {
+    var items = _ref.items,
+        defaultExpandedIds = _ref.defaultExpandedIds,
+        rest = _objectWithoutProperties(_ref, ['items', 'defaultExpandedIds']);
+
+    var _useState = (0, _react.useState)({}),
+        expandedIds = _useState[0],
+        setExpandedIds = _useState[1];
+
+    (0, _react.useEffect)(function () {
+      if (!R.isNil(defaultExpandedIds) && !R.isEmpty(defaultExpandedIds)) {
+        setExpandedIds(defaultExpandedIds);
+      } else {
+        var ids = R.pipe(R.map(_VirtualizedTree.getHierarchicalId), R.indexBy(R.identity))(items);
+        setExpandedIds(ids);
+      }
+    }, [items, defaultExpandedIds]);
+
+    var expand = function expand(id) {
+      setExpandedIds(R.assoc(id, id, expandedIds));
+    };
+
+    var collapse = function collapse(id) {
+      setExpandedIds(R.dissoc(id, expandedIds));
+    };
+
+    var expandAll = function expandAll() {
+      var ids = R.pipe(R.map(_VirtualizedTree.getHierarchicalId), R.indexBy(R.identity))(items);
+      setExpandedIds(ids);
+    };
+
+    var collapseAll = function collapseAll() {
+      setExpandedIds({});
+    };
+
+    return _react2.default.createElement(Component, _extends({}, rest, {
+      items: items,
+      expand: expand,
+      collapse: collapse,
+      expandAll: expandAll,
+      collapseAll: collapseAll,
+      expandedIds: expandedIds
+    }));
+  };
+};
+exports.withExpansionTree = withExpansionTree;

package/package.json

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