@sis-cc/dotstatsuite-visions 10.7.0 → 10.9.0

package/es/AdvancedFilterDialog/AdvancedFilterDialog.js

@@ -6,7 +6,7 @@ import React, { useState, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import * as R from 'ramda';
 import cx from 'classnames';
-import { getSingleDisableAccessor, getHierDisableAccessor, getScopeGetters } from '../VirtualizedTree/utils';
+import { getEvolvedDisableAccessor, getHierarchicalId, getScopeGetters } from '../VirtualizedTree/utils';
 import IconButton from '@material-ui/core/Button';
 import Dialog from '@material-ui/core/Dialog';
 import DialogTitle from '@material-ui/core/DialogTitle';
@@ -207,7 +207,7 @@ var AdvancedFilterDialog = function AdvancedFilterDialog(props) {
       isSelected: R.has(item.id, selection) ? !item.isSelected : !!item.isSelected
     });
   }, items);
-  var groupedFilteredItems = R.groupBy(R.propOr('#ROOT', 'parentId'), selectionItems);
+  var indexedFilteredItems = R.indexBy(getHierarchicalId, selectionItems);
 
   var selectionOptions = [{
     value: 'single',
@@ -236,7 +236,22 @@ var AdvancedFilterDialog = function AdvancedFilterDialog(props) {
       isSelected: R.has(item.id, selection) ? !item.isSelected : !!item.isSelected
     });
   }), R.groupBy(R.propOr('#ROOT', 'parentId')))(allItems);
-  var _disableAccessor = selectionMode === 'single' || selectionMode === 'level' ? getSingleDisableAccessor(_allGroupedItems, disableAccessor) : getHierDisableAccessor(_allGroupedItems, groupedFilteredItems, disableAccessor);
+
+  var isChildInSelectionScope = function isChildInSelectionScope(child, ancestor) {
+    if (!R.has(getHierarchicalId(child), indexedFilteredItems)) {
+      return false;
+    }
+    if (selectionMode === 'single' || selectionMode === 'level') {
+      return false;
+    }
+    if (selectionMode === 'children') {
+      return child.parentId === getHierarchicalId(ancestor);
+    }
+    return true;
+  };
+
+  var _disableAccessor = getEvolvedDisableAccessor(_allGroupedItems, disableAccessor, isChildInSelectionScope);
+
   var isDisabled = function isDisabled(item) {
     return R.is(Function, disableAccessor) ? disableAccessor(item) : false;
   };

package/es/HierarchicalFilter/HierarchicalFilter.js

@@ -8,7 +8,7 @@ import ZoomOutMapIcon from '@material-ui/icons/ZoomOutMap';
 import { ExpansionPanel, Tag as InternalTag, VerticalButton, Spotlight, VirtualizedTree, Tooltip } from '../';
 import { withExpansionTree } from '../VirtualizedTree/withExpansionTree';
 import { withSpotlight } from '../VirtualizedTree/withSpotlight';
-import { getSingleDisableAccessor } from '../VirtualizedTree/utils';
+import { getEvolvedDisableAccessor } from '../VirtualizedTree/utils';
 import { useStyles } from '../ScopeList/styles';
 import { useTheme } from '@material-ui/core';
 import { getIsRtl } from '../utils';
