sigrennesmetropole#34: Toggle toolbar buttons (sigrennesmetropole#37)

offtherailz · Jul 29, 2021 · 15160f3 · 15160f3
1 parent d934910
commit 15160f3
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/js/extension/plugins/__tests__/UrbanismeToolbar-test.js b/js/extension/plugins/__tests__/UrbanismeToolbar-test.js
@@ -63,6 +63,23 @@ describe('UrbanismeToolbar', () => {
         expect(includes(ADSButton.getAttribute('class'), 'active')).toBe(true);
     });
 
+    it('test reset tool of UrbanismeToolbar', () => {
+        const action = {
+            onToggleTool: () => {}
+        };
+        const spyOnToggleTool = expect.spyOn(action, "onToggleTool");
+        ReactDOM.render(<UrbanismeToolbar enabled onToggleTool={action.onToggleTool} urbanisme={{activeTool: "ADS"}}/>, document.getElementById("container"));
+        const container = document.getElementById('container');
+        expect(container).toBeTruthy();
+        const buttons = container.querySelectorAll("button");
+        expect(buttons.length).toBe(4);
+        // Active tool
+        const ADSButton = buttons[1];
+        TestUtils.Simulate.click(ADSButton);
+        expect(spyOnToggleTool).toHaveBeenCalled();
+        expect(spyOnToggleTool.calls[0].arguments[0]).toBe(null);
+    });
+
     it('test UrbanismeToolbar close toolbar', () => {
         const actions = {
             onToggleControl: () => {}

diff --git a/js/extension/plugins/urbanisme/UrbanismeToolbar.js b/js/extension/plugins/urbanisme/UrbanismeToolbar.js
@@ -71,7 +71,7 @@ const UrbanismeToolbar = ({
                             tooltip: <Message msgId={'urbanisme.nru.tooltip'}/>,
                             bsStyle: activeTool === NRU ? "success" : "primary",
                             active: activeTool === NRU,
-                            onClick: () => onToggleTool(NRU)
+                            onClick: () => onToggleTool(activeTool === NRU ? null : NRU)
                         },
                         {
                             text: <img src={ADSIcon} style={{
@@ -83,7 +83,7 @@ const UrbanismeToolbar = ({
                             tooltip: <Message msgId={'urbanisme.ads.tooltip'}/>,
                             bsStyle: activeTool === ADS ? "success" : "primary",
                             active: activeTool === ADS,
-                            onClick: () => onToggleTool(ADS)
+                            onClick: () => onToggleTool(activeTool === ADS ? null : ADS)
                         },
                         {
                             glyph: "question-sign",