@sis-cc/dotstatsuite-visions 8.8.1 → 8.10.0

package/es/AdvancedFilterDialog/AdvancedFilterDialog.js

@@ -17,9 +17,10 @@ import CardContent from '@material-ui/core/CardContent';
 import Paper from '@material-ui/core/Paper';
 import Grid from '@material-ui/core/Grid';
 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 +91,8 @@ var useStyles = makeStyles(function (theme) {
     },
     narrowSelectionButton: {
       height: 32,
-      marginTop: 5,
-      marginRight: 15
+      marginTop: 15,
+      marginRight: 10
     },
     selectionMenu: {
       width: '50%',
@@ -138,6 +139,11 @@ var useStyles = makeStyles(function (theme) {
     },
     actions: {
       justifyContent: 'space-between'
+    },
+    ellipsis: {
+      whiteSpace: 'nowrap',
+      overflow: 'hidden',
+      textOverflow: 'ellipsis'
     }
   };
 });
@@ -364,7 +370,6 @@ var AdvancedFilterDialog = function AdvancedFilterDialog(props) {
         React.createElement(
           'div',
           { className: classes.headerLabel },
-          React.createElement(PlaylistAddCheckIcon, { color: 'primary' }),
           '\xA0',
           title
         ),
@@ -409,9 +414,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/lib/AdvancedFilterDialog/AdvancedFilterDialog.js

@@ -63,10 +63,6 @@ var _Typography = require('@material-ui/core/Typography');
 
 var _Typography2 = _interopRequireDefault(_Typography);
 
-var _PlaylistAddCheck = require('@material-ui/icons/PlaylistAddCheck');
-
-var _PlaylistAddCheck2 = _interopRequireDefault(_PlaylistAddCheck);
-
 var _Close = require('@material-ui/icons/Close');
 
 var _Close2 = _interopRequireDefault(_Close);
@@ -75,6 +71,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 +190,8 @@ var useStyles = (0, _styles.makeStyles)(function (theme) {
     },
     narrowSelectionButton: {
       height: 32,
-      marginTop: 5,
-      marginRight: 15
+      marginTop: 15,
+      marginRight: 10
     },
     selectionMenu: {
       width: '50%',
@@ -234,6 +238,11 @@ var useStyles = (0, _styles.makeStyles)(function (theme) {
     },
     actions: {
       justifyContent: 'space-between'
+    },
+    ellipsis: {
+      whiteSpace: 'nowrap',
+      overflow: 'hidden',
+      textOverflow: 'ellipsis'
     }
   };
 });
@@ -460,7 +469,6 @@ var AdvancedFilterDialog = function AdvancedFilterDialog(props) {
         _react2.default.createElement(
           'div',
           { className: classes.headerLabel },
-          _react2.default.createElement(_PlaylistAddCheck2.default, { color: 'primary' }),
           '\xA0',
           title
         ),
@@ -505,9 +513,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/package.json

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