Merge pull request #104 from Terralego/fix-filter-panel-content-hoc

Fix connect HOC on FilterPanelContent
Terralego · Sep 16, 2019 · a129116 · a129116
2 parents 8745e75 + 937a85c
commit a129116
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/modules/Forms/Controls/RangeNumeric.js b/src/modules/Forms/Controls/RangeNumeric.js
@@ -12,6 +12,7 @@ class RangeNumeric extends RangeComponent {
   onNumericInputChange = pos => bound => {
     const { onChange, min, max } = this.props;
     const { range } = this.state;
+    if (Number.isNaN(+bound)) return; // Sanity check that allows typing '-'
     range[pos] = bound;
     this.setState({ range });
 

diff --git a/src/modules/Forms/Controls/RangeNumeric.test.js b/src/modules/Forms/Controls/RangeNumeric.test.js
@@ -8,7 +8,7 @@ jest.mock('@blueprintjs/core', () => ({
   Intent: { DANGER: 'danger' },
 }));
 
-it('should handle numeric change', async () => {
+it('should handle numeric change', () => {
   const onChange = jest.fn();
   const wrapper = mount(<RangeNumeric onChange={onChange} />);
   expect(wrapper.find('NumericInput').last().prop('value')).toBe(100);
@@ -18,6 +18,13 @@ it('should handle numeric change', async () => {
   expect(onChange).toHaveBeenCalled();
 });
 
+it('should allow typing minus', () => {
+  const instance = new RangeNumeric({});
+  instance.setState = jest.fn();
+  instance.onNumericInputChange(0)('-');
+  expect(instance.setState).not.toHaveBeenCalled();
+});
+
 it('should update range numeric if props are changed', () => {
   const wrapper = mount(<RangeNumeric max={1000} />);
   expect(wrapper.state().range).toEqual([0, 1000]);

diff --git a/src/modules/Visualizer/LayersTree/LayersTreeItem/FiltersPanel/FiltersPanelContent/index.js b/src/modules/Visualizer/LayersTree/LayersTreeItem/FiltersPanel/FiltersPanelContent/index.js
@@ -2,13 +2,17 @@ import FiltersPanelContent from './FiltersPanelContent';
 
 import { connectLayersTree } from '../../../LayersTreeProvider/context';
 
-export default connectLayersTree('translate', ({ getLayerState }, { layer, layer: { exclusive, layers } }) => {
+export default connectLayersTree((
+  { getLayerState, translate }, // context
+  { layer, layer: { exclusive, layers } }, // props
+) => {
   const activeLayer = exclusive
     ? layers.find(l => getLayerState({ layer: l }).active) || layer
     : layer;
 
   return {
     filtersValues: getLayerState({ layer: activeLayer }).filters || {},
     activeLayer,
+    translate,
   };
 })(FiltersPanelContent);