@xy-planning-network/trees 0.10.3 → 0.10.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xy-planning-network/trees",
-  "version": "0.10.3",
+  "version": "0.10.5",
   "description": "",
   "license": "MIT",
   "repository": "github:xy-planning-network/trees",

package/src/lib-components/forms/MultiCheckboxes.vue

@@ -45,33 +45,30 @@ const selectionCount = computed(() => {
 })
 
 const minCount = computed(() => {
-  return props.min || 0
+  return props.min || null
 })
 
 const maxCount = computed(() => {
-  return (
-    props.max ||
-    props.options.filter((opt) => {
-      return !opt.disabled
-    }).length
-  )
+  return props.max || null
 })
 
 const countError = computed(() => {
   // min not reached, no max is set
-  if (selectionCount.value < minCount.value && !props.max) {
+  if (minCount.value !== null && selectionCount.value < minCount.value) {
     return `Please select at least ${minCount.value} of these options.`
   }
 
   // max is reached, no min set
-  if (selectionCount.value > maxCount.value && !props.min) {
+  if (maxCount.value !== null && selectionCount.value > maxCount.value) {
     return `Please limit your selection to ${maxCount.value} of these options.`
   }
 
-  // min and max are both set and out of range
+  // min and max are both set and at least on of them is out of range
   if (
-    selectionCount.value < minCount.value ||
-    selectionCount.value > maxCount.value
+    minCount.value !== null &&
+    maxCount.value !== null &&
+    (selectionCount.value < minCount.value ||
+      selectionCount.value > maxCount.value)
   ) {
     return `Please select between ${minCount.value} and ${maxCount.value} of these options.`
   }
@@ -100,7 +97,7 @@ const setValidationError = () => {
       <FieldsetLegend
         :id="aria.labelledby"
         :label="label"
-        :required="minCount > 0"
+        :required="minCount ? true : false"
       />
       <InputHelp
         v-if="help"
@@ -112,17 +109,6 @@ const setValidationError = () => {
       <InputError :id="aria.errormessage" class="mt-1" :text="errorState" />
     </div>
 
-    <!--Hidden input for custom validation-->
-    <input
-      v-if="countError"
-      ref="errorInput"
-      required
-      class="sr-only top-1 left-1"
-      aria-hidden
-      type="checkbox"
-      @invalid="setValidationError"
-    />
-
     <div class="flex">
       <div
         class="grid gap-y-5"
@@ -175,5 +161,15 @@ const setValidationError = () => {
         </div>
       </div>
     </div>
+    <!--Hidden input for custom validation-->
+    <input
+      v-if="countError"
+      ref="errorInput"
+      required
+      class="sr-only top-1 left-1"
+      aria-hidden
+      type="checkbox"
+      @invalid="setValidationError"
+    />
   </fieldset>
 </template>

package/src/lib-components/overlays/ContentModal.vue

@@ -10,9 +10,11 @@ import {
 withDefaults(
   defineProps<{
     modelValue: boolean
+    btnText?: string
     title?: string
   }>(),
   {
+    btnText: "Go back",
     title: "",
   }
 )
@@ -84,7 +86,7 @@ const updateModelValue = (value: boolean) => {
                 class="inline-flex justify-center w-full xy-btn"
                 @click="updateModelValue(false)"
               >
-                Go back
+                {{ btnText }}
               </button>
             </div>
           </div>

package/types/lib-components/indicators/InlineAlert.vue.d.ts

@@ -40,8 +40,8 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
     "onClick:secondary"?: ((e: Event) => any) | undefined;
 }, {
     title: string;
-    btnLink: string;
     btnText: string;
+    btnLink: string;
     dismissable: boolean;
     secondaryBtnLink: string;
     secondaryBtnText: string;

package/types/lib-components/overlays/ContentModal.vue.d.ts

@@ -1,19 +1,24 @@
 declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToOption<{
     modelValue: boolean;
+    btnText?: string | undefined;
     title?: string | undefined;
 }>, {
+    btnText: string;
     title: string;
 }>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "update:modelValue": (val: boolean) => void;
 }, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<{
     modelValue: boolean;
+    btnText?: string | undefined;
     title?: string | undefined;
 }>, {
+    btnText: string;
     title: string;
 }>>> & {
     "onUpdate:modelValue"?: ((val: boolean) => any) | undefined;
 }, {
     title: string;
+    btnText: string;
 }, {}>, {
     icon?(_: {}): any;
     default?(_: {}): any;