fix(#3137): expose closeOnContentClick prop from modal (#3180)

epicmaxco · Mar 15, 2023 · 57635f2 · 57635f2
1 parent e2c8b19
commit 57635f2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/packages/ui/src/components/va-date-input/VaDateInput.vue b/packages/ui/src/components/va-date-input/VaDateInput.vue
@@ -160,6 +160,8 @@ export default defineComponent({
     modelValue: { type: [Date, Array, Object, String, Number] as PropType<DateInputModelValue> },
 
     resetOnClose: { type: Boolean, default: true },
+    closeOnContentClick: { type: Boolean, default: false },
+    offset: { ...VaDropdownProps.offset, default: () => [2, 0] },
     isOpen: { type: Boolean, default: undefined },
 
     format: { type: Function as PropType<(date: DateInputModelValue) => string> },
@@ -391,12 +393,11 @@ export default defineComponent({
       ...omit(attrs, ['class', 'style']),
     }))
 
+    const filteredProps = filterComponentProps(VaDropdownProps)
     const dropdownPropsComputed = computed(() => ({
-      ...filterComponentProps(VaDropdownProps).value,
-      offset: [2, 0] as DropdownOffsetProp,
+      ...filteredProps.value,
       stateful: false,
       keyboardNavigation: true,
-      closeOnContentClick: false,
       innerAnchorSelector: '.va-input-wrapper__field',
     }))
 

diff --git a/packages/ui/src/components/va-time-input/VaTimeInput.vue b/packages/ui/src/components/va-time-input/VaTimeInput.vue
@@ -134,6 +134,9 @@ export default defineComponent({
     ...useValidationProps as ValidationProps<Date>,
 
     isOpen: { type: Boolean, default: undefined },
+    closeOnContentClick: { type: Boolean, default: false },
+    offset: { ...VaDropdownProps.offset, default: () => [2, 0] },
+    placement: { ...VaDropdownProps.placement, default: 'bottom-start' },
     modelValue: { type: Date, default: undefined },
     clearValue: { type: Date, default: undefined },
     format: { type: Function as PropType<(date?: Date) => string> },
@@ -326,12 +329,10 @@ export default defineComponent({
       ...omit(attrs, ['class', 'style']),
     }))
 
+    const filteredProps = filterComponentProps(VaDropdownProps)
     const dropdownPropsComputed = computed(() => ({
-      ...filterComponentProps(VaDropdownProps).value,
-      closeOnContentClick: false,
-      offset: [2, 0] as DropdownOffsetProp,
+      ...filteredProps.value,
       keyboardNavigation: true,
-      placement: 'bottom-start' as Placement,
       innerAnchorSelector: '.va-input-wrapper__field',
     }))