fix: Null check

surajshetty3416 · surajshetty3416 · commit ecd5b89ee97e · 2025-04-02T14:24:11.000+05:30
diff --git a/builder/builder/doctype/builder_page/builder_page.py b/builder/builder/doctype/builder_page/builder_page.py
@@ -654,7 +654,9 @@ def set_dynamic_content_placeholder(block, data_key=False):
 				"style"
 			] += f"{css_property}: {{{{ {key} or '{escape_single_quotes(block['baseStyles'].get(_property, '') or '')}' }}}};"
 		elif _type == "key" and not block.get("isRepeaterBlock"):
-			block[_property] = f"{{{{ {key} or '{escape_single_quotes(block.get(_property, ''))}' }}}}"
+			block[
+				_property
+			] = f"{{{{ {key} if {key} is not none else '{escape_single_quotes(block.get(_property, ''))}' }}}}"
 
 
 @redis_cache(ttl=60 * 60)
diff --git a/frontend/src/components/BuilderBlock.vue b/frontend/src/components/BuilderBlock.vue
@@ -120,7 +120,7 @@ const attributes = computed(() => {
 	if (props.data) {
 		if (props.block.getDataKey("type") === "attribute") {
 			attribs[props.block.getDataKey("property") as string] =
-				getDataForKey(props.data, props.block.getDataKey("key")) ||
+				getDataForKey(props.data, props.block.getDataKey("key")) ??
 				attribs[props.block.getDataKey("property") as string];
 		}
 	}
diff --git a/frontend/src/components/TextBlock.vue b/frontend/src/components/TextBlock.vue
@@ -216,7 +216,7 @@ const textContent = computed(() => {
 	let innerHTML = props.block.getInnerHTML();
 	if (props.data) {
 		if (props.block.getDataKey("property") === "innerHTML") {
-			innerHTML = getDataForKey(props.data, props.block.getDataKey("key")) || innerHTML;
+			innerHTML = getDataForKey(props.data, props.block.getDataKey("key")) ?? innerHTML;
 		}
 	}
 	return String(innerHTML ?? "");

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ const attributes = computed(() => {`
`120`	`120`	`if (props.data) {`
`121`	`121`	`if (props.block.getDataKey("type") === "attribute") {`
`122`	`122`	`attribs[props.block.getDataKey("property") as string] =`
`123`		`- getDataForKey(props.data, props.block.getDataKey("key")) \|\|`
	`123`	`+ getDataForKey(props.data, props.block.getDataKey("key")) ??`
`124`	`124`	`attribs[props.block.getDataKey("property") as string];`
`125`	`125`	`}`
`126`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ const textContent = computed(() => {`
`216`	`216`	`let innerHTML = props.block.getInnerHTML();`
`217`	`217`	`if (props.data) {`
`218`	`218`	`if (props.block.getDataKey("property") === "innerHTML") {`
`219`		`- innerHTML = getDataForKey(props.data, props.block.getDataKey("key")) \|\| innerHTML;`
	`219`	`+ innerHTML = getDataForKey(props.data, props.block.getDataKey("key")) ?? innerHTML;`
`220`	`220`	`}`
`221`	`221`	`}`
`222`	`222`	`return String(innerHTML ?? "");`