Use executeJs instead of execute JavaScript

Author: javier-godoy

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

@@ -63,7 +63,7 @@ public AppDrawer(Component headerComponent) {
     	Registration[] r = new Registration[1];
     	r[0] = getElement().addEventListener("app-drawer-transitioned", ev->{
     		//need to adjust the height after the drawer has been rendered
-    		getUI().ifPresent(ui->ui.getPage().executeJavaScript("$1.style.height='calc(100% - '+($0.scrollHeight+16)+'px)'", header, pm));
+    		pm.getElement().executeJs("this.style.height='calc(100% - '+($0.scrollHeight+16)+'px)'", header);
     		r[0].remove();
     	});
     }
@@ -116,5 +116,8 @@ private CollapseButton collectMenus(MenuItem topMenuItem) {
     	collapseButton.setEnabled(topMenuItem.isEnabled());
     	return collapseButton;
 	}
-    
+
+	void toggle() {
+		this.getElement().executeJs("this.toggle()");
+	}
 }

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

@@ -21,6 +21,7 @@
 
 
 import java.net.URL;
+import java.util.Optional;
 
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.HasComponents;
@@ -84,8 +85,7 @@ private PaperIconItem(String title, String icon, URL image, Command command, App
 		if (command!=null) {
 			this.getElement().addEventListener("click", e->{
 				command.execute();
-				if (appDrawer!=null)
-					appDrawer.getUI().ifPresent(ui->ui.getPage().executeJavaScript("" + appDrawer.getId().get() + ".toggle()"));
+				Optional.ofNullable(appDrawer).ifPresent(AppDrawer::toggle);
 			});
 		}
 	}

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

@@ -21,6 +21,8 @@
 
 
 
+import java.util.Optional;
+
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.HasEnabled;
 import com.vaadin.flow.component.HasSize;
@@ -53,8 +55,9 @@ public PaperItem(String title, Command command, AppDrawer appDrawer) {
 		if (command!=null) {
 			this.getElement().addEventListener("click", e->{
 				command.execute();
+				Optional.ofNullable(appDrawer).ifPresent(AppDrawer::toggle);
 				if (appDrawer!=null)
-					appDrawer.getUI().ifPresent(ui->ui.getPage().executeJavaScript("" + appDrawer.getId().get() + ".toggle()"));
+					appDrawer.getElement().executeJs("this.toggle()");
 			});
 		}
 	}