@sis-cc/dotstatsuite-visions 7.10.1 → 7.11.0

package/es/ScopeList/Item.js

@@ -54,7 +54,8 @@ var Item = function Item(_ref) {
       accessibility = _ref.accessibility,
       index = _ref.index,
       labelRenderer = _ref.labelRenderer,
-      HTMLRenderer = _ref.HTMLRenderer;
+      HTMLRenderer = _ref.HTMLRenderer,
+      hierarchicalId = _ref.hierarchicalId;
 
   var _React$useState = React.useState(false),
       isTooltipShown = _React$useState[0],
@@ -171,7 +172,7 @@ var Item = function Item(_ref) {
         className: classes.containerArrow,
         tabIndex: 0,
         onClick: function onClick() {
-          return changeList(id);
+          return changeList(hierarchicalId || id);
         },
         onKeyPress: function onKeyPress(e) {
           if (e.key === 'Enter') {
@@ -232,7 +233,8 @@ Item.propTypes = process.env.NODE_ENV !== "production" ? {
   accessibility: PropTypes.bool,
   index: PropTypes.number,
   labelRenderer: PropTypes.func,
-  HTMLRenderer: PropTypes.func
+  HTMLRenderer: PropTypes.func,
+  hierarchicalId: PropTypes.string
 } : {};
 
 export default Item;

package/es/ScopeList/with-scope-list.js

@@ -85,7 +85,7 @@ export var getPlaceholder = function getPlaceholder(_ref2) {
 //----------------------------------------------------------------------------------------------List
 export var withHasChild = function withHasChild(itemsByParentId) {
   return function (item) {
-    return R.assoc('hasChild', R.pipe(R.prop(item.id), R.isNil, R.not)(itemsByParentId))(item);
+    return R.assoc('hasChild', R.pipe(R.prop(item.hierarchicalId || item.id), R.isNil, R.not)(itemsByParentId))(item);
   };
 };
 export var getCurrentList = function getCurrentList(_ref3) {
@@ -110,7 +110,7 @@ export var getList = function getList(_ref4) {
       hasPath = _ref4.hasPath,
       displayAccessor = _ref4.displayAccessor;
 
-  var currentItemId = currentItem ? R.prop('id')(currentItem) : null;
+  var currentItemId = currentItem ? currentItem.hierarchicalId || currentItem.id : null;
   if (R.or(R.isEmpty(term), R.isNil(R.prop('defaultSpotlight')(topElementProps)))) {
     var itemsByParentIdDisplayed = getItemsIndexedByParentId(displayAccessor)(items);
     if (R.isNil(currentItemId)) return R.pipe(getMainList, R.map(function (item) {
@@ -270,7 +270,7 @@ export var withScopeList = function withScopeList(Component) {
         isMousePreSelection: false,
         applyToShiftSelected: R.identity
       }, _this.changeList = function (id) {
-        return _this.setState({ currentItem: R.prop(id)(_this.state.itemsById), term: '' });
+        return _this.setState({ currentItem: R.prop(id)(_this.state.itemsByHierarchicalId), term: '' });
       }, _this.changeSelection = function (panelId) {
         return function (id) {
           return function (event) {
@@ -416,6 +416,7 @@ export var withScopeList = function withScopeList(Component) {
             term = _this$state.term,
             itemsByParentId = _this$state.itemsByParentId,
             itemsById = _this$state.itemsById,
+            itemsByHierarchicalId = _this$state.itemsByHierarchicalId,
             shiftSelection = _this$state.shiftSelection,
             ctrlSelection = _this$state.ctrlSelection,
             mouseSelection = _this$state.mouseSelection,
@@ -426,6 +427,7 @@ export var withScopeList = function withScopeList(Component) {
           items: items,
           itemsByParentId: itemsByParentId,
           itemsById: itemsById,
+          itemsByHierarchicalId: itemsByHierarchicalId,
           topElementProps: topElementProps,
           currentItem: currentItem,
           term: term,
@@ -445,7 +447,7 @@ export var withScopeList = function withScopeList(Component) {
             isActivePanel: isActivePanel,
             currentItem: currentItem,
             items: items,
-            itemsById: itemsById,
+            itemsById: itemsByHierarchicalId,
             hasPath: hasPath
           }),
           action: _this.changeSpotlight,
@@ -480,6 +482,9 @@ export var withScopeList = function withScopeList(Component) {
   }(React.Component), _class.getDerivedStateFromProps = function (props, state) {
     return _extends({}, state, {
       itemsById: R.indexBy(R.prop('id'), props.items),
+      itemsByHierarchicalId: R.indexBy(function (item) {
+        return item.hierarchicalId || item.id;
+      }, props.items),
       itemsByParentId: getItemsIndexedByParentId(props.displayAccessor)(props.items) // only use for hasChild, same keys are overide
     });
   }, _temp2;

package/es/TableHtml5/section.js

@@ -165,9 +165,8 @@ var Section = function Section(_ref) {
 
           var intersectionCellId = rowId + '/' + columnIndex;
           var isActive = R.pipe(R.propOr({}, 'intersectionCellId'), R.equals(intersectionCellId))(activeCellIds);
-          return React.createElement(Cell, _extends({
-            key: intersectionCellId
-          }, R.pathOr({ value: '..' }, [item.key, currentSection, sectionbody.key, 0], cells), {
+          return React.createElement(Cell, _extends({}, R.pathOr({ value: '..' }, [item.key, currentSection, sectionbody.key, 0], cells), {
+            key: intersectionCellId,
             headers: rowIds + ' ' + columnIds + ' ' + currentSection,
             cellHandler: cellHandler,
             HTMLRenderer: HTMLRenderer,

package/lib/ScopeList/Item.js

@@ -92,7 +92,8 @@ var Item = function Item(_ref) {
       accessibility = _ref.accessibility,
       index = _ref.index,
       labelRenderer = _ref.labelRenderer,
-      HTMLRenderer = _ref.HTMLRenderer;
+      HTMLRenderer = _ref.HTMLRenderer,
+      hierarchicalId = _ref.hierarchicalId;
 
   var _React$useState = _react2.default.useState(false),
       isTooltipShown = _React$useState[0],
@@ -209,7 +210,7 @@ var Item = function Item(_ref) {
         className: classes.containerArrow,
         tabIndex: 0,
         onClick: function onClick() {
-          return changeList(id);
+          return changeList(hierarchicalId || id);
         },
         onKeyPress: function onKeyPress(e) {
           if (e.key === 'Enter') {
@@ -270,7 +271,8 @@ Item.propTypes = process.env.NODE_ENV !== "production" ? {
   accessibility: _propTypes2.default.bool,
   index: _propTypes2.default.number,
   labelRenderer: _propTypes2.default.func,
-  HTMLRenderer: _propTypes2.default.func
+  HTMLRenderer: _propTypes2.default.func,
+  hierarchicalId: _propTypes2.default.string
 } : {};
 
 exports.default = Item;

package/lib/ScopeList/with-scope-list.js

@@ -100,7 +100,7 @@ var getPlaceholder = exports.getPlaceholder = function getPlaceholder(_ref2) {
 //----------------------------------------------------------------------------------------------List
 var withHasChild = exports.withHasChild = function withHasChild(itemsByParentId) {
   return function (item) {
-    return R.assoc('hasChild', R.pipe(R.prop(item.id), R.isNil, R.not)(itemsByParentId))(item);
+    return R.assoc('hasChild', R.pipe(R.prop(item.hierarchicalId || item.id), R.isNil, R.not)(itemsByParentId))(item);
   };
 };
 var getCurrentList = exports.getCurrentList = function getCurrentList(_ref3) {
@@ -125,7 +125,7 @@ var getList = exports.getList = function getList(_ref4) {
       hasPath = _ref4.hasPath,
       displayAccessor = _ref4.displayAccessor;
 
-  var currentItemId = currentItem ? R.prop('id')(currentItem) : null;
+  var currentItemId = currentItem ? currentItem.hierarchicalId || currentItem.id : null;
   if (R.or(R.isEmpty(term), R.isNil(R.prop('defaultSpotlight')(topElementProps)))) {
     var itemsByParentIdDisplayed = getItemsIndexedByParentId(displayAccessor)(items);
     if (R.isNil(currentItemId)) return R.pipe(getMainList, R.map(function (item) {
@@ -285,7 +285,7 @@ var withScopeList = exports.withScopeList = function withScopeList(Component) {
         isMousePreSelection: false,
         applyToShiftSelected: R.identity
       }, _this.changeList = function (id) {
-        return _this.setState({ currentItem: R.prop(id)(_this.state.itemsById), term: '' });
+        return _this.setState({ currentItem: R.prop(id)(_this.state.itemsByHierarchicalId), term: '' });
       }, _this.changeSelection = function (panelId) {
         return function (id) {
           return function (event) {
@@ -431,6 +431,7 @@ var withScopeList = exports.withScopeList = function withScopeList(Component) {
             term = _this$state.term,
             itemsByParentId = _this$state.itemsByParentId,
             itemsById = _this$state.itemsById,
+            itemsByHierarchicalId = _this$state.itemsByHierarchicalId,
             shiftSelection = _this$state.shiftSelection,
             ctrlSelection = _this$state.ctrlSelection,
             mouseSelection = _this$state.mouseSelection,
@@ -441,6 +442,7 @@ var withScopeList = exports.withScopeList = function withScopeList(Component) {
           items: items,
           itemsByParentId: itemsByParentId,
           itemsById: itemsById,
+          itemsByHierarchicalId: itemsByHierarchicalId,
           topElementProps: topElementProps,
           currentItem: currentItem,
           term: term,
@@ -460,7 +462,7 @@ var withScopeList = exports.withScopeList = function withScopeList(Component) {
             isActivePanel: isActivePanel,
             currentItem: currentItem,
             items: items,
-            itemsById: itemsById,
+            itemsById: itemsByHierarchicalId,
             hasPath: hasPath
           }),
           action: _this.changeSpotlight,
@@ -495,6 +497,9 @@ var withScopeList = exports.withScopeList = function withScopeList(Component) {
   }(_react2.default.Component), _class.getDerivedStateFromProps = function (props, state) {
     return _extends({}, state, {
       itemsById: R.indexBy(R.prop('id'), props.items),
+      itemsByHierarchicalId: R.indexBy(function (item) {
+        return item.hierarchicalId || item.id;
+      }, props.items),
       itemsByParentId: getItemsIndexedByParentId(props.displayAccessor)(props.items) // only use for hasChild, same keys are overide
     });
   }, _temp2;

package/lib/TableHtml5/section.js

@@ -207,9 +207,8 @@ var Section = function Section(_ref) {
 
           var intersectionCellId = rowId + '/' + columnIndex;
           var isActive = R.pipe(R.propOr({}, 'intersectionCellId'), R.equals(intersectionCellId))(activeCellIds);
-          return _react2.default.createElement(_cell2.default, _extends({
-            key: intersectionCellId
-          }, R.pathOr({ value: '..' }, [item.key, currentSection, sectionbody.key, 0], cells), {
+          return _react2.default.createElement(_cell2.default, _extends({}, R.pathOr({ value: '..' }, [item.key, currentSection, sectionbody.key, 0], cells), {
+            key: intersectionCellId,
             headers: rowIds + ' ' + columnIds + ' ' + currentSection,
             cellHandler: cellHandler,
             HTMLRenderer: HTMLRenderer,

package/package.json

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