Added test case for #869

Improve active support for both accordion and expandable collapsibles.

Author: kevzlou7979

gwt-material/src/main/java/gwt/material/design/client/ui/MaterialCollapsible.java

@@ -23,16 +23,17 @@
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.event.shared.HandlerRegistration;
+import com.google.gwt.user.client.ui.HasWidgets;
 import com.google.gwt.user.client.ui.Widget;
 import gwt.material.design.client.base.*;
 import gwt.material.design.client.base.mixin.CssTypeMixin;
 import gwt.material.design.client.constants.CollapsibleType;
 import gwt.material.design.client.constants.CssName;
+import gwt.material.design.client.constants.Display;
 import gwt.material.design.client.events.ClearActiveEvent;
 import gwt.material.design.client.events.ClearActiveEvent.ClearActiveHandler;
 import gwt.material.design.client.events.CollapseEvent;
 import gwt.material.design.client.events.ExpandEvent;
-import gwt.material.design.client.base.HasCollapsibleHandlers;
 
 import static gwt.material.design.client.js.JsMaterialElement.$;
 
@@ -173,13 +174,24 @@ public void clearActive() {
         ClearActiveEvent.fire(this);
     }
 
+    @Override
+    protected void clearActiveClass(HasWidgets widget) {
+        super.clearActiveClass(widget);
+
+        for (Widget child : widget) {
+            if (child instanceof MaterialCollapsibleBody) {
+                ((MaterialCollapsibleBody) child).setDisplay(Display.NONE);
+            }
+        }
+    }
+
     /**
      * Open the given collapsible item.
      *
      * @param index the one-based collapsible item index.
      */
     public void open(int index) {
-        setActive(index, true);
+        setActive(index);
     }
 
     /**
@@ -236,7 +248,7 @@ public boolean isAccordion() {
 
     @Override
     public void setActive(int index) {
-        if (!isAccordion()) {
+        if (isAccordion()) {
             clearActive();
         }
         setActive(index, true);

gwt-material/src/main/java/gwt/material/design/client/ui/MaterialCollapsibleItem.java

@@ -156,7 +156,7 @@ public void setActive(boolean active) {
                 header.removeStyleName(CssName.ACTIVE);
             }
             if (active) {
-                if (parent != null && !parent.isAccordion()) {
+                if (parent != null && parent.isAccordion()) {
                     parent.clearActive();
                 }
                 addStyleName(CssName.ACTIVE);

gwt-material/src/test/java/gwt/material/design/client/ui/MaterialCollapsibleTest.java

@@ -19,7 +19,6 @@
  */
 package gwt.material.design.client.ui;
 
-import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.user.client.ui.Widget;
 import gwt.material.design.client.base.MaterialWidget;
 import gwt.material.design.client.constants.*;
@@ -129,6 +128,7 @@ public void testMultipleExpansion() {
 
         // when / then
         collapsible.setAccordion(false);
+        assertFalse(collapsible.isAccordion());
         assertTrue(collapsible.getWidget(FIRST_ITEM) instanceof MaterialCollapsibleItem);
         assertTrue(collapsible.getWidget(SECOND_ITEM) instanceof MaterialCollapsibleItem);
 
@@ -145,6 +145,20 @@ public void testMultipleExpansion() {
         assertTrue(item2.getElement().hasClassName(CssName.ACTIVE));
         item2.collapse();
         assertFalse(item2.getElement().hasClassName(CssName.ACTIVE));
+
+        // Test case for MaterialCollapsible Issue programtically setting more than one active
+        // https://github.com/GwtMaterialDesign/gwt-material/issues/869
+        item1.expand();
+        assertTrue(item1.getElement().hasClassName(CssName.ACTIVE));
+        item2.expand();
+        assertTrue(item2.getElement().hasClassName(CssName.ACTIVE));
+        assertTrue(item1.getElement().hasClassName(CssName.ACTIVE));
+        item1.collapse();
+        assertFalse(item1.getElement().hasClassName(CssName.ACTIVE));
+        assertTrue(item2.getElement().hasClassName(CssName.ACTIVE));
+        item2.collapse();
+        assertFalse(item1.getElement().hasClassName(CssName.ACTIVE));
+        assertFalse(item1.getElement().hasClassName(CssName.ACTIVE));
     }
 
     public void testProgress() {