Skip to content

fix: 解决emoji在content.length中占2长度，substring时却只算1长度的问题 #651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: 解决emoji在content.length中占2长度，substring时却只算1长度的问题 #651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 22 additions & 10 deletions src/miniprogram/parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,18 @@ function mergeNodes (nodes) {
}
}

/**
* @description 截取含emoji的字符传
* @param {string} str 要截取的字符串
* @param {number} start 开始
* @param {number} end 结束
*/
function substringWithEmojis (str, start, end) {
const characters = Array.from(str)
const slicedCharacters = characters.slice(start, end)
return slicedCharacters.join('')
}

/**
* @description html 解析器
* @param {Object} vm 组件实例
Expand Down Expand Up @@ -1084,7 +1096,7 @@ function Lexer (handler) {
* @param {String} content 要解析的文本
*/
Lexer.prototype.parse = function (content) {
this.content = content || ''
this.content = Array.from(content) || [] // 从纯字符转成Array，后续substring使用substringWithEmojis进行处理，解决emoji在content.length中占2长度，substring时却只算1长度的问题
this.i = 0 // 标记解析位置
this.start = 0 // 标记一个单词的开始位置
this.state = this.text // 当前状态
Expand All @@ -1103,7 +1115,7 @@ Lexer.prototype.checkClose = function (method) {
const selfClose = this.content[this.i] === '/'
if (this.content[this.i] === '>' || (selfClose && this.content[this.i + 1] === '>')) {
if (method) {
this.handler[method](this.content.substring(this.start, this.i))
this.handler[method](substringWithEmojis(this.content, this.start, this.i))
}
this.i += selfClose ? 2 : 1
this.start = this.i
Expand Down Expand Up @@ -1132,21 +1144,21 @@ Lexer.prototype.text = function () {
if (this.i === -1) {
// 没有标签了
if (this.start < this.content.length) {
this.handler.onText(this.content.substring(this.start, this.content.length))
this.handler.onText(substringWithEmojis(this.content, this.start, this.content.length))
}
return
}
const c = this.content[this.i + 1]
if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) {
// 标签开头
if (this.start !== this.i) {
this.handler.onText(this.content.substring(this.start, this.i))
this.handler.onText(substringWithEmojis(this.content, this.start, this.i))
}
this.start = ++this.i
this.state = this.tagName
} else if (c === '/' || c === '!' || c === '?') {
if (this.start !== this.i) {
this.handler.onText(this.content.substring(this.start, this.i))
this.handler.onText(substringWithEmojis(this.content, this.start, this.i))
}
const next = this.content[this.i + 2]
if (c === '/' && ((next >= 'a' && next <= 'z') || (next >= 'A' && next <= 'Z'))) {
Expand Down Expand Up @@ -1178,7 +1190,7 @@ Lexer.prototype.text = function () {
Lexer.prototype.tagName = function () {
if (blankChar[this.content[this.i]]) {
// 解析到标签名
this.handler.onTagName(this.content.substring(this.start, this.i))
this.handler.onTagName(substringWithEmojis(this.content, this.start, this.i))
while (blankChar[this.content[++this.i]]);
if (this.i < this.content.length && !this.checkClose()) {
this.start = this.i
Expand All @@ -1197,7 +1209,7 @@ Lexer.prototype.attrName = function () {
let c = this.content[this.i]
if (blankChar[c] || c === '=') {
// 解析到属性名
this.handler.onAttrName(this.content.substring(this.start, this.i))
this.handler.onAttrName(substringWithEmojis(this.content, this.start, this.i))
let needVal = c === '='
const len = this.content.length
while (++this.i < len) {
Expand Down Expand Up @@ -1236,12 +1248,12 @@ Lexer.prototype.attrVal = function () {
this.start = ++this.i
this.i = this.content.indexOf(c, this.i)
if (this.i === -1) return
this.handler.onAttrVal(this.content.substring(this.start, this.i))
this.handler.onAttrVal(substringWithEmojis(this.content, this.start, this.i))
} else {
// 没有冒号的属性
for (; this.i < len; this.i++) {
if (blankChar[this.content[this.i]]) {
this.handler.onAttrVal(this.content.substring(this.start, this.i))
this.handler.onAttrVal(substringWithEmojis(this.content, this.start, this.i))
break
} else if (this.checkClose('onAttrVal')) return
}
Expand All @@ -1261,7 +1273,7 @@ Lexer.prototype.attrVal = function () {
Lexer.prototype.endTag = function () {
const c = this.content[this.i]
if (blankChar[c] || c === '>' || c === '/') {
this.handler.onCloseTag(this.content.substring(this.start, this.i))
this.handler.onCloseTag(substringWithEmojis(this.content, this.start, this.i))
if (c !== '>') {
this.i = this.content.indexOf('>', this.i)
if (this.i === -1) return
Expand Down
32 changes: 22 additions & 10 deletions src/uni-app/components/mp-html/parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,18 @@ function mergeNodes (nodes) {
}
}

/**
* @description 截取含emoji的字符传
* @param {string} str 要截取的字符串
* @param {number} start 开始
* @param {number} end 结束
*/
function substringWithEmojis (str, start, end) {
const characters = Array.from(str)
const slicedCharacters = characters.slice(start, end)
return slicedCharacters.join('')
}

/**
* @description html 解析器
* @param {Object} vm 组件实例
Expand Down Expand Up @@ -1208,7 +1220,7 @@ function Lexer (handler) {
* @param {String} content 要解析的文本
*/
Lexer.prototype.parse = function (content) {
this.content = content || ''
this.content = Array.from(content) || [] // 从纯字符转成Array，后续substring使用substringWithEmojis进行处理，解决emoji在content.length中占2长度，substring时却只算1长度的问题
this.i = 0 // 标记解析位置
this.start = 0 // 标记一个单词的开始位置
this.state = this.text // 当前状态
Expand All @@ -1227,7 +1239,7 @@ Lexer.prototype.checkClose = function (method) {
const selfClose = this.content[this.i] === '/'
if (this.content[this.i] === '>' || (selfClose && this.content[this.i + 1] === '>')) {
if (method) {
this.handler[method](this.content.substring(this.start, this.i))
this.handler[method](substringWithEmojis(this.content, this.start, this.i))
}
this.i += selfClose ? 2 : 1
this.start = this.i
Expand Down Expand Up @@ -1256,21 +1268,21 @@ Lexer.prototype.text = function () {
if (this.i === -1) {
// 没有标签了
if (this.start < this.content.length) {
this.handler.onText(this.content.substring(this.start, this.content.length))
this.handler.onText(substringWithEmojis(this.content, this.start, this.content.length))
}
return
}
const c = this.content[this.i + 1]
if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) {
// 标签开头
if (this.start !== this.i) {
this.handler.onText(this.content.substring(this.start, this.i))
this.handler.onText(substringWithEmojis(this.content, this.start, this.i))
}
this.start = ++this.i
this.state = this.tagName
} else if (c === '/' || c === '!' || c === '?') {
if (this.start !== this.i) {
this.handler.onText(this.content.substring(this.start, this.i))
this.handler.onText(substringWithEmojis(this.content, this.start, this.i))
}
const next = this.content[this.i + 2]
if (c === '/' && ((next >= 'a' && next <= 'z') || (next >= 'A' && next <= 'Z'))) {
Expand Down Expand Up @@ -1302,7 +1314,7 @@ Lexer.prototype.text = function () {
Lexer.prototype.tagName = function () {
if (blankChar[this.content[this.i]]) {
// 解析到标签名
this.handler.onTagName(this.content.substring(this.start, this.i))
this.handler.onTagName(substringWithEmojis(this.content, this.start, this.i))
while (blankChar[this.content[++this.i]]);
if (this.i < this.content.length && !this.checkClose()) {
this.start = this.i
Expand All @@ -1321,7 +1333,7 @@ Lexer.prototype.attrName = function () {
let c = this.content[this.i]
if (blankChar[c] || c === '=') {
// 解析到属性名
this.handler.onAttrName(this.content.substring(this.start, this.i))
this.handler.onAttrName(substringWithEmojis(this.content, this.start, this.i))
let needVal = c === '='
const len = this.content.length
while (++this.i < len) {
Expand Down Expand Up @@ -1360,12 +1372,12 @@ Lexer.prototype.attrVal = function () {
this.start = ++this.i
this.i = this.content.indexOf(c, this.i)
if (this.i === -1) return
this.handler.onAttrVal(this.content.substring(this.start, this.i))
this.handler.onAttrVal(substringWithEmojis(this.content, this.start, this.i))
} else {
// 没有冒号的属性
for (; this.i < len; this.i++) {
if (blankChar[this.content[this.i]]) {
this.handler.onAttrVal(this.content.substring(this.start, this.i))
this.handler.onAttrVal(substringWithEmojis(this.content, this.start, this.i))
break
} else if (this.checkClose('onAttrVal')) return
}
Expand All @@ -1385,7 +1397,7 @@ Lexer.prototype.attrVal = function () {
Lexer.prototype.endTag = function () {
const c = this.content[this.i]
if (blankChar[c] || c === '>' || c === '/') {
this.handler.onCloseTag(this.content.substring(this.start, this.i))
this.handler.onCloseTag(substringWithEmojis(this.content, this.start, this.i))
if (c !== '>') {
this.i = this.content.indexOf('>', this.i)
if (this.i === -1) return
Expand Down