@sis-cc/dotstatsuite-visions 7.13.1 → 7.14.0

package/es/ScopeList/Item.js

@@ -55,7 +55,8 @@ var Item = function Item(_ref) {
       index = _ref.index,
       labelRenderer = _ref.labelRenderer,
       HTMLRenderer = _ref.HTMLRenderer,
-      hierarchicalId = _ref.hierarchicalId;
+      hierarchicalId = _ref.hierarchicalId,
+      labels = _ref.labels;
 
   var _React$useState = React.useState(false),
       isTooltipShown = _React$useState[0],
@@ -82,14 +83,14 @@ var Item = function Item(_ref) {
     },
     React.createElement(ListItemText, {
       tabIndex: 0,
-      'aria-label': label,
+      'aria-label': isDisabled ? R.propOr('', 'disableItemLabel')(labels) + ' ' + label : label,
       'aria-pressed': isSelected,
       'aria-disabled': isDisabled,
       primaryTypographyProps: { noWrap: true, color: 'inherit' },
       secondaryTypographyProps: { color: 'inherit' },
       classes: { root: classes.listItem },
       className: cx((_cx2 = {}, _cx2[classes.accessibilityItemHover] = accessibility, _cx2[classes.listItemSelected] = R.and(isSelected, R.not(isDisabled)), _cx2[classes.listItemHover] = R.not(isDisabled), _cx2)),
-      title: label,
+      title: isDisabled ? R.propOr('', 'disableItemLabel')(labels) + ' ' + label : label,
       primary: React.createElement(
         'div',
         {
@@ -234,7 +235,8 @@ Item.propTypes = process.env.NODE_ENV !== "production" ? {
   index: PropTypes.number,
   labelRenderer: PropTypes.func,
   HTMLRenderer: PropTypes.func,
-  hierarchicalId: PropTypes.string
+  hierarchicalId: PropTypes.string,
+  labels: PropTypes.object
 } : {};
 
 export default Item;

package/es/ScopeList/ScopeList.js

@@ -110,7 +110,7 @@ var ScopeList = function ScopeList(props) {
         // ReactVirtualized__Grid ReactVirtualized__List made the scrollbar
         var scrollEl = R.path(['children', 0, 'children', 0], current);
         var isBottom = R.gte(R.add(R.prop('scrollTop')(scrollEl), R.prop('clientHeight')(scrollEl)), R.prop('scrollHeight')(scrollEl));
-        var nextpos = (scrollTop || 0) + event.deltaY / 2;
+        var nextpos = (scrollTop || scrollEl.scrollTop) + event.deltaY / 2;
         if (R.or(event.deltaY < 0, event.deltaY > 0 && R.not(isBottom))) {
           setScrollTop(nextpos < 0 ? 0 : nextpos);
         }
@@ -120,6 +120,9 @@ var ScopeList = function ScopeList(props) {
         setScrollTop(undefined); // should be undefined if the user want use the normal scroll
       }
     };
+    if (scrollTop === 0) {
+      setScrollTop(undefined);
+    }
     if (R.isNil(current)) return;
 
     current.addEventListener('wheel', handler, { passive: false });
@@ -229,7 +232,6 @@ var ScopeList = function ScopeList(props) {
           var height = _ref.height,
               width = _ref.width;
           return React.createElement(VirtualizedList, {
-            ref: ref,
             overscan: 10,
             tabIndex: -1,
             height: height,
@@ -258,7 +260,8 @@ var ScopeList = function ScopeList(props) {
                 changeMouseSelection: changeMouseSelection,
                 ariaLabel: R.prop('navigateNext')(labels),
                 NavigateIcon: isRtl ? NavigateBefore : NavigateNext,
-                accessibility: accessibility
+                accessibility: accessibility,
+                labels: labels
               }, item, {
                 isDisabled: disableAccessor(item),
                 label: labelRenderer(item)
@@ -297,6 +300,7 @@ ScopeList.propTypes = process.env.NODE_ENV !== "production" ? {
     childrenNavigateDesc: PropTypes.string,
     navigateNext: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
     backHelper: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
+    disableItemLabel: PropTypes.string,
     selection: PropTypes.shape({
       title: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
       currentLevel: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),

package/es/ScopeList/index.js

@@ -51,6 +51,7 @@
  *     navigateBefore: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
  *     navigateNext: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
  *     backHelper: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
+ *     disableItemLabel: PropTypes.string,
  *     selection: {
  *       title: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
  *       currentLevel: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),

package/lib/ScopeList/Item.js

@@ -93,7 +93,8 @@ var Item = function Item(_ref) {
       index = _ref.index,
       labelRenderer = _ref.labelRenderer,
       HTMLRenderer = _ref.HTMLRenderer,
-      hierarchicalId = _ref.hierarchicalId;
+      hierarchicalId = _ref.hierarchicalId,
+      labels = _ref.labels;
 
   var _React$useState = _react2.default.useState(false),
       isTooltipShown = _React$useState[0],
@@ -120,14 +121,14 @@ var Item = function Item(_ref) {
     },
     _react2.default.createElement(_ListItemText2.default, {
       tabIndex: 0,
-      'aria-label': label,
+      'aria-label': isDisabled ? R.propOr('', 'disableItemLabel')(labels) + ' ' + label : label,
       'aria-pressed': isSelected,
       'aria-disabled': isDisabled,
       primaryTypographyProps: { noWrap: true, color: 'inherit' },
       secondaryTypographyProps: { color: 'inherit' },
       classes: { root: classes.listItem },
       className: (0, _classnames2.default)((_cx2 = {}, _cx2[classes.accessibilityItemHover] = accessibility, _cx2[classes.listItemSelected] = R.and(isSelected, R.not(isDisabled)), _cx2[classes.listItemHover] = R.not(isDisabled), _cx2)),
-      title: label,
+      title: isDisabled ? R.propOr('', 'disableItemLabel')(labels) + ' ' + label : label,
       primary: _react2.default.createElement(
         'div',
         {
@@ -272,7 +273,8 @@ Item.propTypes = process.env.NODE_ENV !== "production" ? {
   index: _propTypes2.default.number,
   labelRenderer: _propTypes2.default.func,
   HTMLRenderer: _propTypes2.default.func,
-  hierarchicalId: _propTypes2.default.string
+  hierarchicalId: _propTypes2.default.string,
+  labels: _propTypes2.default.object
 } : {};
 
 exports.default = Item;

package/lib/ScopeList/ScopeList.js

@@ -163,7 +163,7 @@ var ScopeList = function ScopeList(props) {
         // ReactVirtualized__Grid ReactVirtualized__List made the scrollbar
         var scrollEl = R.path(['children', 0, 'children', 0], current);
         var isBottom = R.gte(R.add(R.prop('scrollTop')(scrollEl), R.prop('clientHeight')(scrollEl)), R.prop('scrollHeight')(scrollEl));
-        var nextpos = (scrollTop || 0) + event.deltaY / 2;
+        var nextpos = (scrollTop || scrollEl.scrollTop) + event.deltaY / 2;
         if (R.or(event.deltaY < 0, event.deltaY > 0 && R.not(isBottom))) {
           setScrollTop(nextpos < 0 ? 0 : nextpos);
         }
@@ -173,6 +173,9 @@ var ScopeList = function ScopeList(props) {
         setScrollTop(undefined); // should be undefined if the user want use the normal scroll
       }
     };
+    if (scrollTop === 0) {
+      setScrollTop(undefined);
+    }
     if (R.isNil(current)) return;
 
     current.addEventListener('wheel', handler, { passive: false });
@@ -282,7 +285,6 @@ var ScopeList = function ScopeList(props) {
           var height = _ref.height,
               width = _ref.width;
           return _react2.default.createElement(_List2.default, {
-            ref: ref,
             overscan: 10,
             tabIndex: -1,
             height: height,
@@ -311,7 +313,8 @@ var ScopeList = function ScopeList(props) {
                 changeMouseSelection: changeMouseSelection,
                 ariaLabel: R.prop('navigateNext')(labels),
                 NavigateIcon: isRtl ? _NavigateBefore2.default : _NavigateNext2.default,
-                accessibility: accessibility
+                accessibility: accessibility,
+                labels: labels
               }, item, {
                 isDisabled: disableAccessor(item),
                 label: labelRenderer(item)
@@ -350,6 +353,7 @@ ScopeList.propTypes = process.env.NODE_ENV !== "production" ? {
     childrenNavigateDesc: _propTypes2.default.string,
     navigateNext: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.element]),
     backHelper: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.element]),
+    disableItemLabel: _propTypes2.default.string,
     selection: _propTypes2.default.shape({
       title: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.element]),
       currentLevel: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.element]),

package/package.json

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