@sis-cc/dotstatsuite-visions 7.6.0 → 7.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/es/CollapseButtons/CollapseButtons.js +7 -3
  2. package/es/CollapseButtons/Item.js +11 -6
  3. package/lib/CollapseButtons/CollapseButtons.js +7 -3
  4. package/lib/CollapseButtons/Item.js +11 -6
  5. package/package.json +1 -1
package/es/CollapseButtons/CollapseButtons.js CHANGED
@@ -40,7 +40,9 @@ var CollapseButtons = function CollapseButtons(props) {
40
40
  } : _props$breakpoint,
41
41
  justify = props.justify,
42
42
  _props$textTransform = props.textTransform,
43
- textTransform = _props$textTransform === undefined ? 'none' : _props$textTransform;
43
+ textTransform = _props$textTransform === undefined ? 'none' : _props$textTransform,
44
+ _props$labelAccessor = props.labelAccessor,
45
+ labelAccessor = _props$labelAccessor === undefined ? R.prop('label') : _props$labelAccessor;
44
46
 
45
47
 
46
48
  var classes = useStyles();
@@ -65,7 +67,8 @@ var CollapseButtons = function CollapseButtons(props) {
65
67
  parentId: parentId,
66
68
  item: item,
67
69
  action: action,
68
- isSecondLevelClikable: isSecondLevelClikable
70
+ isSecondLevelClikable: isSecondLevelClikable,
71
+ labelAccessor: labelAccessor
69
72
  });
70
73
  });
71
74
  };
@@ -155,7 +158,8 @@ CollapseButtons.propTypes = process.env.NODE_ENV !== "production" ? {
155
158
  breakpoint: PropTypes.func,
156
159
  gridButtonsProps: PropTypes.object,
157
160
  justify: PropTypes.string,
158
- textTransform: PropTypes.string
161
+ textTransform: PropTypes.string,
162
+ labelAccessor: PropTypes.func
159
163
  } : {};
160
164
 
161
165
  export default CollapseButtons;
package/es/CollapseButtons/Item.js CHANGED
@@ -28,6 +28,8 @@ var useStyles = makeStyles(function (theme) {
28
28
  display: 'flex'
29
29
  },
30
30
  itemSubtitle: _extends({}, theme.typography.body1, {
31
+ display: 'flex',
32
+ flexDirection: 'column',
31
33
  color: theme.palette.grey[800]
32
34
  }),
33
35
  itemSubtitleLink: _extends({}, theme.typography.body1, {
@@ -51,7 +53,8 @@ var Item = function Item(_ref) {
51
53
  item = _ref.item,
52
54
  action = _ref.action,
53
55
  testId = _ref.testId,
54
- isSecondLevelClikable = _ref.isSecondLevelClikable;
56
+ isSecondLevelClikable = _ref.isSecondLevelClikable,
57
+ labelAccessor = _ref.labelAccessor;
55
58
 
56
59
  var classes = useStyles();
57
60
 
@@ -83,14 +86,14 @@ var Item = function Item(_ref) {
83
86
  React.createElement(
84
87
  'span',
85
88
  { className: classes.itemTitle },
86
- R.prop('label')(item)
89
+ labelAccessor(item, parentId)
87
90
  ),
88
91
  React.createElement(
89
92
  'span',
90
93
  { className: classes.itemSubtitle },
91
94
  R.map(function (subtopic) {
92
95
  if (R.not(R.is(Object)(subtopic))) return subtopic;
93
- if (R.not(isSecondLevelClikable)) return R.prop('label')(subtopic);
96
+ if (R.not(isSecondLevelClikable)) return labelAccessor(subtopic, parentId);
94
97
  var id = R.prop('id')(subtopic);
95
98
  return React.createElement(
96
99
  Link,
@@ -105,9 +108,10 @@ var Item = function Item(_ref) {
105
108
  },
106
109
  tabIndex: 0
107
110
  },
108
- R.prop('label')(subtopic)
111
+ '\u2022 ',
112
+ labelAccessor(subtopic, parentId)
109
113
  );
110
- })(R.pipe(R.propOr([], 'subtopics'), R.intersperse(' • '))(item))
114
+ })(R.pipe(R.propOr([], 'subtopics'), R.ifElse(R.always(isSecondLevelClikable), R.identity, R.intersperse(' • ')))(item))
111
115
  )
112
116
  )
113
117
  )
@@ -119,7 +123,8 @@ Item.propTypes = process.env.NODE_ENV !== "production" ? {
119
123
  testId: PropTypes.string,
120
124
  item: PropTypes.object,
121
125
  action: PropTypes.func,
122
- isSecondLevelClikable: PropTypes.bool
126
+ isSecondLevelClikable: PropTypes.bool,
127
+ labelAccessor: PropTypes.func
123
128
  } : {};
124
129
 
125
130
  export default Item;
