@cloudcannon/editable-regions 0.0.5 → 0.0.7

package/components/ui/editable-array-item-controls.ts

@@ -92,15 +92,11 @@ export default class EditableArrayItemControls extends EditableComponentControls
 		super.render(shadow);
 
 		this.dragHandle = document.createElement("button");
+		this.dragHandle.type = "button";
 		this.dragHandle.onclick = (e) => {
 			e.stopPropagation();
-			if (this.contextMenu?.classList.contains("open")) {
-				this.contextMenu?.classList.remove("open");
-				this.removeAttribute("open");
-			} else if (this.contextMenu && this.contextMenu.childElementCount > 0) {
-				this.contextMenu?.classList.add("open");
-				this.setAttribute("open", "true");
-			}
+			e.preventDefault();
+			this.toggleContextMenu();
 		};
 		this.dragHandle.ondragstart = () => {
 			this.contextMenu?.classList.remove("open");

package/components/ui/editable-component-controls.ts

@@ -7,6 +7,16 @@ export default class EditableComponentControls extends HTMLElement {
 
 	private editButton?: HTMLButtonElement;
 
+	toggleContextMenu() {
+		if (this.contextMenu?.classList.contains("open")) {
+			this.contextMenu?.classList.remove("open");
+			this.removeAttribute("open");
+		} else if (this.contextMenu && this.contextMenu.childElementCount > 0) {
+			this.contextMenu?.classList.add("open");
+			this.setAttribute("open", "true");
+		}
+	}
+
 	render(shadow: ShadowRoot): void {
 		const style = document.createElement("style");
 		style.textContent = styleContent;
@@ -21,18 +31,23 @@ export default class EditableComponentControls extends HTMLElement {
 		shadow.appendChild(this.contextMenu);
 
 		this.editButton = document.createElement("button");
+		this.editButton.type = "button";
 		this.editButton.innerHTML = '<cc-icon name="edit"></cc-icon>';
 		this.editButton.onclick = () => {
 			this.dispatchEvent(new CustomEvent("edit", { detail: this }));
 		};
 		this.buttonRow.append(this.editButton);
 
-		this.onclick = () => {
+		this.onclick = (e) => {
+			e.preventDefault();
 			this.contextMenu?.classList.remove("open");
 			this.removeAttribute("open");
 		};
 
-		this.onblur = () => {
+		this.onblur = (e) => {
+			if ((e.relatedTarget as HTMLElement)?.tagName === "A") {
+				return;
+			}
 			this.contextMenu?.classList.remove("open");
 			this.removeAttribute("open");
 		};

package/components/ui/editable-region-button.ts

@@ -0,0 +1,39 @@
+import styleContent from "../../styles/ui/editable-region-button.css?inline";
+
+export default class EditableRegionButton extends HTMLElement {
+	private shadow?: ShadowRoot;
+
+	connectedCallback() {
+		if (this.shadow) {
+			return;
+		}
+
+		this.shadow = this.attachShadow({ mode: "open" });
+
+		this.render(this.shadow);
+	}
+
+	render(shadow: ShadowRoot) {
+		const style = document.createElement("style");
+		style.textContent = styleContent;
+		shadow.appendChild(style);
+
+		const button = document.createElement("button");
+		button.innerHTML = `<cc-icon name='${this.getAttribute("icon")}'></cc-icon>${this.getAttribute("text")}`;
+		shadow.appendChild(button);
+
+		button.addEventListener("click", (e) => {
+			this.dispatchEvent(
+				new CustomEvent("button-click", { detail: { originalEvent: e } }),
+			);
+		});
+	}
+}
+
+customElements.define("editable-region-button", EditableRegionButton);
+
+declare global {
+	interface HTMLElementTagNameMap {
+		"editable-region-button": EditableRegionButton;
+	}
+}

package/components/ui/editable-region-error-card.ts

@@ -65,6 +65,14 @@ export default class EditableRegionErrorCard extends HTMLElement {
 				body.appendChild(stack);
 			}
 		}
+
+		if (this.hasAttribute("hint")) {
+			const hint = document.createElement("p");
+			hint.className = "hint";
+			hint.innerHTML = this.getAttribute("hint") ?? "";
+
+			body.appendChild(hint);
+		}
 	}
 }
 

package/helpers/checks.ts

@@ -100,3 +100,10 @@ export const isEditableArrayItem = (el?: Element | null): boolean => {
 		(el instanceof HTMLElement && el.dataset.editable === "array-item")
 	);
 };
+
+export const isEditableArray = (el?: Element | null): boolean => {
+	return (
+		el?.tagName === "EDITABLE-ARRAY" ||
+		(el instanceof HTMLElement && el.dataset.editable === "array")
+	);
+};

package/helpers/hydrate-editable-regions.ts

@@ -52,7 +52,10 @@ export const hydrateDataEditableRegions = (root: Element) => {
 			return;
 		}
 
-		if (!element.dataset.editable || element.dataset.cloudcannonIgnore) {
+		if (
+			typeof element.dataset.editable !== "string" ||
+			typeof element.dataset.cloudcannonIgnore === "string"
+		) {
 			return;
 		}
 
@@ -62,7 +65,17 @@ export const hydrateDataEditableRegions = (root: Element) => {
 			error.setAttribute("heading", "Failed to render editable region");
 			error.setAttribute(
 				"message",
-				`Unrecognized editable type: "${element.dataset.editable}". The supported types are: ${Object.keys(editableMap).join(", ")}`,
+				`This element has an invalid editable type for the 'data-editable' HTML attribute. The supported editable types are ${Object.keys(
+					editableMap,
+				)
+					.map((type) => `"${type}"`)
+					.join(
+						", ",
+					)} but instead received the type "${element.dataset.editable}". Please make sure that this element has a valid "data-editable" attribute.`,
+			);
+			error.setAttribute(
+				"hint",
+				"If this is intentional you can use the 'data-cloudcannon-ignore' attribute to exclude this element from editable regions.",
 			);
 			element.replaceWith(error);
 			return;

package/nodes/editable-array-item.ts

@@ -2,10 +2,12 @@ import "../components/ui/editable-array-item-controls.js";
 import type EditableArrayItemControls from "../components/ui/editable-array-item-controls.js";
 import {
 	hasEditableArrayItem,
+	isEditableArray,
 	isEditableArrayItem,
+	isEditableElement,
 } from "../helpers/checks.js";
 import { CloudCannon, realizeAPIValue } from "../helpers/cloudcannon.js";
-import EditableArray from "./editable-array.js";
+import type EditableArray from "./editable-array.js";
 import EditableComponent from "./editable-component.js";
 
 export default class EditableArrayItem extends EditableComponent {
@@ -14,32 +16,25 @@ export default class EditableArrayItem extends EditableComponent {
 	protected controlsElement?: EditableArrayItemControls;
 
 	private inputConfig?: any;
+	private structureStrings: string[] = [];
 
 	shouldMount(): boolean {
 		return this.value !== undefined;
 	}
 
 	validateConfiguration(): boolean {
-		const key = this.element.dataset.component;
-		if (key) {
-			const component = this.getComponents()[key];
-			if (!component) {
-				this.element.classList.add("errored");
-				const error = document.createElement("editable-region-error-card");
-				error.setAttribute("heading", "Failed to render component");
-				error.setAttribute("message", `Couldn't find component '${key}'`);
-				this.element.replaceChildren(error);
-				return false;
-			}
+		let parentElement = this.element.parentElement;
+		while (parentElement && !isEditableElement(parentElement)) {
+			parentElement = parentElement.parentElement;
 		}
 
-		if (!this.parent || !(this.parent instanceof EditableArray)) {
+		if (!parentElement || !isEditableArray(parentElement)) {
 			this.element.classList.add("errored");
 			const error = document.createElement("editable-region-error-card");
 			error.setAttribute("heading", "Failed to render array item");
 			error.setAttribute(
 				"message",
-				"Parent array editable not found. Array items must be a descendant of an array editable.",
+				"Array item editable regions must be nested inside an array editable region but this element has no parent editable region. Please check that this element is inside an array editable region.",
 			);
 			this.element.replaceChildren(error);
 			return false;
@@ -49,20 +44,43 @@ export default class EditableArrayItem extends EditableComponent {
 	}
 
 	isValidDropzone(e: DragEvent): boolean {
-		const source = this.parent?.contextBase?.filePath;
-		if (!source || !e.dataTransfer) {
+		if (!e.dataTransfer) {
 			return false;
 		}
 
+		const source = this.parent?.contextBase?.fullPath ?? "@currentFile";
+		if (e.dataTransfer?.types.includes(source.toLowerCase())) {
+			return true;
+		}
+
 		const dragType = this.getDragType();
 
-		if (
-			!e.dataTransfer?.types.includes(source.toLowerCase()) &&
-			(!dragType || !e.dataTransfer.types.includes(dragType))
-		) {
+		if (!dragType || !e.dataTransfer.types.includes(dragType)) {
 			return false;
 		}
 
+		if (dragType === "cc:structure") {
+			if (this.structureStrings.length === 0) {
+				return false;
+			}
+
+			const structureString = e.dataTransfer.types
+				.find((type) => type.startsWith("structure:"))
+				?.replace(/^structure:/, "");
+
+			if (!structureString) {
+				return false;
+			}
+
+			const targetStructure = this.structureStrings.find(
+				(targetValue: unknown) => structureString === targetValue,
+			);
+
+			if (!targetStructure) {
+				return false;
+			}
+		}
+
 		return true;
 	}
 
@@ -77,6 +95,47 @@ export default class EditableArrayItem extends EditableComponent {
 		this.element.style.boxShadow = this.getDraggingBoxShadow(e);
 	}
 
+	onDragStart(e: DragEvent): void {
+		if (!e.dataTransfer || !this.element.dataset.prop) {
+			return;
+		}
+
+		const source = this.parent?.contextBase?.fullPath ?? "@currentFile";
+		const clientRect = this.element.getBoundingClientRect();
+
+		e.stopPropagation();
+		this.element.classList.add("dragging");
+
+		e.dataTransfer.setDragImage(this.element, clientRect.width - 35, 35);
+		e.dataTransfer.effectAllowed = "move";
+
+		const id = Math.random().toString(36).slice(2);
+		this.element.id = id;
+
+		const data = {
+			index: this.element.dataset.prop,
+			sourceId: id,
+			value: this.value,
+		};
+
+		if (this.inputConfig?.options?.structures?.values?.length > 0) {
+			const structure = CloudCannon.findStructure(
+				this.inputConfig?.options?.structures,
+				this.value,
+			);
+			if (structure) {
+				e.dataTransfer.setData(`structure:${JSON.stringify(structure)}`, "");
+			}
+		}
+
+		const payload = JSON.stringify(data);
+		e.dataTransfer?.setData(source, payload);
+		const dragType = this.getDragType();
+		if (dragType) {
+			e.dataTransfer?.setData(dragType, payload);
+		}
+	}
+
 	getDragType(): string | undefined {
 		if (this.inputConfig?.options?.structures?.values?.length) {
 			return "cc:structure";
@@ -300,43 +359,9 @@ export default class EditableArrayItem extends EditableComponent {
 				this.element.remove();
 			});
 
-			this.controlsElement.addEventListener("dragstart", (e: DragEvent) => {
-				const source = this.parent?.contextBase?.filePath;
-				if (!source || !e.dataTransfer || !this.element.dataset.prop) {
-					return;
-				}
-
-				const clientRect = this.element.getBoundingClientRect();
-
-				e.stopPropagation();
-				this.element.classList.add("dragging");
-
-				e.dataTransfer.setDragImage(this.element, clientRect.width - 35, 35);
-				e.dataTransfer.effectAllowed = "move";
-
-				const id = Math.random().toString(36).slice(2);
-				this.element.id = id;
-
-				const data: Record<string, any> = {
-					index: this.element.dataset.prop,
-					sourceId: id,
-					value: this.value,
-				};
-
-				if (this.inputConfig?.options?.structures?.values?.length > 0) {
-					data.structure = CloudCannon.findStructure(
-						this.inputConfig?.options?.structures,
-						this.value,
-					);
-				}
-
-				const payload = JSON.stringify(data);
-				e.dataTransfer?.setData(source, payload);
-				const dragType = this.getDragType();
-				if (dragType) {
-					e.dataTransfer?.setData(dragType, payload);
-				}
-			});
+			this.controlsElement.addEventListener("dragstart", (e: DragEvent) =>
+				this.onDragStart(e),
+			);
 
 			this.updateControls();
 
@@ -358,6 +383,12 @@ export default class EditableArrayItem extends EditableComponent {
 					(inputConfig as any)?.options?.disable_add ?? false;
 
 				this.inputConfig = inputConfig;
+				if (this.inputConfig?.options?.structures?.values?.length > 0) {
+					this.structureStrings =
+						this.inputConfig.options.structures.values.map((value: unknown) =>
+							JSON.stringify(value).toLowerCase(),
+						);
+				}
 				this.element.append(this.controlsElement);
 			});
 		}
@@ -392,11 +423,7 @@ export default class EditableArrayItem extends EditableComponent {
 				return;
 			}
 
-			const source = this.parent?.contextBase?.filePath;
-			if (!source) {
-				throw new Error("Source not found");
-			}
-
+			const source = this.parent?.contextBase?.fullPath ?? "@currentFile";
 			const dragType = this.getDragType();
 			const sameArrayData = e.dataTransfer.getData(source);
 			const otherArrayData = dragType
@@ -428,25 +455,7 @@ export default class EditableArrayItem extends EditableComponent {
 					this.dispatchArrayMove(fromIndex, newIndex);
 				}
 			} else if (otherArrayData) {
-				const { index, sourceId, value, structure } =
-					JSON.parse(otherArrayData);
-				if (dragType === "cc:structure") {
-					if (!this.inputConfig?.options?.structures?.values) {
-						return;
-					}
-
-					const targetStructure = CloudCannon.findStructure(
-						this.inputConfig.options.structures,
-						this.value,
-					);
-					if (!targetStructure) {
-						return;
-					}
-
-					if (JSON.stringify(structure) !== JSON.stringify(targetStructure)) {
-						return;
-					}
-				}
+				const { index, sourceId, value } = JSON.parse(otherArrayData);
 
 				const sourceElement = document.getElementById(sourceId);
 				if (sourceElement && hasEditableArrayItem(sourceElement)) {

package/nodes/editable-array.ts

@@ -4,10 +4,12 @@ import type {
 	CloudCannonJavaScriptV1APIFile,
 } from "@cloudcannon/javascript-api";
 import type EditableArrayItemComponent from "../components/editable-array-item-component.js";
-import { hasEditableArrayItem, isEditableElement } from "../helpers/checks.js";
+import type EditableRegionButton from "../components/ui/editable-region-button.js";
+import { isEditableElement } from "../helpers/checks.js";
 import { CloudCannon } from "../helpers/cloudcannon.js";
 import type EditableArrayItem from "./editable-array-item.js";
 import Editable, { type EditableListener } from "./editable.js";
+import "../components/ui/editable-region-button.js";
 
 const arrayDirectionValues = [
 	"row",
@@ -27,18 +29,21 @@ export default class EditableArray extends Editable {
 	value:
 		| CloudCannonJavaScriptV1APICollection
 		| CloudCannonJavaScriptV1APIDataset
+		| CloudCannonJavaScriptV1APIFile
 		| unknown[]
 		| null
 		| undefined = undefined;
 
 	private updatePromise: Promise<void> | undefined;
 	private needsReupdate = false;
+	private addButton?: EditableRegionButton;
 
 	async registerListener(listener: EditableListener): Promise<void> {
 		if (!this.value) {
 			return;
 		}
 
+		const __base_context = { ...this.contextBase };
 		let value: unknown[] | CloudCannonJavaScriptV1APIFile[];
 		if (CloudCannon.isAPICollection(this.value)) {
 			value = await this.value.items();
@@ -48,8 +53,13 @@ export default class EditableArray extends Editable {
 				value = items;
 			} else {
 				const data = await items.data.get();
+				__base_context.file = items;
 				value = Array.isArray(data) ? data : [];
 			}
+		} else if (CloudCannon.isAPIFile(this.value)) {
+			const data = await this.value.data.get();
+			__base_context.file = this.value;
+			value = Array.isArray(data) ? data : [];
 		} else if (Array.isArray(this.value)) {
 			value = this.value;
 		} else {
@@ -81,7 +91,7 @@ export default class EditableArray extends Editable {
 
 		if (listener.path) {
 			listener.editable.pushValue(value, listener, {
-				__base_context: this.contextBase ?? {},
+				__base_context,
 			});
 		}
 	}
@@ -94,7 +104,10 @@ export default class EditableArray extends Editable {
 			this.element.classList.add("errored");
 			const error = document.createElement("editable-region-error-card");
 			error.setAttribute("heading", "Failed to render array editable");
-			error.setAttribute("message", "Missing required attribute data-prop");
+			error.setAttribute(
+				"message",
+				"Array editable regions require a 'data-prop' HTML attribute but none was provided. Please check that this element has a valid 'data-prop' attribute.",
+			);
 			this.element.replaceChildren(error);
 			return false;
 		}
@@ -107,15 +120,27 @@ export default class EditableArray extends Editable {
 			!Array.isArray(value) &&
 			value !== null &&
 			!CloudCannon.isAPICollection(value) &&
-			!CloudCannon.isAPIDataset(value)
+			!CloudCannon.isAPIDataset(value) &&
+			!CloudCannon.isAPIFile(value)
 		) {
 			this.element.classList.add("errored");
 			const error = document.createElement("editable-region-error-card");
 			error.setAttribute("heading", "Failed to render array editable");
 			error.setAttribute(
 				"message",
-				`Illegal value type: ${typeof value}. Supported types are array.`,
+				`Array editable regions expect to receive a value of type "array" but instead received a value of type '${typeof value}'.`,
 			);
+			if (this.contextBase?.fullPath) {
+				error.setAttribute(
+					"hint",
+					`This may mean that the 'data-prop' attribute is incorrectly set for this element, the full 'data-prop' path was '${this.contextBase?.fullPath}'.`,
+				);
+			} else {
+				error.setAttribute(
+					"hint",
+					`This may mean that the 'data-prop' attribute is incorrectly set for this element.`,
+				);
+			}
 			this.element.replaceChildren(error);
 			return;
 		}
@@ -139,6 +164,7 @@ export default class EditableArray extends Editable {
 
 	private async _update(): Promise<void> {
 		let value: unknown[] | CloudCannonJavaScriptV1APIFile[];
+		const __base_context = { ...this.contextBase };
 		if (CloudCannon.isAPICollection(this.value)) {
 			value = await this.value.items();
 		} else if (CloudCannon.isAPIDataset(this.value)) {
@@ -147,8 +173,13 @@ export default class EditableArray extends Editable {
 				value = items;
 			} else {
 				const data = await items.data.get();
+				__base_context.file = items;
 				value = Array.isArray(data) ? data : [];
 			}
+		} else if (CloudCannon.isAPIFile(this.value)) {
+			const data = await this.value.data.get();
+			__base_context.file = this.value;
+			value = Array.isArray(data) ? data : [];
 		} else if (Array.isArray(this.value)) {
 			value = this.value;
 		} else {
@@ -158,7 +189,7 @@ export default class EditableArray extends Editable {
 		const children: (HTMLElement & { editable?: EditableArrayItem })[] = [];
 
 		for (const child of this.element.querySelectorAll(
-			"editable-array-item,[data-editable='array-item']",
+			"editable-array-item,[data-editable='array-item'],array-placeholder",
 		)) {
 			let parent = child.parentElement;
 			while (parent instanceof HTMLElement && !isEditableElement(parent)) {
@@ -172,12 +203,33 @@ export default class EditableArray extends Editable {
 			children.push(child as any);
 		}
 
+		if (
+			children.length === 0 &&
+			!this.element.dataset.component &&
+			!this.element.dataset.componentKey
+		) {
+			const error = document.createElement("editable-region-error-card");
+			error.setAttribute("heading", "Failed to render array editable region");
+			error.setAttribute(
+				"message",
+				"Array editable regions with no child array items must have either a 'data-component' attribute or a 'data-component-key' attribute. Please add an item to this array then save and rebuild to see your changes or add a 'data-component' or 'data-component-key' attribute to this element.",
+			);
+			this.element.replaceChildren(error);
+			return;
+		}
+
 		if (!this.element.dataset.idKey) {
 			while (children.length > value.length) {
 				children.pop()?.remove();
 			}
 
-			const firstChild = children[0];
+			if (value.length === 0 && this.addButton) {
+				this.element.appendChild(this.addButton);
+				return;
+			}
+
+			this.addButton?.remove();
+
 			for (let i = 0; i < value.length; i++) {
 				let child = children[i];
 				if (!child) {
@@ -185,12 +237,11 @@ export default class EditableArray extends Editable {
 						child = document.createElement(
 							"editable-array-item",
 						) as EditableArrayItemComponent;
-					} else if (firstChild) {
+					} else {
+						// Empty arrays should be caught by the error case above so children[0] should always exist
 						child = children[0].cloneNode(true) as HTMLElement & {
 							editable?: EditableArrayItem;
 						};
-					} else {
-						child = document.createElement("array-placeholder");
 					}
 					this.element.appendChild(child);
 				}
@@ -203,7 +254,7 @@ export default class EditableArray extends Editable {
 				child.editable?.pushValue(
 					value,
 					{ path: `${i}`, editable: child.editable },
-					{ __base_context: this.contextBase ?? {} },
+					{ __base_context },
 				);
 			}
 			return;
@@ -226,9 +277,12 @@ export default class EditableArray extends Editable {
 			}
 
 			if (data && typeof data === "object" && componentKey) {
-				componentKeys.push(String((data as any)[componentKey]));
-			} else {
-				componentKeys.push(null);
+				const component = (data as any)[componentKey];
+				if (typeof component !== "undefined" && component !== null) {
+					componentKeys.push(String((data as any)[componentKey]));
+				} else {
+					componentKeys.push(null);
+				}
 			}
 		}
 
@@ -244,9 +298,15 @@ export default class EditableArray extends Editable {
 				child.editable?.pushValue(
 					value,
 					{ path: `${index}`, editable: child.editable },
-					{ __base_context: this.contextBase ?? {} },
+					{ __base_context },
 				);
 			});
+
+			if (dataKeys.length === 0 && this.addButton) {
+				this.element.appendChild(this.addButton);
+			} else {
+				this.addButton?.remove();
+			}
 			return;
 		}
 
@@ -264,6 +324,8 @@ export default class EditableArray extends Editable {
 			}
 			const placeholder = placeholders[i];
 			const existingElement = children[i];
+			const componentKey = componentKeys[i] || this.element.dataset.component;
+
 			const matchingChildIndex = children.findIndex(
 				(child, i) => child.dataset.id === key && !moved[i],
 			);
@@ -273,17 +335,38 @@ export default class EditableArray extends Editable {
 				const clone = children.find((child) => child.dataset.id === key);
 				if (clone) {
 					matchingChild = clone.cloneNode(true) as any;
-				} else {
+				} else if (componentKey) {
 					matchingChild = document.createElement(
 						"editable-array-item",
 					) as EditableArrayItemComponent;
 					matchingChild.dataset.id = key;
-
-					const componentKey =
-						componentKeys[i] || this.element.dataset.component;
-					if (componentKey) {
-						matchingChild.dataset.component = componentKey;
+					matchingChild.dataset.component = componentKey;
+				} else {
+					const error = document.createElement("editable-region-error-card");
+					error.setAttribute("heading", "Failed to render array item");
+					if (typeof this.element.dataset.componentKey === "string") {
+						error.setAttribute(
+							"message",
+							"Array editable region has no child with a matching 'data-id' value for this element and the value has no key matching the 'data-component-key' attribute. Please check that the 'data-component-key' attribute for this element is correct and that each element has an entry for that key, or provide a fallback 'data-component' attribute.",
+						);
+						error.setAttribute(
+							"hint",
+							`This may mean that the value for 'data-component-key' is incorrect or that your array data is incorrectly formatted.
+							The current value for 'data-component-key' is '${this.element.dataset.componentKey}' and the current value for 'data-id' is '${key}'.
+							`,
+						);
+					} else {
+						error.setAttribute(
+							"message",
+							"Array editable region has no child with a matching 'data-id' value for this element and no 'data-component' or 'data-component-key' attribute. Please save and rebuild to see your changes or add a 'data-component' or 'data-component-key' attribute to this element.",
+						);
+						error.setAttribute(
+							"hint",
+							`The full value of "data-id" for this item is "${key}"`,
+						);
 					}
+					matchingChild = document.createElement("array-placeholder");
+					matchingChild.append(error);
 				}
 			} else {
 				moved[matchingChildIndex] = true;
@@ -305,7 +388,7 @@ export default class EditableArray extends Editable {
 				matchingChild.editable.pushValue(
 					value,
 					{ path: `${i}`, editable: matchingChild.editable },
-					{ __base_context: this.contextBase ?? {} },
+					{ __base_context },
 				);
 			}
 		});
@@ -315,6 +398,12 @@ export default class EditableArray extends Editable {
 				child.remove();
 			}
 		});
+
+		if (dataKeys.length === 0 && this.addButton) {
+			this.element.appendChild(this.addButton);
+		} else {
+			this.addButton?.remove();
+		}
 	}
 
 	calculateArrayDirection(): ArrayDirection {
@@ -335,5 +424,21 @@ export default class EditableArray extends Editable {
 
 	mount(): void {
 		this.arrayDirection = this.calculateArrayDirection();
+
+		this.addButton = document.createElement("editable-region-button");
+		this.addButton.setAttribute("icon", "add");
+		this.addButton.setAttribute("text", "Add Item");
+		this.addButton.addEventListener("button-click", () => {
+			this.element.dispatchEvent(
+				new CustomEvent("cloudcannon-api", {
+					bubbles: true,
+					detail: {
+						source: this.element.dataset.prop,
+						action: "add-array-item",
+						newIndex: 0,
+					},
+				}),
+			);
+		});
 	}
 }

package/nodes/editable-component.ts

@@ -42,7 +42,7 @@ export default class EditableComponent extends Editable {
 			error.setAttribute("heading", "Failed to render component");
 			error.setAttribute(
 				"message",
-				"Component key(data-component) not provided",
+				"Component editable regions require a 'data-component' HTML attribute but none was provided. Please check that this element has a valid 'data-component' attribute.",
 			);
 			this.element.replaceChildren(error);
 			return false;

package/nodes/editable-image.ts

@@ -11,11 +11,14 @@ export default class EditableImage extends Editable {
 	configuredAlt = false;
 	configuredTitle = false;
 
-	displayError(heading: string, message: string) {
+	displayError(heading: string, message: string, hint?: string) {
 		this.element.classList.add("errored");
 		const error = document.createElement("editable-region-error-card");
 		error.setAttribute("heading", heading);
 		error.setAttribute("message", message);
+		if (hint) {
+			error.setAttribute("hint", hint);
+		}
 		if (this.imageEl) {
 			this.imageEl?.replaceWith(error);
 		} else {
@@ -32,7 +35,7 @@ export default class EditableImage extends Editable {
 		if (!(child instanceof HTMLImageElement)) {
 			this.displayError(
 				"Failed to render image editable region",
-				"Image editable region requires an image element as its child.",
+				"Image editable regions must contain a child HTML element of type 'img'. Please check that this element has a child 'img' element.",
 			);
 			return false;
 		}
@@ -47,7 +50,7 @@ export default class EditableImage extends Editable {
 		) {
 			this.displayError(
 				"Failed to render image editable region",
-				"Atleast one of data-prop, data-prop-src, data-prop-alt, or data-prop-title is required.",
+				"Image editable regions require atleast one valid 'data-prop-*' HTML attribute. The valid attributes are 'data-prop', 'data-prop-src', 'data-prop-alt', and 'data-prop-title'. Please check that this element has atleast one of these attributes.",
 			);
 			return false;
 		}
@@ -58,7 +61,10 @@ export default class EditableImage extends Editable {
 		if (typeof value !== "object") {
 			this.displayError(
 				"Failed to render image editable region",
-				`Illegal value type: ${typeof value}. Supported types are object.`,
+				`Image editable regions expect to receive a value of type "object" but instead received a value of type '${typeof value}'.`,
+				this.contextBase?.fullPath
+					? `This may mean that the 'data-prop' attribute is incorrectly set for this element, the full 'data-prop' path was '${this.contextBase?.fullPath}'.`
+					: `This may mean that the 'data-prop' attribute is incorrectly set for this element.`,
 			);
 			return;
 		}
@@ -67,32 +73,30 @@ export default class EditableImage extends Editable {
 			return value;
 		}
 
-		if ("src" in value && typeof value.src !== "string" && value.src !== null) {
-			this.displayError(
-				"Failed to render image editable region",
-				`Illegal value type for "src": ${typeof value.src}. Supported types are string.`,
-			);
-			return;
-		}
-
-		if ("alt" in value && typeof value.alt !== "string" && value.alt !== null) {
-			this.displayError(
-				"Failed to render image editable region",
-				`Illegal value type for "alt": ${typeof value.alt}. Supported types are string.`,
-			);
-			return;
-		}
+		for (const key of ["src", "alt", "title"]) {
+			if (
+				key in value &&
+				typeof value[key as keyof typeof value] !== "string" &&
+				value[key as keyof typeof value] !== null
+			) {
+				let hint: string;
+				if (this.contexts[key]?.fullPath) {
+					hint = `This may mean that the 'data-prop-${key}' attribute is incorrectly set for this element, the full 'data-prop-${key}' path was '${this.contexts[key]?.fullPath}'.`;
+				} else if (typeof this.element.dataset[key] === "string") {
+					hint = `This may mean that the 'data-prop-${key}' attribute is incorrectly set for this element.`;
+				} else if (this.contextBase?.fullPath) {
+					hint = `This may mean that the 'data-prop' attribute is incorrectly set for this element, the full 'data-prop' path was '${this.contextBase?.fullPath}'.`;
+				} else {
+					hint = `This may mean that the 'data-prop' attribute is incorrectly set for this element.`;
+				}
 
-		if (
-			"title" in value &&
-			typeof value.title !== "string" &&
-			value.title !== null
-		) {
-			this.displayError(
-				"Failed to render image editable region",
-				`Illegal value type for "title": ${typeof value.title}. Supported types are string.`,
-			);
-			return;
+				this.displayError(
+					"Failed to render image editable region",
+					`Image editable regions expect the "${key}" key to have a value of type "string" but instead it was a value of type '${typeof value[key as keyof typeof value]}'.`,
+					hint,
+				);
+				return;
+			}
 		}
 
 		const unexpectedKey = Object.keys(value).find(
@@ -100,9 +104,21 @@ export default class EditableImage extends Editable {
 		);
 
 		if (unexpectedKey) {
+			let hint: string | undefined;
+			const capitalizedUnexpectedKey =
+				unexpectedKey.charAt(0).toUpperCase() + unexpectedKey.slice(1);
+
+			if (this.element.dataset[`prop${capitalizedUnexpectedKey}`]) {
+				hint = `Try removing the 'data-prop-${unexpectedKey}' HTML attribute from this element.`;
+			} else if (this.contextBase?.fullPath) {
+				hint = `This may mean that the 'data-prop' attribute is incorrectly set for this element, the full 'data-prop' path was '${this.contextBase?.fullPath}'.`;
+			} else {
+				hint = `This may mean that the 'data-prop' attribute is incorrectly set for this element.`;
+			}
 			this.displayError(
 				"Failed to render image editable region",
-				`Unexpected key "${unexpectedKey}" in image editable region. Supported keys are "src", "alt", and "title".`,
+				`Image editable region received an unexpected value key "${unexpectedKey}". The supported values are "src", "alt", and "title". Please check that your data is correctly formatted.`,
+				hint,
 			);
 			return;
 		}
@@ -169,7 +185,9 @@ export default class EditableImage extends Editable {
 			!!this.element.dataset.propTitle || !!this.element.dataset.prop;
 
 		this.loadInputConfig().then(() => {
-			this.imageEl?.addEventListener("click", () => {
+			this.imageEl?.addEventListener("click", (e) => {
+				e.preventDefault();
+
 				if (!this.value) {
 					throw new Error("Value is not defined");
 				}

package/nodes/editable-snippet.ts

@@ -51,6 +51,7 @@ export default class EditableSnippet extends EditableComponent {
 		const { snippets, source } = this.parseSource(options.source);
 
 		if (options.action === "get-input-config") {
+			// TODO: This should actually load the input config, including the snippet in the cascade
 			return false;
 		}
 

package/nodes/editable-source.ts

@@ -5,7 +5,7 @@ import EditableText from "./editable-text.js";
 
 const INDENTATION_REGEX = /^([ \t]+)[^\s]/gm;
 const TAG_REGEX =
-	/<\s*(?<closing>\/?)\s*(?<tagname>[-a-z]+)(\s+[^>]+)*?\s*(?<selfclosing>\/?)\s*>/gi;
+	/<\s*(?<closing>\/?)\s*(?<tagname>[-a-z0-9]+)(\s+[^>]+)*?\s*(?<selfclosing>\/?)\s*>/gi;
 
 const HTML_VOID_ELEMENT: Record<string, boolean> = {
 	area: true,
@@ -38,6 +38,11 @@ export default class EditableSource extends EditableText {
 		if (!this.element.dataset.path) {
 			return;
 		}
+
+		if (!this.element.dataset.path.startsWith("/")) {
+			this.element.dataset.path = `/${this.element.dataset.path}`;
+		}
+
 		this.file = CloudCannon.file(this.element.dataset.path);
 		this.file.addEventListener("change", () => {
 			this.file?.get().then(this.pushValue.bind(this));
@@ -51,7 +56,10 @@ export default class EditableSource extends EditableText {
 			this.element.classList.add("errored");
 			const error = document.createElement("editable-region-error-card");
 			error.setAttribute("heading", "Failed to render source editable region");
-			error.setAttribute("message", "Missing required attribute data-path");
+			error.setAttribute(
+				"message",
+				"Source editable regions require a 'data-path' HTML attribute but none was provided. Please check that this element has a valid 'data-path' attribute.",
+			);
 			this.element.replaceChildren(error);
 			return false;
 		}
@@ -61,7 +69,10 @@ export default class EditableSource extends EditableText {
 			this.element.classList.add("errored");
 			const error = document.createElement("editable-region-error-card");
 			error.setAttribute("heading", "Failed to render source editable region");
-			error.setAttribute("message", "Missing required attribute data-key");
+			error.setAttribute(
+				"message",
+				"Source editable regions require a 'data-key' HTML attribute but none was provided. Please check that this element has a valid 'data-key' attribute.",
+			);
 			this.element.replaceChildren(error);
 			return false;
 		}
@@ -75,7 +86,11 @@ export default class EditableSource extends EditableText {
 			error.setAttribute("heading", "Failed to render source editable region");
 			error.setAttribute(
 				"message",
-				`Illegal value type: ${typeof value}. Supported types are string.`,
+				"The provided 'data-path' HTML attribute references a file that does not exist. Please check that the file exists and that the 'data-path' attribute on this element is correct.",
+			);
+			error.setAttribute(
+				"hint",
+				`The current value of the "data-path" attribute is "${this.element.dataset.path}"`,
 			);
 			this.element.replaceChildren(error);
 			return;
@@ -92,7 +107,11 @@ export default class EditableSource extends EditableText {
 				);
 				error.setAttribute(
 					"message",
-					"Failed to find element with matching data-key attribute",
+					"Failed to find an element matching the provided 'data-key' attribute.",
+				);
+				error.setAttribute(
+					"hint",
+					`This might mean that your 'data-path' attribute is incorrect. The current value of the "data-path" attribute is "${this.element.dataset.path}" and the current value of the "data-key" attribute is "${this.element.dataset.key}".`,
 				);
 				this.element.replaceChildren(error);
 				return;
@@ -111,7 +130,11 @@ export default class EditableSource extends EditableText {
 				);
 				error.setAttribute(
 					"message",
-					"Found duplicate data-key attribute. Make sure all source editables have unique data-key attributes",
+					`Source editable regions require that all 'data-key' attributes in the same file have unique values but the current file contains multiple instances of the key '${this.element.dataset.key}'. Please make sure all 'data-key' attributes are unique within the same file.`,
+				);
+				error.setAttribute(
+					"hint",
+					`The current value of the 'data-path' attribute is '${this.element.dataset.path}'"'.`,
 				);
 				this.element.replaceChildren(error);
 				return;

package/nodes/editable-text.ts

@@ -15,7 +15,10 @@ export default class EditableText extends Editable {
 			this.element.classList.add("errored");
 			const error = document.createElement("editable-region-error-card");
 			error.setAttribute("heading", "Failed to render text editable region");
-			error.setAttribute("message", "Missing required attribute data-prop");
+			error.setAttribute(
+				"message",
+				"Text editable regions require a 'data-prop' HTML attribute but none was provided. Please check that this element has a valid 'data-prop' attribute.",
+			);
 			this.element.replaceChildren(error);
 			return false;
 		}
@@ -30,7 +33,7 @@ export default class EditableText extends Editable {
 			error.setAttribute("heading", "Failed to render text editable region");
 			error.setAttribute(
 				"message",
-				`Unsupported element type: "${elementType}". Supported element types are span, text, and block.`,
+				`Text editable region received an invalid type for the 'data-type' HTML attribute. The provided element type was '${elementType}' but the supported element types are 'span', 'text', and 'block'. Please set the 'data-type' attribute to one of the supported types.`,
 			);
 			this.element.replaceChildren(error);
 			return false;
@@ -45,8 +48,19 @@ export default class EditableText extends Editable {
 			error.setAttribute("heading", "Failed to render text editable region");
 			error.setAttribute(
 				"message",
-				`Illegal value type: ${typeof value}. Supported types are string.`,
+				`Text editable regions expect to receive a value of type "string" but instead received a value of type '${typeof value}'.`,
 			);
+			if (this.contextBase?.fullPath) {
+				error.setAttribute(
+					"hint",
+					`This may mean that the 'data-prop' attribute is incorrectly set for this element, the full 'data-prop' path was '${this.contextBase?.fullPath}'.`,
+				);
+			} else {
+				error.setAttribute(
+					"hint",
+					`This may mean that the 'data-prop' attribute is incorrectly set for this element.`,
+				);
+			}
 			this.element.replaceChildren(error);
 			return;
 		}
@@ -66,6 +80,8 @@ export default class EditableText extends Editable {
 	}
 
 	mount(): void {
+		this.element.addEventListener("click", (e) => e.preventDefault());
+
 		this.element.addEventListener("blur", () => {
 			this.focused = false;
 			this.element.dispatchEvent(

package/nodes/editable.ts

@@ -88,14 +88,16 @@ export default class Editable {
 	}
 
 	async lookupPathAndContext(
-		path: string,
-		obj: unknown,
+		path?: string,
+		obj?: unknown,
 		contexts: { [key: string]: EditableContext } = {},
 	): Promise<{ value: any; context: EditableContext }> {
 		if (!path) {
 			return {
 				value: obj,
-				context: {},
+				context: {
+					...contexts.__base_context,
+				},
 			};
 		}
 
@@ -166,9 +168,9 @@ export default class Editable {
 	): Promise<unknown> {
 		const { key, path } = listener ?? {};
 
-		const { value: resolvedValue, context: newContext } = path
-			? await this.lookupPathAndContext(path, value, contexts)
-			: { value, context: {} };
+		const { value: resolvedValue, context: newContext } =
+			await this.lookupPathAndContext(path, value, contexts);
+
 		if (!key) {
 			this.propsBase = resolvedValue;
 			this.contextBase = newContext;
@@ -286,6 +288,10 @@ export default class Editable {
 	}
 
 	connect(): void {
+		if (!this.validateConfiguration()) {
+			return;
+		}
+
 		if (this.disconnecting) {
 			this.needsReconnect = true;
 			return;
@@ -295,13 +301,11 @@ export default class Editable {
 		}
 		this.connectPromise = loadingPromise.then(() => {
 			this.setupListeners();
-			if (this.validateConfiguration()) {
-				this.connected = true;
-				if (!this.mounted && this.shouldMount()) {
-					this.mounted = true;
-					this.mount();
-					this.update();
-				}
+			this.connected = true;
+			if (!this.mounted && this.shouldMount()) {
+				this.mounted = true;
+				this.mount();
+				this.update();
 			}
 		});
 	}
@@ -315,9 +319,12 @@ export default class Editable {
 		let parentEditable: Editable | undefined;
 		let parent = this.element.parentElement;
 		while (parent) {
-			if (hasEditable(parent)) {
+			if (hasEditable(parent) && !parentEditable) {
 				parentEditable = parent.editable;
-				break;
+			}
+
+			if (parent.tagName === "A") {
+				parent.draggable = false;
 			}
 			parent = parent.parentElement;
 		}
@@ -329,7 +336,7 @@ export default class Editable {
 				return;
 			}
 
-			const { collection, file, dataset, source, absolute } =
+			const { collection, file, dataset, source, absolute, currentFile } =
 				this.parseSource(propPath);
 
 			const listener = {
@@ -347,8 +354,15 @@ export default class Editable {
 			// Any single data path should only be able to refer to a single absolute API object
 			const obj = collection || dataset || file;
 			if (obj) {
+				const fullPath = collection
+					? `@collections[${collection.collectionKey}]`
+					: dataset
+						? `@data[${dataset.datasetKey}]`
+						: currentFile
+							? undefined
+							: `@file[${file?.path}]`;
 				const handleAPIChange = () => {
-					this.pushValue(obj, listener);
+					this.pushValue(obj, listener, { __base_context: { fullPath } });
 				};
 				this.APIListeners.push({
 					obj,
@@ -423,22 +437,6 @@ export default class Editable {
 		}
 
 		filePromise.then((file) => {
-			if (typeof source !== "string") {
-				if (options.action === "get-input-config") {
-					options.callback({
-						options: {
-							disable_reorder: true,
-							disable_remove: true,
-							disable_add: true,
-						},
-					});
-					return true;
-				}
-				throw new Error(
-					`Failed to resolve source for API call: ${options.source}`,
-				);
-			}
-
 			switch (options.action) {
 				case "edit":
 					file?.data.edit({ slug: source, position: options.position });
@@ -472,7 +470,17 @@ export default class Editable {
 					});
 					break;
 				case "get-input-config":
-					file?.getInputConfig({ slug: source }).then(options.callback);
+					if (!file) {
+						options.callback({
+							options: {
+								disable_reorder: true,
+								disable_remove: true,
+								disable_add: true,
+							},
+						});
+					} else {
+						file?.getInputConfig({ slug: source }).then(options.callback);
+					}
 					break;
 			}
 		});
@@ -519,6 +527,7 @@ export default class Editable {
 		let file: CloudCannonJavaScriptV1APIFile | undefined;
 		let dataset: CloudCannonJavaScriptV1APIDataset | undefined;
 		let absolute = false;
+		let currentFile = false;
 
 		const collectionMatch = source?.match(
 			/^@collections\[(?<key>[^\]]+)\](\.(?<rest>.+))?$/,
@@ -548,6 +557,7 @@ export default class Editable {
 					absolute = true;
 				} else {
 					file = CloudCannon.currentFile();
+					currentFile = true;
 				}
 			}
 		}
@@ -564,10 +574,11 @@ export default class Editable {
 		return {
 			collection,
 			file,
-			source,
+			source: source ?? "",
 			absolute,
 			snippets,
 			dataset,
+			currentFile,
 		};
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cloudcannon/editable-regions",
-	"version": "0.0.5",
+	"version": "0.0.7",
 	"type": "module",
 	"description": "Visual Editing for the CloudCannon CMS.",
 	"keywords": [

package/styles/editable-text.css

@@ -1,3 +1,8 @@
 editable-text {
 	display: inline-block;
 }
+
+editable-text,
+[data-editable="text"] {
+	min-width: 10px;
+}

package/styles/ui/editable-region-button.css

@@ -0,0 +1,36 @@
+button {
+	all: initial;
+	-webkit-appearance: none;
+	-moz-appearance: none;
+	appearance: none;
+	text-decoration: none;
+	text-align: center;
+	box-sizing: border-box;
+
+	font-size: 16px;
+	font-weight: bold;
+	font-family: var(--ccrt-font-family);
+	line-height: 1.4;
+	color: var(--ccrt-color-cc-blue);
+	--cc-icon-fill: var(--ccrt-color-cc-blue);
+
+	display: inline-flex;
+	align-items: center;
+	justify-content: center;
+
+	border: var(--ccrt-border-width) solid var(--ccrt-color-alto);
+	border-radius: var(--ccrt-border-radius);
+
+	padding: 0 var(--ccrt-gap);
+	height: 48px;
+}
+
+button:hover {
+	background-color: rgba(226, 234, 250);
+	border-color: color-mix(
+		in srgb,
+		var(--ccrt-color-cc-blue) 80%,
+		var(--ccrt-color-carbon)
+	);
+	cursor: pointer;
+}