sprintify-ui 0.4.8 → 0.4.10

package/dist/types/src/components/BaseAddressForm.vue.d.ts

@@ -14,6 +14,11 @@ declare const _default: import("vue").DefineComponent<{
         required: true;
         default: null;
     };
+    required: {
+        type: import("vue").PropType<boolean>;
+        required: true;
+        default: boolean;
+    };
     modelValue: {
         type: import("vue").PropType<Address | null | undefined>;
         required: true;
@@ -45,6 +50,11 @@ declare const _default: import("vue").DefineComponent<{
         required: true;
         default: null;
     };
+    required: {
+        type: import("vue").PropType<boolean>;
+        required: true;
+        default: boolean;
+    };
     modelValue: {
         type: import("vue").PropType<Address | null | undefined>;
         required: true;
@@ -74,6 +84,7 @@ declare const _default: import("vue").DefineComponent<{
     "onUpdate:model-value"?: ((...args: any[]) => any) | undefined;
 }, {
     prefix: string | null;
+    required: boolean;
     modelValue: Address | null | undefined;
     countries: Country[];
     regions: Region[];

package/dist/types/src/components/BaseBelongsTo.vue.d.ts

@@ -33,10 +33,6 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: undefined;
         type: StringConstructor;
     };
-    currentModel: {
-        default: null;
-        type: PropType<Option | null>;
-    };
     hasError: {
         default: boolean;
         type: BooleanConstructor;
@@ -112,10 +108,6 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         default: undefined;
         type: StringConstructor;
     };
-    currentModel: {
-        default: null;
-        type: PropType<Option | null>;
-    };
     hasError: {
         default: boolean;
         type: BooleanConstructor;
@@ -170,7 +162,6 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
     showEmptyOption: boolean;
     emptyOptionLabel: string;
     primaryKey: string;
-    currentModel: Option | null;
 }, {}>, {
     option?(_: {
         focus: () => void;

package/dist/types/src/components/BaseBelongsToFetch.vue.d.ts

@@ -178,8 +178,8 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
     showEmptyOption: boolean;
     emptyOptionLabel: string;
     primaryKey: string;
-    currentModel: Option | null;
     showRouteUrl: ((id: string | number) => string) | undefined;
+    currentModel: Option | null;
 }, {}>, {
     option?(_: {
         focus: () => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sprintify-ui",
-  "version": "0.4.8",
+  "version": "0.4.10",
   "scripts": {
     "build": "rimraf dist && vue-tsc && vite build",
     "build-fast": "rimraf dist && vite build",

package/src/components/BaseAddressForm.stories.js

@@ -52,6 +52,11 @@ const Template = (args) => ({
 export const Demo = Template.bind({});
 Demo.args = {};
 
+export const Required = Template.bind({});
+Required.args = {
+  required: true
+};
+
 const DefaultCountryTemplate = (args) => ({
   components: { BaseAddressForm, ShowValue },
   setup() {

package/src/components/BaseAddressForm.vue

@@ -3,7 +3,7 @@
     :label="t('sui.address')"
     :name="`${namePrefix}address_1`"
     class="mb-2"
-    required
+    :required="required"
   >
     <BaseInput
       ref="address1Ref"
@@ -13,7 +13,6 @@
       prevent-submit
       name="address_search_field"
       :autocomplete="false"
-      :required="false"
       @update:model-value="update('address_1', $event)"
     />
   </BaseField>
@@ -21,6 +20,7 @@
   <BaseField
     :name="`${namePrefix}address_2`"
     class="mb-4"
+    :required="false"
   >
     <BaseInput
       :model-value="normalizedModelValue.address_2 ?? ''"
@@ -33,7 +33,7 @@
   <div class="sm:flex sm:space-x-3">
     <BaseField
       :label="t('sui.city')"
-      required
+      :required="required"
       :name="`${namePrefix}city`"
       class="mb-4 flex-1"
     >
@@ -45,7 +45,7 @@
     </BaseField>
     <BaseField
       :label="t('sui.postal_code_zip_code')"
-      required
+      :required="required"
       :name="`${namePrefix}postal_code`"
       class="mb-4 flex-1"
     >
@@ -61,7 +61,7 @@
       v-if="!props.hideCountry"
       :label="t('sui.country')"
       :name="`${namePrefix}country`"
-      required
+      :required="required"
       class="mb-4 flex-1"
     >
       <BaseSelect
@@ -78,13 +78,12 @@
       v-if="!props.hideRegion"
       :label="t('sui.region')"
       :name="`${namePrefix}region`"
-      required
+      :required="required"
       class="mb-4 flex-1"
     >
       <BaseSelect
         :model-value="normalizedModelValue.region ?? ''"
         class="w-full"
-        required
         :options="regions"
         label-key="name"
         value-key="id"
@@ -120,6 +119,7 @@ const props = withDefaults(
   defineProps<{
     modelValue: undefined | null | Address;
     prefix: string | null;
+    required: boolean;
     countries?: Country[];
     regions?: Region[];
     restrictCountry?: boolean;
@@ -127,6 +127,7 @@ const props = withDefaults(
     hideCountry?: boolean;
   }>(),
   {
+    required: false,
     modelValue() {
       return {};
     },

package/src/components/BaseBelongsTo.vue

@@ -81,10 +81,6 @@ const props = defineProps({
     default: undefined,
     type: String,
   },
-  currentModel: {
-    default: null,
-    type: [Object, null] as PropType<Option | null>,
-  },
   hasError: {
     default: false,
     type: Boolean,
@@ -127,22 +123,16 @@ const emit = defineEmits(['update:modelValue']);
 
 const autocomplete = ref<InstanceType<typeof BaseAutocomplete> | null>(null);
 
-const model = ref(props.currentModel);
-
-watch(
-  () => props.currentModel,
-  (newValue, oldValue) => {
-    model.value = newValue;
-  },
-  { deep: true }
-);
+const model = computed(() => {
+  return props.modelValue
+    ? props.options.find((option) => option[props.primaryKey] === props.modelValue)
+    : null;
+});
 
 function onUpdate(newModel: Option | null) {
   if (!newModel) {
-    model.value = null;
     emit('update:modelValue', null);
   } else {
-    model.value = newModel;
     emit('update:modelValue', newModel[props.primaryKey]);
   }
 }

package/src/components/BaseDropdownAutocomplete.vue

@@ -47,9 +47,7 @@
               </div>
               <div class="shrink-0">
                 <BaseIcon
-                  v-if="(optionProps.selected ?? false) ||
-                    (optionProps.option[valueKey] == null && newValue == null)
-                    "
+                  v-if="(optionProps.selected ?? false) || (optionProps.option[valueKey] == null && newValue == null)"
                   icon="mdi:check-bold"
                   class="h-4 w-4 text-slate-500"
                 />