Merge pull request #544 from ArcBees/mmc_popupview

Fixed PopupPresenter setCloseHandler
ArcBees · Aug 24, 2014 · 94d3fb3 · 94d3fb3
2 parents dd53a39 + f55e43a
commit 94d3fb3
Show file tree

Hide file tree

Showing 8 changed files with 158 additions and 12 deletions.
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PopupViewImpl.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PopupViewImpl.java
@@ -161,11 +161,16 @@ protected void doCenter() {
         int top = (Window.getClientHeight() - popup.getOffsetHeight()) >> 1;
 
         if (!isShowing) {
-            popup.hide();
+            hidePopup(asPopupPanel());
             popup.setVisible(true);
         }
 
         popup.setPopupPosition(Math.max(Window.getScrollLeft() + left, 0), Math.max(
                 Window.getScrollTop() + top, 0));
     }
+
+    private native void hidePopup(PopupPanel popupPanel) /*-{
+        var resizeAnimation = popupPanel.@com.google.gwt.user.client.ui.PopupPanel::resizeAnimation;
+        resizeAnimation.@com.google.gwt.user.client.ui.PopupPanel.ResizeAnimation::setState(ZZ)(false, false);
+    }-*/;
 }
diff --git a/...-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/ClientModuleTestUtilGwt.java b/...-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/ClientModuleTestUtilGwt.java
@@ -46,6 +46,9 @@ protected void configure() {
         bindPresenter(AdminPresenterTestUtilGwt.class, AdminPresenterTestUtilGwt.MyView.class,
                 AdminViewTestUtilGwt.class, AdminPresenterTestUtilGwt.MyProxy.class);
 
+        bindSingletonPresenterWidget(PopupPresenterTestUtilGwt.class, PopupPresenterTestUtilGwt.MyView.class,
+                PopupViewTestUtilGwt.class);
+
         // For testing
         bind(InstantiationCounterTestUtilGwt.class).asEagerSingleton();
         bindConstant().annotatedWith(Names.named("notice")).to("Hello");

diff --git a/...wtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/GinjectorTestUtilGwt.java b/...wtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/GinjectorTestUtilGwt.java
@@ -28,6 +28,8 @@ public interface GinjectorTestUtilGwt extends Ginjector {
 
     Provider<AdminPresenterTestUtilGwt> getAdminPresenter();
 
+    Provider<PopupPresenterTestUtilGwt> getPopupPresenter();
+
     EventBus getEventBus();
 
     PlaceManager getPlaceManager();

diff --git a/...mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/MainPresenterTestUtilGwt.java b/...mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/MainPresenterTestUtilGwt.java
@@ -17,8 +17,10 @@
 package com.gwtplatform.mvp.client.gwt.mvp;
 
 import javax.inject.Inject;
+import javax.inject.Provider;
 
 import com.google.web.bindery.event.shared.EventBus;
+import com.gwtplatform.mvp.client.PopupViewCloseHandler;
 import com.gwtplatform.mvp.client.Presenter;
 import com.gwtplatform.mvp.client.View;
 import com.gwtplatform.mvp.client.annotations.NameToken;
@@ -28,26 +30,33 @@
 /**
  * A test presenter meant to be run in a GWTTestCase.
  */
-public class MainPresenterTestUtilGwt extends Presenter<MainPresenterTestUtilGwt.MyView,
-        MainPresenterTestUtilGwt.MyProxy> {
+public class MainPresenterTestUtilGwt
+        extends Presenter<MainPresenterTestUtilGwt.MyView, MainPresenterTestUtilGwt.MyProxy> {
 
-    /**
-     * Presenter's view.
-     */
-    public interface MyView extends View {
+    interface MyView extends View {
     }
 
-    /**
-     * Presenter's proxy.
-     */
     @ProxyStandard
     @NameToken("home")
-    public interface MyProxy extends ProxyPlace<MainPresenterTestUtilGwt> {
+    interface MyProxy extends ProxyPlace<MainPresenterTestUtilGwt> {
     }
 
+    private final Provider<PopupPresenterTestUtilGwt> popupPresenterProvider;
+
     @Inject
-    public MainPresenterTestUtilGwt(final EventBus eventBus, final MyView view, final MyProxy proxy) {
+    MainPresenterTestUtilGwt(EventBus eventBus,
+                             MyView view,
+                             MyProxy proxy,
+                             Provider<PopupPresenterTestUtilGwt> popupPresenterProvider) {
         super(eventBus, view, proxy, RevealType.Root);
+
+        this.popupPresenterProvider = popupPresenterProvider;
+    }
+
+    public void showPopup(PopupViewCloseHandler closeHandler) {
+        PopupPresenterTestUtilGwt popup = popupPresenterProvider.get();
+        popup.setCloseHandler(closeHandler);
+        addToPopupSlot(popup);
     }
 }
 
diff --git a/...e/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/MvpGwtTestInSuite.java b/...e/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/MvpGwtTestInSuite.java
@@ -19,8 +19,10 @@
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.core.client.Scheduler.ScheduledCommand;
+import com.google.gwt.event.logical.shared.AttachEvent;
 import com.google.gwt.junit.client.GWTTestCase;
 import com.gwtplatform.mvp.client.DelayedBindRegistry;
+import com.gwtplatform.mvp.client.PopupViewCloseHandler;
 import com.gwtplatform.mvp.shared.proxy.PlaceRequest;
 import com.gwtplatform.mvp.shared.proxy.PlaceRequest.Builder;
 
@@ -43,6 +45,7 @@ protected void gwtSetUp() throws Exception {
         InstantiationCounterTestUtilGwt.resetCounter();
         ginjector = GWT.create(GinjectorTestUtilGwt.class);
         DelayedBindRegistry.bind(ginjector);
+        presenter = ginjector.getMainPresenter().get();
     }
 
     /**
@@ -54,6 +57,42 @@ public void testShouldCreateOnlyOneGinjector() {
         assertEquals(1, InstantiationCounterTestUtilGwt.getCounter());
     }
 
+    public void testPopupViewCloseHandlerNotCalledWhenShown() {
+        delayTestFinish(1000);
+        runTest(new ScheduledCommand() {
+            @Override
+            public void execute() {
+                PopupPresenterTestUtilGwt popupPresenter = ginjector.getPopupPresenter().get();
+                popupPresenter.asWidget().addAttachHandler(new AttachEvent.Handler() {
+                    @Override
+                    public void onAttachOrDetach(AttachEvent event) {
+                        if (event.isAttached()) {
+                            finishTest();
+                        } else {
+                            fail();
+                        }
+                    }
+                });
+
+                ginjector.getPlaceManager().revealDefaultPlace();
+
+                final PopupViewCloseHandler closeHandler = new PopupViewCloseHandler() {
+                    @Override
+                    public void onClose() {
+                        fail();
+                    }
+                };
+
+                Scheduler.get().scheduleDeferred(new ScheduledCommand() {
+                    @Override
+                    public void execute() {
+                        presenter.showPopup(closeHandler);
+                    }
+                });
+            }
+        });
+    }
+
     /**
      * Verify multiple name tokens.
      */
@@ -116,4 +155,8 @@ public void execute() {
             }
         });
     }
+
+    private void runTest(ScheduledCommand test) {
+        Scheduler.get().scheduleDeferred(test);
+    }
 }
diff --git a/...vp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/PopupPresenterTestUtilGwt.java b/...vp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/PopupPresenterTestUtilGwt.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright 2014 ArcBees Inc.
+ *
+ * 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. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.gwtplatform.mvp.client.gwt.mvp;
+
+import javax.inject.Inject;
+
+import com.google.web.bindery.event.shared.EventBus;
+import com.gwtplatform.mvp.client.PopupView;
+import com.gwtplatform.mvp.client.PopupViewCloseHandler;
+import com.gwtplatform.mvp.client.PresenterWidget;
+
+public class PopupPresenterTestUtilGwt extends PresenterWidget<PopupPresenterTestUtilGwt.MyView> {
+    public interface MyView extends PopupView {
+    }
+
+    @Inject
+    PopupPresenterTestUtilGwt(EventBus eventBus, MyView view) {
+        super(eventBus, view);
+    }
+
+    public void setCloseHandler(PopupViewCloseHandler closeHandler) {
+        getView().setCloseHandler(closeHandler);
+    }
+}
diff --git a/...wtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/PopupViewTestUtilGwt.java b/...wtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/PopupViewTestUtilGwt.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright 2014 ArcBees Inc.
+ *
+ * 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. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.gwtplatform.mvp.client.gwt.mvp;
+
+import javax.inject.Inject;
+
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.user.client.ui.DialogBox;
+import com.google.gwt.user.client.ui.Widget;
+import com.google.web.bindery.event.shared.EventBus;
+import com.gwtplatform.mvp.client.PopupViewImpl;
+
+public class PopupViewTestUtilGwt extends PopupViewImpl implements PopupPresenterTestUtilGwt.MyView {
+    public interface Binder extends UiBinder<Widget, PopupViewTestUtilGwt> {
+    }
+
+    @UiField
+    DialogBox mainSlot;
+
+    @Inject
+    PopupViewTestUtilGwt(EventBus eventBus, Binder uiBinder) {
+        super(eventBus);
+
+        initWidget(uiBinder.createAndBindUi(this));
+    }
+}
diff --git a/...p-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/PopupViewTestUtilGwt.ui.xml b/...p-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/PopupViewTestUtilGwt.ui.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
+             xmlns:g="urn:import:com.google.gwt.user.client.ui">
+    <g:DialogBox ui:field="mainSlot" modal="true" glassEnabled="true" animationEnabled="true"/>
+</ui:UiBinder>