Merge pull request #7664 from getkirby/forms/cache-field-options

refact: Cache field options

Author: bastianallgeier

config/fields/color.php

@@ -51,6 +51,9 @@
 		 * to directly select them
 		 */
 		'options' => function (array $options = []): array {
+			// make sure to flush the options cache when
+			// new options are being passed
+			$this->optionsCache = null;
 			return $options;
 		}
 	],
@@ -59,6 +62,14 @@
 			return Str::lower($this->default);
 		},
 		'options' => function (): array {
+			return $this->optionsCache ??= $this->getOptions();
+		}
+	],
+	'methods' => [
+		'emptyValue' => function () {
+			return '';
+		},
+		'getOptions' => function () {
 			// resolve options to support manual arrays
 			// alongside api and query options
 			$props   = FieldOptions::polyfill($this->props);
@@ -103,11 +114,6 @@
 			}
 
 			return $options;
-		}
-	],
-	'methods' => [
-		'emptyValue' => function () {
-			return '';
 		},
 		'isColor' => function (string $value): bool {
 			return

config/fields/mixins/options.php

@@ -14,6 +14,9 @@
 		 * An array with options
 		 */
 		'options' => function ($options = []) {
+			// make sure to flush the options cache when
+			// new options are being passed
+			$this->optionsCache = null;
 			return $options;
 		},
 		/**
@@ -25,7 +28,7 @@
 	],
 	'computed' => [
 		'options' => function (): array {
-			return $this->getOptions();
+			return $this->optionsCache ??= $this->getOptions();
 		}
 	],
 	'methods' => [