Update DMN-js to 16.1.0

joleaf · Apr 29, 2024 · 43ffb54 · 43ffb54
1 parent dced6be
commit 43ffb54
Show file tree

Hide file tree

Showing 7 changed files with 158 additions and 145 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All changes to this plugin are listed here.
 
+## 0.5.1 (2024-04-29)
+
+### Changed
+
+- Updated DMN-js to version 16.1.0
+
 ## 0.5.0 (2024-01-26)
 
 ### Changed

diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "dmn-plugin",
 	"name": "DMN",
-	"version": "0.5.0",
+	"version": "0.5.1",
 	"minAppVersion": "0.15.0",
 	"description": "This plugin enables viewing DMNs using dmn-js.",
 	"author": "JoLeaf",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dmn",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "This plugin enables viewing/editing DMNs using dmn-js.",
   "main": "main.js",
   "scripts": {
@@ -22,6 +22,6 @@
     "typescript": "5.3.3"
   },
   "dependencies": {
-    "dmn-js": "^15.1.0"
+    "dmn-js": "^16.1.0"
   }
 }
diff --git a/src/dmnModeler.ts b/src/dmnModeler.ts
@@ -17,15 +17,16 @@ export class DmnModelerView extends TextFileView {
         this.dmnXml = data;
         const thisRef = this;
         this.dmnModeler.importXML(this.dmnXml).catch(function (err: { warnings: any; message: string; }) {
-            thisRef.clear();
-            thisRef.contentEl.createEl("div", {text: err.message});
+            console.error(err);
         });
     }
 
     async onOpen() {
-        let dmnSave = this.contentEl.createEl("button", {text: "Save", placeholder:"Save"});
+        let contentEl = this.contentEl.createEl("div", {cls: "dmn-content"});
+        let buttonbar = contentEl.createEl("div");
+        let dmnSave = buttonbar.createEl("button", {text: "Save", placeholder: "Save"});
         setIcon(dmnSave, "save");
-        this.dmnDiv = this.contentEl.createEl("div", {cls: "dmn-view dmn-fullscreen"});
+        this.dmnDiv = contentEl.createEl("div", {cls: "dmn-view dmn-view-modeler"});
         this.dmnModeler = new Modeler({
             container: this.dmnDiv,
             keyboard: {
@@ -57,7 +58,7 @@ export class DmnModelerView extends TextFileView {
     }
 
     clear() {
-        this.contentEl.empty();
+
     }
 
     getViewType() {

diff --git a/src/styles.css b/src/styles.css
@@ -20,11 +20,22 @@
     font-style: normal;
 }
 
-.dmn-view {
-    width: 100%;
+.dmn-content {
     display: flex;
     flex-wrap: wrap;
+    flex-flow: column;
+    row-gap: 5px;
+    height: 100%;
+}
+
+.dmn-view {
     cursor: pointer;
+    width: 100%;
+}
+
+.dmn-view-modeler {
+    flex: 1;
+    border: 1px dashed #212121;
 }
 
 /* Dark mode from system */
@@ -34,11 +45,12 @@
         color: black !important;
     }
 
-    .dmn-view  textarea, .dmn-view .dms-input, .dmn-view  input.metadata-input-text, .dmn-view  input[type='date'], .dmn-view  input[type='datetime-local'], .dmn-view  input[type='text'], .dmn-view  input[type='search'], .dmn-view  input[type='email'], .dmn-view  input[type='password'], .dmn-view  input[type='number'], .dmn-view  .bio-properties-panel-input {
+    .dmn-view textarea, .dmn-view .dms-input, .dmn-view input.metadata-input-text, .dmn-view input[type='date'], .dmn-view input[type='datetime-local'], .dmn-view input[type='text'], .dmn-view input[type='search'], .dmn-view input[type='email'], .dmn-view input[type='password'], .dmn-view input[type='number'], .dmn-view .bio-properties-panel-input {
         background-color: white !important;
         color: black !important;
     }
 }
+
 .dmn-view .input-cell, .dmn-view .output-cell, .dmn-view .annotation {
     background-color: white !important;
 }
@@ -63,3 +75,7 @@
 .dmn-definitions {
     display: none;
 }
+
+.dmn-view > canvas {
+    pointer-events: none;
+}
diff --git a/versions.json b/versions.json
@@ -5,5 +5,6 @@
   "0.3.0": "0.15.0",
   "0.4.0": "0.15.0",
   "0.4.1": "0.15.0",
-  "0.5.0": "0.15.0"
+  "0.5.0": "0.15.0",
+  "0.5.1": "0.15.0"
 }