@narrative.io/jsonforms-provider-protocols 3.0.0-beta.1 → 3.0.0-beta.3

package/src/vue/primevue/JfEnum.vue

@@ -42,10 +42,11 @@ export default {
 import type { JsonSchema } from "@jsonforms/core";
 import type { ControlProps } from "@jsonforms/vue";
 import { useJsonFormsControl } from "@jsonforms/vue";
-import { computed, ref, inject, getCurrentInstance, watch } from "vue";
+import { computed, inject, getCurrentInstance, watch } from "vue";
 import { useProvider } from "../composables/useProvider";
 import { useDerive } from "../composables/useDerive";
 import { useProjection } from "../composables/useProjection";
+import { useDirtyValidation } from "../composables/useDirtyValidation";
 import { shouldAutoSelect } from "../utils/autoSelect";
 import Dropdown from "primevue/dropdown";
 
@@ -53,7 +54,7 @@ import Dropdown from "primevue/dropdown";
 const instance = getCurrentInstance()!;
 const props = instance.props as unknown as ControlProps;
 const { control, handleChange: rawHandleChange } = useJsonFormsControl(props);
-const { projectedData, handleProjectedChange: handleChange } = useProjection(control, rawHandleChange);
+const { projectedData, handleProjectedChange: handleChange, projectedErrors, projectedLabel } = useProjection(control, rawHandleChange);
 
 type Opt = { label: string; value: unknown };
 const toOptions = (schema?: JsonSchema): Opt[] => {
@@ -160,44 +161,38 @@ watch(
   { immediate: true }
 );
 
-// Track user interaction
-const hasInteracted = ref(false);
-
-const showErrors = computed(() => hasInteracted.value && control.value.errors);
+// Track user interaction — errors only show after blur
+const { showErrors, markDirty } = useDirtyValidation(control, projectedErrors);
 
 const onSelect = (val: unknown) => {
   handleChange(control.value.path, val);
 };
-
-const onBlur = () => {
-  hasInteracted.value = true;
-};
 </script>
 
 <template>
   <div class="flex flex-column gap-2">
-    <label v-if="control.label" class="text-color text-left">{{
-      control.label
+    <label v-if="projectedLabel" class="text-color text-left">{{
+      projectedLabel
     }}</label>
     <div v-if="control.description" class="text-color-secondary text-left">
       {{ control.description }}
     </div>
     <Dropdown
-      class="w-full"
+      :class="['w-full', { 'p-invalid': showErrors }]"
       :options="options"
       option-label="label"
       option-value="value"
       :model-value="projectedData ?? null"
       :placeholder="placeholder"
       :disabled="!control.enabled || loading"
-      :aria-invalid="!!showErrors || undefined"
+      :aria-invalid="showErrors || undefined"
       :show-clear="true"
       @update:model-value="onSelect"
-      @blur="onBlur"
+      @blur="markDirty"
     />
     <small v-if="error" class="p-error" role="alert"
       >Failed to load: {{ error }}</small
     >
-    <small v-else-if="showErrors" class="p-error">{{ control.errors }}</small>
+    <small v-else-if="showErrors" class="p-error">{{ projectedErrors }}</small>
   </div>
 </template>

package/src/vue/primevue/JfEnumArray.vue

@@ -45,6 +45,7 @@ import { computed, inject, getCurrentInstance, watch } from "vue";
 import { useProvider } from "../composables/useProvider";
 import { useDerive } from "../composables/useDerive";
 import { useProjection } from "../composables/useProjection";
+import { useDirtyValidation } from "../composables/useDirtyValidation";
 import { shouldAutoSelectMulti } from "../utils/autoSelect";
 import MultiSelect from "primevue/multiselect";
 
@@ -52,7 +53,7 @@ import MultiSelect from "primevue/multiselect";
 const instance = getCurrentInstance()!;
 const props = instance.props as unknown as ControlProps;
 const { control, handleChange: rawHandleChange } = useJsonFormsControl(props);
-const { projectedData, handleProjectedChange: handleChange } = useProjection(control, rawHandleChange);
+const { projectedData, handleProjectedChange: handleChange, projectedErrors, projectedLabel } = useProjection(control, rawHandleChange);
 
 type Opt = { label: string; value: unknown };
 const toOptions = (schema?: JsonSchema): Opt[] => {
@@ -132,6 +133,9 @@ const options = computed(() => {
 // Add derive functionality
 useDerive({ control, handleChange, data: projectedData });
 
+// Track user interaction — errors only show after first change
+const { showErrors, markDirty } = useDirtyValidation(control, projectedErrors);
+
 // Auto-select when provider returns only one item (opt-in for multiselect)
 watch(
   [providerItems, loading],
@@ -177,15 +181,18 @@ const model = computed<unknown[]>({
   set(val) {
     const next = Array.isArray(val) ? [...val] : [];
     const curr = Array.isArray(projectedData.value) ? projectedData.value : [];
-    if (!sameSet(curr, next)) handleChange(control.value.path, next);
+    if (!sameSet(curr, next)) {
+      markDirty();
+      handleChange(control.value.path, next);
+    }
   },
 });
 </script>
 
 <template>
   <div class="flex flex-column gap-2">
-    <label v-if="control.label" class="text-color text-left">{{
-      control.label
+    <label v-if="projectedLabel" class="text-color text-left">{{
+      projectedLabel
     }}</label>
     <div v-if="control.description" class="text-color-secondary text-left">
       {{ control.description }}
@@ -193,22 +200,22 @@ const model = computed<unknown[]>({
 
     <MultiSelect
       v-model="model"
-      class="w-full"
+      :class="['w-full', { 'p-invalid': showErrors }]"
       :options="options"
       option-label="label"
       option-value="value"
       data-key="value"
       display="chip"
       :disabled="!control.enabled || loading"
-      :aria-invalid="!!control.errors || undefined"
+      :aria-invalid="showErrors || undefined"
       :placeholder="placeholder"
     />
 
     <small v-if="error" class="p-error" role="alert"
       >Failed to load: {{ error }}</small
     >
-    <small v-else-if="control.errors" class="p-error">{{
-      control.errors
+    <small v-else-if="showErrors" class="p-error">{{
+      projectedErrors
     }}</small>
   </div>
 </template>

package/src/vue/primevue/JfNumber.vue

@@ -40,16 +40,17 @@ export default {
 <script setup lang="ts">
 import type { ControlProps } from "@jsonforms/vue";
 import { useJsonFormsControl } from "@jsonforms/vue";
-import { computed, ref, getCurrentInstance } from "vue";
+import { computed, getCurrentInstance } from "vue";
 import { useDerive } from "../composables/useDerive";
 import { useProjection } from "../composables/useProjection";
+import { useDirtyValidation } from "../composables/useDirtyValidation";
 import InputNumber from "primevue/inputnumber";
 
 // Access props from the component instance
 const instance = getCurrentInstance()!;
 const props = instance.props as unknown as ControlProps;
 const { control, handleChange: rawHandleChange } = useJsonFormsControl(props);
-const { projectedData, handleProjectedChange: handleChange } = useProjection(control, rawHandleChange);
+const { projectedData, handleProjectedChange: handleChange, projectedErrors, projectedLabel } = useProjection(control, rawHandleChange);
 
 const options = computed(
   () =>
@@ -100,31 +101,25 @@ const useGrouping = computed(() => {
   return options.value.useGrouping === true;
 });
 
-// Track user interaction
-const hasInteracted = ref(false);
-
-const showErrors = computed(() => hasInteracted.value && control.value.errors);
+// Track user interaction — errors only show after blur
+const { showErrors, markDirty } = useDirtyValidation(control, projectedErrors);
 
 const onNumber = (val: number | null) => {
   handleChange(control.value.path, val ?? undefined);
 };
-
-const onBlur = () => {
-  hasInteracted.value = true;
-};
 </script>
 
 <template>
   <div class="flex flex-column gap-2">
-    <label v-if="control.label" class="text-color text-left">{{
-      control.label
+    <label v-if="projectedLabel" class="text-color text-left">{{
+      projectedLabel
     }}</label>
     <div v-if="control.description" class="text-color-secondary text-left">
       {{ control.description }}
     </div>
     <InputNumber
-      class="w-full"
-      input-class="w-full"
+      :class="['w-full', { 'p-invalid': showErrors }]"
+      :input-class="['w-full', { 'p-invalid': showErrors }]"
       :use-grouping="useGrouping"
       :mode="mode"
       :currency="currency"
@@ -133,10 +128,10 @@ const onBlur = () => {
       :model-value="typeof projectedData === 'number' ? projectedData : null"
       :placeholder="placeholder"
       :disabled="!control.enabled"
-      :aria-invalid="!!showErrors || undefined"
+      :aria-invalid="showErrors || undefined"
       @update:model-value="onNumber"
-      @blur="onBlur"
+      @blur="markDirty"
     />
-    <small v-if="showErrors" class="p-error">{{ control.errors }}</small>
+    <small v-if="showErrors" class="p-error">{{ projectedErrors }}</small>
   </div>
 </template>

package/src/vue/primevue/JfText.vue

@@ -44,6 +44,7 @@ import { computed, ref, inject, watch, getCurrentInstance } from "vue";
 import { useProvider } from "../composables/useProvider";
 import { useDerive } from "../composables/useDerive";
 import { useProjection } from "../composables/useProjection";
+import { useDirtyValidation } from "../composables/useDirtyValidation";
 import InputText from "primevue/inputtext";
 import AutoComplete from "primevue/autocomplete";
 
@@ -51,7 +52,7 @@ import AutoComplete from "primevue/autocomplete";
 const instance = getCurrentInstance()!;
 const props = instance.props as unknown as ControlProps;
 const { control, handleChange: rawHandleChange } = useJsonFormsControl(props);
-const { projectedData, handleProjectedChange: handleChange } = useProjection(control, rawHandleChange);
+const { projectedData, handleProjectedChange: handleChange, projectedErrors, projectedLabel } = useProjection(control, rawHandleChange);
 
 // Provider support for autocomplete functionality
 const binding = computed(() => {
@@ -117,11 +118,8 @@ const isAutocomplete = computed(() => !!binding.value);
 // Add derive functionality
 useDerive({ control, handleChange, data: projectedData });
 
-// Track user interaction
-const hasInteracted = ref(false);
-const hasFocused = ref(false);
-
-const showErrors = computed(() => hasInteracted.value && control.value.errors);
+// Track user interaction — errors only show after blur
+const { showErrors, markDirty } = useDirtyValidation(control, projectedErrors);
 
 function onInput(val: string | undefined) {
   // Convert empty strings to undefined for proper required field validation
@@ -132,15 +130,14 @@ function onInput(val: string | undefined) {
 }
 
 function onBlur() {
-  if (hasFocused.value) {
-    hasInteracted.value = true;
+  markDirty();
+  // Normalize empty strings to undefined so required validation fires
+  const val = projectedData.value;
+  if (typeof val === "string" && val.trim() === "") {
+    handleChange(control.value.path, undefined);
   }
 }
 
-function onFocus() {
-  hasFocused.value = true;
-}
-
 // Autocomplete specific handlers
 const onComplete = (event: { query: string }) => {
   query.value = event.query;
@@ -154,42 +151,40 @@ const onSelect = (event: { value?: { value?: unknown } | unknown }) => {
 
 <template>
   <div class="flex flex-column gap-2">
-    <label v-if="control.label" class="text-color text-left">{{
-      control.label
+    <label v-if="projectedLabel" class="text-color text-left">{{
+      projectedLabel
     }}</label>
     <div v-if="control.description" class="text-color-secondary text-left">
       {{ control.description }}
     </div>
     <AutoComplete
       v-if="isAutocomplete"
-      class="w-full"
+      :class="['w-full', { 'p-invalid': showErrors }]"
       :model-value="projectedData ?? ''"
       :suggestions="items"
       option-label="label"
       :placeholder="placeholder"
       :disabled="!control.enabled"
-      :aria-invalid="!!showErrors || undefined"
+      :aria-invalid="showErrors || undefined"
       @complete="onComplete"
       @item-select="onSelect"
       @update:model-value="onInput"
       @blur="onBlur"
-      @focus="onFocus"
     />
     <InputText
       v-else
-      class="w-full"
+      :class="['w-full', { 'p-invalid': showErrors }]"
       :model-value="(projectedData as string) ?? ''"
       :disabled="!control.enabled"
-      :aria-invalid="!!showErrors || undefined"
+      :aria-invalid="showErrors || undefined"
       :placeholder="placeholder"
       autocapitalize="off"
       autocomplete="off"
       spellcheck="false"
       @update:model-value="onInput"
       @blur="onBlur"
-      @focus="onFocus"
     />
     <small v-if="error" class="p-error" role="alert">Failed: {{ error }}</small>
-    <small v-else-if="showErrors" class="p-error">{{ control.errors }}</small>
+    <small v-else-if="showErrors" class="p-error">{{ projectedErrors }}</small>
   </div>
 </template>

package/src/vue/primevue/JfTextArea.vue

@@ -40,15 +40,16 @@ export default {
 <script setup lang="ts">
 import type { ControlProps } from "@jsonforms/vue";
 import { useJsonFormsControl } from "@jsonforms/vue";
-import { computed, ref, getCurrentInstance } from "vue";
+import { computed, getCurrentInstance } from "vue";
 import { useProjection } from "../composables/useProjection";
+import { useDirtyValidation } from "../composables/useDirtyValidation";
 import Textarea from "primevue/textarea";
 
 // Access props from the component instance
 const instance = getCurrentInstance()!;
 const props = instance.props as unknown as ControlProps;
 const { control, handleChange: rawHandleChange } = useJsonFormsControl(props);
-const { projectedData, handleProjectedChange: handleChange } = useProjection(control, rawHandleChange);
+const { projectedData, handleProjectedChange: handleChange, projectedErrors, projectedLabel } = useProjection(control, rawHandleChange);
 
 const placeholder = computed<string | undefined>(
   () =>
@@ -56,10 +57,8 @@ const placeholder = computed<string | undefined>(
       ?.placeholder ?? control.value.description,
 );
 
-// Track user interaction
-const hasInteracted = ref(false);
-
-const showErrors = computed(() => hasInteracted.value && control.value.errors);
+// Track user interaction — errors only show after blur
+const { showErrors, markDirty } = useDirtyValidation(control, projectedErrors);
 
 function onInput(val: string | undefined) {
   // Convert empty strings to undefined for proper required field validation
@@ -70,29 +69,34 @@ function onInput(val: string | undefined) {
 }
 
 function onBlur() {
-  hasInteracted.value = true;
+  markDirty();
+  // Normalize empty strings to undefined so required validation fires
+  const val = projectedData.value;
+  if (typeof val === "string" && val.trim() === "") {
+    handleChange(control.value.path, undefined);
+  }
 }
 </script>
 
 <template>
   <div class="flex flex-column gap-2">
-    <label v-if="control.label" class="text-color text-left">{{
-      control.label
+    <label v-if="projectedLabel" class="text-color text-left">{{
+      projectedLabel
     }}</label>
     <div v-if="control.description" class="text-color-secondary text-left">
       {{ control.description }}
     </div>
     <Textarea
-      class="w-full"
+      :class="['w-full', { 'p-invalid': showErrors }]"
       :model-value="(projectedData as string) ?? ''"
       :disabled="!control.enabled"
-      :aria-invalid="!!showErrors || undefined"
+      :aria-invalid="showErrors || undefined"
       :placeholder="placeholder"
       :rows="4"
       :auto-resize="true"
       @update:model-value="onInput"
       @blur="onBlur"
     />
-    <small v-if="showErrors" class="p-error">{{ control.errors }}</small>
+    <small v-if="showErrors" class="p-error">{{ projectedErrors }}</small>
   </div>
 </template>