@@ -54,7 +54,7 @@ var HierarchicalFilter = function HierarchicalFilter(props) {
   var isRtl = getIsRtl(theme);
   var Chip = R.isNil(Tag) ? InternalTag : Tag;
   var _allGroupedItems = R.groupBy(R.propOr('#ROOT', 'parentId'), allItems);
-  var _disableAccessor = getSingleDisableAccessor(_allGroupedItems, disableAccessor);
+  var _disableAccessor = getEvolvedDisableAccessor(_allGroupedItems, disableAccessor, R.always(false));
   var tagValue = getCounter(items, _disableAccessor, tagAccessor);
   var isDisabled = function isDisabled(item) {
     return R.is(Function, disableAccessor) ? disableAccessor(item) : false;

package/es/TableHtml5/TableHtml5.js

@@ -38,12 +38,13 @@ var useStyles = makeStyles(function (theme) {
 var mapIndexed = R.addIndex(R.map);
 
 export var getEnhancedValuesHeaderData = function getEnhancedValuesHeaderData(data) {
-  var colLength = R.pipe(R.pathOr([], [0, 'data']), R.length)(data);
+  var colLength = R.pipe(R.last, R.propOr([], 'data'), R.length)(data);
   return R.pipe(R.pluck('data'),
   // mix merge and transpose for performance
   R.reduce(function (acc, cells) {
-    R.addIndex(R.forEach)(function (cell, rowIndex) {
-      var cellId = R.has('values', cell) ? R.pipe(R.prop('values'), R.pluck('id'), R.join(','))(cell) : R.path(['value', 'id'], cell);
+    R.addIndex(R.forEach)(function (_, rowIndex) {
+      var cell = R.nth(rowIndex, cells) || {};
+      var cellId = R.has('values', cell) ? R.pipe(R.prop('values'), R.pluck('id'), R.join(','))(cell) : R.pathOr('missing' + rowIndex, ['value', 'id'], cell);
       var topCell = rowIndex > 0 ? R.pipe(R.nth(rowIndex - 1), R.last)(acc) : null;
       var cellKey = R.isNil(topCell) ? cellId : topCell.key + '-' + cellId;
 
@@ -51,9 +52,13 @@ export var getEnhancedValuesHeaderData = function getEnhancedValuesHeaderData(da
       if (R.prop('key', leftCell) === cellKey && rowIndex !== colLength - 1) {
         acc = R.over(R.lensIndex(rowIndex), R.over(R.lensIndex(-1), R.evolve({ spanCount: R.add(1) })))(acc);
       } else {
-        acc = R.over(R.lensIndex(rowIndex), R.append(_extends({}, R.pick(['value', 'values'], cell), { key: cellKey, spanCount: 1 })))(acc);
+        acc = R.over(R.lensIndex(rowIndex), R.append(_extends({}, R.pick(['value', 'values'], cell), {
+          key: cellKey,
+          spanCount: 1,
+          isEmpty: R.isEmpty(cell)
+        })))(acc);
       }
-    })(cells);
+    })(acc);
     return acc;
   }, R.times(R.always([]), colLength)))(data);
 };
@@ -118,7 +123,7 @@ var TableHtml5 = function TableHtml5(_ref) {
     };
   }, []);
 
-  var xLayoutData = R.pathOr([], [0, 1, 0, 'data'], sectionsData);
+  var xLayoutData = R.pathOr([], [0, 1, -1, 'data'], sectionsData);
   var xLayoutDataLength = R.length(xLayoutData);
 
   var _useMemo = useMemo(function () {

package/es/TableHtml5/header.js

@@ -93,7 +93,7 @@ var Header = function Header(_ref) {
           React.createElement(
             Typography,
             { variant: 'body1', className: classes.cellLabelHeader },
-            R.pipe(R.path([0, 'data', index, 'dimension']), labelAccessor)(headerData),
+            R.pipe(R.path([-1, 'data', index, 'dimension']), labelAccessor)(headerData),
             React.createElement(Flags, {
               HTMLRenderer: HTMLRenderer,
               flags: flags,
@@ -106,7 +106,7 @@ var Header = function Header(_ref) {
       mapIndexed(function (headerItem, idx) {
         var _cx;
 
-        var value = getValue(labelAccessor)(headerItem);
+        var value = headerItem.isEmpty ? { label: '' } : getValue(labelAccessor)(headerItem);
         var flags = R.propOr([], 'flags', value);
         var hierarchySpace = R.pipe(R.propOr([], 'parents'), R.length, R.times(function () {
           return '·';
@@ -154,7 +154,7 @@ var Header = function Header(_ref) {
         );
       }, R.nth(index, valuesHeaderData))
     );
-  }, R.compose(R.length, R.pathOr([], [0, 'data']))(headerData));
+  }, R.compose(R.length, R.pathOr([], [-1, 'data']))(headerData));
 };
 
 Header.propTypes = process.env.NODE_ENV !== "production" ? {

package/es/TableHtml5/section.js

@@ -105,7 +105,7 @@ var Section = function Section(_ref) {
       HTMLRenderer: HTMLRenderer,
       labelAccessor: labelAccessor
     }),
-    R.addIndex(R.map)(function (sectionbody, rowIndex) {
+    mapIndexed(function (sectionbody, rowIndex) {
       var _cx2;
 
       var rowId = sectionbody.key + '_' + sectionIndex + '_' + rowIndex;
@@ -115,11 +115,12 @@ var Section = function Section(_ref) {
       return React.createElement(
         TableRow,
         { key: rowId },
-        mapIndexed(function (cell, index) {
+        R.times(function (index) {
           var _cx;
 
-          var value = getValue(labelAccessor)(cell);
-          var flags = R.prop('flags', value);
+          var cell = R.path(['data', index], sectionbody);
+          var value = R.isNil(cell) ? { label: '' } : getValue(labelAccessor)(cell);
+          var flags = R.propOr([], 'flags', value);
           var id = rowIndex + '_' + rowId + '_' + index;
 
           // special space is used for hierarchy U+2007    
@@ -133,7 +134,7 @@ var Section = function Section(_ref) {
             TableCell,
             {
               key: id,
-              className: cx(classes.rowTitle, classes.stickyHeader, (_cx = {}, _cx[classes.highlight] = R.prop(rowId)(activeCellIds), _cx[classes.timePeriodCells] = R.is(Function, isNoWrap) && isNoWrap(R.prop('dimension', cell)), _cx)),
+              className: cx(classes.rowTitle, classes.stickyHeader, (_cx = {}, _cx[classes.highlight] = R.prop(rowId)(activeCellIds), _cx[classes.timePeriodCells] = R.is(Function, isNoWrap) && isNoWrap(R.propOr({}, 'dimension', cell)), _cx)),
               id: id,
               headers: 'subHeader_' + index + ' ' + currentSection,
               component: 'th',
@@ -159,7 +160,7 @@ var Section = function Section(_ref) {
               )
             )
           );
-        }, R.prop('data', sectionbody)),
+        }, xLayoutDataLength /*R.prop('data', sectionbody)*/),
         React.createElement(
           TableCell,
           {
@@ -185,8 +186,9 @@ var Section = function Section(_ref) {
 
           var intersectionCellId = rowId + '/' + columnIndex;
           var isActive = R.pipe(R.propOr({}, 'intersectionCellId'), R.equals(intersectionCellId))(activeCellIds);
+          var missingValLabel = item.isEmpty || sectionbody.isEmpty ? '' : '..';
           return React.createElement(Cell, _extends({}, R.pipe(R.pathOr({ value: null }, [item.key, currentSection, sectionbody.key, 0]), R.over(R.lensProp('value'), function (val) {
-            return R.isNil(val) ? '..' : cellValueAccessor(val);
+            return R.isNil(val) ? missingValLabel : cellValueAccessor(val);
           }))(cells), {
             key: intersectionCellId,
             headers: rowIds + ' ' + columnIds + ' ' + currentSection,

package/es/VirtualizedTree/Item.js

@@ -86,7 +86,7 @@ var Item = function Item(_ref) {
       primaryTypographyProps: { noWrap: true, color: 'inherit' },
       secondaryTypographyProps: { color: 'inherit' },
       classes: { root: classes.listItem },
-      className: cx((_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)),
+      className: cx((_cx = {}, _cx[classes.accessibilityItemHover] = accessibility, _cx[classes.listItemSelected] = isSelected && (!isDisabled || !isGreyed), _cx[classes.listItemHover] = !isDisabled || !isGreyed, _cx)),
       onClick: isDisabled ? null : callbacks.onClick,
       onMouseDown: isDisabled || isTooltipShown ? null : callbacks.onMouseDown,
       onMouseUp: isDisabled || isTooltipShown ? null : callbacks.onMouseUp,
@@ -112,7 +112,7 @@ var Item = function Item(_ref) {
           SvgIcon,
           {
             color: 'primary',
-            className: cx(classes.labelIcon, (_cx4 = {}, _cx4[classes.disabledLabel] = isGreyed || isDisabled, _cx4))
+            className: cx(classes.labelIcon, (_cx4 = {}, _cx4[classes.disabledLabel] = isDisabled, _cx4))
           },
           React.createElement('path', { d: svgPath })
         ),
@@ -141,7 +141,7 @@ var Item = function Item(_ref) {
             {
               color: 'inherit',
               variant: 'body2',
-              className: cx(classes.label, (_cx5 = {}, _cx5[classes.disabledLabel] = isGreyed || isDisabled, _cx5[classes.tooltipNotice] = !R.isEmpty(description), _cx5))
+              className: cx(classes.label, (_cx5 = {}, _cx5[classes.disabledLabel] = isGreyed, _cx5[classes.tooltipNotice] = !R.isEmpty(description), _cx5))
             },
             label
           )

package/es/VirtualizedTree/VirtualizedTree.js

@@ -11,7 +11,7 @@ import List from '@material-ui/core/List';
 import Item from './Item';
 import { useTheme } from '@material-ui/core';
 import { useStyles, height as rowHeight } from '../ScopeList/styles';
-import { getDepth, getHierarchicalId, isItemSelected as _isItemSelected, getDeprecatedIds, getDuplicates } from './utils';
+import { getDepth, getHierarchicalId, isItemSelected as _isItemSelected, getDeprecatedIds, getDuplicates, getImposedItems } from './utils';
 import { getIsRtl } from '../utils';
 
 var singleScopeGetter = function singleScopeGetter() {
@@ -110,7 +110,7 @@ var VirtualizedTree = function VirtualizedTree(props) {
 
   var multiSelect = function multiSelect(id) {
     var item = R.prop(id, indexedItemsById);
-    var ids = R.pipe(getItemScope, R.filter(function (v) {
+    var ids = R.pipe(getItemScope, getImposedItems(selectIds, indexedItemsById), R.filter(function (v) {
       return v.isSelected === item.isSelected;
     }), function (items) {
       return getDuplicates(items, indexedItemsById);

package/es/VirtualizedTree/utils.js

@@ -84,34 +84,37 @@ export var getDeprecatedIds = function getDeprecatedIds(ids, items, selectedIds)
   return reccurse(ids);
 };
 
-export var getSingleDisableAccessor = function getSingleDisableAccessor(groupedItems, disableAccessor) {
-  // items => total list
-  return function (item, selectedIds) {
-    if (!isItemSelected(selectedIds)(item) && disableAccessor(item)) {
-      var descendants = getDescendants(getHierarchicalId(item), groupedItems);
-      var validDescendant = R.find(isItemSelected(selectedIds), descendants);
-      return R.isNil(validDescendant);
-    }
-    return false;
-  };
-};
-
-export var getHierDisableAccessor = function getHierDisableAccessor(groupedItems, spotlightedGroupedItems, disableAccessor) {
-  var accessor = function accessor(item, selectedIds) {
-    if (!isItemSelected(selectedIds)(item) && disableAccessor(item)) {
-      var spotlightedDescendants = getDescendants(getHierarchicalId(item), spotlightedGroupedItems);
-      var validSpotlightedDescendant = R.find(function (_item) {
-        return !accessor(_item, spotlightedGroupedItems);
-      }, spotlightedDescendants);
-      if (R.isNil(validSpotlightedDescendant)) {
-        var descendants = getDescendants(getHierarchicalId(item), groupedItems);
-        var validDescendant = R.find(isItemSelected(selectedIds), descendants);
+// evolved disableAccessor with hierarchical context and selection mode
+export var getEvolvedDisableAccessor = function getEvolvedDisableAccessor(groupedItems) {
+  var disableAccessor = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : R.always(false);
+  var getIsChildInSelectionScope = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : R.always(true);
+  return (//combine selection mode + spotlight
+    function (item, selectedIds) {
+      var hierarchicalFinder = function hierarchicalFinder(validator) {
+        return function (parentId) {
+          return R.find(function (child) {
+            if (validator(child)) return true;
+            return !R.isNil(hierarchicalFinder(validator)(getHierarchicalId(child)));
+          }, R.propOr([], parentId, groupedItems));
+        };
+      };
+      // selected forcedItem isn't deselectable unless all selected descendants are in deselection scope
+      if (isItemSelected(selectedIds)(item) && R.propOr(false, 'isForced', item)) {
+        var outOfScopeSelectedDescendant = hierarchicalFinder(function (child) {
+          return isItemSelected(selectedIds)(child) && !getIsChildInSelectionScope(child, item);
+        })(getHierarchicalId(item));
+        return !R.isNil(outOfScopeSelectedDescendant);
+      }
+      // non selected invalid item is disabled unless some (valid) children are selected or selectable in scope
+      if (!isItemSelected(selectedIds)(item) && disableAccessor(item)) {
+        var validDescendant = hierarchicalFinder(function (child) {
+          return isItemSelected(selectedIds)(child) || getIsChildInSelectionScope(child, item) && !disableAccessor(child);
+        })(getHierarchicalId(item));
         return R.isNil(validDescendant);
       }
+      return false;
     }
-    return false;
-  };
-  return accessor;
+  );
 };
 
 export var getScopeGetters = {
@@ -147,4 +150,17 @@ export var getScopeGetters = {
       }, R.values(indexed));
     };
   }
+};
+
+export var getImposedItems = function getImposedItems(selectIds, indexedItems) {
+  return function (selectedItems) {
+    return R.reduce(function (acc, item) {
+      var isSelected = isItemSelected(selectIds)(item);
+      if (!isSelected) {
+        var imposedItems = R.props(R.propOr([], 'imposedIds', item), indexedItems);
+        return R.concat(acc, R.append(item, imposedItems));
+      }
+      return R.append(item, acc);
+    }, [], selectedItems);
+  };
 };

package/lib/AdvancedFilterDialog/AdvancedFilterDialog.js

@@ -298,7 +298,7 @@ var AdvancedFilterDialog = function AdvancedFilterDialog(props) {
       isSelected: R.has(item.id, selection) ? !item.isSelected : !!item.isSelected
     });
   }, items);
-  var groupedFilteredItems = R.groupBy(R.propOr('#ROOT', 'parentId'), selectionItems);
+  var indexedFilteredItems = R.indexBy(_utils.getHierarchicalId, selectionItems);
 
   var selectionOptions = [{
     value: 'single',
@@ -327,7 +327,22 @@ var AdvancedFilterDialog = function AdvancedFilterDialog(props) {
       isSelected: R.has(item.id, selection) ? !item.isSelected : !!item.isSelected
     });
   }), R.groupBy(R.propOr('#ROOT', 'parentId')))(allItems);
-  var _disableAccessor = selectionMode === 'single' || selectionMode === 'level' ? (0, _utils.getSingleDisableAccessor)(_allGroupedItems, disableAccessor) : (0, _utils.getHierDisableAccessor)(_allGroupedItems, groupedFilteredItems, disableAccessor);
+
+  var isChildInSelectionScope = function isChildInSelectionScope(child, ancestor) {
+    if (!R.has((0, _utils.getHierarchicalId)(child), indexedFilteredItems)) {
+      return false;
+    }
+    if (selectionMode === 'single' || selectionMode === 'level') {
+      return false;
+    }
+    if (selectionMode === 'children') {
+      return child.parentId === (0, _utils.getHierarchicalId)(ancestor);
+    }
+    return true;
+  };
+
+  var _disableAccessor = (0, _utils.getEvolvedDisableAccessor)(_allGroupedItems, disableAccessor, isChildInSelectionScope);
+
   var isDisabled = function isDisabled(item) {
     return R.is(Function, disableAccessor) ? disableAccessor(item) : false;
   };

package/lib/HierarchicalFilter/HierarchicalFilter.js

@@ -83,7 +83,7 @@ var HierarchicalFilter = function HierarchicalFilter(props) {
   var isRtl = (0, _utils2.getIsRtl)(theme);
   var Chip = R.isNil(Tag) ? _.Tag : Tag;
   var _allGroupedItems = R.groupBy(R.propOr('#ROOT', 'parentId'), allItems);
-  var _disableAccessor = (0, _utils.getSingleDisableAccessor)(_allGroupedItems, disableAccessor);
+  var _disableAccessor = (0, _utils.getEvolvedDisableAccessor)(_allGroupedItems, disableAccessor, R.always(false));
   var tagValue = getCounter(items, _disableAccessor, tagAccessor);
   var isDisabled = function isDisabled(item) {
     return R.is(Function, disableAccessor) ? disableAccessor(item) : false;

package/lib/TableHtml5/TableHtml5.js

@@ -72,12 +72,13 @@ var useStyles = (0, _styles.makeStyles)(function (theme) {
 var mapIndexed = R.addIndex(R.map);
 
 var getEnhancedValuesHeaderData = exports.getEnhancedValuesHeaderData = function getEnhancedValuesHeaderData(data) {
-  var colLength = R.pipe(R.pathOr([], [0, 'data']), R.length)(data);
+  var colLength = R.pipe(R.last, R.propOr([], 'data'), R.length)(data);
   return R.pipe(R.pluck('data'),
   // mix merge and transpose for performance
   R.reduce(function (acc, cells) {
-    R.addIndex(R.forEach)(function (cell, rowIndex) {
-      var cellId = R.has('values', cell) ? R.pipe(R.prop('values'), R.pluck('id'), R.join(','))(cell) : R.path(['value', 'id'], cell);
+    R.addIndex(R.forEach)(function (_, rowIndex) {
+      var cell = R.nth(rowIndex, cells) || {};
+      var cellId = R.has('values', cell) ? R.pipe(R.prop('values'), R.pluck('id'), R.join(','))(cell) : R.pathOr('missing' + rowIndex, ['value', 'id'], cell);
       var topCell = rowIndex > 0 ? R.pipe(R.nth(rowIndex - 1), R.last)(acc) : null;
       var cellKey = R.isNil(topCell) ? cellId : topCell.key + '-' + cellId;
 
@@ -85,9 +86,13 @@ var getEnhancedValuesHeaderData = exports.getEnhancedValuesHeaderData = function
       if (R.prop('key', leftCell) === cellKey && rowIndex !== colLength - 1) {
         acc = R.over(R.lensIndex(rowIndex), R.over(R.lensIndex(-1), R.evolve({ spanCount: R.add(1) })))(acc);
       } else {
-        acc = R.over(R.lensIndex(rowIndex), R.append(_extends({}, R.pick(['value', 'values'], cell), { key: cellKey, spanCount: 1 })))(acc);
+        acc = R.over(R.lensIndex(rowIndex), R.append(_extends({}, R.pick(['value', 'values'], cell), {
+          key: cellKey,
+          spanCount: 1,
+          isEmpty: R.isEmpty(cell)
+        })))(acc);
       }
-    })(cells);
+    })(acc);
     return acc;
   }, R.times(R.always([]), colLength)))(data);
 };
@@ -152,7 +157,7 @@ var TableHtml5 = function TableHtml5(_ref) {
     };
   }, []);
 
-  var xLayoutData = R.pathOr([], [0, 1, 0, 'data'], sectionsData);
+  var xLayoutData = R.pathOr([], [0, 1, -1, 'data'], sectionsData);
   var xLayoutDataLength = R.length(xLayoutData);
 
   var _useMemo = (0, _react.useMemo)(function () {

package/lib/TableHtml5/header.js

@@ -127,7 +127,7 @@ var Header = function Header(_ref) {
           _react2.default.createElement(
             _Typography2.default,
             { variant: 'body1', className: classes.cellLabelHeader },
-            R.pipe(R.path([0, 'data', index, 'dimension']), labelAccessor)(headerData),
+            R.pipe(R.path([-1, 'data', index, 'dimension']), labelAccessor)(headerData),
             _react2.default.createElement(_flags2.default, {
               HTMLRenderer: HTMLRenderer,
               flags: flags,
@@ -140,7 +140,7 @@ var Header = function Header(_ref) {
       mapIndexed(function (headerItem, idx) {
         var _cx;
 
-        var value = (0, _utils2.getValue)(labelAccessor)(headerItem);
+        var value = headerItem.isEmpty ? { label: '' } : (0, _utils2.getValue)(labelAccessor)(headerItem);
         var flags = R.propOr([], 'flags', value);
         var hierarchySpace = R.pipe(R.propOr([], 'parents'), R.length, R.times(function () {
           return '·';
@@ -188,7 +188,7 @@ var Header = function Header(_ref) {
         );
       }, R.nth(index, valuesHeaderData))
     );
-  }, R.compose(R.length, R.pathOr([], [0, 'data']))(headerData));
+  }, R.compose(R.length, R.pathOr([], [-1, 'data']))(headerData));
 };
 
 Header.propTypes = process.env.NODE_ENV !== "production" ? {

package/lib/TableHtml5/section.js

@@ -147,7 +147,7 @@ var Section = function Section(_ref) {
       HTMLRenderer: HTMLRenderer,
       labelAccessor: labelAccessor
     }),
-    R.addIndex(R.map)(function (sectionbody, rowIndex) {
+    mapIndexed(function (sectionbody, rowIndex) {
       var _cx2;
 
       var rowId = sectionbody.key + '_' + sectionIndex + '_' + rowIndex;
@@ -157,11 +157,12 @@ var Section = function Section(_ref) {
       return _react2.default.createElement(
         _TableRow2.default,
         { key: rowId },
-        mapIndexed(function (cell, index) {
+        R.times(function (index) {
           var _cx;
 
-          var value = (0, _utils2.getValue)(labelAccessor)(cell);
-          var flags = R.prop('flags', value);
+          var cell = R.path(['data', index], sectionbody);
+          var value = R.isNil(cell) ? { label: '' } : (0, _utils2.getValue)(labelAccessor)(cell);
+          var flags = R.propOr([], 'flags', value);
           var id = rowIndex + '_' + rowId + '_' + index;
 
           // special space is used for hierarchy U+2007    
@@ -175,7 +176,7 @@ var Section = function Section(_ref) {
             _TableCell2.default,
             {
               key: id,
-              className: (0, _classnames2.default)(classes.rowTitle, classes.stickyHeader, (_cx = {}, _cx[classes.highlight] = R.prop(rowId)(activeCellIds), _cx[classes.timePeriodCells] = R.is(Function, isNoWrap) && isNoWrap(R.prop('dimension', cell)), _cx)),
+              className: (0, _classnames2.default)(classes.rowTitle, classes.stickyHeader, (_cx = {}, _cx[classes.highlight] = R.prop(rowId)(activeCellIds), _cx[classes.timePeriodCells] = R.is(Function, isNoWrap) && isNoWrap(R.propOr({}, 'dimension', cell)), _cx)),
               id: id,
               headers: 'subHeader_' + index + ' ' + currentSection,
               component: 'th',
@@ -201,7 +202,7 @@ var Section = function Section(_ref) {
               )
             )
           );
-        }, R.prop('data', sectionbody)),
+        }, xLayoutDataLength /*R.prop('data', sectionbody)*/),
         _react2.default.createElement(
           _TableCell2.default,
           {
@@ -227,8 +228,9 @@ var Section = function Section(_ref) {
 
           var intersectionCellId = rowId + '/' + columnIndex;
           var isActive = R.pipe(R.propOr({}, 'intersectionCellId'), R.equals(intersectionCellId))(activeCellIds);
+          var missingValLabel = item.isEmpty || sectionbody.isEmpty ? '' : '..';
           return _react2.default.createElement(_cell2.default, _extends({}, R.pipe(R.pathOr({ value: null }, [item.key, currentSection, sectionbody.key, 0]), R.over(R.lensProp('value'), function (val) {
-            return R.isNil(val) ? '..' : cellValueAccessor(val);
+            return R.isNil(val) ? missingValLabel : cellValueAccessor(val);
           }))(cells), {
             key: intersectionCellId,
             headers: rowIds + ' ' + columnIds + ' ' + currentSection,

package/lib/VirtualizedTree/Item.js

@@ -126,7 +126,7 @@ var Item = function Item(_ref) {
       primaryTypographyProps: { noWrap: true, color: 'inherit' },
       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)),
+      className: (0, _classnames2.default)((_cx = {}, _cx[classes.accessibilityItemHover] = accessibility, _cx[classes.listItemSelected] = isSelected && (!isDisabled || !isGreyed), _cx[classes.listItemHover] = !isDisabled || !isGreyed, _cx)),
       onClick: isDisabled ? null : callbacks.onClick,
       onMouseDown: isDisabled || isTooltipShown ? null : callbacks.onMouseDown,
       onMouseUp: isDisabled || isTooltipShown ? null : callbacks.onMouseUp,
@@ -152,7 +152,7 @@ var Item = function Item(_ref) {
           _SvgIcon2.default,
           {
             color: 'primary',
-            className: (0, _classnames2.default)(classes.labelIcon, (_cx4 = {}, _cx4[classes.disabledLabel] = isGreyed || isDisabled, _cx4))
+            className: (0, _classnames2.default)(classes.labelIcon, (_cx4 = {}, _cx4[classes.disabledLabel] = isDisabled, _cx4))
           },
           _react2.default.createElement('path', { d: svgPath })
         ),
@@ -181,7 +181,7 @@ var Item = function Item(_ref) {
             {
               color: 'inherit',
               variant: 'body2',
-              className: (0, _classnames2.default)(classes.label, (_cx5 = {}, _cx5[classes.disabledLabel] = isGreyed || isDisabled, _cx5[classes.tooltipNotice] = !R.isEmpty(description), _cx5))
+              className: (0, _classnames2.default)(classes.label, (_cx5 = {}, _cx5[classes.disabledLabel] = isGreyed, _cx5[classes.tooltipNotice] = !R.isEmpty(description), _cx5))
             },
             label
           )

package/lib/VirtualizedTree/VirtualizedTree.js

@@ -149,7 +149,7 @@ var VirtualizedTree = function VirtualizedTree(props) {
 
   var multiSelect = function multiSelect(id) {
     var item = R.prop(id, indexedItemsById);
-    var ids = R.pipe(getItemScope, R.filter(function (v) {
+    var ids = R.pipe(getItemScope, (0, _utils.getImposedItems)(selectIds, indexedItemsById), R.filter(function (v) {
       return v.isSelected === item.isSelected;
     }), function (items) {
       return (0, _utils.getDuplicates)(items, indexedItemsById);

package/lib/VirtualizedTree/utils.js

@@ -1,7 +1,7 @@
 'use strict';
 
 exports.__esModule = true;
-exports.getScopeGetters = exports.getHierDisableAccessor = exports.getSingleDisableAccessor = exports.getDeprecatedIds = exports.getDuplicates = exports.getDepth = exports.isItemSelected = exports.getDescendants = exports.getHierarchicalId = undefined;
+exports.getImposedItems = exports.getScopeGetters = exports.getEvolvedDisableAccessor = exports.getDeprecatedIds = exports.getDuplicates = exports.getDepth = exports.isItemSelected = exports.getDescendants = exports.getHierarchicalId = undefined;
 
 var _ramda = require('ramda');
 
@@ -93,34 +93,37 @@ var getDeprecatedIds = exports.getDeprecatedIds = function getDeprecatedIds(ids,
   return reccurse(ids);
 };
 
-var getSingleDisableAccessor = exports.getSingleDisableAccessor = function getSingleDisableAccessor(groupedItems, disableAccessor) {
-  // items => total list
-  return function (item, selectedIds) {
-    if (!isItemSelected(selectedIds)(item) && disableAccessor(item)) {
-      var descendants = getDescendants(getHierarchicalId(item), groupedItems);
-      var validDescendant = R.find(isItemSelected(selectedIds), descendants);
-      return R.isNil(validDescendant);
-    }
-    return false;
-  };
-};
-
-var getHierDisableAccessor = exports.getHierDisableAccessor = function getHierDisableAccessor(groupedItems, spotlightedGroupedItems, disableAccessor) {
-  var accessor = function accessor(item, selectedIds) {
-    if (!isItemSelected(selectedIds)(item) && disableAccessor(item)) {
-      var spotlightedDescendants = getDescendants(getHierarchicalId(item), spotlightedGroupedItems);
-      var validSpotlightedDescendant = R.find(function (_item) {
-        return !accessor(_item, spotlightedGroupedItems);
-      }, spotlightedDescendants);
-      if (R.isNil(validSpotlightedDescendant)) {
-        var descendants = getDescendants(getHierarchicalId(item), groupedItems);
-        var validDescendant = R.find(isItemSelected(selectedIds), descendants);
+// evolved disableAccessor with hierarchical context and selection mode
+var getEvolvedDisableAccessor = exports.getEvolvedDisableAccessor = function getEvolvedDisableAccessor(groupedItems) {
+  var disableAccessor = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : R.always(false);
+  var getIsChildInSelectionScope = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : R.always(true);
+  return (//combine selection mode + spotlight
+    function (item, selectedIds) {
+      var hierarchicalFinder = function hierarchicalFinder(validator) {
+        return function (parentId) {
+          return R.find(function (child) {
+            if (validator(child)) return true;
+            return !R.isNil(hierarchicalFinder(validator)(getHierarchicalId(child)));
+          }, R.propOr([], parentId, groupedItems));
+        };
+      };
+      // selected forcedItem isn't deselectable unless all selected descendants are in deselection scope
+      if (isItemSelected(selectedIds)(item) && R.propOr(false, 'isForced', item)) {
+        var outOfScopeSelectedDescendant = hierarchicalFinder(function (child) {
+          return isItemSelected(selectedIds)(child) && !getIsChildInSelectionScope(child, item);
+        })(getHierarchicalId(item));
+        return !R.isNil(outOfScopeSelectedDescendant);
+      }
+      // non selected invalid item is disabled unless some (valid) children are selected or selectable in scope
+      if (!isItemSelected(selectedIds)(item) && disableAccessor(item)) {
+        var validDescendant = hierarchicalFinder(function (child) {
+          return isItemSelected(selectedIds)(child) || getIsChildInSelectionScope(child, item) && !disableAccessor(child);
+        })(getHierarchicalId(item));
         return R.isNil(validDescendant);
       }
+      return false;
     }
-    return false;
-  };
-  return accessor;
+  );
 };
 
 var getScopeGetters = exports.getScopeGetters = {
@@ -156,4 +159,17 @@ var getScopeGetters = exports.getScopeGetters = {
       }, R.values(indexed));
     };
   }
+};
+
+var getImposedItems = exports.getImposedItems = function getImposedItems(selectIds, indexedItems) {
+  return function (selectedItems) {
+    return R.reduce(function (acc, item) {
+      var isSelected = isItemSelected(selectIds)(item);
+      if (!isSelected) {
+        var imposedItems = R.props(R.propOr([], 'imposedIds', item), indexedItems);
+        return R.concat(acc, R.append(item, imposedItems));
+      }
+      return R.append(item, acc);
+    }, [], selectedItems);
+  };
 };

package/package.json

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