@xy-planning-network/trees 0.6.9 → 0.6.11

package/package.json

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

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

@@ -55,17 +55,15 @@ onMounted(() => {
     },
   }
 
-  if (props.maxRange) {
-    // Set the range to a prefilled value given the allowed range
-    const daysAgo = new Date()
-    const minDate = daysAgo.setDate(daysAgo.getDate() - props.maxRange)
-    const maxDate = new Date()
-    opts.defaultDate = [minDate, maxDate]
-    updateModelValue({
-      minDate: Math.floor(minDate / 1000),
-      maxDate: Math.floor(maxDate.getTime() / 1000),
-    })
+  // Handle initial values if set
+  if (props.modelValue.minDate != 0 && props.modelValue.maxDate != 0) {
+    opts.defaultDate = [
+      props.modelValue.minDate * 1000,
+      props.modelValue.maxDate * 1000,
+    ]
+  }
 
+  if (props.maxRange) {
     // Handle onChange to dynamically adjust maxDate to x days ahead of the selected start date
     opts.onChange = (selectedDates, _, self) => {
       if (selectedDates.length === 1) {

package/src/lib-components/lists/DynamicTable.vue

@@ -67,6 +67,20 @@ const reloadTable = (): void => {
   loadAndRender()
 }
 
+const setDateRange = (): void => {
+  if (dateSearchProps.value.maxRange) {
+    const daysAgo = new Date()
+    const minDate = daysAgo.setDate(
+      daysAgo.getDate() - dateSearchProps.value.maxRange
+    )
+    const maxDate = new Date()
+    dateRange.value = {
+      minDate: Math.floor(minDate / 1000),
+      maxDate: Math.floor(maxDate.getTime() / 1000),
+    }
+  }
+}
+
 const tableData = ref<Record<string, any>[]>([])
 
 const publicMethods: DynamicTableAPI = {
@@ -151,6 +165,7 @@ watch(
 defineExpose(publicMethods)
 
 // onCreated
+setDateRange()
 loadAndRender()
 </script>
 <template>