Refactoring

Author: javier-godoy

pom.xml

@@ -9,7 +9,7 @@
     <description>Integration of app-layout for Vaadin Flow</description>
 
     <properties>
-        <vaadin.version>14.0.11</vaadin.version>
+        <vaadin.version>14.0.14</vaadin.version>
 
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>

src/main/java/com/flowingcode/addons/applayout/AppDrawer.java

@@ -21,8 +21,9 @@
 
 
 
+import java.util.Collection;
 import java.util.Collections;
-import java.util.List;
+import java.util.Optional;
 
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.HasComponents;
@@ -104,14 +105,24 @@ public void removeAll() {
     	this.add(pm);
     }
 
-	public void setMenuItems(List<MenuItem> menuItems) {
+	public void setMenuItems(Collection<MenuItem> menuItems) {
 		pm.removeAll();
     	menuItems.stream().forEach(pm::add);
     }
 
 	/**Close the app-drawer.*/
 	public void close() {
-		getUI().ifPresent(ui->ui.getPage().executeJavaScript("$0.close()", this));
+		getUI().ifPresent(ui->ui.getPage().executeJs("$0.close()", this));
+	}
+
+	static Optional<AppDrawer> findAppDrawer(Component component) {
+		while (component!=null) {
+			if (component instanceof AppDrawer) {
+				return Optional.of((AppDrawer)component);
+			} else {
+				component = component.getParent().orElse(null);
+			}
+		}
+		return Optional.empty();
 	}
-	
 }

src/main/java/com/flowingcode/addons/applayout/AppHeader.java

@@ -64,8 +64,8 @@ public AppToolbar getAppToolbar() {
     	return appToolbar;
     }
 
