Skip to content

Commit

Permalink
fix: filter width + input bug (#567)
Browse files Browse the repository at this point in the history
* Sets the filter popup to the correct width (320px)
* Fixes a bug where the filter popup would change width when the user starts to type in the filter input field
* Updated Analytics dep to v4.1.5, for the latest DimensionItem fix
  • Loading branch information
martinkrulltott authored Feb 26, 2020
1 parent 8742a6a commit 751cbc4
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"private": true,
"license": "BSD-3-Clause",
"dependencies": {
"@dhis2/analytics": "^4.0.2",
"@dhis2/analytics": "^4.1.5",
"@dhis2/app-runtime": "^2.0.3",
"@dhis2/d2-i18n": "^1.0.6",
"@dhis2/d2-ui-core": "^6.5.8",
Expand Down
1 change: 1 addition & 0 deletions src/components/ItemFilter/FilterSelector.js
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ class FilterSelector extends Component {
}}
>
<DimensionsPanel
style={{ width: '320px' }}
dimensions={dimensions}
onDimensionClick={this.selectDimension}
selectedIds={selectedDimensions}
Expand Down
22 changes: 21 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1154,7 +1154,7 @@
resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==

"@dhis2/analytics@^4.0.1", "@dhis2/analytics@^4.0.2":
"@dhis2/analytics@^4.0.1":
version "4.0.2"
resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-4.0.2.tgz#fa874ce93c2499c6466b746a2ee4e9e75a61ebd8"
integrity sha512-cJVsxPt5rWDv+TOpP6qNcUxJe4my+e+1/NqKj/jm+rxF5XvlK1RovCNFlLvoIVekgw6acI4y6+KYIGznC65d5w==
Expand Down Expand Up @@ -1194,6 +1194,26 @@
resize-observer-polyfill "^1.5.1"
styled-jsx "^3.2.1"

"@dhis2/analytics@^4.1.5":
version "4.1.5"
resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-4.1.5.tgz#c16f0c9de24c0635b950cbfd25a6fc42a08ff74a"
integrity sha512-pHUwZ9CFvCxNZmrS3tnkfZc+P26UulsxOXmxVxD9weDIeY5+5hnfOMqd+x6QKZSlfPz4HQXRZ2XBSKBtAQ7DWg==
dependencies:
"@dhis2/d2-i18n" "^1.0.4"
"@dhis2/d2-ui-org-unit-dialog" "^6.5.6"
"@dhis2/d2-ui-period-selector-dialog" "^6.5.7"
"@dhis2/ui-core" "^4.9.1"
"@material-ui/core" "^3.9.3"
"@material-ui/icons" "^3.0.2"
classnames "^2.2.6"
d2-utilizr "^0.2.16"
d3-color "^1.2.3"
highcharts "^7.2.1"
lodash "^4.17.13"
react-beautiful-dnd "^10.1.1"
resize-observer-polyfill "^1.5.1"
styled-jsx "^3.2.1"

"@dhis2/app-runtime@^2.0.3":
version "2.0.3"
resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-2.0.3.tgz#ababc8494420b4f16cbfdc3fef8f9a2707008a4c"
Expand Down

0 comments on commit 751cbc4

Please sign in to comment.