@indielayer/ui 1.8.0 → 1.8.1

package/lib/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "1.8.0";
+declare const _default: "1.8.1";
 export default _default;

package/lib/version.js

@@ -1,4 +1,4 @@
-const e = "1.8.0";
+const e = "1.8.1";
 export {
   e as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indielayer/ui",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "Indielayer UI Components with Tailwind CSS build for Vue 3",
   "author": {
     "name": "João Teixeira",

package/src/components/modal/Modal.vue

@@ -67,7 +67,7 @@ export default {
 </script>
 
 <script setup lang="ts">
-import { ref, watch, type PropType, type ExtractPublicPropTypes, computed, nextTick, onMounted } from 'vue'
+import { ref, watch, type PropType, type ExtractPublicPropTypes, computed, nextTick } from 'vue'
 import { onClickOutside, useEventListener } from '@vueuse/core'
 import { useTheme, type ThemeComponent } from '../../composables/useTheme'
 import { useFocusTrap } from '../../composables/useFocusTrap'
@@ -132,8 +132,17 @@ async function checkVisibiliy() {
 
 if (typeof window !== 'undefined') useEventListener(document, 'keydown', onKeyDown)
 
+const shouldIgnoreEvent = (event: KeyboardEvent) => {
+  return ['.v-popper__popper', '.x-datepicker'].some((target) => {
+    if (typeof target === 'string') {
+      return Array.from(window.document.querySelectorAll(target))
+        .some((el) => el === event.target || event.composedPath().includes(el))
+    }
+  })
+}
+
 function onKeyDown(event: KeyboardEvent) {
-  if (event.key === 'Escape' && value.value && !props.persistent) close()
+  if (event.key === 'Escape' && !shouldIgnoreEvent(event) && value.value && !props.persistent) close()
 }
 
 function clickOutsideCallback() {

package/src/components/select/Select.vue

@@ -432,7 +432,13 @@ defineExpose({ focus, blur, reset, validate, setError })
           <x-popover-container :class="classes.content">
             <slot name="content-header">
               <div v-if="filterable" :class="classes.search">
-                <x-input ref="filterRef" v-model="filter" :placeholder="filterPlaceholder" size="sm"/>
+                <x-input
+                  ref="filterRef"
+                  v-model="filter"
+                  :placeholder="filterPlaceholder"
+                  skip-form-registry
+                  size="sm"
+                />
               </div>
             </slot>
             <div v-if="internalOptions.length > 0" :class="classes.contentBody">

package/src/composables/useInputtable.ts

@@ -118,7 +118,8 @@ export const useInputtable = (props: any, { focus, emit, withListeners = true }:
     if (formGroup.isInsideFormGroup) {
       formGroup.registerInputGroup(nameInternal.value, focus)
     } else {
-      form.registerInput(nameInternal.value, focus, validate, setError)
+      if (!props.skipFormRegistry)
+        form.registerInput(nameInternal.value, focus, validate, setError)
     }
   })
 
@@ -126,7 +127,8 @@ export const useInputtable = (props: any, { focus, emit, withListeners = true }:
     if (formGroup.isInsideFormGroup) {
       formGroup.unregisterInputGroup(nameInternal.value)
     } else {
-      form.unregisterInput(nameInternal.value)
+      if (!props.skipFormRegistry)
+        form.unregisterInput(nameInternal.value)
     }
 
   })
@@ -136,7 +138,7 @@ export const useInputtable = (props: any, { focus, emit, withListeners = true }:
     errorInternal,
     hideFooterInternal,
     isFocused,
-    isInsideForm: form.isInsideForm,
+    isInsideForm: props.skipFormRegistry ? false : form.isInsideForm,
     isInsideFormGroup: formGroup.isInsideFormGroup,
     inputListeners,
     formGroup,
@@ -174,4 +176,5 @@ useInputtable.props = () => ({
     default: () => [],
   },
   tooltip: String,
+  skipFormRegistry: Boolean,
 } as const)

package/src/version.ts

@@ -1 +1 @@
-export default '1.8.0'
+export default '1.8.1'