srcdev-nuxt-forms 0.0.23 → 0.2.0

package/components/forms/input-text/InputTextCore.vue

@@ -1,62 +1,64 @@
 <template>
-  <input
-    :type
-    :placeholder="c12.placeholder"
-    :id
-    :name
-    :pattern="componentValidation.pattern"
-    :maxlength="componentValidation.maxlength"
-    :required
-    :class="[
-      'input-text',
-      'text-normal',
-      styleClassPassthrough,
-      { active: isFocused },
-      { dirty: isDirty },
-      { error: fieldHasError() },
-    ]"
-    v-model="modelValue.data[name]"
-    ref="inputField"
-    @focusin="isFocused = true"
-    @focusout="isFocused = false"
-  />
+  <div class="input-text-wrapper" :class="[{ 'has-left-content': hasLeftContent }, { 'has-right-content': hasRightContent }]">
+    <template v-if="hasLeftContent">
+      <span class="left-content">
+        <slot name="left"></slot>
+      </span>
+    </template>
+
+    <input
+      :type
+      :placeholder="c12.placeholder"
+      :id
+      :name
+      :pattern="componentValidation.pattern"
+      :maxlength="componentValidation.maxlength"
+      :required
+      :class="['input-text-core', 'text-normal', styleClassPassthrough, { active: isFocused }, { dirty: fieldIsDirty }, { error: fieldHasError }]"
+      v-model="modelValue.data[name]"
+      ref="inputField"
+      :aria-invalid="fieldHasError"
+      :aria-describedby="`${id}-error-message`"
+      @focusin="updateFocus(name, true)"
+      @focusout="updateFocus(name, false)"
+    />
+
+    <template v-if="hasRightContent">
+      <span class="right-content">
+        <slot name="right"></slot>
+      </span>
+    </template>
+  </div>
 </template>
 
 <script setup lang="ts">
-import type { InpuTextC12, IFormData } from '@/types/types.forms';
+import type { InpuTextC12, IFormFieldC12, IFormData } from '@/types/types.forms';
 import { validationConfig } from '@/components/forms/c12/validation-patterns';
