From 80b203ce7beb21c59f7c76456fd3b2a5834eb43b Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Sat, 2 Oct 2021 23:47:33 +1000
Subject: [PATCH] Reimplement instance data

---
 lib/api_form.dart | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/api_form.dart b/lib/api_form.dart
index bb3b147a..f6e7fcf0 100644
--- a/lib/api_form.dart
+++ b/lib/api_form.dart
@@ -71,10 +71,10 @@ class APIFormField {
    *
    * - First the user-provided data is checked
    * - Second, the server-provided definition is checked
-   * - Third, return null
+   *
+   * - Finally, return null
    */
   dynamic getParameter(String key) {
-
     if (data.containsKey(key)) {
       return data[key];
     } else if (definition.containsKey(key)) {
@@ -107,7 +107,7 @@ class APIFormField {
   bool get multiline => (getParameter("multiline") ?? false) as bool;
 
   // Get the "value" as a string (look for "default" if not available)
-  dynamic get value => getParameter("value") ?? data["default"];
+  dynamic get value => data["value"] ?? data["instance_value"] ?? data["default"];
 
   // Get the "default" as a string
   dynamic get defaultValue => getParameter("default");
@@ -756,6 +756,9 @@ Future<void> launchApiForm(
       continue;
     }
 
+    // Add instance value to the field
+    field.data["instance_value"] = modelData[fieldName];
+
     formFields.add(field);
   }