@portabletext/editor 1.17.0 → 1.17.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portabletext/editor",
-  "version": "1.17.0",
+  "version": "1.17.1",
   "description": "Portable Text Editor made in React",
   "keywords": [
     "sanity",
@@ -55,7 +55,7 @@
     "src"
   ],
   "dependencies": {
-    "@portabletext/patches": "1.1.0",
+    "@portabletext/patches": "1.1.1",
     "@xstate/react": "^5.0.0",
     "debug": "^4.3.4",
     "get-random-values-esm": "^1.0.2",
@@ -70,11 +70,11 @@
   },
   "devDependencies": {
     "@portabletext/toolkit": "^2.0.16",
-    "@sanity/block-tools": "^3.67.1",
-    "@sanity/diff-match-patch": "^3.1.1",
+    "@sanity/block-tools": "^3.68.0",
+    "@sanity/diff-match-patch": "^3.1.2",
     "@sanity/pkg-utils": "^6.12.0",
-    "@sanity/schema": "^3.67.1",
-    "@sanity/types": "^3.67.1",
+    "@sanity/schema": "^3.68.0",
+    "@sanity/types": "^3.68.0",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.1.0",
     "@types/debug": "^4.1.5",
@@ -103,9 +103,9 @@
     "racejar": "1.1.1"
   },
   "peerDependencies": {
-    "@sanity/block-tools": "^3.67.1",
-    "@sanity/schema": "^3.67.1",
-    "@sanity/types": "^3.67.1",
+    "@sanity/block-tools": "^3.68.0",
+    "@sanity/schema": "^3.68.0",
+    "@sanity/types": "^3.68.0",
     "react": "^16.9 || ^17 || ^18 || ^19",
     "rxjs": "^7.8.1",
     "styled-components": "^6.1.13"

package/src/behaviors/behavior.emoji-picker.ts

@@ -37,6 +37,43 @@ export function createEmojiPickerBehaviors<TEmojiMatch>(
   })
 
   return [
+    defineBehavior({
+      on: 'insert.text',
+      guard: ({context, event}) => {
+        const isEmojiChar = emojiCharRegEx.test(event.text)
+
+        if (!isEmojiChar) {
+          return {emojis: []}
+        }
+
+        const focusBlock = selectors.getFocusTextBlock({context})
+        const textBefore = selectors.getBlockTextBefore({context})
+        const emojiKeyword = `${textBefore}${event.text}`.match(
+          incompleteEmojiRegEx,
+        )?.[1]
+
+        if (!focusBlock || emojiKeyword === undefined) {
+          return {emojis: []}
+        }
+
+        const emojis = config.matchEmojis({keyword: emojiKeyword})
+
+        return {emojis}
+      },
+      actions: [
+        (_, params) => [
+          {
+            type: 'effect',
+            effect: () => {
+              emojiPickerActor.send({
+                type: 'emojis found',
+                matches: params.emojis,
+              })
+            },
+          },
+        ],
+      ],
+    }),
     defineBehavior({
       on: 'insert.text',
       guard: ({context, event}) => {
@@ -106,43 +143,6 @@ export function createEmojiPickerBehaviors<TEmojiMatch>(
         ],
       ],
     }),
-    defineBehavior({
-      on: 'insert.text',
-      guard: ({context, event}) => {
-        const isEmojiChar = emojiCharRegEx.test(event.text)
-
-        if (!isEmojiChar) {
-          return {emojis: []}
-        }
-
-        const focusBlock = selectors.getFocusTextBlock({context})
-        const textBefore = selectors.getBlockTextBefore({context})
-        const emojiKeyword = `${textBefore}${event.text}`.match(
-          incompleteEmojiRegEx,
-        )?.[1]
-
-        if (!focusBlock || emojiKeyword === undefined) {
-          return {emojis: []}
-        }
-
-        const emojis = config.matchEmojis({keyword: emojiKeyword})
-
-        return {emojis}
-      },
-      actions: [
-        (_, params) => [
-          {
-            type: 'effect',
-            effect: () => {
-              emojiPickerActor.send({
-                type: 'emojis found',
-                matches: params.emojis,
-              })
-            },
-          },
-        ],
-      ],
-    }),
     defineBehavior({
       on: 'key.down',
       guard: ({context, event}) => {
@@ -158,9 +158,9 @@ export function createEmojiPickerBehaviors<TEmojiMatch>(
         const isArrowUp = isHotkey('ArrowUp', event.keyboardEvent)
         const isEnter = isHotkey('Enter', event.keyboardEvent)
         const isTab = isHotkey('Tab', event.keyboardEvent)
+        const matches = emojiPickerActor.getSnapshot().context.matches
 
         if (isEnter || isTab) {
-          const matches = emojiPickerActor.getSnapshot().context.matches
           const selectedIndex =
             emojiPickerActor.getSnapshot().context.selectedIndex
 
@@ -195,11 +195,11 @@ export function createEmojiPickerBehaviors<TEmojiMatch>(
           return false
         }
 
-        if (isArrowDown) {
+        if (isArrowDown && matches.length > 0) {
           return {action: 'navigate down' as const}
         }
 
-        if (isArrowUp) {
+        if (isArrowUp && matches.length > 0) {
           return {action: 'navigate up' as const}
         }
 
@@ -283,6 +283,12 @@ export function createEmojiPickerBehaviors<TEmojiMatch>(
           return false
         }
 
+        const matches = emojiPickerActor.getSnapshot().context.matches
+
+        if (matches.length === 0) {
+          return false
+        }
+
         const focusBlock = selectors.getFocusTextBlock({context})
         const textBefore = selectors.getBlockTextBefore({context})
         const emojiKeyword = textBefore
@@ -290,7 +296,7 @@ export function createEmojiPickerBehaviors<TEmojiMatch>(
           .match(incompleteEmojiRegEx)?.[1]
 
         if (!focusBlock || emojiKeyword === undefined) {
-          return {emojis: [], event}
+          return {emojis: []}
         }
 
         const emojis = config.matchEmojis({keyword: emojiKeyword})