Merge pull request #320 from napakalas/issue-#319

Add borderStyle property, defaulting to default if not set.

Author: alan-wu

cypress/fixtures/test-canvas_hr.png

@@ -47,6 +47,8 @@ Cypress.on('uncaught:exception', (err) => {
         return false
     if (err.message.includes("Cannot read properties of null (reading 'length')"))
         return false
+    if (err.message.includes("Cannot read properties of null (reading 'id')"))
+        return false
     return true
 })
 

cypress/fixtures/test-canvas_lr.png

@@ -70,6 +70,7 @@ export default {
       const specifiedColour = this.item["color"] ? this.item["color"] : this.item["colour"];
       let colour = specifiedColour ? specifiedColour : "transparent";
       let borderColour = this.item.border ? this.item.border : "black";
+      let borderStyle = this.item.borderStyle ? this.item.borderStyle : "default";
       if (specifiedColour && !this.item.border) {
         borderColour = colour;
       }
@@ -82,7 +83,7 @@ export default {
       } else if (this.item[this.styleKey] === 'line') {
         return {'color': colour};
       } else {
-        return { 'background-color': colour, 'border-color': borderColour};
+        return { 'background-color': colour, 'border-color': borderColour, 'border-style': borderStyle};
       }
     },
   },

cypress/support/commands.js

@@ -1,6 +1,6 @@
 /**
  * a single source for the flatmap-viewer library import
  */
-import * as flatmap from 'https://cdn.jsdelivr.net/npm/@abi-software/[email protected].1/+esm';
+import * as flatmap from 'https://cdn.jsdelivr.net/npm/@abi-software/[email protected].2/+esm';
 
 export default flatmap;