Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@
"@tiptap/extension-text": "^3.11.0",
"@tiptap/extension-history": "^3.11.0",
"@tiptap/extension-placeholder": "^3.11.0",
"@tiptap/extension-character-count": "^3.11.0"
"@tiptap/extension-character-count": "^3.11.0",
"unicode-segmenter": "^0.14.5"
},
"devDependencies": {
"@types/dom-speech-recognition": "^0.0.6",
Expand Down
2 changes: 2 additions & 0 deletions packages/components/src/sender/composables/useEditor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import CharacterCount from '@tiptap/extension-character-count'
import type { AnyExtension } from '@tiptap/core'
import type { SenderEmits, UseEditorReturn } from '../index.type'
import type { SenderPropsWithDefaults } from '../index.vue'
import { countGraphemes } from '../utils/countGraphemes'

/**
* 编辑器 Hook
Expand Down Expand Up @@ -46,6 +47,7 @@ export function useEditor(props: SenderPropsWithDefaults, emit: SenderEmits): Us
}),
CharacterCount.configure({
mode: 'textSize',
textCounter: countGraphemes,
}),
]

Expand Down
4 changes: 2 additions & 2 deletions packages/components/src/sender/composables/useSenderCore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import { useEditor } from './useEditor'
import { useKeyboardShortcuts } from './useKeyboardShortcuts'
import { useModeSwitch } from './useModeSwitch'
import { useAutoSize } from './useAutoSize'
import { countGraphemes } from '../utils/countGraphemes'

/**
* useSenderCore 返回类型
Expand Down Expand Up @@ -76,8 +77,7 @@ export function useSenderCore(props: SenderPropsWithDefaults, emit: SenderEmits)

const characterCount = computed(() => {
if (!editor.value) return 0
const text = getTextWithTemplates(editor.value)
return text.length
return countGraphemes(getTextWithTemplates(editor.value))
})

const isOverLimit = computed(() => {
Expand Down
22 changes: 22 additions & 0 deletions packages/components/src/sender/utils/countGraphemes.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { countGraphemes as countGraphemesFallback } from 'unicode-segmenter/grapheme'

const graphemeSegmenter =
typeof Intl !== 'undefined' && typeof Intl.Segmenter === 'function'
? new Intl.Segmenter(undefined, { granularity: 'grapheme' })
: null

export function countGraphemes(text: string): number {
if (!text) return 0

if (graphemeSegmenter) {
let count = 0

for (const _segment of graphemeSegmenter.segment(text)) {
count++
}

return count
}

return countGraphemesFallback(text)
}
1 change: 1 addition & 0 deletions packages/components/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"useDefineForClassFields": true,
"module": "ESNext",
"lib": [
"ES2022.Intl",
"ES2020",
"DOM",
"DOM.Iterable"
Expand Down
Loading