Bug fix & upgrade

Author: jet-pang

package-lock.json

@@ -8,7 +8,7 @@
       "lit-html": "1.4.1"
     },
     "devDependencies": {
-      "webpack-babel-multi-target-plugin": "2.3.3",
+      "webpack-babel-multi-target-plugin": "2.5.0",
       "copy-webpack-plugin": "5.1.2",
       "compression-webpack-plugin": "4.0.1",
       "raw-loader": "3.1.0",
@@ -23,7 +23,9 @@
       "file-loader": "6.1.0",
       "extra-watch-webpack-plugin": "1.0.3",
       "lit-css-loader": "0.0.4",
-      "extract-loader": "5.1.0"
+      "extract-loader": "5.1.0",
+      "babel-loader": "8.2.2",
+      "html-webpack-plugin": "4.5.2"
     },
     "hash": ""
   },
@@ -35,7 +37,7 @@
     "lit-html": "1.4.1"
   },
   "devDependencies": {
-    "webpack-babel-multi-target-plugin": "2.3.3",
+    "webpack-babel-multi-target-plugin": "2.5.0",
     "copy-webpack-plugin": "5.1.2",
     "compression-webpack-plugin": "4.0.1",
     "raw-loader": "3.1.0",
@@ -50,6 +52,8 @@
     "file-loader": "6.1.0",
     "extra-watch-webpack-plugin": "1.0.3",
     "lit-css-loader": "0.0.4",
-    "extract-loader": "5.1.0"
+    "extract-loader": "5.1.0",
+    "babel-loader": "8.2.2",
+    "html-webpack-plugin": "4.5.2"
   }
 }

package.json

@@ -5,7 +5,7 @@
 
     <groupId>com.wontlost</groupId>
     <artifactId>ckeditor-vaadin</artifactId>
-    <version>2.2.0</version>
+    <version>2.3.0</version>
     <name>CKEditorVaadin</name>
     <description>Integration of CKEditor 5 for Vaadin 14</description>
     <scm>
@@ -14,7 +14,7 @@
         <developerConnection>scm:git:git@https://github.com/eroself/vaadin-litelement-ckeditor.git</developerConnection>
     </scm>
     <properties>
-        <vaadin.version>14.6.8</vaadin.version>
+        <vaadin.version>14.7.3</vaadin.version>
         <vaadin-applayout-addon.version>4.0.0.rc5</vaadin-applayout-addon.version>
         <maven.compiler.release>11</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

pom.xml

@@ -115,6 +115,7 @@ public Config() {
         configs.put(ConfigType.table, Json.createObject());
         configs.put(ConfigType.title, Json.createObject());
         configs.put(ConfigType.typing, Json.createObject());
+        configs.put(ConfigType.ui, Json.createObject());
         configs.put(ConfigType.wordCount, Json.createObject());
         configs.put(ConfigType.wproofreader, Json.createObject());
     }
@@ -154,6 +155,7 @@ public Config() {
         configs.put(ConfigType.title, jsonObject.get(ConfigType.title.name()));
         configs.put(ConfigType.typing, jsonObject.get(ConfigType.typing.name()));
         configs.put(ConfigType.wordCount, jsonObject.get(ConfigType.wordCount.name()));
+        configs.put(ConfigType.ui, jsonObject.get(ConfigType.ui.name()));
         configs.put(ConfigType.wproofreader, jsonObject.get(ConfigType.wproofreader.name()));
     }
 
@@ -213,6 +215,16 @@ public void setEditorToolBar(Toolbar[] editorToolBar) {
         configs.put(ConfigType.toolbar, toJsonArray(editorToolBar));
     }
 
+    /**
+     * @param editorToolBar Toolbar of Editor, refer to enum @Constants.Toolbar
+     */
+    public void setEditorToolBarObject(Toolbar[] editorToolBar, Boolean shouldNotGroupWhenFull) {
+        JsonObject toolbar = Json.createObject();
+        toolbar.put("items", toJsonArray(editorToolBar));
+        toolbar.put("shouldNotGroupWhenFull", shouldNotGroupWhenFull);
+        configs.put(ConfigType.toolbar, toolbar);
+    }
+
     /**
      * @param uiLanguage Language of user interface, refer to enum @Language
      */
@@ -303,6 +315,17 @@ public void setCloudServices(String bundleVersion, String tokenUrl, String uploa
         configs.put(ConfigType.cloudServices, cloudServices);
     }
 
+    public void setUiViewportOffset(Double top, Double left, Double bottom, Double right) {
+        JsonObject ui = Json.createObject();
+        JsonObject viewportOffset = Json.createObject();
+        viewportOffset.put("top", top);
+        viewportOffset.put("left", left);
+        viewportOffset.put("bottom", bottom);
+        viewportOffset.put("right", right);
+        ui.put("viewportOffset", viewportOffset);
+        configs.put(ConfigType.ui, ui);
+    }
+
     /**
      *
      * @param indentSequence A sequence of characters inserted or removed from the code block lines 、

src/main/java/com/wontlost/ckeditor/Config.java

@@ -47,6 +47,7 @@ public enum ConfigType {
         wordCount,
         licenseKey,
         pagination,
+        ui,
         wproofreader
 
     }