From 6750bf559d3701d657093dd3299a38d36e30367e Mon Sep 17 00:00:00 2001
From: Arpit <arpitnath42@gmail.com>
Date: Mon, 9 Oct 2023 20:51:58 +0530
Subject: [PATCH] fixes: container widget is not getting saved on drop (#7718)

---
 frontend/src/Editor/EditorFunc.jsx | 2 +-
 frontend/src/_stores/utils.js      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/src/Editor/EditorFunc.jsx b/frontend/src/Editor/EditorFunc.jsx
index 4d04688d83..74b6807d77 100644
--- a/frontend/src/Editor/EditorFunc.jsx
+++ b/frontend/src/Editor/EditorFunc.jsx
@@ -1789,7 +1789,7 @@ const EditorComponent = (props) => {
                 <div className="pages-container">
                   {selectedComponents.length === 1 &&
                     !isEmpty(appDefinition?.pages[currentPageId]?.components) &&
-                    !isEmpty(appDefinition?.pages[currentPageId]?.components[selectedComponents[0].id]) && (
+                    !isEmpty(appDefinition?.pages[currentPageId]?.components[selectedComponents[0]?.id]) && (
                       <Inspector
                         moveComponents={moveComponents}
                         componentDefinitionChanged={componentDefinitionChanged}
diff --git a/frontend/src/_stores/utils.js b/frontend/src/_stores/utils.js
index 99d9afff27..7bd42ef208 100644
--- a/frontend/src/_stores/utils.js
+++ b/frontend/src/_stores/utils.js
@@ -72,6 +72,8 @@ function generatePath(obj, targetKey, currentPath = '') {
 }
 
 function getValueFromJson(json, path) {
+  if (!path || typeof path !== 'string') return null;
+
   let value = json;
   path.split('.').forEach((key) => {
     value = value[key];