Merge branch 'fix-android-emoji-input' into 'develop'
Add onInput() function as listener for input events, remove unnecessary compositionupdate listener Closes #775 See merge request pleroma/pleroma-fe!1065
This commit is contained in:
commit
12cd96bfa7
2 changed files with 14 additions and 14 deletions
|
@ -147,7 +147,7 @@ const EmojiInput = {
|
||||||
input.elm.addEventListener('keydown', this.onKeyDown)
|
input.elm.addEventListener('keydown', this.onKeyDown)
|
||||||
input.elm.addEventListener('click', this.onClickInput)
|
input.elm.addEventListener('click', this.onClickInput)
|
||||||
input.elm.addEventListener('transitionend', this.onTransition)
|
input.elm.addEventListener('transitionend', this.onTransition)
|
||||||
input.elm.addEventListener('compositionupdate', this.onCompositionUpdate)
|
input.elm.addEventListener('input', this.onInput)
|
||||||
},
|
},
|
||||||
unmounted () {
|
unmounted () {
|
||||||
const { input } = this
|
const { input } = this
|
||||||
|
@ -159,7 +159,7 @@ const EmojiInput = {
|
||||||
input.elm.removeEventListener('keydown', this.onKeyDown)
|
input.elm.removeEventListener('keydown', this.onKeyDown)
|
||||||
input.elm.removeEventListener('click', this.onClickInput)
|
input.elm.removeEventListener('click', this.onClickInput)
|
||||||
input.elm.removeEventListener('transitionend', this.onTransition)
|
input.elm.removeEventListener('transitionend', this.onTransition)
|
||||||
input.elm.removeEventListener('compositionupdate', this.onCompositionUpdate)
|
input.elm.removeEventListener('input', this.onInput)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
@ -406,12 +406,6 @@ const EmojiInput = {
|
||||||
this.resize()
|
this.resize()
|
||||||
this.$emit('input', e.target.value)
|
this.$emit('input', e.target.value)
|
||||||
},
|
},
|
||||||
onCompositionUpdate (e) {
|
|
||||||
this.showPicker = false
|
|
||||||
this.setCaret(e)
|
|
||||||
this.resize()
|
|
||||||
this.$emit('input', e.target.value)
|
|
||||||
},
|
|
||||||
onClickInput (e) {
|
onClickInput (e) {
|
||||||
this.showPicker = false
|
this.showPicker = false
|
||||||
},
|
},
|
||||||
|
|
|
@ -36,7 +36,8 @@ describe('EmojiInput', () => {
|
||||||
input.setValue(initialString)
|
input.setValue(initialString)
|
||||||
wrapper.setData({ caret: initialString.length })
|
wrapper.setData({ caret: initialString.length })
|
||||||
wrapper.vm.insert({ insertion: '(test)', keepOpen: false })
|
wrapper.vm.insert({ insertion: '(test)', keepOpen: false })
|
||||||
expect(wrapper.emitted().input[0][0]).to.eql('Testing (test) ')
|
const inputEvents = wrapper.emitted().input
|
||||||
|
expect(inputEvents[inputEvents.length - 1][0]).to.eql('Testing (test) ')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('inserts string at the end with trailing space (source has a trailing space)', () => {
|
it('inserts string at the end with trailing space (source has a trailing space)', () => {
|
||||||
|
@ -46,7 +47,8 @@ describe('EmojiInput', () => {
|
||||||
input.setValue(initialString)
|
input.setValue(initialString)
|
||||||
wrapper.setData({ caret: initialString.length })
|
wrapper.setData({ caret: initialString.length })
|
||||||
wrapper.vm.insert({ insertion: '(test)', keepOpen: false })
|
wrapper.vm.insert({ insertion: '(test)', keepOpen: false })
|
||||||
expect(wrapper.emitted().input[0][0]).to.eql('Testing (test) ')
|
const inputEvents = wrapper.emitted().input
|
||||||
|
expect(inputEvents[inputEvents.length - 1][0]).to.eql('Testing (test) ')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('inserts string at the begginning without leading space', () => {
|
it('inserts string at the begginning without leading space', () => {
|
||||||
|
@ -56,7 +58,8 @@ describe('EmojiInput', () => {
|
||||||
input.setValue(initialString)
|
input.setValue(initialString)
|
||||||
wrapper.setData({ caret: 0 })
|
wrapper.setData({ caret: 0 })
|
||||||
wrapper.vm.insert({ insertion: '(test)', keepOpen: false })
|
wrapper.vm.insert({ insertion: '(test)', keepOpen: false })
|
||||||
expect(wrapper.emitted().input[0][0]).to.eql('(test) Testing')
|
const inputEvents = wrapper.emitted().input
|
||||||
|
expect(inputEvents[inputEvents.length - 1][0]).to.eql('(test) Testing')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('inserts string between words without creating extra spaces', () => {
|
it('inserts string between words without creating extra spaces', () => {
|
||||||
|
@ -66,7 +69,8 @@ describe('EmojiInput', () => {
|
||||||
input.setValue(initialString)
|
input.setValue(initialString)
|
||||||
wrapper.setData({ caret: 6 })
|
wrapper.setData({ caret: 6 })
|
||||||
wrapper.vm.insert({ insertion: ':ebin:', keepOpen: false })
|
wrapper.vm.insert({ insertion: ':ebin:', keepOpen: false })
|
||||||
expect(wrapper.emitted().input[0][0]).to.eql('Spurdo :ebin: Sparde')
|
const inputEvents = wrapper.emitted().input
|
||||||
|
expect(inputEvents[inputEvents.length - 1][0]).to.eql('Spurdo :ebin: Sparde')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('inserts string between words without creating extra spaces (other caret)', () => {
|
it('inserts string between words without creating extra spaces (other caret)', () => {
|
||||||
|
@ -76,7 +80,8 @@ describe('EmojiInput', () => {
|
||||||
input.setValue(initialString)
|
input.setValue(initialString)
|
||||||
wrapper.setData({ caret: 7 })
|
wrapper.setData({ caret: 7 })
|
||||||
wrapper.vm.insert({ insertion: ':ebin:', keepOpen: false })
|
wrapper.vm.insert({ insertion: ':ebin:', keepOpen: false })
|
||||||
expect(wrapper.emitted().input[0][0]).to.eql('Spurdo :ebin: Sparde')
|
const inputEvents = wrapper.emitted().input
|
||||||
|
expect(inputEvents[inputEvents.length - 1][0]).to.eql('Spurdo :ebin: Sparde')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('inserts string without any padding if padEmoji setting is set to false', () => {
|
it('inserts string without any padding if padEmoji setting is set to false', () => {
|
||||||
|
@ -86,7 +91,8 @@ describe('EmojiInput', () => {
|
||||||
input.setValue(initialString)
|
input.setValue(initialString)
|
||||||
wrapper.setData({ caret: initialString.length, keepOpen: false })
|
wrapper.setData({ caret: initialString.length, keepOpen: false })
|
||||||
wrapper.vm.insert({ insertion: ':spam:' })
|
wrapper.vm.insert({ insertion: ':spam:' })
|
||||||
expect(wrapper.emitted().input[0][0]).to.eql('Eat some spam!:spam:')
|
const inputEvents = wrapper.emitted().input
|
||||||
|
expect(inputEvents[inputEvents.length - 1][0]).to.eql('Eat some spam!:spam:')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('correctly sets caret after insertion at beginning', (done) => {
|
it('correctly sets caret after insertion at beginning', (done) => {
|
||||||
|
|
Loading…
Reference in a new issue