Skip to content

Commit

Permalink
fix: fix emoji placement (#2626) (#2645)
Browse files Browse the repository at this point in the history
  • Loading branch information
nonnullish authored Mar 4, 2024
1 parent 9f04e17 commit 0c15aa5
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 3 deletions.
35 changes: 32 additions & 3 deletions composables/tiptap/emoji.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import type { ExtendedRegExpMatchArray } from '@tiptap/core'
import type { ExtendedRegExpMatchArray, InputRuleFinder, nodeInputRule } from '@tiptap/core'
import type { NodeType } from '@tiptap/pm/model'
import {
InputRule,
Node,
callOrReturn,
mergeAttributes,
nodeInputRule,
nodePasteRule,
} from '@tiptap/core'
import { emojiRegEx, getEmojiAttributes } from '~/config/emojis'
Expand Down Expand Up @@ -80,7 +82,34 @@ export const TiptapPluginEmoji = Node.create({
},

addInputRules() {
return createEmojiRule(nodeInputRule, this.type)
function emojiInputRule(config: {
find: InputRuleFinder
type: NodeType
getAttributes?:
| Record<string, any>
| ((match: ExtendedRegExpMatchArray) => Record<string, any>)
| false
| null
}) {
return new InputRule({
find: config.find,
handler: ({ state, range, match }) => {
const attributes = callOrReturn(config.getAttributes, undefined, match) || {}
const { tr } = state
const start = range.from
const end = range.to

tr.insert(start, config.type.create(attributes)).delete(
tr.mapping.map(start),
tr.mapping.map(end),
)

tr.scrollIntoView()
},
})
}

return createEmojiRule(emojiInputRule, this.type)
},

addPasteRules() {
Expand Down
2 changes: 2 additions & 0 deletions mocks/tiptap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,7 @@ export const nodePasteRule = proxy
export const VueNodeViewRenderer = proxy
export const findChildren = proxy
export const VueRenderer = proxy
export const callOrReturn = proxy
export const InputRule = proxy

export { proxy as default }

0 comments on commit 0c15aa5

Please sign in to comment.