Merge branch 'master' of https://github.com/ExperienceLovelace/ha-flo…

…orplan
ExperienceLovelace · Dec 3, 2023 · bd68d67 · bd68d67
2 parents 532fe8b + 5db8228
commit bd68d67
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 43 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -62,4 +62,4 @@ jobs:
       uses: ad-m/github-push-action@master
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
-        branch: ${{ github.ref_name }}
+        branch: ${{ github.ref_name }}
diff --git a/dist/floorplan-examples.js b/dist/floorplan-examples.js
diff --git a/dist/floorplan.js b/dist/floorplan.js
diff --git a/docs/_docs/floorplan/floorplan-examples.js b/docs/_docs/floorplan/floorplan-examples.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ha-floorplan",
-  "version": "1.0.37",
+  "version": "1.0.40",
   "description": "Floorplan for Home Assistant",
   "homepage": "https://experiencelovelace.github.io/ha-floorplan",
   "keywords": [
@@ -63,4 +63,4 @@
     "webpack-cli": "^5.0.0",
     "webpack-dev-server": "^4.11.1"
   }
-}
+}
diff --git a/src/components/floorplan/floorplan-element.ts b/src/components/floorplan/floorplan-element.ts
@@ -758,10 +758,14 @@ export class FloorplanElement extends LitElement {
 
     svg.id = svgElementInfo.svgElement.id;
     svg.setAttribute('preserveAspectRatio', 'xMinYMin meet');
-    svg.setAttribute('height', svgElementInfo.originalBBox.height.toString());
-    svg.setAttribute('width', svgElementInfo.originalBBox.width.toString());
-    svg.setAttribute('x', svgElementInfo.originalBBox.x.toString());
-    svg.setAttribute('y', svgElementInfo.originalBBox.y.toString());
+
+    // A clipPath does not have the clipPath function on the element, therefore originalBBox can be null in some cases
+    if(svgElementInfo.originalBBox !== null){
+      svg.setAttribute('height', svgElementInfo.originalBBox.height.toString());
+      svg.setAttribute('width', svgElementInfo.originalBBox.width.toString());
+      svg.setAttribute('x', svgElementInfo.originalBBox.x.toString());
+      svg.setAttribute('y', svgElementInfo.originalBBox.y.toString());
+    }
 
     if (svgElementInfo.svgElement.nodeName !== 'g') {
       const originalTransform =
@@ -1334,7 +1338,8 @@ export class FloorplanElement extends LitElement {
       svgElement.id,
       svgElement,
       svgElement,
-      svgElement.getBBox()
+      // A clipPath does not have the clipPath function
+      svgElement.getBBox ? svgElement.getBBox() : null
     );
     ruleInfo.svgElementInfos[svgElement.id] = svgElementInfo;
 

diff --git a/src/components/floorplan/lib/floorplan-info.ts b/src/components/floorplan/lib/floorplan-info.ts
@@ -22,7 +22,7 @@ export class FloorplanSvgElementInfo {
     public entityId: string,
     public svgElement: SVGGraphicsElement,
     public originalSvgElement: SVGGraphicsElement,
-    public originalBBox: DOMRect
+    public originalBBox: DOMRect | null,
   ) { }
 }
 

diff --git a/src/lib/utils.ts b/src/lib/utils.ts
@@ -117,7 +117,7 @@ export class Utils {
       textElement.textContent = ''; 
 
       // Note the user about the intended change in a dataset
-      textElement.dataset.ha_floorplan_notice = 'The text_set function splitted your text into multiple tspans. Only the style of the first tspan is preserved. The style from the original tspan is reused on every tspan. The x and y are calculated on basis of the first tspan or text-element.';
+      textElement.dataset.ha_floorplan_notice = 'The text_set function split your text into multiple tspans. Only the style of the first tspan is preserved. The style from the original tspan is reused on every tspan. The x and y are calculated on the basis of the first tspan or text-element.';
 
       // Get x location of text, if no found, set to 0
       const textXPosition = textElement.getAttribute('x') || '0';
@@ -394,4 +394,4 @@ export class Utils {
     }
     return localStorage[ID_BROWER_KEY];
   }
-}
+}