From f59a92ca1533a44e17fbc8b7945bdaa9a83e805a Mon Sep 17 00:00:00 2001 From: Benjamin Canac Date: Thu, 1 Jun 2023 15:27:53 +0200 Subject: [PATCH] chore(Input)!: move pointer class inside its own preset class --- src/runtime/app.config.ts | 6 ++++-- src/runtime/components/forms/Input.vue | 16 ++++++++-------- src/runtime/components/forms/Select.vue | 12 ++++++------ src/runtime/components/forms/SelectMenu.vue | 8 ++++---- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/runtime/app.config.ts b/src/runtime/app.config.ts index 4b4ed093..9d3c1b99 100644 --- a/src/runtime/app.config.ts +++ b/src/runtime/app.config.ts @@ -339,7 +339,8 @@ const input = { xl: 'h-6 w-6' }, leading: { - wrapper: 'absolute inset-y-0 left-0 flex items-center pointer-events-none', + wrapper: 'absolute inset-y-0 left-0 flex items-center', + pointer: 'pointer-events-none', padding: { '2xs': 'pl-2', xs: 'pl-2.5', @@ -350,7 +351,8 @@ const input = { } }, trailing: { - wrapper: 'absolute inset-y-0 right-0 flex items-center pointer-events-none', + wrapper: 'absolute inset-y-0 right-0 flex items-center', + pointer: 'pointer-events-none', padding: { '2xs': 'pr-2', xs: 'pr-2.5', diff --git a/src/runtime/components/forms/Input.vue b/src/runtime/components/forms/Input.vue index ff950348..8c3ae245 100644 --- a/src/runtime/components/forms/Input.vue +++ b/src/runtime/components/forms/Input.vue @@ -19,17 +19,17 @@ > -
+ -
+ -
+ -
+ @@ -220,8 +220,8 @@ export default defineComponent({ const leadingWrapperIconClass = computed(() => { return classNames( ui.value.icon.leading.wrapper, - ui.value.icon.leading.padding[props.size], - slots.leading && '!pointer-events-auto' + ui.value.icon.leading.pointer, + ui.value.icon.leading.padding[props.size] ) }) @@ -237,8 +237,8 @@ export default defineComponent({ const trailingWrapperIconClass = computed(() => { return classNames( ui.value.icon.trailing.wrapper, - ui.value.icon.trailing.padding[props.size], - slots.trailing && '!pointer-events-auto' + ui.value.icon.trailing.pointer, + ui.value.icon.trailing.padding[props.size] ) }) diff --git a/src/runtime/components/forms/Select.vue b/src/runtime/components/forms/Select.vue index c3612472..b3e1bb31 100644 --- a/src/runtime/components/forms/Select.vue +++ b/src/runtime/components/forms/Select.vue @@ -36,11 +36,11 @@ -
+ -
+ @@ -267,8 +267,8 @@ export default defineComponent({ const leadingWrapperIconClass = computed(() => { return classNames( ui.value.icon.leading.wrapper, - ui.value.icon.leading.padding[props.size], - slots.leading && '!pointer-events-auto' + ui.value.icon.leading.pointer, + ui.value.icon.leading.padding[props.size] ) }) @@ -284,8 +284,8 @@ export default defineComponent({ const trailingWrapperIconClass = computed(() => { return classNames( ui.value.icon.trailing.wrapper, - ui.value.icon.trailing.padding[props.size], - slots.trailing && '!pointer-events-auto' + ui.value.icon.trailing.pointer, + ui.value.icon.trailing.padding[props.size] ) }) diff --git a/src/runtime/components/forms/SelectMenu.vue b/src/runtime/components/forms/SelectMenu.vue index a6893b1e..bd47e951 100644 --- a/src/runtime/components/forms/SelectMenu.vue +++ b/src/runtime/components/forms/SelectMenu.vue @@ -332,8 +332,8 @@ export default defineComponent({ const leadingWrapperIconClass = computed(() => { return classNames( uiSelect.value.icon.leading.wrapper, - uiSelect.value.icon.leading.padding[props.size], - slots.leading && '!pointer-events-auto' + uiSelect.value.icon.leading.pointer, + uiSelect.value.icon.leading.padding[props.size] ) }) @@ -349,8 +349,8 @@ export default defineComponent({ const trailingWrapperIconClass = computed(() => { return classNames( uiSelect.value.icon.trailing.wrapper, - uiSelect.value.icon.trailing.padding[props.size], - slots.trailing && '!pointer-events-auto' + uiSelect.value.icon.trailing.pointer, + uiSelect.value.icon.trailing.padding[props.size] ) })