@sis-cc/dotstatsuite-visions 10.7.0 → 10.8.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/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/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.8.0",
   "description": "Library of visual components",
   "author": "OECD",
   "homepage": "https://visions-qa.siscc.org/#o",

package/umd/@sis-cc/dotstatsuite-visions.js

@@ -1,5 +1,5 @@
 /*!
- * @sis-cc/dotstatsuite-visions v10.7.0 - https://visions-qa.siscc.org/#o
+ * @sis-cc/dotstatsuite-visions v10.8.0 - https://visions-qa.siscc.org/#o
  * MIT Licensed
  */
 (function webpackUniversalModuleDefinition(root, factory) {
@@ -6699,7 +6699,7 @@ function removeClassName(el
 /* 121 */
 /***/ (function(module) {
 
-module.exports = {"name":"@sis-cc/dotstatsuite-visions","version":"10.7.0","description":"Library of visual components","author":"OECD","homepage":"https://visions-qa.siscc.org/#o","license":"MIT","repository":"https://gitlab.com/sis-cc/.stat-suite/dotstatsuite-visions","main":"lib/index.js","module":"es/index.js","engines":{"node":">=14"},"files":["css","es","lib","umd"],"scripts":{"build":"nwb build-react-component --copy-files --no-demo && node scripts/doc && nwb build-demo","build:dev":"nwb build-react-component --copy-files --no-demo","clean":"nwb clean-module && nwb clean-demo","prepublishOnly":"npm run build","start":"nwb serve-react-demo","test":"jest","test:watch":"jest --watch --no-cache","lint":"eslint src/ --color","precommit":"lint-staged"},"dependencies":{"@react-hook/size":"^2.1.1","classnames":"^2.2.6","date-fns":"^1.30.1","isemail":"^3.2.0","numeral":"^2.0.6","prop-types":"^15.7.2","ramda":"^0.27.0","react-beautiful-dnd":"^13.0.0","react-draggable":"^4.4.5","react-error-boundary":"^4.0.10","react-virtualized":"^9.21.2"},"peerDependencies":{"@material-ui/core":"^4","@material-ui/icons":"^4","@sis-cc/dotstatsuite-sdmxjs":"^8.x","react":"^18","react-dom":"^18"},"devDependencies":{"@babel/eslint-parser":"^7.5.4","@babel/plugin-syntax-dynamic-import":"^7.2.0","@cfaester/enzyme-adapter-react-18":"^0.7.0","@material-ui/core":"^4","@material-ui/icons":"^4","@sis-cc/dotstatsuite-sdmxjs":"*","@testing-library/jest-dom":"^5.16.5","@testing-library/react":"^14.0.0","babel-jest":"^24.8.0","babel-preset-react-app":"^9.0.0","dox":"^0.9.0","eslint":"^8.39.0","eslint-plugin-import":"^2.27.5","eslint-plugin-jsx-a11y":"^6.7.1","eslint-plugin-prettier":"^4.2.1","eslint-plugin-react":"^7.32.2","eslint-plugin-react-hooks":"^4.6.0","husky":"^2.7.0","identity-obj-proxy":"^3.0.0","jest":"^24.8.0","jss":"^10.10.0","jss-rtl":"^0.2.3","lint-staged":"^8.2.1","mutationobserver-shim":"^0.3.7","nwb":"0.23.0","prettier":"^2.8.8","pretty-quick":"^3.1.3","react":"^18","react-a11y":"^1.1.0","react-dom":"^18","react-helmet":"^5.2.1","react-scrollable-anchor":"^0.6.1","react-syntax-highlighter":"^10.2.1","sanitize-html":"2.7.0","webpack":"^5.68.0","webpack-cli":"^4.9.2","webpack-dev-server":"^4.7.4"},"jest":{"verbose":true,"coverageDirectory":"coverage","collectCoverageFrom":["src/**/*.{js,jsx,ts,tsx}","!src/ScopeList/*.{js,jsx,ts,tsx}","!src/**/*.d.ts"],"setupFilesAfterEnv":["<rootDir>/tests/setup.js"],"testMatch":["**/tests/**/*.{spec,test}.{js,jsx,ts,tsx}","!**/tests/ScopeList.test.js"],"testEnvironment":"jsdom","transform":{"^.+\\.(js|jsx|ts|tsx)$":"<rootDir>/node_modules/babel-jest"},"transformIgnorePatterns":["[/\\\\]node_modules[/\\\\].+\\.(js|jsx|ts|tsx)$","^.+\\.module\\.(css|sass|scss)$"],"modulePaths":[],"moduleNameMapper":{"^react-native$":"react-native-web","^.+\\.module\\.(css|sass|scss)$":"identity-obj-proxy","\\.(jpg|jpeg|png)$":"identity-obj-proxy"},"moduleFileExtensions":["web.js","js","web.ts","ts","web.tsx","tsx","json","web.jsx","jsx","node"]},"babel":{"presets":["react-app"],"plugins":["@babel/plugin-syntax-dynamic-import"]},"eslintConfig":{"env":{"browser":true,"jest":true,"node":true,"es6":true},"extends":["eslint:recommended","plugin:react/recommended","plugin:jsx-a11y/recommended"],"parser":"@babel/eslint-parser","parserOptions":{"babelOptions":{"presets":[["babel-preset-react-app",false],"babel-preset-react-app/test"]},"ecmaFeatures":{"experimentalObjectRestSpread":true,"jsx":true},"sourceType":"module"},"plugins":["prettier","react","import","react-hooks","jsx-a11y"],"rules":{"no-console":"warn","no-unused-vars":"error","react/display-name":"off","react-hooks/rules-of-hooks":"error","react-hooks/exhaustive-deps":"warn","no-use-before-define":"error"}},"browserslist":{"production":[">0.2%","not dead","not op_mini all"],"development":["last 1 chrome version","last 1 firefox version","last 1 safari version"]},"husky":{"hooks":{"pre-commit":"lint-staged"}},"lint-staged":{"src/**/*.{js,css}":["prettier --write","git add","yarn lint"]},"prettier":{"endOfLine":"lf","useTabs":false,"printWidth":100,"tabWidth":2,"singleQuote":true,"trailingComma":"all","bracketSameLine":false,"bracketSpacing":true,"parser":"babel","semi":true,"arrowParens":"avoid"}};
+module.exports = {"name":"@sis-cc/dotstatsuite-visions","version":"10.8.0","description":"Library of visual components","author":"OECD","homepage":"https://visions-qa.siscc.org/#o","license":"MIT","repository":"https://gitlab.com/sis-cc/.stat-suite/dotstatsuite-visions","main":"lib/index.js","module":"es/index.js","engines":{"node":">=14"},"files":["css","es","lib","umd"],"scripts":{"build":"nwb build-react-component --copy-files --no-demo && node scripts/doc && nwb build-demo","build:dev":"nwb build-react-component --copy-files --no-demo","clean":"nwb clean-module && nwb clean-demo","prepublishOnly":"npm run build","start":"nwb serve-react-demo","test":"jest","test:watch":"jest --watch --no-cache","lint":"eslint src/ --color","precommit":"lint-staged"},"dependencies":{"@react-hook/size":"^2.1.1","classnames":"^2.2.6","date-fns":"^1.30.1","isemail":"^3.2.0","numeral":"^2.0.6","prop-types":"^15.7.2","ramda":"^0.27.0","react-beautiful-dnd":"^13.0.0","react-draggable":"^4.4.5","react-error-boundary":"^4.0.10","react-virtualized":"^9.21.2"},"peerDependencies":{"@material-ui/core":"^4","@material-ui/icons":"^4","@sis-cc/dotstatsuite-sdmxjs":"^8.x","react":"^18","react-dom":"^18"},"devDependencies":{"@babel/eslint-parser":"^7.5.4","@babel/plugin-syntax-dynamic-import":"^7.2.0","@cfaester/enzyme-adapter-react-18":"^0.7.0","@material-ui/core":"^4","@material-ui/icons":"^4","@sis-cc/dotstatsuite-sdmxjs":"*","@testing-library/jest-dom":"^5.16.5","@testing-library/react":"^14.0.0","babel-jest":"^24.8.0","babel-preset-react-app":"^9.0.0","dox":"^0.9.0","eslint":"^8.39.0","eslint-plugin-import":"^2.27.5","eslint-plugin-jsx-a11y":"^6.7.1","eslint-plugin-prettier":"^4.2.1","eslint-plugin-react":"^7.32.2","eslint-plugin-react-hooks":"^4.6.0","husky":"^2.7.0","identity-obj-proxy":"^3.0.0","jest":"^24.8.0","jss":"^10.10.0","jss-rtl":"^0.2.3","lint-staged":"^8.2.1","mutationobserver-shim":"^0.3.7","nwb":"0.23.0","prettier":"^2.8.8","pretty-quick":"^3.1.3","react":"^18","react-a11y":"^1.1.0","react-dom":"^18","react-helmet":"^5.2.1","react-scrollable-anchor":"^0.6.1","react-syntax-highlighter":"^10.2.1","sanitize-html":"2.7.0","webpack":"^5.68.0","webpack-cli":"^4.9.2","webpack-dev-server":"^4.7.4"},"jest":{"verbose":true,"coverageDirectory":"coverage","collectCoverageFrom":["src/**/*.{js,jsx,ts,tsx}","!src/ScopeList/*.{js,jsx,ts,tsx}","!src/**/*.d.ts"],"setupFilesAfterEnv":["<rootDir>/tests/setup.js"],"testMatch":["**/tests/**/*.{spec,test}.{js,jsx,ts,tsx}","!**/tests/ScopeList.test.js"],"testEnvironment":"jsdom","transform":{"^.+\\.(js|jsx|ts|tsx)$":"<rootDir>/node_modules/babel-jest"},"transformIgnorePatterns":["[/\\\\]node_modules[/\\\\].+\\.(js|jsx|ts|tsx)$","^.+\\.module\\.(css|sass|scss)$"],"modulePaths":[],"moduleNameMapper":{"^react-native$":"react-native-web","^.+\\.module\\.(css|sass|scss)$":"identity-obj-proxy","\\.(jpg|jpeg|png)$":"identity-obj-proxy"},"moduleFileExtensions":["web.js","js","web.ts","ts","web.tsx","tsx","json","web.jsx","jsx","node"]},"babel":{"presets":["react-app"],"plugins":["@babel/plugin-syntax-dynamic-import"]},"eslintConfig":{"env":{"browser":true,"jest":true,"node":true,"es6":true},"extends":["eslint:recommended","plugin:react/recommended","plugin:jsx-a11y/recommended"],"parser":"@babel/eslint-parser","parserOptions":{"babelOptions":{"presets":[["babel-preset-react-app",false],"babel-preset-react-app/test"]},"ecmaFeatures":{"experimentalObjectRestSpread":true,"jsx":true},"sourceType":"module"},"plugins":["prettier","react","import","react-hooks","jsx-a11y"],"rules":{"no-console":"warn","no-unused-vars":"error","react/display-name":"off","react-hooks/rules-of-hooks":"error","react-hooks/exhaustive-deps":"warn","no-use-before-define":"error"}},"browserslist":{"production":[">0.2%","not dead","not op_mini all"],"development":["last 1 chrome version","last 1 firefox version","last 1 safari version"]},"husky":{"hooks":{"pre-commit":"lint-staged"}},"lint-staged":{"src/**/*.{js,css}":["prettier --write","git add","yarn lint"]},"prettier":{"endOfLine":"lf","useTabs":false,"printWidth":100,"tabWidth":2,"singleQuote":true,"trailingComma":"all","bracketSameLine":false,"bracketSpacing":true,"parser":"babel","semi":true,"arrowParens":"avoid"}};
 
 /***/ }),
 /* 122 */
@@ -70623,7 +70623,7 @@ var VirtualizedTree_Item_Item = function Item(_ref) {
       primaryTypographyProps: { noWrap: true, color: 'inherit' },
       secondaryTypographyProps: { color: 'inherit' },
       classes: { root: classes.listItem },
-      className: classnames_default()((_cx = {}, _cx[classes.accessibilityItemHover] = accessibility, _cx[classes.listItemSelected] = es_and(isSelected, es_not(isDisabled)), _cx[classes.listItemHover] = es_not(isDisabled), _cx[classes.disabledLabel] = isDisabled, _cx)),
+      className: classnames_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,
@@ -70649,7 +70649,7 @@ var VirtualizedTree_Item_Item = function Item(_ref) {
           SvgIcon["a" /* default */],
           {
             color: 'primary',
-            className: classnames_default()(classes.labelIcon, (_cx4 = {}, _cx4[classes.disabledLabel] = isGreyed || isDisabled, _cx4))
+            className: classnames_default()(classes.labelIcon, (_cx4 = {}, _cx4[classes.disabledLabel] = isDisabled, _cx4))
           },
           react_default.a.createElement('path', { d: svgPath })
         ),
@@ -70678,7 +70678,7 @@ var VirtualizedTree_Item_Item = function Item(_ref) {
             {
               color: 'inherit',
               variant: 'body2',
-              className: classnames_default()(classes.label, (_cx5 = {}, _cx5[classes.disabledLabel] = isGreyed || isDisabled, _cx5[classes.tooltipNotice] = !es_isEmpty(description), _cx5))
+              className: classnames_default()(classes.label, (_cx5 = {}, _cx5[classes.disabledLabel] = isGreyed, _cx5[classes.tooltipNotice] = !es_isEmpty(description), _cx5))
             },
             label
           )
@@ -70965,34 +70965,37 @@ var utils_getDeprecatedIds = function getDeprecatedIds(ids, items, selectedIds)
   return reccurse(ids);
 };
 
-var utils_getSingleDisableAccessor = function getSingleDisableAccessor(groupedItems, disableAccessor) {
-  // items => total list
-  return function (item, selectedIds) {
-    if (!utils_isItemSelected(selectedIds)(item) && disableAccessor(item)) {
-      var descendants = utils_getDescendants(utils_getHierarchicalId(item), groupedItems);
-      var validDescendant = es_find(utils_isItemSelected(selectedIds), descendants);
-      return es_isNil(validDescendant);
-    }
-    return false;
-  };
-};
-
-var utils_getHierDisableAccessor = function getHierDisableAccessor(groupedItems, spotlightedGroupedItems, disableAccessor) {
-  var accessor = function accessor(item, selectedIds) {
-    if (!utils_isItemSelected(selectedIds)(item) && disableAccessor(item)) {
-      var spotlightedDescendants = utils_getDescendants(utils_getHierarchicalId(item), spotlightedGroupedItems);
-      var validSpotlightedDescendant = es_find(function (_item) {
-        return !accessor(_item, spotlightedGroupedItems);
-      }, spotlightedDescendants);
-      if (es_isNil(validSpotlightedDescendant)) {
-        var descendants = utils_getDescendants(utils_getHierarchicalId(item), groupedItems);
-        var validDescendant = es_find(utils_isItemSelected(selectedIds), descendants);
+// evolved disableAccessor with hierarchical context and selection mode
+var utils_getEvolvedDisableAccessor = function getEvolvedDisableAccessor(groupedItems) {
+  var disableAccessor = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : es_always(false);
+  var getIsChildInSelectionScope = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : es_always(true);
+  return (//combine selection mode + spotlight
+    function (item, selectedIds) {
+      var hierarchicalFinder = function hierarchicalFinder(validator) {
+        return function (parentId) {
+          return es_find(function (child) {
+            if (validator(child)) return true;
+            return !es_isNil(hierarchicalFinder(validator)(utils_getHierarchicalId(child)));
+          }, es_propOr([], parentId, groupedItems));
+        };
+      };
+      // selected forcedItem isn't deselectable unless all selected descendants are in deselection scope
+      if (utils_isItemSelected(selectedIds)(item) && es_propOr(false, 'isForced', item)) {
+        var outOfScopeSelectedDescendant = hierarchicalFinder(function (child) {
+          return utils_isItemSelected(selectedIds)(child) && !getIsChildInSelectionScope(child, item);
+        })(utils_getHierarchicalId(item));
+        return !es_isNil(outOfScopeSelectedDescendant);
+      }
+      // non selected invalid item is disabled unless some (valid) children are selected or selectable in scope
+      if (!utils_isItemSelected(selectedIds)(item) && disableAccessor(item)) {
+        var validDescendant = hierarchicalFinder(function (child) {
+          return utils_isItemSelected(selectedIds)(child) || getIsChildInSelectionScope(child, item) && !disableAccessor(child);
+        })(utils_getHierarchicalId(item));
         return es_isNil(validDescendant);
       }
+      return false;
     }
-    return false;
-  };
-  return accessor;
+  );
 };
 
 var getScopeGetters = {
@@ -71029,6 +71032,19 @@ var getScopeGetters = {
     };
   }
 };
+
+var utils_getImposedItems = function getImposedItems(selectIds, indexedItems) {
+  return function (selectedItems) {
+    return es_reduce(function (acc, item) {
+      var isSelected = utils_isItemSelected(selectIds)(item);
+      if (!isSelected) {
+        var imposedItems = es_props(es_propOr([], 'imposedIds', item), indexedItems);
+        return es_concat(acc, es_append(item, imposedItems));
+      }
+      return es_append(item, acc);
+    }, [], selectedItems);
+  };
+};
 // CONCATENATED MODULE: ./src/VirtualizedTree/VirtualizedTree.js
 var VirtualizedTree_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; };
 
@@ -71142,7 +71158,7 @@ var VirtualizedTree_VirtualizedTree = function VirtualizedTree(props) {
 
   var multiSelect = function multiSelect(id) {
     var item = es_prop(id, indexedItemsById);
-    var ids = pipe(getItemScope, es_filter(function (v) {
+    var ids = pipe(getItemScope, utils_getImposedItems(selectIds, indexedItemsById), es_filter(function (v) {
       return v.isSelected === item.isSelected;
     }), function (items) {
       return utils_getDuplicates(items, indexedItemsById);
@@ -72041,7 +72057,7 @@ var AdvancedFilterDialog_AdvancedFilterDialog = function AdvancedFilterDialog(pr
       isSelected: es_has(item.id, selection) ? !item.isSelected : !!item.isSelected
     });
   }, items);
-  var groupedFilteredItems = es_groupBy(es_propOr('#ROOT', 'parentId'), selectionItems);
+  var indexedFilteredItems = es_indexBy(utils_getHierarchicalId, selectionItems);
 
   var selectionOptions = [{
     value: 'single',
@@ -72070,7 +72086,22 @@ var AdvancedFilterDialog_AdvancedFilterDialog = function AdvancedFilterDialog(pr
       isSelected: es_has(item.id, selection) ? !item.isSelected : !!item.isSelected
     });
   }), es_groupBy(es_propOr('#ROOT', 'parentId')))(allItems);
-  var _disableAccessor = selectionMode === 'single' || selectionMode === 'level' ? utils_getSingleDisableAccessor(_allGroupedItems, disableAccessor) : utils_getHierDisableAccessor(_allGroupedItems, groupedFilteredItems, disableAccessor);
+
+  var isChildInSelectionScope = function isChildInSelectionScope(child, ancestor) {
+    if (!es_has(utils_getHierarchicalId(child), indexedFilteredItems)) {
+      return false;
+    }
+    if (selectionMode === 'single' || selectionMode === 'level') {
+      return false;
+    }
+    if (selectionMode === 'children') {
+      return child.parentId === utils_getHierarchicalId(ancestor);
+    }
+    return true;
+  };
+
+  var _disableAccessor = utils_getEvolvedDisableAccessor(_allGroupedItems, disableAccessor, isChildInSelectionScope);
+
   var isDisabled = function isDisabled(item) {
     return es_is(Function, disableAccessor) ? disableAccessor(item) : false;
   };
@@ -72377,7 +72408,7 @@ var HierarchicalFilter_HierarchicalFilter = function HierarchicalFilter(props) {
   var isRtl = utils_getIsRtl(theme);
   var Chip = es_isNil(Tag) ? src_Tag_Tag : Tag;
   var _allGroupedItems = es_groupBy(es_propOr('#ROOT', 'parentId'), allItems);
-  var _disableAccessor = utils_getSingleDisableAccessor(_allGroupedItems, disableAccessor);
+  var _disableAccessor = utils_getEvolvedDisableAccessor(_allGroupedItems, disableAccessor, es_always(false));
   var tagValue = HierarchicalFilter_getCounter(items, _disableAccessor, tagAccessor);
   var isDisabled = function isDisabled(item) {
     return es_is(Function, disableAccessor) ? disableAccessor(item) : false;