diff --git a/packages/vuetify/src/components/VSelect/VSelectList.ts b/packages/vuetify/src/components/VSelect/VSelectList.ts
index 8bd46bcfc72..46b464b44e5 100644
--- a/packages/vuetify/src/components/VSelect/VSelectList.ts
+++ b/packages/vuetify/src/components/VSelect/VSelectList.ts
@@ -18,10 +18,7 @@ import Colorable from '../../mixins/colorable'
import Themeable from '../../mixins/themeable'
// Helpers
-import {
- escapeHTML,
- getPropertyFromItem,
-} from '../../util/helpers'
+import { getPropertyFromItem } from '../../util/helpers'
// Types
import mixins from '../../util/mixins'
@@ -113,17 +110,17 @@ export default mixins(Colorable, Themeable).extend({
genFilteredText (text: string) {
text = text || ''
- if (!this.searchInput || this.noFilter) return escapeHTML(text)
+ if (!this.searchInput || this.noFilter) return text
const { start, middle, end } = this.getMaskedCharacters(text)
- return `${escapeHTML(start)}${this.genHighlight(middle)}${escapeHTML(end)}`
+ return [start, this.genHighlight(middle), end]
},
genHeader (props: { [key: string]: any }): VNode {
return this.$createElement(VSubheader, { props }, props.header)
},
- genHighlight (text: string): string {
- return `${escapeHTML(text)}`
+ genHighlight (text: string) {
+ return this.$createElement('span', { staticClass: 'v-list__tile__mask' }, text)
},
getMaskedCharacters (text: string): {
start: string
@@ -202,13 +199,11 @@ export default mixins(Colorable, Themeable).extend({
: scopedSlot
},
genTileContent (item: any, index = 0): VNode {
- const innerHTML = this.genFilteredText(this.getText(item))
-
- return this.$createElement(VListItemContent,
- [this.$createElement(VListItemTitle, {
- domProps: { innerHTML },
- })]
- )
+ return this.$createElement(VListItemContent, [
+ this.$createElement(VListItemTitle, [
+ this.genFilteredText(this.getText(item)),
+ ]),
+ ])
},
hasItem (item: object) {
return this.parsedItems.indexOf(this.getValue(item)) > -1
diff --git a/packages/vuetify/src/util/helpers.ts b/packages/vuetify/src/util/helpers.ts
index 8ab5dca3286..92bd7a078b4 100644
--- a/packages/vuetify/src/util/helpers.ts
+++ b/packages/vuetify/src/util/helpers.ts
@@ -162,16 +162,6 @@ export function getZIndex (el?: Element | null): number {
return index
}
-const tagsToReplace = {
- '&': '&',
- '<': '<',
- '>': '>',
-} as any
-
-export function escapeHTML (str: string): string {
- return str.replace(/[&<>]/g, tag => tagsToReplace[tag] || tag)
-}
-
export function filterObjectOnKeys (obj: T, keys: K[]): { [N in K]: T[N] } {
const filtered = {} as { [N in K]: T[N] }