Fixed MaterialCollapsible Issue programatically setting more than one active #869

kevzlou7979 · kevzlou7979 · commit 8695fde4dcf2 · 2018-08-27T05:41:00.000+08:00
diff --git a/gwt-material/src/main/java/gwt/material/design/client/ui/MaterialCollapsible.java b/gwt-material/src/main/java/gwt/material/design/client/ui/MaterialCollapsible.java
@@ -236,7 +236,9 @@ public boolean isAccordion() {
 
     @Override
     public void setActive(int index) {
-        clearActive();
+        if (!isAccordion()) {
+            clearActive();
+        }
         setActive(index, true);
     }
 
diff --git a/gwt-material/src/main/java/gwt/material/design/client/ui/MaterialCollapsibleItem.java b/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) {
+                if (parent != null && !parent.isAccordion()) {
                     parent.clearActive();
                 }
                 addStyleName(CssName.ACTIVE);

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,9 @@ public boolean isAccordion() {`
`236`	`236`
`237`	`237`	`@Override`
`238`	`238`	`public void setActive(int index) {`
`239`		`- clearActive();`
	`239`	`+ if (!isAccordion()) {`
	`240`	`+ clearActive();`
	`241`	`+ }`
`240`	`242`	`setActive(index, true);`
`241`	`243`	`}`
`242`	`244`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ public void setActive(boolean active) {`
`156`	`156`	`header.removeStyleName(CssName.ACTIVE);`
`157`	`157`	`}`
`158`	`158`	`if (active) {`
`159`		`- if (parent != null) {`
	`159`	`+ if (parent != null && !parent.isAccordion()) {`
`160`	`160`	`parent.clearActive();`
`161`	`161`	`}`
`162`	`162`	`addStyleName(CssName.ACTIVE);`