@narrative.io/jsonforms-provider-protocols 1.1.0-beta.2 → 1.1.0-beta.4

package/src/vue/primevue/JfText.vue

@@ -1,26 +1,114 @@
 <script setup lang="ts">
 import type { ControlElement } from "@jsonforms/core";
 import { rendererProps, useJsonFormsControl } from "@jsonforms/vue";
-import { computed } from "vue";
+import { computed, ref, inject, watch } from "vue";
+import { useProvider } from "../composables/useProvider";
+import { useDerive } from "../composables/useDerive";
 import InputText from "primevue/inputtext";
+import AutoComplete from "primevue/autocomplete";
 
 defineOptions({ name: "JfText" });
 
 const props = defineProps(rendererProps<ControlElement>());
 const { control, handleChange } = useJsonFormsControl(props);
 
-const placeholder = computed<string | undefined>(
+// Provider support for autocomplete functionality
+const binding = computed(() => {
+  const provider = control.value.uischema?.options?.provider;
+  // Ensure load property is set to 'query' by default for autocomplete
+  if (provider && typeof provider === "object" && !provider.load) {
+    return { ...provider, load: "query" };
+  }
+  return provider;
+});
+
+const deps = computed(
   () =>
-    (control.value.uischema as { options?: { placeholder?: string } })?.options
-      ?.placeholder ?? control.value.description,
+    ((
+      (control.value.schema as Record<string, unknown>)?.[
+        "x-provider"
+      ] as Record<string, unknown>
+    )?.dependsOn as string[]) ?? [],
 );
+const depValues = computed(() => {
+  return deps.value.map((dep) => {
+    // Resolve dependency value from form data using JSON pointer-like path
+    const path = dep.startsWith("#/") ? dep.slice(2) : dep;
+    const keys = path.replace(/\//g, ".").split(".");
+    let value: unknown = rootData.value;
+    for (const key of keys) {
+      if (value && typeof value === "object" && key in value) {
+        value = (value as Record<string, unknown>)[key];
+      } else {
+        return null;
+      }
+    }
+    return value;
+  });
+});
+
+// Get the root form data from JSONForms context for template URL resolution
+const injectedFormData = inject<{ value: unknown }>("formData", { value: {} });
+const rootData = computed(() => injectedFormData.value || {});
+
+const query = ref("");
+const { items, loading, error, reload } = useProvider(binding, {
+  data: rootData,
+  path: control.value.path,
+  uiQuery: query.value,
+  dependsOnValues: depValues.value,
+});
+
+watch(query, () => {
+  if (binding.value?.load === "query") reload();
+});
+
+const placeholder = computed<string | undefined>(() => {
+  if (loading.value) return "Loading…";
+  return (
+    (control.value.uischema as { options?: { placeholder?: string } })?.options
+      ?.placeholder ?? control.value.description
+  );
+});
+
+const isAutocomplete = computed(() => !!binding.value);
+
+// Add derive functionality
+useDerive({ control, handleChange });
+
+// Track user interaction
+const hasInteracted = ref(false);
+const hasFocused = ref(false);
+
+const showErrors = computed(() => hasInteracted.value && control.value.errors);
 
 function onInput(val: string | undefined) {
-  const newValue = val ?? "";
-  if ((control.value.data ?? "") !== newValue) {
+  // Convert empty strings to undefined for proper required field validation
+  const newValue = val && val.trim() !== "" ? val : undefined;
+  if (control.value.data !== newValue) {
     handleChange(control.value.path, newValue);
   }
 }
+
+function onBlur() {
+  if (hasFocused.value) {
+    hasInteracted.value = true;
+  }
+}
+
+function onFocus() {
+  hasFocused.value = true;
+}
+
+// Autocomplete specific handlers
+const onComplete = (event: { query: string }) => {
+  query.value = event.query;
+};
+
+const onSelect = (event: { value?: { value?: unknown } | unknown }) => {
+  const newValue = (event.value as { value?: unknown })?.value ?? event.value;
+  handleChange(control.value.path, newValue);
+};
 </script>
 
 <template>
@@ -31,17 +119,36 @@ function onInput(val: string | undefined) {
     <div v-if="control.description" class="text-color-secondary text-left">
       {{ control.description }}
     </div>
+    <AutoComplete
+      v-if="isAutocomplete"
+      class="w-full"
+      :model-value="control.data ?? ''"
+      :suggestions="items"
+      option-label="label"
+      :placeholder="placeholder"
+      :disabled="!control.enabled"
+      :aria-invalid="!!showErrors || undefined"
+      @complete="onComplete"
+      @item-select="onSelect"
+      @update:model-value="onInput"
+      @blur="onBlur"
+      @focus="onFocus"
+    />
     <InputText
+      v-else
       class="w-full"
       :model-value="control.data ?? ''"
       :disabled="!control.enabled"
-      :aria-invalid="!!control.errors || undefined"
+      :aria-invalid="!!showErrors || undefined"
       :placeholder="placeholder"
       autocapitalize="off"
       autocomplete="off"
       spellcheck="false"
       @update:model-value="onInput"
+      @blur="onBlur"
+      @focus="onFocus"
     />
-    <small v-if="control.errors" class="p-error">{{ control.errors }}</small>
+    <small v-if="error" class="p-error" role="alert">Failed: {{ error }}</small>
+    <small v-else-if="showErrors" class="p-error">{{ control.errors }}</small>
   </div>
 </template>

package/src/vue/primevue/JfTextArea.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { ControlElement } from "@jsonforms/core";
 import { rendererProps, useJsonFormsControl } from "@jsonforms/vue";
-import { computed } from "vue";
+import { computed, ref } from "vue";
 import Textarea from "primevue/textarea";
 
 defineOptions({ name: "JfTextArea" });
@@ -15,12 +15,22 @@ const placeholder = computed<string | undefined>(
       ?.placeholder ?? control.value.description,
 );
 
+// Track user interaction
+const hasInteracted = ref(false);
+
+const showErrors = computed(() => hasInteracted.value && control.value.errors);
+
 function onInput(val: string | undefined) {
-  const newValue = val ?? "";
-  if ((control.value.data ?? "") !== newValue) {
+  // Convert empty strings to undefined for proper required field validation
+  const newValue = val && val.trim() !== "" ? val : undefined;
+  if (control.value.data !== newValue) {
     handleChange(control.value.path, newValue);
   }
 }
+
+function onBlur() {
+  hasInteracted.value = true;
+}
 </script>
 
 <template>
@@ -35,12 +45,13 @@ function onInput(val: string | undefined) {
       class="w-full"
       :model-value="control.data ?? ''"
       :disabled="!control.enabled"
-      :aria-invalid="!!control.errors || undefined"
+      :aria-invalid="!!showErrors || undefined"
       :placeholder="placeholder"
       :rows="4"
       :auto-resize="true"
       @update:model-value="onInput"
+      @blur="onBlur"
     />
-    <small v-if="control.errors" class="p-error">{{ control.errors }}</small>
+    <small v-if="showErrors" class="p-error">{{ control.errors }}</small>
   </div>
 </template>