feat(datepicker): make modelValue conditional typed by range prop

oruga-ui · Jul 8, 2024 · dcd00c4 · dcd00c4
1 parent c3280d6
commit dcd00c4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/packages/oruga/src/components/datepicker/DatepickerMonth.vue b/packages/oruga/src/components/datepicker/DatepickerMonth.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts" generic="T extends boolean">
+<script setup lang="ts">
 import {
     computed,
     ref,
@@ -28,7 +28,7 @@ const props = defineProps({
     monthNames: { type: Array as PropType<string[]>, required: true },
     focusedDate: { type: Object as PropType<FocusedDate>, required: true },
     pickerProps: {
-        type: Object as PropType<DatepickerProps<T>>,
+        type: Object as PropType<DatepickerProps>,
         required: true,
     },
 });
@@ -46,7 +46,7 @@ const selectedBeginDate = ref<Date>();
 const selectedEndDate = ref<Date>();
 const hoveredEndDate = ref<Date>();
 
-const datepicker = computed<DatepickerProps<T>>(() => props.pickerProps);
+const datepicker = computed<DatepickerProps>(() => props.pickerProps);
 
 const hasEvents = computed(() => !!datepicker.value.events?.length);
 

diff --git a/packages/oruga/src/components/datepicker/DatepickerTable.vue b/packages/oruga/src/components/datepicker/DatepickerTable.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts" generic="T extends boolean">
+<script setup lang="ts">
 import { computed, ref, type PropType } from "vue";
 
 import ODatepickerTableRow from "./DatepickerTableRow.vue";
@@ -24,7 +24,7 @@ const props = defineProps({
     dayNames: { type: Array as PropType<string[]>, required: true },
     monthNames: { type: Array as PropType<string[]>, required: true },
     pickerProps: {
-        type: Object as PropType<DatepickerProps<T>>,
+        type: Object as PropType<DatepickerProps>,
         required: true,
     },
 });
@@ -47,7 +47,7 @@ const selectedBeginDate = ref<Date>();
 const selectedEndDate = ref<Date>();
 const hoveredEndDate = ref<Date>();
 
-const datepicker = computed<DatepickerProps<T>>(() => props.pickerProps);
+const datepicker = computed<DatepickerProps>(() => props.pickerProps);
 
 const visibleDayNames = computed(() => {
     const visibleDayNames = [];

diff --git a/packages/oruga/src/components/datepicker/DatepickerTableRow.vue b/packages/oruga/src/components/datepicker/DatepickerTableRow.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts" generic="T extends boolean">
+<script setup lang="ts">
 import {
     computed,
     watch,
@@ -31,7 +31,7 @@ const props = defineProps({
     events: { type: Array as PropType<DatepickerEvent[]>, default: undefined },
     hoveredDateRange: { type: Array as PropType<Date[]>, default: () => [] },
     pickerProps: {
-        type: Object as PropType<DatepickerProps<T>>,
+        type: Object as PropType<DatepickerProps>,
         required: true,
     },
 });
@@ -45,7 +45,7 @@ const emits = defineEmits<{
 
 const { isDateSelectable } = useDatepickerMixins(props.pickerProps);
 
-const datepicker = computed<DatepickerProps<T>>(() => props.pickerProps);
+const datepicker = computed<DatepickerProps>(() => props.pickerProps);
 
 const hasEvents = computed(() => !!props.events?.length);
 

diff --git a/packages/oruga/src/components/datepicker/types.ts b/packages/oruga/src/components/datepicker/types.ts
@@ -1,7 +1,7 @@
 import type { ComponentProps } from "vue-component-type-helpers";
 import Datepicker from "./Datepicker.vue";
 
-export type DatepickerProps<T extends boolean> = ComponentProps<
+export type DatepickerProps<T extends boolean = false> = ComponentProps<
     typeof Datepicker<T>
 >;