Merge pull request #375 from ovh-ux/master

Sync master to develop

Author: AxelPeter

CHANGELOG.md

@@ -1,3 +1,18 @@
+<a name="2.26.0"></a>
+# [2.26.0](https://github.com/ovh-ux/ovh-ui-angular/compare/v2.25.1...v2.26.0) (2019-03-26)
+
+
+### Bug Fixes
+
+* **oui-modal:** hide content when loading ([#373](https://github.com/ovh-ux/ovh-ui-angular/issues/373)) ([411e594](https://github.com/ovh-ux/ovh-ui-angular/commit/411e594))
+
+
+### Features
+
+* **oui-collapsible:** add on-toggle event ([#372](https://github.com/ovh-ux/ovh-ui-angular/issues/372)) ([6b1adda](https://github.com/ovh-ux/ovh-ui-angular/commit/6b1adda))
+
+
+
 <a name="2.25.1"></a>
 ## [2.25.1](https://github.com/ovh-ux/ovh-ui-angular/compare/v2.25.0...v2.25.1) (2019-03-04)
 

dist/oui-angular.min.js

@@ -3,7 +3,7 @@
   "description": "A set of maintainable components for the OVH ecosystem (Angular).",
   "license": "BSD-3-Clause",
   "author": "OVH SAS",
-  "version": "2.25.1",
+  "version": "2.26.0",
   "keywords": [
     "angular"
   ],

dist/oui-angular.min.js.map

@@ -20,6 +20,14 @@
 </oui-collapsible>
 ```
 
+### Event handler
+
+```html:preview
+<oui-collapsible heading="Title" aria-label="Action" expanded="true" on-toggle="$ctrl.onToggle(expanded)">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis semper ligula nec fringilla tempor. In rhoncus ullamcorper feugiat. Phasellus vel ipsum vitae neque varius luctus. Proin id iaculis arcu. Fusce justo arcu, egestas vel nulla nec, dictum cursus lacus. Aenean elementum vel odio quis rutrum. In quis tellus in neque vulputate rhoncus vitae ut justo. Ut dignissim varius est in consequat. Donec nisi mauris, pellentesque condimentum congue in, blandit ut arcu. In et elit ipsum.
+</oui-collapsible>
+```
+
 ## API
 
 ### oui-collapsible
@@ -29,3 +37,4 @@
 | `heading`     | string    | @       | no                  | n/a       | n/a       | text of the heading
 | `aria-label`  | string    | @?      | yes                 | n/a       | n/a       | accessibility label
 | `expanded`    | boolean   | <?      | yes                 | n/a       | `false`   | initial expanded state
+| `on-toggle`   | function  | &       | no                  | n/a       | n/a       | on collapsible state changed event handler

package.json

@@ -8,7 +8,8 @@ export default {
         id: "@",
         heading: "@",
         ariaLabel: "@?",
-        expanded: "<?"
+        expanded: "<?",
+        onToggle: "&"
     },
     transclude: true
 };

packages/oui-collapsible/README.md

@@ -38,5 +38,6 @@ export default class {
 
     toggle () {
         this.expanded = !this.expanded;
+        this.onToggle({ expanded: this.expanded });
     }
 }

packages/oui-collapsible/src/collapsible.component.js

@@ -75,5 +75,23 @@ describe("ouiCollapsible", () => {
             const contentEl = bodyEl.querySelector(".custom-content");
             expect(contentEl).toBeTruthy();
         });
+
+        it("should call ontoggle when defined into attributes", () => {
+            const onToggle = jasmine.createSpy("onToggle");
+            const element = TestUtils.compileTemplate(`
+                <oui-collapsible heading="Title" aria-label="Action" on-toggle="$ctrl.onToggle(expanded)"></oui-collapsible>`, {
+                onToggle
+            });
+
+            const headerEl = angular.element(getHeaderElement(element));
+
+            // Expand
+            headerEl.triggerHandler("click");
+            expect(onToggle).toHaveBeenCalledWith(true);
+
+            // Collapse
+            headerEl.triggerHandler("click");
+            expect(onToggle).toHaveBeenCalledWith(false);
+        });
     });
 });