Upgrade to 3.2.0

kirby/config/fields/textarea.php

@@ -1,6 +1,7 @@
 <?php
 
 return [
+    'mixins' => ['filepicker', 'upload'],
     'props' => [
         /**
          * Unset inherited props
@@ -44,6 +45,13 @@ return [
             return $files;
         },
 
+        /**
+         * Sets the font family (sans or monospace)
+         */
+        'font' => function (string $font = null) {
+            return $font === 'monospace' ? 'monospace' : 'sans-serif';
+        },
+
         /**
          * Maximum number of allowed characters
          */
@@ -65,24 +73,6 @@ return [
             return $size;
         },
 
-        /**
-         * Sets the upload options for linked files
-         */
-        'uploads' => function ($uploads = []) {
-            if ($uploads === false) {
-                return false;
-            }
-
-            if (is_string($uploads) === true) {
-                return ['template' => $uploads];
-            }
-
-            if (is_array($uploads) === false) {
-                $uploads = [];
-            }
-
-            return $uploads;
-        },
 
         'value' => function (string $value = null) {
             return trim($value);
@@ -93,66 +83,13 @@ return [
             [
                 'pattern' => 'files',
                 'action' => function () {
-                    $field = $this->field();
-                    $model = $field->model();
-
-                    if (empty($filed->files['query']) === false) {
-                        $query = $filed->files['query'];
-                    } elseif (is_a($model, 'Kirby\Cms\File') === true) {
-                        $query = 'file.siblings';
-                    } else {
-                        $query = $model::CLASS_ALIAS . '.files';
-                    }
-
-                    $files = $model->query($query, 'Kirby\Cms\Files');
-                    $data  = [];
-
-                    foreach ($files as $index => $file) {
-                        $image = $file->panelImage($field->files['image'] ?? []);
-                        $model = $field->model();
-
-                        $data[] = [
-                            'filename' => $file->filename(),
-                            'dragText' => $file->dragText(),
-                            'image'    => $image,
-                            'icon'     => $file->panelIcon($image)
-                        ];
-                    }
-
-                    return $data;
+                    return $this->field()->filepicker($this->field()->files());
                 }
             ],
             [
                 'pattern' => 'upload',
                 'action' => function () {
-                    $field   = $this->field();
-                    $uploads = $field->uploads();
-
-                    if ($uploads === false) {
-                        throw new Exception('Uploads are disabled for this field');
-                    }
-
-                    if ($parentQuery = ($uploads['parent'] ?? null)) {
-                        $parent = $field->model()->query($parentQuery);
-                    } else {
-                        $parent = $field->model();
-                    }
-
-                    if (is_a($parent, 'Kirby\Cms\File') === true) {
-                        $parent = $parent->parent();
-                    }
-
-                    return $this->upload(function ($source, $filename) use ($field, $parent, $uploads) {
-                        $file = $parent->createFile([
-                            'source'   => $source,
-                            'template' => $uploads['template'] ?? null,
-                            'filename' => $filename,
-                        ]);
-
-                        if (is_a($file, 'Kirby\Cms\File') === false) {
-                            throw new Exception('The file could not be uploaded');
-                        }
-
+                    return $this->field()->upload($this, $this->field()->uploads(), function ($file) {
                         return [
                             'filename' => $file->filename(),
                             'dragText' => $file->dragText(),