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

…orplan
ExperienceLovelace · Jan 2, 2024 · f3ce711 · f3ce711
2 parents 7a0b1f1 + 28fd7dd
commit f3ce711
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 7 deletions.
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.40",
+  "version": "1.0.41",
   "description": "Floorplan for Home Assistant",
   "homepage": "https://experiencelovelace.github.io/ha-floorplan",
   "keywords": [

diff --git a/src/components/floorplan/floorplan-element.ts b/src/components/floorplan/floorplan-element.ts
@@ -1756,7 +1756,13 @@ export class FloorplanElement extends LitElement {
               `Performing action: ${actionConfig.action} ${actionConfig.navigation_path}`
             );
           } else {
-            navigate(this, actionConfig.navigation_path);
+            // Evaluate the navigation path
+            const navigationPath = this.evaluate(
+              actionConfig.navigation_path,
+              entityId,
+              svgElementInfo?.svgElement
+            ) as string;
+            navigate(this, navigationPath, actionConfig.navigation_replace ?? false);
           }
           break;
 

diff --git a/src/lib/homeassistant/data/lovelace.ts b/src/lib/homeassistant/data/lovelace.ts
@@ -131,6 +131,7 @@ export interface CallServiceActionConfig extends BaseActionConfig {
 export interface NavigateActionConfig extends BaseActionConfig {
   action: 'navigate';
   navigation_path: string;
+  navigation_replace?: boolean;
 }
 
 export interface UrlActionConfig extends BaseActionConfig {

diff --git a/src/lib/homeassistant/lovelace/types.ts b/src/lib/homeassistant/lovelace/types.ts
@@ -131,6 +131,7 @@ export interface CallServiceActionConfig extends BaseActionConfig {
 export interface NavigateActionConfig extends BaseActionConfig {
   action: 'navigate';
   navigation_path: string;
+  navigation_replace?: boolean;
 }
 
 export interface UrlActionConfig extends BaseActionConfig {

diff --git a/src/lib/homeassistant/panels/lovelace/editor/types.ts b/src/lib/homeassistant/panels/lovelace/editor/types.ts
@@ -96,6 +96,7 @@ export interface EditSubElementEvent {
 export const actionConfigStruct = object({
   action: string(),
   navigation_path: optional(string()),
+  navigation_replace: optional(boolean()),
   url_path: optional(string()),
   service: optional(string()),
   service_data: optional(object()),