Merge pull request #6158 from qburst/fix--6153

fix: prevent icon display when inline property is set
pull/6171/head
Tuğçe Küçükoğlu 2024-08-01 14:50:52 +03:00 committed by GitHub
commit 1336a4e0aa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions

View File

@ -32,7 +32,7 @@
@keydown="onKeyDown" @keydown="onKeyDown"
:pt="ptm('pcInput')" :pt="ptm('pcInput')"
/> />
<slot v-if="showIcon && iconDisplay === 'button'" name="dropdownbutton"> <slot v-if="showIcon && iconDisplay === 'button' && !inline" name="dropdownbutton">
<button <button
:class="cx('dropdown')" :class="cx('dropdown')"
:disabled="disabled" :disabled="disabled"
@ -49,7 +49,7 @@
</slot> </slot>
</button> </button>
</slot> </slot>
<template v-else-if="showIcon && iconDisplay === 'input'"> <template v-else-if="showIcon && iconDisplay === 'input' && !inline">
<span v-if="$slots.inputicon || showIcon" :class="cx('inputIconContainer')" v-bind="ptm('inputIconContainer')"> <span v-if="$slots.inputicon || showIcon" :class="cx('inputIconContainer')" v-bind="ptm('inputIconContainer')">
<slot name="inputicon" :class="cx('inputIcon')" :clickCallback="onButtonClick"> <slot name="inputicon" :class="cx('inputIcon')" :clickCallback="onButtonClick">
<component :is="icon ? 'i' : 'CalendarIcon'" :class="[icon, cx('inputIcon')]" @click="onButtonClick" v-bind="ptm('inputicon')" /> <component :is="icon ? 'i' : 'CalendarIcon'" :class="[icon, cx('inputIcon')]" @click="onButtonClick" v-bind="ptm('inputicon')" />