Skip to content

Commit d4768fe

Browse files
committed
fix(QExpansionItem): toggle handling
1 parent e3da756 commit d4768fe

File tree

1 file changed

+12
-17
lines changed

1 file changed

+12
-17
lines changed

ui/src/components/expansion-item/QExpansionItem.js

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -133,27 +133,24 @@ export default Vue.extend({
133133
side: this.switchToggleSide !== true,
134134
avatar: this.switchToggleSide
135135
},
136-
attrs: { tabindex: 0 },
137-
on: cache(this, 'inpExt', {
136+
attrs: this.activeToggleIcon === true
137+
? { tabindex: 0 }
138+
: void 0,
139+
on: this.activeToggleIcon === true ? cache(this, 'inpExt', {
138140
click: this.__toggleIcon,
139141
keyup: this.__toggleIconKeyboard
140-
})
142+
}) : null
141143
}, [
142144
h('div', {
145+
ref: 'blurTarget',
143146
staticClass: 'q-expansion-item__toggle-focus q-icon q-focus-helper q-focus-helper--rounded',
144-
attrs: { tabindex: -1 },
145-
ref: 'blurTarget'
147+
attrs: { tabindex: -1 }
146148
}),
147149

148150
h(QIcon, {
149151
staticClass: 'q-expansion-item__toggle-icon',
150-
class: {
151-
'rotate-180': this.showing,
152-
invisible: this.disable
153-
},
154-
props: {
155-
name: this.expansionIcon
156-
}
152+
class: this.showing === true ? 'rotate-180' : void 0,
153+
props: { name: this.expansionIcon }
157154
})
158155
])
159156
},
@@ -193,11 +190,9 @@ export default Vue.extend({
193190
)
194191
}
195192

196-
if (this.activeToggleIcon === true) {
197-
child[this.switchToggleSide === true ? 'unshift' : 'push'](
198-
this.__getToggleIcon(h)
199-
)
200-
}
193+
this.disable !== true && child[this.switchToggleSide === true ? 'unshift' : 'push'](
194+
this.__getToggleIcon(h)
195+
)
201196

202197
const data = {
203198
ref: 'item',

0 commit comments

Comments
 (0)