Merge pull request #51 from xdev-software/develop

Release 2.1.0

Author: AB-xdev

.github/workflows/master.yml

@@ -48,7 +48,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [check_code]
     outputs:
-      upload_url: ${{ steps.create_draft.outputs.upload_url }}
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
     steps:
     - uses: actions/checkout@v2
 

pom.xml

@@ -8,7 +8,7 @@
 	<groupId>com.xdev-software</groupId>
 	<artifactId>vaadin-date-range-picker-root</artifactId>
 	<packaging>pom</packaging>
-	<version>2.0.0</version>
+	<version>2.1.0-SNAPSHOT</version>
 
 	<name>Vaadin DateRangePicker Root Project</name>
 

vaadin-date-range-picker-demo/pom.xml

@@ -7,7 +7,7 @@
 
 	<groupId>com.xdev-software</groupId>
 	<artifactId>vaadin-date-range-picker-demo</artifactId>
-	<version>2.0.0</version>
+	<version>2.1.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 
 	<name>Vaadin DateRangePicker Demo</name>

vaadin-date-range-picker-demo/src/main/java/software/xdev/vaadin/daterange_picker/example/DateRangePickerStyledDemo.java

@@ -81,7 +81,15 @@ protected void initUI()
 			this.taResult.setValue(
 					"DateRange: " + modell.getDateRange().getKey() + "\r\n" +
 					"Start: " + modell.getStart() + "\r\n" +
-					"End: " + modell.getEnd()
+					"End: " + modell.getEnd() + "\r\n" +
+					(ev.getOldValue() != null ?
+						"OldValue-DateRange: " + ev.getOldValue().getDateRange().getKey() + "\r\n" +
+						"OldValue-Start: " + ev.getOldValue().getStart() + "\r\n" +
+						"OldValue-End: " + ev.getOldValue().getEnd()
+						: "OldValue: null")
+					+ "\r\n"
+					+ "IsFromClient: " + ev.isFromClient()
+					
 				);
 			// @formatter:on
 		});

vaadin-date-range-picker/pom.xml

@@ -9,7 +9,7 @@
 	<artifactId>vaadin-date-range-picker</artifactId>
 
 	<packaging>jar</packaging>
-	<version>2.0.0</version>
+	<version>2.1.0-SNAPSHOT</version>
 
 	<name>DateRangePicker for Vaadin</name>
 	<description>DateRangePicker for Vaadin</description>

vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/DateRangeModel.java

@@ -82,4 +82,69 @@ public DateRangeModel<D> setDateRange(final D dateRange)
 		this.dateRange = dateRange;
 		return this;
 	}
+
+	@Override
+	public int hashCode()
+	{
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + (this.dateRange == null ? 0 : this.dateRange.hashCode());
+		result = prime * result + (this.end == null ? 0 : this.end.hashCode());
+		result = prime * result + (this.start == null ? 0 : this.start.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(final Object obj)
+	{
+		if(this == obj)
+		{
+			return true;
+		}
+		if(obj == null)
+		{
+			return false;
+		}
+		if(this.getClass() != obj.getClass())
+		{
+			return false;
+		}
+		final DateRangeModel<?> other = (DateRangeModel<?>)obj;
+		if(this.dateRange == null)
+		{
+			if(other.dateRange != null)
+			{
+				return false;
+			}
+		}
+		else if(!this.dateRange.equals(other.dateRange))
+		{
+			return false;
+		}
+		if(this.end == null)
+		{
+			if(other.end != null)
+			{
+				return false;
+			}
+		}
+		else if(!this.end.equals(other.end))
+		{
+			return false;
+		}
+		if(this.start == null)
+		{
+			if(other.start != null)
+			{
+				return false;
+			}
+		}
+		else if(!this.start.equals(other.start))
+		{
+			return false;
+		}
+		return true;
+	}
+	
+	
 }

vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/ui/DateRangePicker.java

@@ -253,8 +253,10 @@ protected void registerListeners()
 		});
 		this.overlay.addValueChangeListener(ev ->
 		{
-			this.updateFromModel();
-			this.fireEvent(new DateRangeValueChangeEvent<>(this));
+			this.model = ev.getSource().getModel();
+			
+			this.updateFromModel(false);
+			this.fireEvent(new DateRangeValueChangeEvent<>(this, ev.getOldValue(), ev.isFromClient()));
 		});
 	}
 
@@ -263,7 +265,7 @@ protected void onAttach(final AttachEvent attachEvent)
 	{
 		this.setLocaleFromClient();
 
-		this.updateFromModel();
+		this.updateFromModel(true);
 
 		this.addClickOutsideListener();
 	}
@@ -280,11 +282,6 @@ protected void addClickOutsideListener()
 			return;
 		}
 
-		/*
-		 * JS-Explanation
-		 * Base Function (see https://stackoverflow.com/a/28432139/13122067)
-		 * If a click was trigger, check if it originated from this element
-		 */
 		final String funcName = "outsideClickFunc" + this.getId().get();
 
 		// @formatter:off
@@ -308,7 +305,7 @@ protected void addClickOutsideListener()
 			"    spEl.$server.clickOutsideOccured()\r\n" +
 			"  }\r\n" +
 			"}; \r\n" +
-			"document.addEventListener('click'," + funcName + ");";
+			"document.body.addEventListener('click'," + funcName + ");";
 		// @formatter:on
 
 		this.getContent().getElement().executeJs(jsCommand);
@@ -328,9 +325,12 @@ protected void clickOutsideOccured()
 		}
 	}
 
-	public void updateFromModel()
+	protected void updateFromModel(final boolean updateOverlay)
 	{
-		this.tryFixInvalidModel();
+		if(updateOverlay)
+		{
+			this.tryFixInvalidModel();
+		}
 
 		final DateTimeFormatter formatter =
 			DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT).withLocale(this.getFormatLocale());
@@ -346,7 +346,10 @@ public void updateFromModel()
 		);
 		// @formatter:on
 
-		this.overlay.setModel(this.model);
+		if(updateOverlay)
+		{
+			this.overlay.setModel(this.model);
+		}
 	}
 
 	protected void tryFixInvalidModel()
@@ -462,7 +465,7 @@ public LocalDate getStart()
 	public DateRangePicker<D> setStart(final LocalDate start)
 	{
 		this.model.setStart(start);
-		this.updateFromModel();
+		this.updateFromModel(true);
 		return this;
 	}
 
@@ -476,7 +479,7 @@ public LocalDate getEnd()
 	public DateRangePicker<D> setEnd(final LocalDate end)
 	{
 		this.model.setEnd(end);
-		this.updateFromModel();
+		this.updateFromModel(true);
 		return this;
 	}
 
@@ -490,15 +493,15 @@ public D getDateRange()
 	public DateRangePicker<D> setDateRange(final D dateRange)
 	{
 		this.model.setDateRange(dateRange);
-		this.updateFromModel();
+		this.updateFromModel(true);
 		return this;
 	}
 
 	@Override
 	public void setValue(final DateRangeModel<D> value)
 	{
 		this.model = value;
-		this.updateFromModel();
+		this.updateFromModel(true);
 	}
 
 	@Override