Compare commits
10 commits
71f2cd8f59
...
34d6e014ae
Author | SHA1 | Date | |
---|---|---|---|
|
34d6e014ae | ||
|
ba50661840 | ||
|
f25dafb049 | ||
|
868119679f | ||
|
4faca7d3ca | ||
|
e5fa8b357b | ||
|
6c5a34e491 | ||
|
6ffaa8edc9 | ||
|
7a8511f86c | ||
|
e72552e75c |
1 changed files with 10 additions and 6 deletions
|
@ -106,9 +106,6 @@ const EmojiPicker = {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
inject: ['popoversZLayer'],
|
inject: ['popoversZLayer'],
|
||||||
mounted () {
|
|
||||||
this.updateEmojiSize()
|
|
||||||
},
|
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
keyword: '',
|
keyword: '',
|
||||||
|
@ -136,10 +133,15 @@ const EmojiPicker = {
|
||||||
methods: {
|
methods: {
|
||||||
updateEmojiSize () {
|
updateEmojiSize () {
|
||||||
const css = window.getComputedStyle(this.$refs.popover.$el)
|
const css = window.getComputedStyle(this.$refs.popover.$el)
|
||||||
|
console.log('CSS', css)
|
||||||
const emojiSize = css.getPropertyValue('--emojiSize')
|
const emojiSize = css.getPropertyValue('--emojiSize')
|
||||||
|
console.log('CSS', emojiSize)
|
||||||
const emojiSizeUnit = emojiSize.replace(/[0-9,.]+/, '')
|
const emojiSizeUnit = emojiSize.replace(/[0-9,.]+/, '')
|
||||||
const emojiSizeValue = emojiSize.replace(/[^0-9,.]+/, '')
|
console.log('CSS', emojiSizeUnit)
|
||||||
const fontSize = css.getPropertyValue('font-size').replace(/[^0-9,.]+/, '')
|
const emojiSizeValue = Number(emojiSize.replace(/[^0-9,.]+/, ''))
|
||||||
|
console.log('CSS', emojiSizeValue)
|
||||||
|
const fontSize = Number(emojiSize.replace(css.getPropertyValue('font-size').replace(/[^0-9,.]+/, '')))
|
||||||
|
console.log('CSS', fontSize)
|
||||||
|
|
||||||
let emojiSizeReal
|
let emojiSizeReal
|
||||||
if (emojiSizeUnit.endsWith('em')) {
|
if (emojiSizeUnit.endsWith('em')) {
|
||||||
|
@ -245,6 +247,7 @@ const EmojiPicker = {
|
||||||
},
|
},
|
||||||
onShowing () {
|
onShowing () {
|
||||||
const oldContentLoaded = this.contentLoaded
|
const oldContentLoaded = this.contentLoaded
|
||||||
|
this.updateEmojiSize()
|
||||||
this.recalculateItemPerRow()
|
this.recalculateItemPerRow()
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.$refs.search.focus()
|
this.$refs.search.focus()
|
||||||
|
@ -305,9 +308,10 @@ const EmojiPicker = {
|
||||||
itemPerRow () {
|
itemPerRow () {
|
||||||
console.log(
|
console.log(
|
||||||
this.emojiWidth,
|
this.emojiWidth,
|
||||||
|
this.emojiSize,
|
||||||
this.width
|
this.width
|
||||||
)
|
)
|
||||||
return this.width ? Math.floor(this.width / this.emojiWidth) : 6
|
return this.width ? Math.floor(this.width / this.emojiSize) : 6
|
||||||
},
|
},
|
||||||
activeGroupView () {
|
activeGroupView () {
|
||||||
return this.showingStickers ? '' : this.activeGroup
|
return this.showingStickers ? '' : this.activeGroup
|
||||||
|
|
Loading…
Add table
Reference in a new issue