@sis-cc/dotstatsuite-visions 8.8.0 → 8.9.0

package/es/AdvancedFilterDialog/AdvancedFilterDialog.js

@@ -20,6 +20,8 @@ import Typography from '@material-ui/core/Typography';
 import PlaylistAddCheckIcon from '@material-ui/icons/PlaylistAddCheck';
 import CloseIcon from '@material-ui/icons/Close';
 import HintIcon from '@material-ui/icons/EmojiObjects';
+import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
+import ExpandLessIcon from '@material-ui/icons/ExpandLess';
 import Draggable from 'react-draggable';
 import { Button, Spotlight, VirtualizedTree } from '..';
 import { withExpansionTree } from '../VirtualizedTree/withExpansionTree';
@@ -90,8 +92,8 @@ var useStyles = makeStyles(function (theme) {
     },
     narrowSelectionButton: {
       height: 32,
-      marginTop: 5,
-      marginRight: 15
+      marginTop: 15,
+      marginRight: 10
     },
     selectionMenu: {
       width: '50%',
@@ -138,6 +140,11 @@ var useStyles = makeStyles(function (theme) {
     },
     actions: {
       justifyContent: 'space-between'
+    },
+    ellipsis: {
+      whiteSpace: 'nowrap',
+      overflow: 'hidden',
+      textOverflow: 'ellipsis'
     }
   };
 });
@@ -409,9 +416,16 @@ var AdvancedFilterDialog = function AdvancedFilterDialog(props) {
                 },
                 color: 'primary',
                 variant: 'contained',
-                alternative: 'siscc'
+                alternative: 'siscc',
+                selected: isOpenSelectionMenu
               },
-              R.prop('selectionMode', labels)
+              React.createElement(
+                Typography,
+                { variant: 'body2', className: classes.ellipsis },
+                R.prop('selectionMode', labels)
+              ),
+              '\xA0',
+              isOpenSelectionMenu ? React.createElement(ExpandLessIcon, { fontSize: 'small' }) : React.createElement(ExpandMoreIcon, { fontSize: 'small' })
             ),
             '\xA0',
             R.prop(selectionMode + 'Selection', labels),

package/es/HierarchicalFilter/HierarchicalFilter.js

@@ -4,7 +4,7 @@ import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
 import * as R from 'ramda';
 import Container from '@material-ui/core/Container';
-import PlaylistAddCheckIcon from '@material-ui/icons/PlaylistAddCheck';
+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';
@@ -97,7 +97,7 @@ var HierarchicalFilter = function HierarchicalFilter(props) {
                 classes: { root: classes.bulkSelectionIcon },
                 onClick: onAdvancedToggle
               },
-              React.createElement(PlaylistAddCheckIcon, { color: 'primary' })
+              React.createElement(ZoomOutMapIcon, { color: 'primary' })
             )
           )
         )

package/lib/AdvancedFilterDialog/AdvancedFilterDialog.js

@@ -75,6 +75,14 @@ var _EmojiObjects = require('@material-ui/icons/EmojiObjects');
 
 var _EmojiObjects2 = _interopRequireDefault(_EmojiObjects);
 
+var _ExpandMore = require('@material-ui/icons/ExpandMore');
+
+var _ExpandMore2 = _interopRequireDefault(_ExpandMore);
+
+var _ExpandLess = require('@material-ui/icons/ExpandLess');
+
+var _ExpandLess2 = _interopRequireDefault(_ExpandLess);
+
 var _reactDraggable = require('react-draggable');
 
 var _reactDraggable2 = _interopRequireDefault(_reactDraggable);
@@ -186,8 +194,8 @@ var useStyles = (0, _styles.makeStyles)(function (theme) {
     },
     narrowSelectionButton: {
       height: 32,
-      marginTop: 5,
-      marginRight: 15
+      marginTop: 15,
+      marginRight: 10
     },
     selectionMenu: {
       width: '50%',
@@ -234,6 +242,11 @@ var useStyles = (0, _styles.makeStyles)(function (theme) {
     },
     actions: {
       justifyContent: 'space-between'
+    },
+    ellipsis: {
+      whiteSpace: 'nowrap',
+      overflow: 'hidden',
+      textOverflow: 'ellipsis'
     }
   };
 });
@@ -505,9 +518,16 @@ var AdvancedFilterDialog = function AdvancedFilterDialog(props) {
                 },
                 color: 'primary',
                 variant: 'contained',
-                alternative: 'siscc'
+                alternative: 'siscc',
+                selected: isOpenSelectionMenu
               },
-              R.prop('selectionMode', labels)
+              _react2.default.createElement(
+                _Typography2.default,
+                { variant: 'body2', className: classes.ellipsis },
+                R.prop('selectionMode', labels)
+              ),
+              '\xA0',
+              isOpenSelectionMenu ? _react2.default.createElement(_ExpandLess2.default, { fontSize: 'small' }) : _react2.default.createElement(_ExpandMore2.default, { fontSize: 'small' })
             ),
             '\xA0',
             R.prop(selectionMode + 'Selection', labels),

package/lib/HierarchicalFilter/HierarchicalFilter.js

@@ -20,9 +20,9 @@ var _Container = require('@material-ui/core/Container');
 
 var _Container2 = _interopRequireDefault(_Container);
 
-var _PlaylistAddCheck = require('@material-ui/icons/PlaylistAddCheck');
+var _ZoomOutMap = require('@material-ui/icons/ZoomOutMap');
 
-var _PlaylistAddCheck2 = _interopRequireDefault(_PlaylistAddCheck);
+var _ZoomOutMap2 = _interopRequireDefault(_ZoomOutMap);
 
 var _ = require('../');
 
@@ -125,7 +125,7 @@ var HierarchicalFilter = function HierarchicalFilter(props) {
                 classes: { root: classes.bulkSelectionIcon },
                 onClick: onAdvancedToggle
               },
-              _react2.default.createElement(_PlaylistAddCheck2.default, { color: 'primary' })
+              _react2.default.createElement(_ZoomOutMap2.default, { color: 'primary' })
             )
           )
         )

package/package.json

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