+import propValidators from '../c12/prop-validators';
 
 const props = defineProps({
   type: {
-    // type: String as PropType<"text" | "password" | "tel" | "number" | "email" | "url">, // This breaks props setup in unit tests
     type: String,
     validator(value: string) {
-      return ['text', 'password', 'tel', 'number', 'email', 'url'].includes(
-        value
-      );
+      return propValidators.inputTypesText.includes(value);
     },
   },
   id: {
-    // type: String as PropType<string>,
     type: String,
     required: true,
   },
   name: {
     type: String,
-    default: null,
+    required: true,
   },
   validation: {
     type: String,
-    default: '',
+    default: null,
   },
   required: {
     type: Boolean,
     value: false,
   },
-  isPending: {
-    type: Boolean,
-    value: false,
-  },
   c12: {
     type: Object as PropType<InpuTextC12>,
     required: true,
@@ -67,9 +69,19 @@ const props = defineProps({
   },
 });
 
+const slots = useSlots();
+const hasLeftContent = computed(() => slots.left !== undefined);
+const hasRightContent = computed(() => slots.right !== undefined);
+
 const modelValue = defineModel() as Ref<IFormData>;
-const isFocused = defineModel('isFocused') as Ref<boolean>;
-const isDirty = defineModel('isDirty') as Ref<boolean>;
+
+const updateFocus = (name: string, isFocused: boolean) => {
+  modelValue.value.focusedField = isFocused ? name : '';
+};
+
+const isFocused = computed(() => {
+  return modelValue.value.focusedField == name.value;
+});
 
 const name = computed(() => {
   return props.name !== null ? props.name : props.id;
@@ -77,69 +89,93 @@ const name = computed(() => {
 
 const validatorLocale = toRef(useRuntimeConfig().public.validatorLocale);
 
-const componentValidation =
-  validationConfig[validatorLocale.value][props.validation];
+const componentValidation = validationConfig[validatorLocale.value][props.validation];
 const inputField = ref<HTMLInputElement | null>(null);
 
-const { hasCustomError, removeCustomError } = useErrorMessage(
-  name.value,
-  modelValue
-);
-
-const fieldHasError = () => {
-  const hasApiErrorMessage = hasCustomError();
-  const inputBad = !inputField.value?.validity.valid;
+const fieldIsDirty = computed(() => {
+  return modelValue.value!.formFieldsC12[name.value].isDirty;
+});
+const fieldHasError = computed(() => {
+  return modelValue.value!.submitAttempted && !modelValue.value!.formFieldsC12[name.value].isValid;
+});
 
-  if (modelValue.value.isPending) {
-    modelValue.value!.validityState[name.value] =
-      inputField.value?.validity.valid ?? false;
-    return hasApiErrorMessage ? hasApiErrorMessage : inputBad;
-  }
-  return false;
+// const { fieldHasError } = useFormControl(name.value);
+
+const formFieldC12 = <IFormFieldC12>{
+  label: props.c12.label,
+  placeholder: props.c12.placeholder,
+  errorMessage: props.c12.errorMessage,
+  useCustomError: false,
+  customErrors: {},
+  isValid: false,
+  isDirty: false,
+  type: 'string',
+  previousValue: null,
 };
+modelValue.value!.formFieldsC12[name.value] = formFieldC12;
+
+const { initFormFieldsC12 } = useFormControl();
+initFormFieldsC12(props.name, formFieldC12);
 
-watchEffect(() => {
-  console.log(
-    'InputTextCore >> Form value changed to: ',
-    modelValue.value.data[name.value]
-  );
+const fieldValue = computed(() => {
+  return modelValue.value.data[name.value];
+});
 
-  isDirty.value = modelValue.value.data[name.value] !== '';
+watch(fieldValue, () => {
+  if (!modelValue.value!.formFieldsC12[name.value].isDirty) {
+    modelValue.value!.formFieldsC12[name.value].isDirty = modelValue.value.data[name.value] !== '';
+  }
+  modelValue.value!.formFieldsC12[name.value].isValid = inputField.value?.validity.valid ?? false;
+  modelValue.value!.validityState[name.value] = inputField.value?.validity.valid ?? false;
 
-  modelValue.value!.validityState[name.value] =
-    inputField.value?.validity.valid ?? false;
-  if (hasCustomError()) {
-    removeCustomError(inputField.value?.validity.valid);
+  if (modelValue.value!.formFieldsC12[name.value].useCustomError && modelValue.value.data[props.name] === modelValue.value.formFieldsC12[props.name].previousValue) {
+    modelValue.value!.validityState[name.value] = false;
+    modelValue.value!.formFieldsC12[name.value].isValid = false;
+    modelValue.value.displayErrorMessages = true;
   }
 });
 
 const isValid = () => {
   setTimeout(() => {
-    modelValue.value!.validityState[name.value] =
-      inputField.value?.validity.valid ?? false;
+    modelValue.value!.validityState[name.value] = inputField.value?.validity.valid ?? false;
+    modelValue.value!.formFieldsC12[name.value].isValid = inputField.value?.validity.valid ?? false;
+    if (!modelValue.value!.formFieldsC12[name.value].isDirty) {
+      modelValue.value!.formFieldsC12[name.value].isDirty = modelValue.value.data[name.value] !== '';
+    }
   }, 0);
 };
 
-// Keep an eye on this for performance issue
-// watch(
-//   () => modelValue.value.data[name.value],
-//   () => {
-//     modelValue.value!.validityState[name.value] =
-//       inputField.value?.validity.valid ?? false;
-//     if (hasCustomError()) {
-//       removeCustomError(inputField.value?.validity.valid);
-//     }
-//   },
-//   { deep: true }
-// );
-
 onMounted(() => {
   isValid();
 });
 </script>
 
 <style lang="css">
-/* .input-text {
-  transition: all linear 200ms;
-} */
+.input-text-wrapper {
+  align-items: center;
+  display: grid;
+  grid-template-columns: 1fr;
+
+  &.has-left-content {
+    grid-template-columns: auto 1fr;
+    margin-left: var(--_gutter);
+
+    .left-content {
+      display: flex;
+      align-items: center;
+    }
+  }
+
+  &.has-right-content {
+    display: grid;
+    grid-template-columns: 1fr auto;
+    /* display: flex; */
+    margin-right: var(--_gutter);
+
+    .right-content {
+      display: flex;
+      align-items: center;
+    }
+  }
+}
 </style>

package/components/forms/input-text/variants/material/InputEmailMaterial.vue

@@ -0,0 +1,72 @@
+<template>
+  <InputTextMaterialCore type="email" :id :name :required :c12 :styleClassPassthrough :theme v-model="modelValue">
+    <template #input>
+      <InputTextCore :id :name type="email" :validation :required v-model="modelValue" :c12 :style-class-passthrough="styleClassPassthrough">
+        <template #left>
+          <Icon name="radix-icons:envelope-closed" class="icon" />
+        </template>
+      </InputTextCore>
+    </template>
+  </InputTextMaterialCore>
+</template>
+
+<script setup lang="ts">
+import type { InpuTextC12, IFormData } from '@/types/types.forms';
+
+import propValidators from '../../../c12/prop-validators';
+
+const props = defineProps({
+  size: {
+    type: String as PropType<string>,
+    default: 'normal',
+    validator(value: string) {
+      return propValidators.size.includes(value);
+    },
+  },
+  weight: {
+    type: String as PropType<string>,
+    default: 'wght-400',
+    validator(value: string) {
+      return propValidators.weight.includes(value);
+    },
+  },
+  theme: {
+    type: String as PropType<string>,
+    default: 'primary',
+    validator(value: string) {
+      return propValidators.theme.includes(value);
+    },
+  },
+  id: {
+    // type: String as PropType<string>,
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    default: null,
+  },
+  validation: {
+    type: String,
+    default: '',
+  },
+  required: {
+    type: Boolean,
+    value: false,
+  },
+  c12: {
+    type: Object as PropType<InpuTextC12>,
+    required: true,
+  },
+  styleClassPassthrough: {
+    type: String,
+    default: '',
+  },
+});
+
+const name = computed(() => {
+  return props.name !== null ? props.name : props.id;
+});
+
+const modelValue = defineModel() as Ref<IFormData>;
+</script>

package/components/forms/input-text/variants/material/InputPasswordMaterial.vue

@@ -0,0 +1,114 @@
+<template>
+  <InputTextMaterialCore :type :id :name :required :c12 :styleClassPassthrough :theme v-model="modelValue">
+    <template #input>
+      <InputTextCore :id :name :type :validation :required v-model="modelValue" :c12 :style-class-passthrough="styleClassPassthrough">
+        <template #right>
+          <InputButtonCore
+            type="button"
+            @click.stop.prevent="toggleDisplayPassword"
+            :is-pending="false"
+            :buttonText
+            theme="ghost"
+            size="x-small"
+            @focusin="updateFocus(name, true)"
+            @focusout="updateFocus(name, false)"
+          >
+            <template #iconOnly>
+              <Icon v-if="displayPassword" name="radix-icons:eye-none" class="icon" />
+              <Icon v-else name="radix-icons:eye-open" class="icon" />
+            </template>
+          </InputButtonCore>
+        </template>
+      </InputTextCore>
+    </template>
+  </InputTextMaterialCore>
+</template>
+
+<script setup lang="ts">
+import type { InpuTextC12, IFormData } from '@/types/types.forms';
+
+import propValidators from '../../../c12/prop-validators';
+
+const props = defineProps({
+  size: {
+    type: String as PropType<string>,
+    default: 'normal',
+    validator(value: string) {
+      return propValidators.size.includes(value);
+    },
+  },
+  weight: {
+    type: String as PropType<string>,
+    default: 'wght-400',
+    validator(value: string) {
+      return propValidators.weight.includes(value);
+    },
+  },
+  theme: {
+    type: String as PropType<string>,
+    default: 'primary',
+    validator(value: string) {
+      return propValidators.theme.includes(value);
+    },
+  },
+  id: {
+    // type: String as PropType<string>,
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    default: null,
+  },
+  validation: {
+    type: String,
+    default: '',
+  },
+  required: {
+    type: Boolean,
+    value: false,
+  },
+  c12: {
+    type: Object as PropType<InpuTextC12>,
+    required: true,
+  },
+  styleClassPassthrough: {
+    type: String,
+    default: '',
+  },
+});
+
+const name = computed(() => {
+  return props.name !== null ? props.name : props.id;
+});
+
+const modelValue = defineModel() as Ref<IFormData>;
+
+const updateFocus = (name: string, isFocused: boolean) => {
+  modelValue.value.focusedField = isFocused ? name : '';
+};
+
+const displayPassword = ref(false);
+
+const type = computed(() => {
+  // return displayPassword.value && !modelValue.value.isPending ? "text" : "password";
+  return displayPassword.value ? 'text' : 'password';
+});
+
+const buttonText = computed(() => {
+  return displayPassword.value ? 'Hide password' : 'Show password';
+});
+
+const toggleDisplayPassword = () => {
+  displayPassword.value = !displayPassword.value;
+};
+</script>
+
+<style lang="css" scoped>
+/* :deep(.input-text-core:not(.active)),
+:deep(.input-text-core:not(.dirty)) {
+  + .right-content {
+    display: none !important;
+  }
+} */
+</style>

package/components/forms/input-text/variants/material/InputTextMaterial.vue

@@ -0,0 +1,68 @@
+<template>
+  <InputTextMaterialCore type="text" :id :name :required :c12 :styleClassPassthrough :theme v-model="modelValue">
+    <template #input>
+      <InputTextCore :id :name type="text" :validation :required v-model="modelValue" :c12 :style-class-passthrough="styleClassPassthrough" />
+    </template>
+  </InputTextMaterialCore>
+</template>
+
+<script setup lang="ts">
+import type { InpuTextC12, IFormData } from '@/types/types.forms';
+
+import propValidators from '../../../c12/prop-validators';
+
+const props = defineProps({
+  size: {
+    type: String as PropType<string>,
+    default: 'normal',
+    validator(value: string) {
+      return propValidators.size.includes(value);
+    },
+  },
+  weight: {
+    type: String as PropType<string>,
+    default: 'wght-400',
+    validator(value: string) {
+      return propValidators.weight.includes(value);
+    },
+  },
+  theme: {
+    type: String as PropType<string>,
+    default: 'primary',
+    validator(value: string) {
+      return propValidators.theme.includes(value);
+    },
+  },
+  id: {
+    // type: String as PropType<string>,
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    default: null,
+  },
+  validation: {
+    type: String,
+    default: '',
+  },
+  required: {
+    type: Boolean,
+    value: false,
+  },
+  c12: {
+    type: Object as PropType<InpuTextC12>,
+    required: true,
+  },
+  styleClassPassthrough: {
+    type: String,
+    default: '',
+  },
+});
+
+const name = computed(() => {
+  return props.name !== null ? props.name : props.id;
+});
+
+const modelValue = defineModel() as Ref<IFormData>;
+</script>