Use CoreInteractionOptions for Options#interaction and Options#hover

Fix #281

Author: AB-xdev

CHANGELOG.md

@@ -1,5 +1,7 @@
 ## 2.4.0
 * PointStyle can also contain non-string constants #280
+* Use ``CoreInteractionOptions`` for ``Options#interaction`` and ``Options#hover`` #281
+* Updated dependencies
 
 ## 2.3.1
 * Synced ``LineOptions/DataSet`` ``stepped`` and ``tension`` with ChartJS source #262

chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/CoreInteractionOptions.java

@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * 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 software.xdev.chartjs.model.options;
+
+/**
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.6/src/types/index.d.ts#L1564">ChartJS Source</a>
+ */
+public class CoreInteractionOptions
+{
+	protected String mode;
+	protected Boolean intersect;
+	protected String axis;
+	protected Boolean includeInvisible;
+	
+	public String getMode()
+	{
+		return this.mode;
+	}
+	
+	public CoreInteractionOptions setMode(final String mode)
+	{
+		this.mode = mode;
+		return this;
+	}
+	
+	public Boolean getIntersect()
+	{
+		return this.intersect;
+	}
+	
+	public CoreInteractionOptions setIntersect(final Boolean intersect)
+	{
+		this.intersect = intersect;
+		return this;
+	}
+	
+	public String getAxis()
+	{
+		return this.axis;
+	}
+	
+	public CoreInteractionOptions setAxis(final String axis)
+	{
+		this.axis = axis;
+		return this;
+	}
+	
+	public Boolean getIncludeInvisible()
+	{
+		return this.includeInvisible;
+	}
+	
+	public CoreInteractionOptions setIncludeInvisible(final Boolean includeInvisible)
+	{
+		this.includeInvisible = includeInvisible;
+		return this;
+	}
+}

chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/Hover.java

@@ -40,7 +40,8 @@ public class Options<T extends Options<T, A>, A extends Animation<A>>
 	protected JavaScriptFunction onClick;
 	protected JavaScriptFunction legendCallback;
 	protected JavaScriptFunction onResize;
-	protected Hover hover;
+	protected CoreInteractionOptions interaction;
+	protected CoreInteractionOptions hover;
 	protected Animations<A> animations;
 	protected Boolean animation = true;
 	protected Layout layout;
@@ -215,10 +216,18 @@ public T setOnResize(final JavaScriptFunction onResize)
 		return this.self();
 	}
 
-	/**
-	 * @see #setHover(Hover)
-	 */
-	public Hover getHover()
+	public CoreInteractionOptions getInteraction()
+	{
+		return this.interaction;
+	}
+	
+	public T setInteraction(final CoreInteractionOptions interaction)
+	{
+		this.interaction = interaction;
+		return this.self();
+	}
+	
+	public CoreInteractionOptions getHover()
 	{
 		return this.hover;
 	}
@@ -227,7 +236,7 @@ public Hover getHover()
 	 * The hover configuration is passed into the options.hover namespace. The global hover configuration is at
 	 * Chart.defaults.global.hover.
 	 */
-	public T setHover(final Hover hover)
+	public T setHover(final CoreInteractionOptions hover)
 	{
 		this.hover = hover;
 		return this.self();