diff --git a/pom.xml b/pom.xml index 760f342..a955af1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.flowingcode.vaadin.addons zoomist-addon - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT Zoomist Add-on Zoomist Add-on for Vaadin Flow https://www.flowingcode.com/en/open-source/ @@ -119,6 +119,11 @@ 1.18.34 provided + + com.flowingcode.vaadin + json-migration-helper + 0.9.2 + org.slf4j slf4j-simple @@ -465,6 +470,7 @@ **/it/* **/DemoView.class **/DemoLayout.class + **/AppShellConfiguratorImpl.class diff --git a/src/main/java/com/flowingcode/vaadin/addons/zoomist/ContainerData.java b/src/main/java/com/flowingcode/vaadin/addons/zoomist/ContainerData.java index c1cd40f..d6554ec 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/zoomist/ContainerData.java +++ b/src/main/java/com/flowingcode/vaadin/addons/zoomist/ContainerData.java @@ -2,7 +2,7 @@ * #%L * Zoomist Add-on * %% - * Copyright (C) 2023 Flowing Code + * Copyright (C) 2023 - 2026 Flowing Code * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/com/flowingcode/vaadin/addons/zoomist/DragEndEvent.java b/src/main/java/com/flowingcode/vaadin/addons/zoomist/DragEndEvent.java index a9efdfd..4e06469 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/zoomist/DragEndEvent.java +++ b/src/main/java/com/flowingcode/vaadin/addons/zoomist/DragEndEvent.java @@ -2,7 +2,7 @@ * #%L * Zoomist Add-on * %% - * Copyright (C) 2023 Flowing Code + * Copyright (C) 2023 - 2026 Flowing Code * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/com/flowingcode/vaadin/addons/zoomist/DragEvent.java b/src/main/java/com/flowingcode/vaadin/addons/zoomist/DragEvent.java index 6e9d005..b80cee5 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/zoomist/DragEvent.java +++ b/src/main/java/com/flowingcode/vaadin/addons/zoomist/DragEvent.java @@ -2,7 +2,7 @@ * #%L * Zoomist Add-on * %% - * Copyright (C) 2023 Flowing Code + * Copyright (C) 2023 - 2026 Flowing Code * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/com/flowingcode/vaadin/addons/zoomist/DragStartEvent.java b/src/main/java/com/flowingcode/vaadin/addons/zoomist/DragStartEvent.java index 1dffdf2..23c68ae 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/zoomist/DragStartEvent.java +++ b/src/main/java/com/flowingcode/vaadin/addons/zoomist/DragStartEvent.java @@ -2,7 +2,7 @@ * #%L * Zoomist Add-on * %% - * Copyright (C) 2023 Flowing Code + * Copyright (C) 2023 - 2026 Flowing Code * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/com/flowingcode/vaadin/addons/zoomist/PinchEndEvent.java b/src/main/java/com/flowingcode/vaadin/addons/zoomist/PinchEndEvent.java index a549b01..2258bb5 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/zoomist/PinchEndEvent.java +++ b/src/main/java/com/flowingcode/vaadin/addons/zoomist/PinchEndEvent.java @@ -2,7 +2,7 @@ * #%L * Zoomist Add-on * %% - * Copyright (C) 2023 Flowing Code + * Copyright (C) 2023 - 2026 Flowing Code * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/com/flowingcode/vaadin/addons/zoomist/PinchEvent.java b/src/main/java/com/flowingcode/vaadin/addons/zoomist/PinchEvent.java index 2fd60eb..02688cc 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/zoomist/PinchEvent.java +++ b/src/main/java/com/flowingcode/vaadin/addons/zoomist/PinchEvent.java @@ -2,7 +2,7 @@ * #%L * Zoomist Add-on * %% - * Copyright (C) 2023 Flowing Code + * Copyright (C) 2023 - 2026 Flowing Code * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/com/flowingcode/vaadin/addons/zoomist/PinchStartEvent.java b/src/main/java/com/flowingcode/vaadin/addons/zoomist/PinchStartEvent.java index 9896982..a605f49 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/zoomist/PinchStartEvent.java +++ b/src/main/java/com/flowingcode/vaadin/addons/zoomist/PinchStartEvent.java @@ -2,7 +2,7 @@ * #%L * Zoomist Add-on * %% - * Copyright (C) 2023 Flowing Code + * Copyright (C) 2023 - 2026 Flowing Code * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/com/flowingcode/vaadin/addons/zoomist/ReadyEvent.java b/src/main/java/com/flowingcode/vaadin/addons/zoomist/ReadyEvent.java index 890ad77..e49f2dc 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/zoomist/ReadyEvent.java +++ b/src/main/java/com/flowingcode/vaadin/addons/zoomist/ReadyEvent.java @@ -2,7 +2,7 @@ * #%L * Zoomist Add-on * %% - * Copyright (C) 2023 Flowing Code + * Copyright (C) 2023 - 2026 Flowing Code * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/com/flowingcode/vaadin/addons/zoomist/ResizeEvent.java b/src/main/java/com/flowingcode/vaadin/addons/zoomist/ResizeEvent.java index f78b7e3..c6cde03 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/zoomist/ResizeEvent.java +++ b/src/main/java/com/flowingcode/vaadin/addons/zoomist/ResizeEvent.java @@ -2,7 +2,7 @@ * #%L * Zoomist Add-on * %% - * Copyright (C) 2023 Flowing Code + * Copyright (C) 2023 - 2026 Flowing Code * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/com/flowingcode/vaadin/addons/zoomist/SlideEndEvent.java b/src/main/java/com/flowingcode/vaadin/addons/zoomist/SlideEndEvent.java index f23994c..dbd002f 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/zoomist/SlideEndEvent.java +++ b/src/main/java/com/flowingcode/vaadin/addons/zoomist/SlideEndEvent.java @@ -2,7 +2,7 @@ * #%L * Zoomist Add-on * %% - * Copyright (C) 2023 Flowing Code + * Copyright (C) 2023 - 2026 Flowing Code * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/com/flowingcode/vaadin/addons/zoomist/SlideEvent.java b/src/main/java/com/flowingcode/vaadin/addons/zoomist/SlideEvent.java index 22f3f12..954a21f 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/zoomist/SlideEvent.java +++ b/src/main/java/com/flowingcode/vaadin/addons/zoomist/SlideEvent.java @@ -2,7 +2,7 @@ * #%L * Zoomist Add-on * %% - * Copyright (C) 2023 Flowing Code + * Copyright (C) 2023 - 2026 Flowing Code * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/com/flowingcode/vaadin/addons/zoomist/SlideStartEvent.java b/src/main/java/com/flowingcode/vaadin/addons/zoomist/SlideStartEvent.java index 410a219..6b38f9d 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/zoomist/SlideStartEvent.java +++ b/src/main/java/com/flowingcode/vaadin/addons/zoomist/SlideStartEvent.java @@ -2,7 +2,7 @@ * #%L * Zoomist Add-on * %% - * Copyright (C) 2023 Flowing Code + * Copyright (C) 2023 - 2026 Flowing Code * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/com/flowingcode/vaadin/addons/zoomist/WheelEvent.java b/src/main/java/com/flowingcode/vaadin/addons/zoomist/WheelEvent.java index 040cddf..5f13ae0 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/zoomist/WheelEvent.java +++ b/src/main/java/com/flowingcode/vaadin/addons/zoomist/WheelEvent.java @@ -2,7 +2,7 @@ * #%L * Zoomist Add-on * %% - * Copyright (C) 2023 Flowing Code + * Copyright (C) 2023 - 2026 Flowing Code * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/com/flowingcode/vaadin/addons/zoomist/ZoomEvent.java b/src/main/java/com/flowingcode/vaadin/addons/zoomist/ZoomEvent.java index f767442..f0f2b0d 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/zoomist/ZoomEvent.java +++ b/src/main/java/com/flowingcode/vaadin/addons/zoomist/ZoomEvent.java @@ -2,7 +2,7 @@ * #%L * Zoomist Add-on * %% - * Copyright (C) 2023 Flowing Code + * Copyright (C) 2023 - 2026 Flowing Code * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/com/flowingcode/vaadin/addons/zoomist/Zoomist.java b/src/main/java/com/flowingcode/vaadin/addons/zoomist/Zoomist.java index 0cfe3b1..cbe923a 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/zoomist/Zoomist.java +++ b/src/main/java/com/flowingcode/vaadin/addons/zoomist/Zoomist.java @@ -2,7 +2,7 @@ * #%L * Zoomist Add-on * %% - * Copyright (C) 2023 Flowing Code + * Copyright (C) 2023 - 2026 Flowing Code * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,6 +19,7 @@ */ package com.flowingcode.vaadin.addons.zoomist; +import com.flowingcode.vaadin.jsonmigration.JsonMigration; import com.vaadin.flow.component.Component; import com.vaadin.flow.component.ComponentEventListener; import com.vaadin.flow.component.Tag; @@ -32,6 +33,7 @@ import java.util.Objects; import lombok.Getter; +import lombok.experimental.ExtensionMethod; /** * This component is a wrapper for Zoomist Component (https://npm.io/package/zoomist) @@ -40,9 +42,10 @@ */ @SuppressWarnings("serial") @NpmPackage(value = "zoomist", version = "1.1.1") -@NpmPackage(value = "sass", version = "1.66.1") +@NpmPackage(value = "sass", version = "1.72.0") @JsModule("./zoomist/fc-zoomist.ts") @Tag("fc-zoomist") +@ExtensionMethod(value = JsonMigration.class, suppressBaseMethods = true) public class Zoomist extends Component { /** diff --git a/src/main/resources/META-INF/resources/frontend/zoomist/fc-zoomist.ts b/src/main/resources/META-INF/resources/frontend/zoomist/fc-zoomist.ts index cb9a37c..cd93f75 100644 --- a/src/main/resources/META-INF/resources/frontend/zoomist/fc-zoomist.ts +++ b/src/main/resources/META-INF/resources/frontend/zoomist/fc-zoomist.ts @@ -2,7 +2,7 @@ * #%L * Zoomist Add-on * %% - * Copyright (C) 2023 Flowing Code + * Copyright (C) 2023 - 2026 Flowing Code * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/flowingcode/vaadin/addons/AppShellConfiguratorImpl.java b/src/test/java/com/flowingcode/vaadin/addons/AppShellConfiguratorImpl.java new file mode 100644 index 0000000..17ec671 --- /dev/null +++ b/src/test/java/com/flowingcode/vaadin/addons/AppShellConfiguratorImpl.java @@ -0,0 +1,28 @@ +/*- + * #%L + * Zoomist Add-on + * %% + * Copyright (C) 2023 - 2026 Flowing Code + * %% + * 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. + * #L% + */ +package com.flowingcode.vaadin.addons; + +import com.vaadin.flow.component.page.AppShellConfigurator; +import com.vaadin.flow.theme.Theme; + +@Theme +public class AppShellConfiguratorImpl implements AppShellConfigurator { + +} diff --git a/src/test/java/com/flowingcode/vaadin/addons/DemoLayout.java b/src/test/java/com/flowingcode/vaadin/addons/DemoLayout.java index 0c5b9f0..1e8da53 100644 --- a/src/test/java/com/flowingcode/vaadin/addons/DemoLayout.java +++ b/src/test/java/com/flowingcode/vaadin/addons/DemoLayout.java @@ -2,7 +2,7 @@ * #%L * Zoomist Add-on * %% - * Copyright (C) 2023 Flowing Code + * Copyright (C) 2023 - 2026 Flowing Code * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/flowingcode/vaadin/addons/zoomist/DemoView.java b/src/test/java/com/flowingcode/vaadin/addons/zoomist/DemoView.java index d2f15ff..51952bf 100644 --- a/src/test/java/com/flowingcode/vaadin/addons/zoomist/DemoView.java +++ b/src/test/java/com/flowingcode/vaadin/addons/zoomist/DemoView.java @@ -2,7 +2,7 @@ * #%L * Zoomist Add-on * %% - * Copyright (C) 2023 Flowing Code + * Copyright (C) 2023 - 2026 Flowing Code * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/flowingcode/vaadin/addons/zoomist/ZoomistDemo.java b/src/test/java/com/flowingcode/vaadin/addons/zoomist/ZoomistDemo.java index 2966762..ed9b80b 100644 --- a/src/test/java/com/flowingcode/vaadin/addons/zoomist/ZoomistDemo.java +++ b/src/test/java/com/flowingcode/vaadin/addons/zoomist/ZoomistDemo.java @@ -2,7 +2,7 @@ * #%L * Zoomist Add-on * %% - * Copyright (C) 2023 Flowing Code + * Copyright (C) 2023 - 2026 Flowing Code * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/flowingcode/vaadin/addons/zoomist/ZoomistDemoView.java b/src/test/java/com/flowingcode/vaadin/addons/zoomist/ZoomistDemoView.java index 7508c2d..16e9348 100644 --- a/src/test/java/com/flowingcode/vaadin/addons/zoomist/ZoomistDemoView.java +++ b/src/test/java/com/flowingcode/vaadin/addons/zoomist/ZoomistDemoView.java @@ -2,7 +2,7 @@ * #%L * Zoomist Add-on * %% - * Copyright (C) 2023 Flowing Code + * Copyright (C) 2023 - 2026 Flowing Code * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/flowingcode/vaadin/addons/zoomist/it/AbstractViewTest.java b/src/test/java/com/flowingcode/vaadin/addons/zoomist/it/AbstractViewTest.java index 52ae71d..5a22fc1 100644 --- a/src/test/java/com/flowingcode/vaadin/addons/zoomist/it/AbstractViewTest.java +++ b/src/test/java/com/flowingcode/vaadin/addons/zoomist/it/AbstractViewTest.java @@ -2,7 +2,7 @@ * #%L * Zoomist Add-on * %% - * Copyright (C) 2023 Flowing Code + * Copyright (C) 2023 - 2026 Flowing Code * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/flowingcode/vaadin/addons/zoomist/it/ViewIT.java b/src/test/java/com/flowingcode/vaadin/addons/zoomist/it/ViewIT.java index 958ad5f..e790273 100644 --- a/src/test/java/com/flowingcode/vaadin/addons/zoomist/it/ViewIT.java +++ b/src/test/java/com/flowingcode/vaadin/addons/zoomist/it/ViewIT.java @@ -2,7 +2,7 @@ * #%L * Zoomist Add-on * %% - * Copyright (C) 2023 Flowing Code + * Copyright (C) 2023 - 2026 Flowing Code * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/flowingcode/vaadin/addons/zoomist/test/SerializationTest.java b/src/test/java/com/flowingcode/vaadin/addons/zoomist/test/SerializationTest.java index 351bb82..3d46aed 100644 --- a/src/test/java/com/flowingcode/vaadin/addons/zoomist/test/SerializationTest.java +++ b/src/test/java/com/flowingcode/vaadin/addons/zoomist/test/SerializationTest.java @@ -2,7 +2,7 @@ * #%L * Zoomist Add-on * %% - * Copyright (C) 2023 Flowing Code + * Copyright (C) 2023 - 2026 Flowing Code * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/resources/META-INF/frontend/styles/zoomist-demo-styles.css b/src/test/resources/META-INF/frontend/styles/zoomist-demo-styles.css index 0083e51..5844404 100644 --- a/src/test/resources/META-INF/frontend/styles/zoomist-demo-styles.css +++ b/src/test/resources/META-INF/frontend/styles/zoomist-demo-styles.css @@ -2,7 +2,7 @@ * #%L * Zoomist Add-on * %% - * Copyright (C) 2023 Flowing Code + * Copyright (C) 2023 - 2026 Flowing Code * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.