Merge pull request #57 from frappe/develop

frappe · Jan 11, 2024 · 8e4e549 · 8e4e549
2 parents 6fa416a + 0b60cf2
commit 8e4e549
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/frontend/src/builder.d.ts b/frontend/src/builder.d.ts
@@ -5,7 +5,7 @@ declare interface BlockStyleMap {
 }
 
 declare interface BlockAttributeMap {
-	[key: string]: string;
+	[key: string]: string | number | null | undefined;
 }
 
 declare interface BlockOptions {

diff --git a/frontend/src/components/BlockEditor.vue b/frontend/src/components/BlockEditor.vue
@@ -114,6 +114,7 @@ watchEffect(() => {
 	props.block.getStyle("bottom");
 	props.block.getStyle("right");
 	props.block.getStyle("position");
+	props.block.rawStyles;
 	const parentBlock = props.block.getParentBlock();
 	parentBlock?.getStyle("display");
 	parentBlock?.getStyle("justifyContent");

diff --git a/frontend/src/components/ObjectEditor.vue b/frontend/src/components/ObjectEditor.vue
@@ -74,7 +74,7 @@ const pasteObj = (e: ClipboardEvent) => {
 		const map = new Map(Object.entries(props.obj));
 		try {
 			const objString = text.match(/{[^{}]+}/)?.[0];
-			if (!objString) return new Error("Invalid object");
+			if (!objString) throw new Error("Invalid object");
 			const obj = new Function("return " + objString)();
 			if (typeof obj === "object") {
 				for (const [key, value] of Object.entries(obj)) {
@@ -91,7 +91,6 @@ const pasteObj = (e: ClipboardEvent) => {
 			}
 			map.delete("");
 		}
-		e.preventDefault();
 		emit("update:obj", mapToObject(map));
 	}
 };

diff --git a/frontend/src/utils/block.ts b/frontend/src/utils/block.ts
@@ -33,7 +33,7 @@ class Block implements BlockOptions {
 	referenceBlockId?: string;
 	isRepeaterBlock?: boolean;
 	visibilityCondition?: string;
-	customAttributes?: BlockAttributeMap;
+	customAttributes: BlockAttributeMap;
 	constructor(options: BlockOptions) {
 		this.element = options.element;
 		this.innerHTML = options.innerHTML;
@@ -409,7 +409,12 @@ class Block implements BlockOptions {
 		return store.findParentBlock(this.blockId);
 	}
 	canHaveChildren(): boolean {
-		return (this.isContainer() || this.isRoot() || this.isDiv()) && !this.isExtendedFromComponent();
+		return !(
+			this.isImage() ||
+			this.isSVG() ||
+			(this.isText() && !this.isLink()) ||
+			this.isExtendedFromComponent()
+		);
 	}
 	updateStyles(styles: BlockStyleObjects) {
 		this.baseStyles = Object.assign({}, this.baseStyles, styles.baseStyles);

diff --git a/frontend/src/utils/blockController.ts b/frontend/src/utils/blockController.ts
@@ -110,15 +110,25 @@ const blockController = {
 	},
 	setRawStyles: (rawStyles: BlockStyleMap) => {
 		store.selectedBlocks.forEach((block) => {
-			block.rawStyles = rawStyles;
+			Object.keys(block.rawStyles).forEach((key) => {
+				if (!rawStyles[key]) {
+					delete block.rawStyles[key];
+				}
+			});
+			Object.assign(block.rawStyles, rawStyles);
 		});
 	},
 	getCustomAttributes: () => {
 		return blockController.isBLockSelected() && store.selectedBlocks[0].customAttributes;
 	},
 	setCustomAttributes: (customAttributes: BlockAttributeMap) => {
 		store.selectedBlocks.forEach((block) => {
-			block.customAttributes = customAttributes;
+			Object.keys(block.customAttributes).forEach((key) => {
+				if (!customAttributes[key]) {
+					delete block.customAttributes[key];
+				}
+			});
+			Object.assign(block.customAttributes, customAttributes);
 		});
 	},
 	getParentBlock: () => {