package/lib/CollapseButtons/CollapseButtons.js CHANGED
@@ -74,7 +74,9 @@ var CollapseButtons = function CollapseButtons(props) {
74
74
  } : _props$breakpoint,
75
75
  justify = props.justify,
76
76
  _props$textTransform = props.textTransform,
77
- textTransform = _props$textTransform === undefined ? 'none' : _props$textTransform;
77
+ textTransform = _props$textTransform === undefined ? 'none' : _props$textTransform,
78
+ _props$labelAccessor = props.labelAccessor,
79
+ labelAccessor = _props$labelAccessor === undefined ? R.prop('label') : _props$labelAccessor;
78
80
 
79
81
 
80
82
  var classes = useStyles();
@@ -99,7 +101,8 @@ var CollapseButtons = function CollapseButtons(props) {
99
101
  parentId: parentId,
100
102
  item: item,
101
103
  action: action,
102
- isSecondLevelClikable: isSecondLevelClikable
104
+ isSecondLevelClikable: isSecondLevelClikable,
105
+ labelAccessor: labelAccessor
103
106
  });
104
107
  });
105
108
  };
@@ -189,7 +192,8 @@ CollapseButtons.propTypes = process.env.NODE_ENV !== "production" ? {
189
192
  breakpoint: _propTypes2.default.func,
190
193
  gridButtonsProps: _propTypes2.default.object,
191
194
  justify: _propTypes2.default.string,
192
- textTransform: _propTypes2.default.string
195
+ textTransform: _propTypes2.default.string,
196
+ labelAccessor: _propTypes2.default.func
193
197
  } : {};
194
198
 
195
199
  exports.default = CollapseButtons;
package/lib/CollapseButtons/Item.js CHANGED
@@ -57,6 +57,8 @@ var useStyles = (0, _styles.makeStyles)(function (theme) {
57
57
  display: 'flex'
58
58
  },
59
59
  itemSubtitle: _extends({}, theme.typography.body1, {
60
+ display: 'flex',
61
+ flexDirection: 'column',
60
62
  color: theme.palette.grey[800]
61
63
  }),
62
64
  itemSubtitleLink: _extends({}, theme.typography.body1, {
@@ -80,7 +82,8 @@ var Item = function Item(_ref) {
80
82
  item = _ref.item,
81
83
  action = _ref.action,
82
84
  testId = _ref.testId,
83
- isSecondLevelClikable = _ref.isSecondLevelClikable;
85
+ isSecondLevelClikable = _ref.isSecondLevelClikable,
86
+ labelAccessor = _ref.labelAccessor;
84
87
 
85
88
  var classes = useStyles();
86
89
 
@@ -112,14 +115,14 @@ var Item = function Item(_ref) {
112
115
  _react2.default.createElement(
113
116
  'span',
114
117
  { className: classes.itemTitle },
115
- R.prop('label')(item)
118
+ labelAccessor(item, parentId)
116
119
  ),
117
120
  _react2.default.createElement(
118
121
  'span',
119
122
  { className: classes.itemSubtitle },
120
123
  R.map(function (subtopic) {
121
124
  if (R.not(R.is(Object)(subtopic))) return subtopic;
122
- if (R.not(isSecondLevelClikable)) return R.prop('label')(subtopic);
125
+ if (R.not(isSecondLevelClikable)) return labelAccessor(subtopic, parentId);
123
126
  var id = R.prop('id')(subtopic);
124
127
  return _react2.default.createElement(
125
128
  _Link2.default,
@@ -134,9 +137,10 @@ var Item = function Item(_ref) {
134
137
  },
135
138
  tabIndex: 0
136
139
  },
137
- R.prop('label')(subtopic)
140
+ '\u2022 ',
141
+ labelAccessor(subtopic, parentId)
138
142
  );
139
- })(R.pipe(R.propOr([], 'subtopics'), R.intersperse(' • '))(item))
143
+ })(R.pipe(R.propOr([], 'subtopics'), R.ifElse(R.always(isSecondLevelClikable), R.identity, R.intersperse(' • ')))(item))
140
144
  )
141
145
  )
142
146
  )
@@ -148,7 +152,8 @@ Item.propTypes = process.env.NODE_ENV !== "production" ? {
148
152
  testId: _propTypes2.default.string,
149
153
  item: _propTypes2.default.object,
150
154
  action: _propTypes2.default.func,
151
- isSecondLevelClikable: _propTypes2.default.bool
155
+ isSecondLevelClikable: _propTypes2.default.bool,
156
+ labelAccessor: _propTypes2.default.func
152
157
  } : {};
153
158
 
154
159
  exports.default = Item;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sis-cc/dotstatsuite-visions",
3
- "version": "7.6.0",
3
+ "version": "7.6.1",
4
4
  "description": "Library of visual components",
5
5
  "author": "OECD",
6
6
  "homepage": "https://visions-qa.siscc.org/#o",