Merge pull request #382 from ExperienceLovelace/bugfix/handle_getbbox…

…_errors Hdl no getBBox if not set (So also ignore x,y,w&h)
ExperienceLovelace · Dec 3, 2023 · 7831e34 · 7831e34
2 parents b993b5e + db3a3a3
commit 7831e34
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,7 +3,10 @@
 
 name: Last commit
 
-on: [push]
+on:
+  push:
+    branches:
+      - master
 
 jobs:
   build:

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/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,
   ) { }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,10 @@ @@
     name: Last commit
-    on: [push]
+    on:
+      push:
+        branches:
+          - master
     jobs:
       build:
@@ Expand Down @@