@sis-cc/dotstatsuite-visions 12.0.0 → 12.2.0

package/es/CollapseButtons/Item.js

@@ -107,6 +107,7 @@ var Item = function Item(_ref) {
                   e.stopPropagation();
                 },
                 tabIndex: 0,
+                underline: 'none',
                 style: { display: 'list-item' }
               },
               labelAccessor(subtopic, parentId)

package/es/InputNumber/InputNumber.js

@@ -23,7 +23,7 @@ var useStyles = makeStyles(function (theme) {
       margin: '0px 10px 0 10px'
     },
     input: {
-      padding: '4px 12px 4px 16px',
+      padding: '4px 4px',
       height: 27,
       '&[type=number]::-webkit-inner-spin-button, &[type=number]::-webkit-outer-spin-button': {
         '-webkit-appearance': 'none',

package/es/TableHtml5/header.js

@@ -63,7 +63,7 @@ var Header = function Header(_ref) {
   var theme = useTheme();
   var isRtl = getIsRtl(theme);
 
-  var stickyLabelPosition = R.last(subHeadCellsWidth) + 30 + theme.spacing(1);
+  var stickyLabelPosition = R.last(subHeadCellsWidth) + 'px + 30px + ' + theme.spacing(1);
 
   if (R.compose(R.anyPass([R.isNil, R.isEmpty]), R.path([0, 'data']))(headerData)) return null;
   return timesIndexed(function (index) {

package/es/VirtualizedTree/withSpotlight.js

@@ -5,31 +5,55 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
 /* eslint react/prop-types: 0 */
 import * as R from 'ramda';
 import React, { useEffect, useMemo, useState } from 'react';
-import { getHierarchicalId } from './utils';
+import { getDescendants, getHierarchicalId } from './utils';
 
 export var spotlightFilter = function spotlightFilter(term) {
   var labelRenderer = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : R.prop('label');
+  var displayChildren = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   return function (items) {
     if (R.isEmpty(term) || R.isNil(term)) {
       return items;
     }
 
     var groupedItemsByParentId = R.groupBy(R.propOr('#ROOT', 'parentId'), items);
-    var recurse = R.filter(function (item) {
-      var isValidItem = R.isEmpty(term) || R.isNil(term) ? true : R.includes(R.toLower(term), R.toLower(labelRenderer(item)));
+
+    var findParents = function findParents(item) {
+      var acc = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+
+      var parentId = R.prop('parentId', item);
+      if (parentId && parentId !== '#ROOT') {
+        var parent = R.find(R.propEq('id', parentId), items);
+        if (parent) {
+          return findParents(parent, [parent].concat(acc));
+        }
+      }
+      return acc;
+    };
+
+    var recurse = function recurse(item) {
+      var isValidItem = R.includes(R.toLower(term), R.toLower(labelRenderer(item)));
+
+      var result = [];
+
       if (isValidItem) {
-        return true;
+        var parents = findParents(item);
+        result = [].concat(parents, [item]);
+        if (displayChildren) {
+          var children = getDescendants(R.prop('id', item), groupedItemsByParentId);
+          return [].concat(parents, [item], children);
+        }
       }
       if (R.has(getHierarchicalId(item), groupedItemsByParentId)) {
-        var filtered = recurse(R.prop(getHierarchicalId(item), groupedItemsByParentId));
-        if (!R.isEmpty(filtered)) {
-          return true;
-        }
+        var childItems = groupedItemsByParentId[getHierarchicalId(item)] || [];
+        var matchingChildren = R.chain(recurse, childItems);
+
+        // res with any matching children
+        return R.uniq([].concat(result, matchingChildren));
       }
-      return false;
-    });
+      return result;
+    };
 
-    return recurse(items);
+    return R.uniq(R.chain(recurse, groupedItemsByParentId['#ROOT'] || []));
   };
 };
 
@@ -38,7 +62,8 @@ var withSpotlight = function withSpotlight(Component) {
     var items = _ref.items,
         defaultSpotlight = _ref.defaultSpotlight,
         labelRenderer = _ref.labelRenderer,
-        rest = _objectWithoutProperties(_ref, ['items', 'defaultSpotlight', 'labelRenderer']);
+        displayChildren = _ref.displayChildren,
+        rest = _objectWithoutProperties(_ref, ['items', 'defaultSpotlight', 'labelRenderer', 'displayChildren']);
 
     var _useState = useState({ term: '' }),
         term = _useState[0].term,
@@ -51,7 +76,7 @@ var withSpotlight = function withSpotlight(Component) {
     }, [defaultSpotlight]);
 
     var filteredItems = useMemo(function () {
-      return spotlightFilter(term, labelRenderer)(items);
+      return spotlightFilter(term, labelRenderer, displayChildren)(items);
     }, [term, items]);
 
     return React.createElement(Component, _extends({}, rest, {

package/es/theme.js

@@ -1,3 +1,5 @@
+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; };
+
 export var innerPalette = {
   highlight1: '#f7a42c',
   highlight2: '#8CC841',
@@ -13,7 +15,8 @@ export var innerPalette = {
 
 export var sisccTheme = function sisccTheme(_ref) {
   var rtl = _ref.rtl,
-      isA11y = _ref.isA11y,
+      _ref$isA11y = _ref.isA11y,
+      isA11y = _ref$isA11y === undefined ? false : _ref$isA11y,
       _ref$outerPalette = _ref.outerPalette,
       outerPalette = _ref$outerPalette === undefined ? {} : _ref$outerPalette;
 
@@ -21,9 +24,9 @@ export var sisccTheme = function sisccTheme(_ref) {
     outlineColor: outerPalette.highlight1 || innerPalette.highlight1
   };
 
-  var buttonBaseFocus = {
+  var buttonBaseFocus = isA11y && {
     borderColor: outerPalette.highlight1 || innerPalette.highlight1,
-    '&.Mui-focused': {
+    '&:focus': {
       outlineColor: outerPalette.highlight1 || innerPalette.highlight1,
       outlineWidth: 1,
       outlineStyle: 'auto'
@@ -44,7 +47,11 @@ export var sisccTheme = function sisccTheme(_ref) {
           disableRipple: true
         },
         styleOverrides: {
-          root: isA11y && buttonBaseFocus
+          root: _extends({
+            '&:focus': {
+              outline: 'none'
+            }
+          }, buttonBaseFocus)
         }
       },
       MuiUseMediaQuery: {
@@ -79,7 +86,7 @@ export var sisccTheme = function sisccTheme(_ref) {
       MuiAccordion: {
         styleOverrides: {
           root: {
-            '&$expanded': {
+            '&.Mui-expanded': {
               margin: 0
             }
           }
@@ -88,7 +95,10 @@ export var sisccTheme = function sisccTheme(_ref) {
       MuiButton: {
         styleOverrides: {
           root: {
-            textTransform: 'none'
+            textTransform: 'none',
+            '&:focus': {
+              outline: 'none'
+            }
           },
           textPrimary: {
             '&:hover': {
@@ -125,6 +135,9 @@ export var sisccTheme = function sisccTheme(_ref) {
         }
       },
       MuiLink: {
+        defaultProps: {
+          underline: 'none'
+        },
         styleOverrides: {
           root: {
             color: outerPalette.primaryMain || innerPalette.primaryMain,
@@ -134,7 +147,7 @@ export var sisccTheme = function sisccTheme(_ref) {
             '&.Mui-focused': isA11y && focus
           },
           button: {
-            '&.Mui-focused': isA11y && focus
+            '&:focus': isA11y && focus
           }
         }
       },

package/lib/CollapseButtons/Item.js

@@ -138,6 +138,7 @@ var Item = function Item(_ref) {
                   e.stopPropagation();
                 },
                 tabIndex: 0,
+                underline: 'none',
                 style: { display: 'list-item' }
               },
               labelAccessor(subtopic, parentId)

package/lib/InputNumber/InputNumber.js

@@ -58,7 +58,7 @@ var useStyles = (0, _makeStyles2.default)(function (theme) {
       margin: '0px 10px 0 10px'
     },
     input: {
-      padding: '4px 12px 4px 16px',
+      padding: '4px 4px',
       height: 27,
       '&[type=number]::-webkit-inner-spin-button, &[type=number]::-webkit-outer-spin-button': {
         '-webkit-appearance': 'none',

package/lib/TableHtml5/header.js

@@ -100,7 +100,7 @@ var Header = function Header(_ref) {
   var theme = (0, _styles.useTheme)();
   var isRtl = (0, _utils.getIsRtl)(theme);
 
-  var stickyLabelPosition = R.last(subHeadCellsWidth) + 30 + theme.spacing(1);
+  var stickyLabelPosition = R.last(subHeadCellsWidth) + 'px + 30px + ' + theme.spacing(1);
 
   if (R.compose(R.anyPass([R.isNil, R.isEmpty]), R.path([0, 'data']))(headerData)) return null;
   return timesIndexed(function (index) {

package/lib/VirtualizedTree/withSpotlight.js

@@ -24,27 +24,51 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
 
 var spotlightFilter = exports.spotlightFilter = function spotlightFilter(term) {
   var labelRenderer = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : R.prop('label');
+  var displayChildren = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   return function (items) {
     if (R.isEmpty(term) || R.isNil(term)) {
       return items;
     }
 
     var groupedItemsByParentId = R.groupBy(R.propOr('#ROOT', 'parentId'), items);
-    var recurse = R.filter(function (item) {
-      var isValidItem = R.isEmpty(term) || R.isNil(term) ? true : R.includes(R.toLower(term), R.toLower(labelRenderer(item)));
+
+    var findParents = function findParents(item) {
+      var acc = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+
+      var parentId = R.prop('parentId', item);
+      if (parentId && parentId !== '#ROOT') {
+        var parent = R.find(R.propEq('id', parentId), items);
+        if (parent) {
+          return findParents(parent, [parent].concat(acc));
+        }
+      }
+      return acc;
+    };
+
+    var recurse = function recurse(item) {
+      var isValidItem = R.includes(R.toLower(term), R.toLower(labelRenderer(item)));
+
+      var result = [];
+
       if (isValidItem) {
-        return true;
+        var parents = findParents(item);
+        result = [].concat(parents, [item]);
+        if (displayChildren) {
+          var children = (0, _utils.getDescendants)(R.prop('id', item), groupedItemsByParentId);
+          return [].concat(parents, [item], children);
+        }
       }
       if (R.has((0, _utils.getHierarchicalId)(item), groupedItemsByParentId)) {
-        var filtered = recurse(R.prop((0, _utils.getHierarchicalId)(item), groupedItemsByParentId));
-        if (!R.isEmpty(filtered)) {
-          return true;
-        }
+        var childItems = groupedItemsByParentId[(0, _utils.getHierarchicalId)(item)] || [];
+        var matchingChildren = R.chain(recurse, childItems);
+
+        // res with any matching children
+        return R.uniq([].concat(result, matchingChildren));
       }
-      return false;
-    });
+      return result;
+    };
 
-    return recurse(items);
+    return R.uniq(R.chain(recurse, groupedItemsByParentId['#ROOT'] || []));
   };
 };
 
@@ -53,7 +77,8 @@ var withSpotlight = function withSpotlight(Component) {
     var items = _ref.items,
         defaultSpotlight = _ref.defaultSpotlight,
         labelRenderer = _ref.labelRenderer,
-        rest = _objectWithoutProperties(_ref, ['items', 'defaultSpotlight', 'labelRenderer']);
+        displayChildren = _ref.displayChildren,
+        rest = _objectWithoutProperties(_ref, ['items', 'defaultSpotlight', 'labelRenderer', 'displayChildren']);
 
     var _useState = (0, _react.useState)({ term: '' }),
         term = _useState[0].term,
@@ -66,7 +91,7 @@ var withSpotlight = function withSpotlight(Component) {
     }, [defaultSpotlight]);
 
     var filteredItems = (0, _react.useMemo)(function () {
-      return spotlightFilter(term, labelRenderer)(items);
+      return spotlightFilter(term, labelRenderer, displayChildren)(items);
     }, [term, items]);
 
     return _react2.default.createElement(Component, _extends({}, rest, {

package/lib/theme.js

@@ -1,6 +1,9 @@
 'use strict';
 
 exports.__esModule = true;
+
+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 innerPalette = exports.innerPalette = {
   highlight1: '#f7a42c',
   highlight2: '#8CC841',
@@ -16,7 +19,8 @@ var innerPalette = exports.innerPalette = {
 
 var sisccTheme = exports.sisccTheme = function sisccTheme(_ref) {
   var rtl = _ref.rtl,
-      isA11y = _ref.isA11y,
+      _ref$isA11y = _ref.isA11y,
+      isA11y = _ref$isA11y === undefined ? false : _ref$isA11y,
       _ref$outerPalette = _ref.outerPalette,
       outerPalette = _ref$outerPalette === undefined ? {} : _ref$outerPalette;
 
@@ -24,9 +28,9 @@ var sisccTheme = exports.sisccTheme = function sisccTheme(_ref) {
     outlineColor: outerPalette.highlight1 || innerPalette.highlight1
   };
 
-  var buttonBaseFocus = {
+  var buttonBaseFocus = isA11y && {
     borderColor: outerPalette.highlight1 || innerPalette.highlight1,
-    '&.Mui-focused': {
+    '&:focus': {
       outlineColor: outerPalette.highlight1 || innerPalette.highlight1,
       outlineWidth: 1,
       outlineStyle: 'auto'
@@ -47,7 +51,11 @@ var sisccTheme = exports.sisccTheme = function sisccTheme(_ref) {
           disableRipple: true
         },
         styleOverrides: {
-          root: isA11y && buttonBaseFocus
+          root: _extends({
+            '&:focus': {
+              outline: 'none'
+            }
+          }, buttonBaseFocus)
         }
       },
       MuiUseMediaQuery: {
@@ -82,7 +90,7 @@ var sisccTheme = exports.sisccTheme = function sisccTheme(_ref) {
       MuiAccordion: {
         styleOverrides: {
           root: {
-            '&$expanded': {
+            '&.Mui-expanded': {
               margin: 0
             }
           }
@@ -91,7 +99,10 @@ var sisccTheme = exports.sisccTheme = function sisccTheme(_ref) {
       MuiButton: {
         styleOverrides: {
           root: {
-            textTransform: 'none'
+            textTransform: 'none',
+            '&:focus': {
+              outline: 'none'
+            }
           },
           textPrimary: {
             '&:hover': {
@@ -128,6 +139,9 @@ var sisccTheme = exports.sisccTheme = function sisccTheme(_ref) {
         }
       },
       MuiLink: {
+        defaultProps: {
+          underline: 'none'
+        },
         styleOverrides: {
           root: {
             color: outerPalette.primaryMain || innerPalette.primaryMain,
@@ -137,7 +151,7 @@ var sisccTheme = exports.sisccTheme = function sisccTheme(_ref) {
             '&.Mui-focused': isA11y && focus
           },
           button: {
-            '&.Mui-focused': isA11y && focus
+            '&:focus': isA11y && focus
           }
         }
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sis-cc/dotstatsuite-visions",
-  "version": "12.0.0",
+  "version": "12.2.0",
   "description": "Library of visual components",
   "author": "OECD",
   "homepage": "https://visions-qa.siscc.org/#o",
@@ -31,17 +31,18 @@
   "dependencies": {
     "@emotion/react": "^11.13.0",
     "@emotion/styled": "^11.13.0",
+    "@hello-pangea/dnd": "^16.6.0",
     "@mui/icons-material": "^5.16.5",
     "@mui/material": "^5.16.5",
     "@mui/styles": "^5.16.5",
     "@react-hook/size": "^2.1.1",
     "classnames": "^2.2.6",
+    "cross-env": "^7.0.3",
     "date-fns": "^1.30.1",
     "isemail": "^3.2.0",
     "numeral": "^2.0.6",
     "prop-types": "^15.7.2",
     "ramda": "^0.27.0",
-    "@hello-pangea/dnd": "^16.6.0",
     "react-draggable": "^4.4.5",
     "react-error-boundary": "^4.0.10",
     "react-virtualized": "^9.21.2"
@@ -49,7 +50,6 @@
   "peerDependencies": {
     "@mui/icons-material": "^5.16.5",
     "@mui/material": "^5.16.5",
-    "@sis-cc/dotstatsuite-sdmxjs": "^8.x",
     "react": "^18",
     "react-dom": "^18"
   },
@@ -59,7 +59,6 @@
     "@cfaester/enzyme-adapter-react-18": "^0.7.0",
     "@mui/icons-material": "^5.16.5",
     "@mui/material": "^5.16.5",
-    "@sis-cc/dotstatsuite-sdmxjs": "*",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^14.0.0",
     "babel-jest": "^24.8.0",