Merge branch 'v5/develop' into v6/develop

config/areas/languages/views.php

@@ -75,9 +75,8 @@
 				],
 				'props'      => [
 					'buttons' => fn () =>
-						ViewButtons::view('language')
+						ViewButtons::view('language', model: $language)
 							->defaults('preview', 'settings', 'delete')
-							->bind(['language' => $language])
 							->render(),
 					'deletable'    => $language->isDeletable(),
 					'code'         => Escape::html($language->code()),

config/fields/number.php

@@ -34,7 +34,7 @@
 	],
 	'methods' => [
 		'toNumber' => function ($value) {
-			if ($this->isEmpty($value) === true) {
+			if ($this->isEmptyValue($value) === true) {
 				return null;
 			}
 

config/fields/toggle.php

@@ -67,7 +67,7 @@
 		'required' => function ($value) {
 			if (
 				$this->isRequired() &&
-				($value === false || $this->isEmpty($value))
+				($value === false || $this->isEmptyValue($value))
 			) {
 				throw new InvalidArgumentException(
 					message: I18n::translate('field.required')

panel/src/components/Forms/Blocks/BlockOptions.vue

@@ -181,13 +181,13 @@ export default {
 			this.$refs.options.open();
 		},
 		sort(event) {
-			event.preventDefault();
-
 			switch (event.key) {
 				case "ArrowUp":
+					event.preventDefault();
 					this.$emit("sortUp");
 					break;
 				case "ArrowDown":
+					event.preventDefault();
 					this.$emit("sortDown");
 					break;
 			}

panel/src/components/Forms/Field/StructureField.vue

@@ -67,7 +67,7 @@
 						:rows="paginatedItems"
 						:sortable="isSortable"
 						@cell="open($event.row, $event.columnIndex)"
-						@input="save"
+						@input="onTableInput"
 						@option="option"
 						@paginate="paginate"
 					/>
@@ -171,21 +171,6 @@ export default {
 
 			return (this.page - 1) * this.limit + 1;
 		},
-		/**
-		 * Returns if new entries can be added
-		 * @returns {bool}
-		 */
-		more() {
-			if (this.disabled === true) {
-				return false;
-			}
-
-			if (this.max && this.items.length >= this.max) {
-				return false;
-			}
-
-			return true;
-		},
 		hasFields() {
 			return this.$helper.object.length(this.fields) > 0;
 		},
@@ -216,6 +201,21 @@ export default {
 
 			return true;
 		},
+		/**
+		 * Returns if new entries can be added
+		 * @returns {bool}
+		 */
+		more() {
+			if (this.disabled === true) {
+				return false;
+			}
+
+			if (this.max && this.items.length >= this.max) {
+				return false;
+			}
+
+			return true;
+		},
 		/**
 		 * Returns config for `k-pagination`
 		 * @returns {Obect}
@@ -245,31 +245,25 @@ export default {
 				return [];
 			}
 
-			let options = [];
-			let more = this.duplicate && this.more;
-
-			options.push({
-				icon: "edit",
-				text: this.$t("edit"),
-				click: "edit"
-			});
-
-			options.push({
-				disabled: !more,
-				icon: "copy",
-				text: this.$t("duplicate"),
-				click: "duplicate"
-			});
-
-			options.push("-");
-
-			options.push({
-				icon: "trash",
-				text: more ? this.$t("delete") : null,
-				click: "remove"
-			});
-
-			return options;
+			return [
+				{
+					icon: "edit",
+					text: this.$t("edit"),
+					click: "edit"
+				},
+				{
+					disabled: !this.duplicate || !this.more,
+					icon: "copy",
+					text: this.$t("duplicate"),
+					click: "duplicate"
+				},
+				"-",
+				{
+					icon: "trash",
+					text: this.$t("delete"),
+					click: "remove"
+				}
+			];
 		},
 		/**
 		 * Returns paginated slice of items/rows
@@ -443,6 +437,23 @@ export default {
 			}
 		},
 
+		/**
+		 * Merges the updated values from the paginated table
+		 * into the original items array and saves them
+		 * @param {Array} values
+		 */
+		onTableInput(values) {
+			if (this.limit) {
+				values = this.items.toSpliced(
+					this.pagination.offset,
+					this.limit,
+					...values
+				);
+			}
+
+			this.save(values);
+		},
+
 		/**
 		 * Update pagination state
 		 * @param {Object} pagination

panel/src/components/Forms/Writer/Editor.js

@@ -413,16 +413,6 @@ export default class Editor extends Emitter {
 		}
 	}
 
-	isEditable() {
-		return this.options.editable;
-	}
-
-	isEmpty() {
-		if (this.state) {
-			return this.state.doc.textContent.length === 0;
-		}
-	}
-
 	get isActive() {
 		return Object.entries({
 			...this.activeMarks,
@@ -436,6 +426,16 @@ export default class Editor extends Emitter {
 		);
 	}
 
+	isEditable() {
+		return this.options.editable;
+	}
+
+	isEmpty() {
+		if (this.state) {
+			return this.state.doc.textContent.length === 0;
+		}
+	}
+
 	removeMark(mark) {
 		if (this.schema.marks[mark]) {
 			return utils.removeMark(this.schema.marks[mark])(

panel/src/components/Forms/Writer/Extensions.js

@@ -92,7 +92,7 @@ export default class Extensions {
 					buttons[button.id ?? button.name] = button;
 				}
 			} else {
-				buttons[extension.name] = extension.button;
+				buttons[extension.name] = { name: extension.name, ...extension.button };
 			}
 		}