-	public void setToolbarIconButtons(MenuItem[] menuItems) {
-		appToolbar.setToolbarIconButtons(menuItems);
+	public void setToolbarIconButtons(Component[] components) {
+		appToolbar.setToolbarIconButtons(components);
 	}
 
 	public void setMenuIconVisible(boolean visible) {

src/main/java/com/flowingcode/addons/applayout/AppLayout.java

@@ -93,8 +93,8 @@ public void clearMenuItems() {
 		drawer.setMenuItems(new ArrayList<MenuItem>());
 	}
 
-	public void setToolbarIconButtons(MenuItem... menuItems) {
-		header.setToolbarIconButtons(menuItems);
+	public void setToolbarIconButtons(Component... components) {
+		header.setToolbarIconButtons(components);
 	}
 
 	public void setMenuVisible(boolean visible) {

src/main/java/com/flowingcode/addons/applayout/AppToolbar.java

@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,9 +21,6 @@
 
 
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.HasComponents;
 import com.vaadin.flow.component.Tag;
@@ -35,7 +32,7 @@
 
 /**
  * Component that renders the app toolbar
- * 
+ *
  * @author mlopez
  *
  */
@@ -48,17 +45,17 @@
 @JsModule("@polymer/iron-icons/iron-icons.js")
 @Tag("app-toolbar")
 public class AppToolbar extends Component implements HasComponents {
-	
-	private PaperIconButton menu;
+
+	private ToolbarIconButton menu;
 	private Component ctitle;
 	private Div divTitle;
-	
+
     public AppToolbar(String title, AppDrawer drawer) {
     	this(null,title, drawer);
     }
 
     public AppToolbar(Image logo, String title, AppDrawer drawer) {
-    	menu = new PaperIconButton("menu");
+    	menu = new ToolbarIconButton().setIcon("menu");    	
     	drawer.getId().ifPresent(id -> menu.getElement().setAttribute("onclick", id + ".toggle()"));
     	this.add(menu);
     	if (logo!=null) {
@@ -75,29 +72,17 @@ public void setTitle(String title) {
     	divTitle.setText(title);
     }
 
-	public void setToolbarIconButtons(MenuItem[] menuItems) {		
+	public void setToolbarIconButtons(Component... components) {
 		this.removeAll();
 		this.add(menu);
 		if (ctitle!=null) this.add(ctitle);
 		if (divTitle!=null) this.add(divTitle);
-		this.add(menuItems);
+		this.add(components);
 	}
 
-	/*
-	private static List<PaperIconButton> createToolbarIconButtons(MenuItem[] menuItems) {
-		
-        List<PaperIconButton> result = new ArrayList<>();
-        for (MenuItem menuItem : menuItems) {
-                PaperIconButton paperIconButton = new PaperIconButton(menuItem.getIcon(), menuItem.getCommand());
-               	paperIconButton.setEnabled(menuItem.isEnabled());
-                result.add(paperIconButton);
-        }
-        return result;
-	}*/
-
 	public void setMenuIconVisible(boolean visible) {
 		menu.setVisible(visible);
 	}
 
-    
+
 }

src/main/java/com/flowingcode/addons/applayout/CollapseButton.java

@@ -0,0 +1,50 @@
+package com.flowingcode.addons.applayout;
+
+import java.util.EnumMap;
+
+import org.apache.commons.lang3.tuple.Pair;
+
+import com.flowingcode.addons.applayout.MouseClickEvent.MouseButton;
+import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.ComponentUtil;
+import com.vaadin.flow.component.HasElement;
+import com.vaadin.flow.server.Command;
+import com.vaadin.flow.shared.Registration;
+
+interface HasMenuItemCommands<T extends Component & HasMenuItemCommands<T>> extends HasElement {
+
+	class Data {
+		private final EnumMap<MouseButton, Pair<Command, Registration>> commands = new EnumMap<>(MouseButton.class);
+	}
+		
+	public default T setCommand(Command command) {
+		return setCommand(MouseButton.LEFT, command);
+	}
+
+	public default T setCommand(MouseButton button, Command command) {
+		Data data = ComponentUtil.getData((Component)this, HasMenuItemCommands.Data.class);
+		if (data==null) {
+			data = new Data();
+		}
+						
+		data.commands.remove(button);
+		if (command!=null) {
+			Registration registration = getElement().addEventListener("item-click", ev->{
+				command.execute();
+				AppDrawer.findAppDrawer((Component)this).ifPresent(AppDrawer::close);
+			}).setFilter("event.detail=="+button.ordinal());
+			data.commands.put(button, Pair.of(command, registration));			
+		}
+		
+		if (data.commands.isEmpty()) {
+			data = null;			
+		}
+		
+		ComponentUtil.setData((Component)this, HasMenuItemCommands.Data.class, data);
+		
+		@SuppressWarnings("unchecked")
+		T self = (T) this;
+		return self;
+	}
+	
+}

src/main/java/com/flowingcode/addons/applayout/HasMenuItemCommands.java

@@ -0,0 +1,41 @@
+package com.flowingcode.addons.applayout;
+
+import com.vaadin.flow.component.HasElement;
+
+interface HasMenuItemIcon<T extends HasMenuItemIcon<T>> extends HasElement {
+
+	public default String getIcon() {
+		return getElement().getAttribute("icon");
+	}
+
+	public default T setIcon(String icon) {
+		if (icon!=null) {
+			getElement().setAttribute("icon", icon);
+			getElement().removeAttribute("image");
+		} else {
+			getElement().removeAttribute("icon");
+		}
+		
+		@SuppressWarnings("unchecked")
+		T self = (T) this;
+		return self;
+	}
+
+	public default String getImage() {
+		return getElement().getAttribute("image");
+	}
+
+	public default T setImage(String imageUrl) {
+		if (imageUrl!=null) {
+			getElement().setAttribute("image", imageUrl);
+			getElement().removeAttribute("icon");
+		} else {
+			getElement().removeAttribute("image");
+		}
+		
+		@SuppressWarnings("unchecked")
+		T self = (T) this;
+		return self;
+	}
+	
+}