expo-native-sheet-emojis 2.0.4 → 2.1.1

package/android/src/main/java/expo/community/modules/emojisheet/EmojiSheetContentView.kt

@@ -2,6 +2,8 @@ package expo.community.modules.emojisheet
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.os.Handler
+import android.os.Looper
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
@@ -27,9 +29,30 @@ class EmojiSheetContentView(
         pickerView.loadDataAsync()
     }
 
+    private var hasOpened = false
+    private val mainHandler = Handler(Looper.getMainLooper())
+    // A transient detach (layout reparenting, brief clipping) is followed by a
+    // reattach on the same or next loop. Defer the dismiss one loop and skip it if
+    // the view came back, so onDismiss fires only when the view stays detached.
+    private val emitDismissIfStillDetached = Runnable {
+        if (!isAttachedToWindow) {
+            hasOpened = false
+            onDismiss(mapOf<String, Any>())
+        }
+    }
+
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
-        onOpen(mapOf<String, Any>())
+        mainHandler.removeCallbacks(emitDismissIfStillDetached)
+        if (!hasOpened) {
+            hasOpened = true
+            onOpen(mapOf<String, Any>())
+        }
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        mainHandler.post(emitDismissIfStillDetached)
     }
 
     fun applyConfiguration() {
@@ -61,14 +84,17 @@ class EmojiSheetContentView(
 
     fun updateRecentLimit(limit: Int) {
         pickerView.recentLimit = limit
+        pickerView.rebuildAfterPropChange()
     }
 
     fun updateShowSearch(show: Boolean) {
         pickerView.showSearch = show
+        pickerView.applyConfiguration()
     }
 
     fun updateShowRecents(show: Boolean) {
         pickerView.showRecents = show
+        pickerView.rebuildAfterPropChange()
     }
 
     fun updateEnableSkinTones(enable: Boolean) {
@@ -93,9 +119,11 @@ class EmojiSheetContentView(
 
     fun updateCategoryNames(names: Map<String, String>) {
         pickerView.categoryNames = names
+        pickerView.rebuildAfterPropChange()
     }
 
     fun updateExcludeEmojis(ids: List<String>) {
         pickerView.excludeEmojis = ids.toSet()
+        pickerView.rebuildAfterPropChange()
     }
 }

package/android/src/main/java/expo/community/modules/emojisheet/EmojiSheetModule.kt

@@ -9,11 +9,14 @@ import android.view.ViewGroup
 import android.view.animation.AccelerateDecelerateInterpolator
 import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
+import android.widget.Button
+import android.widget.FrameLayout
+import android.widget.LinearLayout
+import androidx.core.view.AccessibilityDelegateCompat
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
-import android.widget.FrameLayout
-import android.widget.LinearLayout
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import expo.modules.kotlin.Promise
@@ -124,6 +127,12 @@ class EmojiSheetModule : Module() {
 
     private fun presentSheet(options: Map<String, Any>, promise: Promise) {
         val activity = appContext.currentActivity ?: return
+        // Single-flight guard (mirrors iOS): ignore a second present() while a sheet
+        // is already open so the first promise is never orphaned and dialogs cannot stack.
+        if (currentPromise != null || dialog != null) {
+            promise.resolve(Bundle().apply { putBoolean("cancelled", true) })
+            return
+        }
         val themeString = options["theme"] as? String ?: "light"
         val isDark = when (themeString) {
             "dark" -> true
@@ -250,19 +259,37 @@ class EmojiSheetModule : Module() {
         }
 
         // Drag handle
+        val handleTargetHeight = (24 * density).toInt()
         val handleBar = View(activity).apply {
             val width = (40 * density).toInt()
             val height = (4 * density).toInt()
-            layoutParams = LinearLayout.LayoutParams(width, height).apply {
-                gravity = Gravity.CENTER_HORIZONTAL
+            layoutParams = FrameLayout.LayoutParams(width, height, Gravity.TOP or Gravity.CENTER_HORIZONTAL).apply {
                 topMargin = (8 * density).toInt()
-                bottomMargin = (4 * density).toInt()
             }
             background = GradientDrawable().apply {
                 setColor(handleColor)
                 cornerRadius = height / 2f
             }
         }
+        val handleTouchTarget = FrameLayout(activity).apply {
+            layoutParams = LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                handleTargetHeight
+            )
+            contentDescription = "Dismiss emoji sheet"
+            importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_YES
+            isClickable = true
+            isFocusable = true
+            setOnClickListener { dismissSheet(cancelled = true) }
+            ViewCompat.setAccessibilityDelegate(this, object : AccessibilityDelegateCompat() {
+                override fun onInitializeAccessibilityNodeInfo(host: View, info: AccessibilityNodeInfoCompat) {
+                    super.onInitializeAccessibilityNodeInfo(host, info)
+                    info.className = Button::class.java.name
+                    info.hintText = "Double tap to dismiss."
+                }
+            })
+            addView(handleBar)
+        }
 
         // Container
         val halfExpandedRatio = (snapPoints.firstOrNull()?.toFloat() ?: 0.5f).coerceIn(0.05f, 1f)
@@ -285,7 +312,7 @@ class EmojiSheetModule : Module() {
             }
             clipToOutline = true
             outlineProvider = android.view.ViewOutlineProvider.BACKGROUND
-            addView(handleBar)
+            addView(handleTouchTarget)
             val pickerLp = LinearLayout.LayoutParams(
                 LinearLayout.LayoutParams.MATCH_PARENT, 0, 1f
             )
@@ -539,8 +566,19 @@ class EmojiSheetModule : Module() {
 
     private fun parseColor(hex: String?): Int? {
         if (hex == null) return null
+        val trimmed = hex.trim()
+        // 8-digit hex is #RRGGBBAA (CSS / iOS order). Android's Color.parseColor reads
+        // 8-digit as #AARRGGBB, so parse it manually to keep both platforms in sync.
+        if (trimmed.startsWith("#") && trimmed.length == 9) {
+            val value = trimmed.substring(1).toLongOrNull(16) ?: return null
+            val r = ((value shr 24) and 0xFF).toInt()
+            val g = ((value shr 16) and 0xFF).toInt()
+            val b = ((value shr 8) and 0xFF).toInt()
+            val a = (value and 0xFF).toInt()
+            return Color.argb(a, r, g, b)
+        }
         return try {
-            Color.parseColor(hex)
+            Color.parseColor(trimmed)
         } catch (e: IllegalArgumentException) {
             null
         }

package/android/src/main/java/expo/community/modules/emojisheet/EmojiSheetUIView.kt

@@ -21,6 +21,7 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.ensureActive
+import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -39,8 +40,11 @@ class EmojiSheetUIView(context: Context) : LinearLayout(context) {
         private var cachedData: Pair<List<EmojiCategory>, Map<String, List<String>>>? = null
 
         fun warmCache(context: Context) {
-            if (cachedData != null) return
             val appContext = context.applicationContext
+            cacheScope.launch {
+                appContext.getSharedPreferences(FREQ_PREFS, Context.MODE_PRIVATE).all
+            }
+            if (cachedData != null) return
             cacheScope.launch {
                 loadCachedData(appContext)
             }
@@ -57,8 +61,11 @@ class EmojiSheetUIView(context: Context) : LinearLayout(context) {
                     val keywords = loadAllKeywords(context)
                     Pair(categories, keywords).also { cachedData = it }
                 } catch (e: Exception) {
+                    // Degrade to an empty data set instead of throwing an uncaught
+                    // coroutine exception (which would crash the app). Not cached, so a
+                    // later attempt can still succeed. Mirrors iOS, which returns [].
                     android.util.Log.e("EmojiSheet", "Failed to load emoji data", e)
-                    throw e
+                    Pair(emptyList(), emptyMap())
                 }
             }
         }
@@ -98,6 +105,13 @@ class EmojiSheetUIView(context: Context) : LinearLayout(context) {
     var columns: Int = 7
     var emojiSize: Float = 32f
     var showSearch: Boolean = true
+        set(value) {
+            field = value
+            if (!value && currentSearchQuery.isNotBlank()) {
+                searchBar.clearSearch()
+                onSearch("")
+            }
+        }
     var showRecents: Boolean = true
     var enableSkinTones: Boolean = true
     var enableHaptics: Boolean = true
@@ -130,6 +144,7 @@ class EmojiSheetUIView(context: Context) : LinearLayout(context) {
 
     private var isSearchActive = false
     private var bottomPillContainer: View? = null
+    private var bottomBarWrapper: FrameLayout? = null
     private var suppressCategorySync = false
     private var currentSearchQuery = ""
     private var didTriggerExpandForCurrentDrag = false
@@ -146,7 +161,7 @@ class EmojiSheetUIView(context: Context) : LinearLayout(context) {
     private var baseRecyclerBottomPadding = 0
     private var keyboardRecyclerBottomPadding = 0
     private var usesDockedSheetKeyboardInsets = false
-    private val viewScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
+    private var viewScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
     private var loadJob: Job? = null
     private var searchJob: Job? = null
 
@@ -212,9 +227,12 @@ class EmojiSheetUIView(context: Context) : LinearLayout(context) {
                             lastTopPullDragDistance = 0f
                             isHandlingTopPullDrag = false
                             topPullStartY = null
+                            // While the sheet is expanding, halt any momentum scroll but do
+                            // NOT swallow the gesture: intercepting DOWN/UP would cancel an
+                            // emoji tap. Only a drag (ACTION_MOVE below) is intercepted, so a
+                            // plain tap still reaches the cell even mid-expansion.
                             if (isSheetExpansionInProgress) {
                                 rv.stopScroll()
-                                return true
                             }
                         }
                         android.view.MotionEvent.ACTION_UP,
@@ -232,15 +250,22 @@ class EmojiSheetUIView(context: Context) : LinearLayout(context) {
                             velocityTracker = null
                             if (isSheetExpansionInProgress) {
                                 rv.stopScroll()
-                                return true
                             }
                         }
                     }
 
                     if (e.actionMasked == android.view.MotionEvent.ACTION_MOVE) {
                         if (isSheetExpansionInProgress) {
-                            rv.stopScroll()
-                            return true
+                            // Only steal the gesture once it becomes a real drag (past touch
+                            // slop). A finger tap jitters a pixel or two; intercepting that
+                            // here cancels the emoji tap whenever this flag is set while the
+                            // keyboard is up — which is exactly the "can't tap while searching"
+                            // bug. Sub-slop movement falls through so the cell click fires.
+                            if (kotlin.math.abs(e.y - initialTouchY) > touchSlop) {
+                                rv.stopScroll()
+                                return true
+                            }
+                            return false
                         }
 
                         val deltaY = e.y - initialTouchY
@@ -390,9 +415,13 @@ class EmojiSheetUIView(context: Context) : LinearLayout(context) {
         updateRecyclerBottomPadding()
     }
 
-    /** Call after setting configurable properties but before loadDataAsync to apply layout changes. */
+    /**
+     * Call after setting configurable properties to apply grid + layout changes.
+     * Safe to call repeatedly: grid settings are always refreshed, and the
+     * category-bar hierarchy is only moved when the target position actually changes.
+     */
     fun applyConfiguration() {
-        // Update grid adapter settings
+        // Update grid adapter settings (idempotent — safe on every call)
         gridAdapter.spanCount = columns
         gridAdapter.emojiTextSize = emojiSize
         gridAdapter.enableSkinTones = enableSkinTones
@@ -403,72 +432,105 @@ class EmojiSheetUIView(context: Context) : LinearLayout(context) {
         // Show/hide search
         searchBar.visibility = if (showSearch) View.VISIBLE else View.GONE
 
-        // Category bar position
+        applyCategoryBarPosition()
+    }
+
+    private fun applyCategoryBarPosition() {
         if (categoryBarPosition == "bottom") {
-            // Move category strip to floating pill overlay at bottom
-            val stripIndex = indexOfChild(categoryStrip)
-            if (stripIndex >= 0) {
-                removeView(categoryStrip)
+            if (bottomBarWrapper != null) return // already wrapped; do not re-move the hierarchy
+            moveCategoryBarToBottom()
+        } else {
+            if (bottomBarWrapper == null) {
+                // Already in the default top layout.
+                baseRecyclerBottomPadding = 0
+                updateRecyclerBottomPadding()
+                return
             }
-            // Remove contentFrame from linear layout and re-add in a wrapper
-            removeView(contentFrame)
+            restoreCategoryBarToTop()
+        }
+    }
 
-            val density = context.resources.displayMetrics.density
-            val horizontalInset = (16 * density).toInt()
-            val bottomInset = (8 * density).toInt()
-            val stripHeight = (44 * density).toInt()
-            val cornerRadius = 22 * density
+    private fun moveCategoryBarToBottom() {
+        // Detach the strip and content frame from their current parents (whatever they are).
+        (categoryStrip.parent as? android.view.ViewGroup)?.removeView(categoryStrip)
+        (contentFrame.parent as? android.view.ViewGroup)?.removeView(contentFrame)
 
-            val wrapperFrame = FrameLayout(context).apply {
-                layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, 0, 1f)
-            }
-
-            contentFrame.layoutParams = FrameLayout.LayoutParams(
-                FrameLayout.LayoutParams.MATCH_PARENT,
-                FrameLayout.LayoutParams.MATCH_PARENT
-            )
-            wrapperFrame.addView(contentFrame)
+        val density = context.resources.displayMetrics.density
+        val horizontalInset = (16 * density).toInt()
+        val bottomInset = (8 * density).toInt()
+        val stripHeight = (44 * density).toInt()
+        val cornerRadius = 22 * density
 
-            // Floating pill container with rounded background
-            val pillBackground = android.graphics.drawable.GradientDrawable().apply {
-                setColor(currentTheme.categoryBarBackgroundColor)
-                this.cornerRadius = cornerRadius
-            }
+        val wrapperFrame = FrameLayout(context).apply {
+            layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, 0, 1f)
+        }
 
-            val pillContainer = FrameLayout(context).apply {
-                background = pillBackground
-                elevation = 8 * density
-                clipToOutline = true
-                outlineProvider = android.view.ViewOutlineProvider.BACKGROUND
-            }
+        contentFrame.layoutParams = FrameLayout.LayoutParams(
+            FrameLayout.LayoutParams.MATCH_PARENT,
+            FrameLayout.LayoutParams.MATCH_PARENT
+        )
+        wrapperFrame.addView(contentFrame)
 
-            categoryStrip.setBackgroundColor(android.graphics.Color.TRANSPARENT)
-            categoryStrip.layoutParams = FrameLayout.LayoutParams(
-                FrameLayout.LayoutParams.MATCH_PARENT,
-                stripHeight
-            )
-            pillContainer.addView(categoryStrip)
+        // Floating pill container with rounded background
+        val pillBackground = android.graphics.drawable.GradientDrawable().apply {
+            setColor(currentTheme.categoryBarBackgroundColor)
+            this.cornerRadius = cornerRadius
+        }
 
-            pillContainer.layoutParams = FrameLayout.LayoutParams(
-                FrameLayout.LayoutParams.MATCH_PARENT,
-                stripHeight
-            ).apply {
-                gravity = Gravity.BOTTOM
-                setMargins(horizontalInset, 0, horizontalInset, bottomInset)
-            }
-            bottomPillContainer = pillContainer
-            wrapperFrame.addView(pillContainer)
+        val pillContainer = FrameLayout(context).apply {
+            background = pillBackground
+            elevation = 8 * density
+            clipToOutline = true
+            outlineProvider = android.view.ViewOutlineProvider.BACKGROUND
+        }
 
-            // Bottom padding so grid content scrolls above the floating bar
-            val totalBarSpace = stripHeight + bottomInset * 2
-            baseRecyclerBottomPadding = totalBarSpace
-            updateRecyclerBottomPadding()
+        categoryStrip.setBackgroundColor(android.graphics.Color.TRANSPARENT)
+        categoryStrip.layoutParams = FrameLayout.LayoutParams(
+            FrameLayout.LayoutParams.MATCH_PARENT,
+            stripHeight
+        )
+        pillContainer.addView(categoryStrip)
 
-            addView(wrapperFrame)
-        } else {
-            baseRecyclerBottomPadding = 0
-            updateRecyclerBottomPadding()
+        pillContainer.layoutParams = FrameLayout.LayoutParams(
+            FrameLayout.LayoutParams.MATCH_PARENT,
+            stripHeight
+        ).apply {
+            gravity = Gravity.BOTTOM
+            setMargins(horizontalInset, 0, horizontalInset, bottomInset)
         }
+        bottomPillContainer = pillContainer
+        wrapperFrame.addView(pillContainer)
+
+        // Bottom padding so grid content scrolls above the floating bar
+        val totalBarSpace = stripHeight + bottomInset * 2
+        baseRecyclerBottomPadding = totalBarSpace
+        updateRecyclerBottomPadding()
+
+        bottomBarWrapper = wrapperFrame
+        addView(wrapperFrame)
+    }
+
+    private fun restoreCategoryBarToTop() {
+        val wrapper = bottomBarWrapper ?: return
+        // Detach views from the wrapper, then drop the wrapper itself.
+        (categoryStrip.parent as? android.view.ViewGroup)?.removeView(categoryStrip)
+        (contentFrame.parent as? android.view.ViewGroup)?.removeView(contentFrame)
+        removeView(wrapper)
+        bottomBarWrapper = null
+        bottomPillContainer = null
+
+        // Restore the default top order: searchBar, categoryStrip, contentFrame.
+        categoryStrip.setBackgroundColor(android.graphics.Color.TRANSPARENT)
+        categoryStrip.layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
+        addView(categoryStrip, indexOfChild(searchBar) + 1)
+        contentFrame.layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, 0, 1f)
+        addView(contentFrame)
+
+        categoryStrip.applyTheme(currentTheme)
+        applyLayoutDirection()
+
+        baseRecyclerBottomPadding = 0
+        updateRecyclerBottomPadding()
     }
 
     private fun setGridItems(items: List<EmojiGridAdapter.ListItem>, sectionPositions: List<Int>) {
@@ -509,6 +571,13 @@ class EmojiSheetUIView(context: Context) : LinearLayout(context) {
         }
     }
 
+    fun rebuildAfterPropChange() {
+        if (allCategories.isEmpty()) return
+        allCategoryKeys = buildCategoryKeys()
+        rebuildCategoryStrip()
+        if (currentSearchQuery.isBlank()) buildAndSetItems() else onSearch(currentSearchQuery)
+    }
+
     fun updateTheme(theme: String) {
         currentTheme = EmojiSheetTheme.fromName(theme)
         applyTheme(currentTheme)
@@ -906,6 +975,13 @@ class EmojiSheetUIView(context: Context) : LinearLayout(context) {
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
+        if (!viewScope.isActive) {
+            viewScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
+            // Only reload when data hasn't loaded yet; otherwise the populated grid
+            // and category strip survive the detach, so re-running loadDataAsync would
+            // rebuild the strip and reset scroll to 0 on every reattach.
+            if (allCategories.isEmpty()) loadDataAsync()
+        }
         ViewCompat.requestApplyInsets(this)
     }
 }

package/ios/EmojiGridView.swift

@@ -149,15 +149,26 @@ class EmojiGridView: UIView, UICollectionViewDataSource, UICollectionViewDelegat
     }
 
     func scrollToSection(_ index: Int) {
-        guard index < sections.count else { return }
+        guard index < sections.count, !sections[index].data.isEmpty else { return }
         isScrollingProgrammatically = true
         let indexPath = IndexPath(item: 0, section: index)
-        if let attributes = collectionView.layoutAttributesForSupplementaryElement(
-            ofKind: UICollectionView.elementKindSectionHeader,
-            at: indexPath
-        ) {
-            let offset = CGPoint(x: 0, y: attributes.frame.origin.y - collectionView.contentInset.top)
-            collectionView.setContentOffset(offset, animated: true)
+        // The header pins to the visible bounds, so its queried origin.y can be the
+        // sticky position rather than the section's natural top. Items never pin, so
+        // derive the section top from the first item and the (stable) header height.
+        if let itemAttributes = collectionView.layoutAttributesForItem(at: indexPath) {
+            let headerHeight = collectionView.layoutAttributesForSupplementaryElement(
+                ofKind: UICollectionView.elementKindSectionHeader,
+                at: indexPath
+            )?.frame.height ?? 32
+            let sectionTopInset: CGFloat = 4
+            let sectionTop = itemAttributes.frame.origin.y - headerHeight - sectionTopInset
+            let minOffset = -collectionView.adjustedContentInset.top
+            let maxOffset = max(
+                minOffset,
+                collectionView.contentSize.height - collectionView.bounds.height + collectionView.adjustedContentInset.bottom
+            )
+            let target = min(max(sectionTop - collectionView.adjustedContentInset.top, minOffset), maxOffset)
+            collectionView.setContentOffset(CGPoint(x: 0, y: target), animated: true)
         }
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.35) { [weak self] in
             self?.isScrollingProgrammatically = false
@@ -178,15 +189,8 @@ class EmojiGridView: UIView, UICollectionViewDataSource, UICollectionViewDelegat
 
     static func applyingSkinTone(_ modifier: String, to emoji: String) -> String {
         var scalars = Array(emoji.unicodeScalars)
-        if scalars.count >= 1 {
-            let modifierScalar = modifier.unicodeScalars.first!
-            // Insert skin tone modifier after the first scalar
-            if scalars.count > 1 && scalars[1] == "\u{200D}" {
-                // ZWJ sequence: insert before ZWJ
-                scalars.insert(modifierScalar, at: 1)
-            } else {
-                scalars.insert(modifierScalar, at: 1)
-            }
+        if scalars.count >= 1, let modifierScalar = modifier.unicodeScalars.first {
+            scalars.insert(modifierScalar, at: 1)
         }
         return String(String.UnicodeScalarView(scalars))
     }

package/ios/EmojiSheetContentView.swift

@@ -27,6 +27,7 @@ class EmojiSheetContentView: ExpoView, EmojiSheetUIViewDelegate {
     let onDismiss = EventDispatcher()
     let onOpen = EventDispatcher()
     private let pickerView = EmojiSheetUIView()
+    private var hasOpened = false
 
     required init(appContext: AppContext? = nil) {
         super.init(appContext: appContext)
@@ -49,7 +50,21 @@ class EmojiSheetContentView: ExpoView, EmojiSheetUIViewDelegate {
     override func didMoveToWindow() {
         super.didMoveToWindow()
         if window != nil {
-            onOpen([:])
+            if !hasOpened {
+                hasOpened = true
+                onOpen([:])
+            }
+        } else {
+            // A transient detach (reparenting, brief clipping) reattaches on the next
+            // runloop. Defer the dismiss and skip it if the view came back, so onDismiss
+            // fires only when the view stays detached (e.g. real unmount).
+            DispatchQueue.main.async { [weak self, dismiss = onDismiss] in
+                if let self {
+                    if self.window != nil { return }
+                    self.hasOpened = false
+                }
+                dismiss([:])
+            }
         }
     }
 

package/ios/EmojiSheetModule.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name           = 'EmojiSheetModule'
-  s.version        = '2.0.4'
+  s.version        = '2.1.1'
   s.summary        = 'Native emoji picker bottom sheet for React Native'
   s.description    = 'A fully native iOS/Android emoji picker presented in a bottom sheet with search, skin tones, and theming support.'
   s.author         = ''

package/ios/EmojiSheetModule.swift

@@ -337,6 +337,7 @@ private final class SheetViewController: UIViewController, UIGestureRecognizerDe
 
     private let backdropView = UIView()
     private let sheetContainerView = UIView()
+    private let grabberHitAreaView = UIControl()
     private let grabberView = UIView()
     private let contentContainerView = UIView()
     private let backdropColor: UIColor
@@ -411,6 +412,11 @@ private final class SheetViewController: UIViewController, UIGestureRecognizerDe
         applyDetentLayout(currentDetent)
     }
 
+    override func accessibilityPerformEscape() -> Bool {
+        requestDismiss()
+        return true
+    }
+
     func embedPickerView(_ embeddedView: UIView) {
         embeddedView.translatesAutoresizingMaskIntoConstraints = false
         contentContainerView.addSubview(embeddedView)
@@ -574,9 +580,7 @@ private final class SheetViewController: UIViewController, UIGestureRecognizerDe
         let dismissalThreshold = max(sheetContainerView.bounds.height * 0.5, 1)
         let shouldDismiss = distance >= dismissalThreshold || velocity >= 1400
         if shouldDismiss {
-            dismissSheet { [weak self] in
-                self?.onDismiss?()
-            }
+            requestDismiss()
             return
         }
 
@@ -632,17 +636,28 @@ private final class SheetViewController: UIViewController, UIGestureRecognizerDe
         sheetContainerView.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner]
         sheetContainerView.layer.masksToBounds = true
 
+        grabberHitAreaView.translatesAutoresizingMaskIntoConstraints = false
+        grabberHitAreaView.backgroundColor = .clear
+        grabberHitAreaView.isAccessibilityElement = true
+        grabberHitAreaView.accessibilityLabel = "Dismiss emoji sheet"
+        grabberHitAreaView.accessibilityHint = "Double-tap to dismiss."
+        grabberHitAreaView.accessibilityTraits = .button
+        grabberHitAreaView.addTarget(self, action: #selector(handleGrabberTap), for: .touchUpInside)
+
         grabberView.translatesAutoresizingMaskIntoConstraints = false
         grabberView.backgroundColor = theme.handleColor
         grabberView.layer.cornerRadius = Layout.grabberHeight / 2
+        grabberView.isUserInteractionEnabled = false
 
         contentContainerView.translatesAutoresizingMaskIntoConstraints = false
         contentContainerView.backgroundColor = .clear
 
+        sheetContainerView.accessibilityViewIsModal = true
         view.addSubview(backdropView)
         view.addSubview(sheetContainerView)
         sheetContainerView.addSubview(contentContainerView)
-        sheetContainerView.addSubview(grabberView)
+        sheetContainerView.addSubview(grabberHitAreaView)
+        grabberHitAreaView.addSubview(grabberView)
 
         if gestureEnabled {
             let panGesture = UIPanGestureRecognizer(target: self, action: #selector(handleSheetPan(_:)))
@@ -668,11 +683,16 @@ private final class SheetViewController: UIViewController, UIGestureRecognizerDe
             sheetContainerView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
             sheetBottomConstraint,
 
+            grabberHitAreaView.topAnchor.constraint(equalTo: sheetContainerView.topAnchor),
+            grabberHitAreaView.centerXAnchor.constraint(equalTo: sheetContainerView.centerXAnchor),
+            grabberHitAreaView.widthAnchor.constraint(equalToConstant: 96),
+            grabberHitAreaView.heightAnchor.constraint(equalToConstant: 24),
+
             grabberView.topAnchor.constraint(
-                equalTo: sheetContainerView.topAnchor,
+                equalTo: grabberHitAreaView.topAnchor,
                 constant: Layout.grabberTopInset
             ),
-            grabberView.centerXAnchor.constraint(equalTo: sheetContainerView.centerXAnchor),
+            grabberView.centerXAnchor.constraint(equalTo: grabberHitAreaView.centerXAnchor),
             grabberView.widthAnchor.constraint(equalToConstant: Layout.grabberWidth),
             grabberView.heightAnchor.constraint(equalToConstant: Layout.grabberHeight),
 
@@ -684,6 +704,15 @@ private final class SheetViewController: UIViewController, UIGestureRecognizerDe
     }
 
     @objc private func handleBackdropTap() {
+        requestDismiss()
+    }
+
+    @objc private func handleGrabberTap() {
+        requestDismiss()
+    }
+
+    private func requestDismiss() {
+        guard !isAnimatingDismissal else { return }
         dismissSheet { [weak self] in
             self?.onDismiss?()
         }
@@ -713,9 +742,7 @@ private final class SheetViewController: UIViewController, UIGestureRecognizerDe
                 velocityY > Layout.dismissVelocityThreshold
 
             if shouldDismiss {
-                dismissSheet { [weak self] in
-                    self?.onDismiss?()
-                }
+                requestDismiss()
             } else {
                 let targetDetent: Detent
 

package/ios/EmojiSheetUIView.swift

@@ -118,7 +118,9 @@ class EmojiSheetUIView: UIView,
     var showSearch: Bool = true {
         didSet { if showSearch != oldValue { configureLayout() } }
     }
-    var showRecents: Bool = true
+    var showRecents: Bool = true {
+        didSet { if showRecents != oldValue { rebuildLoadedSections() } }
+    }
     var enableSkinTones: Bool = true {
         didSet { gridView.enableSkinTones = enableSkinTones }
     }
@@ -128,15 +130,21 @@ class EmojiSheetUIView: UIView,
     var enableAnimations: Bool = false {
         didSet { gridView.enableAnimations = enableAnimations }
     }
-    var recentLimit: Int = 30
+    var recentLimit: Int = 30 {
+        didSet { if recentLimit != oldValue { rebuildLoadedSections() } }
+    }
     var categoryBarPosition: String = "top" {
         didSet { if categoryBarPosition != oldValue { configureLayout() } }
     }
     var layoutDirection: String = "auto" {
         didSet { applyLayoutDirection() }
     }
-    var categoryNames: [String: String]?
-    var excludeEmojis: Set<String> = []
+    var categoryNames: [String: String]? {
+        didSet { if categoryNames != oldValue { rebuildLoadedSections() } }
+    }
+    var excludeEmojis: Set<String> = [] {
+        didSet { if excludeEmojis != oldValue { rebuildLoadedSections() } }
+    }
 
     private var currentTheme: EmojiSheetTheme = .light
     private var allSections: [EmojiSection] = []
@@ -544,6 +552,11 @@ class EmojiSheetUIView: UIView,
         }
     }
 
+    private func rebuildLoadedSections() {
+        guard !allSections.isEmpty else { return }
+        rebuildSections(searchText: currentSearchText)
+    }
+
     // iOS version → max Unicode emoji version. Source: https://emojipedia.org/apple
     // Cases MUST remain ordered most-specific first (Swift evaluates top-to-bottom).
     nonisolated private static func maxSupportedEmojiVersion() -> Double {
@@ -755,19 +768,6 @@ class EmojiSheetUIView: UIView,
         return 0
     }
 
-    /// Fast path: checks pre-normalized text first, then falls back to transliteration-aware variants.
-    private func matchesNormalized(_ normalizedText: String, originalText: String, searchVariants: [String]) -> Bool {
-        if searchVariants.contains(where: normalizedText.contains) {
-            return true
-        }
-
-        return Self.normalizedSearchVariants(originalText)
-            .contains { candidateVariant in
-                candidateVariant != normalizedText &&
-                    searchVariants.contains(where: { candidateVariant.contains($0) })
-            }
-    }
-
     // MARK: - Frequently Used
 
     private func loadFrequentlyUsed() -> [EmojiItem] {

package/lib/commonjs/EmojiSheetView.js

@@ -26,15 +26,9 @@ function EmojiSheetView({
   excludeEmojis,
   ...rest
 }) {
-  const resolvedTheme = typeof theme === 'object' ? 'custom' : theme;
-
-  // For custom themes, we pass individual color props through the native view
-  // For now, the declarative view supports 'dark' | 'light' string themes
-  // Custom theme object support would require additional native view props
-
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(NativeView, {
     ...rest,
-    theme: resolvedTheme,
+    theme: typeof theme === 'string' ? theme : undefined,
     layoutDirection: layoutDirection,
     categoryBarPosition: categoryBarPosition,
     columns: columns,

package/lib/commonjs/EmojiSheetView.js.map

@@ -1 +1 @@
-{"version":3,"names":["_expo","require","_jsxRuntime","NativeView","requireNativeView","EmojiSheetView","onEmojiSelected","onDismiss","onOpen","theme","translations","layoutDirection","categoryBarPosition","columns","emojiSize","recentLimit","showSearch","showRecents","enableSkinTones","enableHaptics","enableAnimations","excludeEmojis","rest","resolvedTheme","jsx","searchPlaceholder","noResultsText","categoryNames","nativeEvent","emoji","name","id","undefined"],"sourceRoot":"../../src","sources":["EmojiSheetView.tsx"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AAAyC,IAAAC,WAAA,GAAAD,OAAA;AAOzC,MAAME,UAA0D,GAC9D,IAAAC,uBAAiB,EAAC,YAAY,CAAC;AAElB,SAASC,cAAcA,CAAC;EACrCC,eAAe;EACfC,SAAS;EACTC,MAAM;EACNC,KAAK;EACLC,YAAY;EACZC,eAAe;EACfC,mBAAmB;EACnBC,OAAO;EACPC,SAAS;EACTC,WAAW;EACXC,UAAU;EACVC,WAAW;EACXC,eAAe;EACfC,aAAa;EACbC,gBAAgB;EAChBC,aAAa;EACb,GAAGC;AACgB,CAAC,EAAE;EACtB,MAAMC,aAAa,GAAG,OAAOd,KAAK,KAAK,QAAQ,GAAG,QAAQ,GAAGA,KAAK;;EAElE;EACA;EACA;;EAEA,oBACE,IAAAP,WAAA,CAAAsB,GAAA,EAACrB,UAAU;IAAA,GACLmB,IAAI;IACRb,KAAK,EAAEc,aAAc;IACrBZ,eAAe,EAAEA,eAAgB;IACjCC,mBAAmB,EAAEA,mBAAoB;IACzCC,OAAO,EAAEA,OAAQ;IACjBC,SAAS,EAAEA,SAAU;IACrBC,WAAW,EAAEA,WAAY;IACzBC,UAAU,EAAEA,UAAW;IACvBC,WAAW,EAAEA,WAAY;IACzBC,eAAe,EAAEA,eAAgB;IACjCC,aAAa,EAAEA,aAAc;IAC7BC,gBAAgB,EAAEA,gBAAiB;IACnCC,aAAa,EAAEA,aAAc;IAC7BI,iBAAiB,EAAEf,YAAY,EAAEe,iBAAkB;IACnDC,aAAa,EAAEhB,YAAY,EAAEgB,aAAc;IAC3CC,aAAa,EAAEjB,YAAY,EAAEiB,aAAc;IAC3CrB,eAAe,EAAEA,CAAC;MAAEsB;IAAY,CAAC,KAAK;MACpCtB,eAAe,CAACsB,WAAW,CAACC,KAAK,EAAED,WAAW,CAACE,IAAI,EAAEF,WAAW,CAACG,EAAE,CAAC;IACtE,CAAE;IACFxB,SAAS,EAAEA,SAAS,GAAG,MAAMA,SAAS,CAAC,CAAC,GAAGyB,SAAU;IACrDxB,MAAM,EAAEA,MAAM,GAAG,MAAMA,MAAM,CAAC,CAAC,GAAGwB;EAAU,CAC7C,CAAC;AAEN","ignoreList":[]}
+{"version":3,"names":["_expo","require","_jsxRuntime","NativeView","requireNativeView","EmojiSheetView","onEmojiSelected","onDismiss","onOpen","theme","translations","layoutDirection","categoryBarPosition","columns","emojiSize","recentLimit","showSearch","showRecents","enableSkinTones","enableHaptics","enableAnimations","excludeEmojis","rest","jsx","undefined","searchPlaceholder","noResultsText","categoryNames","nativeEvent","emoji","name","id"],"sourceRoot":"../../src","sources":["EmojiSheetView.tsx"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AAAyC,IAAAC,WAAA,GAAAD,OAAA;AAOzC,MAAME,UAA0D,GAC9D,IAAAC,uBAAiB,EAAC,YAAY,CAAC;AAElB,SAASC,cAAcA,CAAC;EACrCC,eAAe;EACfC,SAAS;EACTC,MAAM;EACNC,KAAK;EACLC,YAAY;EACZC,eAAe;EACfC,mBAAmB;EACnBC,OAAO;EACPC,SAAS;EACTC,WAAW;EACXC,UAAU;EACVC,WAAW;EACXC,eAAe;EACfC,aAAa;EACbC,gBAAgB;EAChBC,aAAa;EACb,GAAGC;AACgB,CAAC,EAAE;EACtB,oBACE,IAAApB,WAAA,CAAAqB,GAAA,EAACpB,UAAU;IAAA,GACLmB,IAAI;IACRb,KAAK,EAAE,OAAOA,KAAK,KAAK,QAAQ,GAAGA,KAAK,GAAGe,SAAU;IACrDb,eAAe,EAAEA,eAAgB;IACjCC,mBAAmB,EAAEA,mBAAoB;IACzCC,OAAO,EAAEA,OAAQ;IACjBC,SAAS,EAAEA,SAAU;IACrBC,WAAW,EAAEA,WAAY;IACzBC,UAAU,EAAEA,UAAW;IACvBC,WAAW,EAAEA,WAAY;IACzBC,eAAe,EAAEA,eAAgB;IACjCC,aAAa,EAAEA,aAAc;IAC7BC,gBAAgB,EAAEA,gBAAiB;IACnCC,aAAa,EAAEA,aAAc;IAC7BI,iBAAiB,EAAEf,YAAY,EAAEe,iBAAkB;IACnDC,aAAa,EAAEhB,YAAY,EAAEgB,aAAc;IAC3CC,aAAa,EAAEjB,YAAY,EAAEiB,aAAc;IAC3CrB,eAAe,EAAEA,CAAC;MAAEsB;IAAY,CAAC,KAAK;MACpCtB,eAAe,CAACsB,WAAW,CAACC,KAAK,EAAED,WAAW,CAACE,IAAI,EAAEF,WAAW,CAACG,EAAE,CAAC;IACtE,CAAE;IACFxB,SAAS,EAAEA,SAAS,GAAG,MAAMA,SAAS,CAAC,CAAC,GAAGiB,SAAU;IACrDhB,MAAM,EAAEA,MAAM,GAAG,MAAMA,MAAM,CAAC,CAAC,GAAGgB;EAAU,CAC7C,CAAC;AAEN","ignoreList":[]}

package/lib/module/EmojiSheetView.js

@@ -22,15 +22,9 @@ export default function EmojiSheetView({
   excludeEmojis,
   ...rest
 }) {
-  const resolvedTheme = typeof theme === 'object' ? 'custom' : theme;
-
-  // For custom themes, we pass individual color props through the native view
-  // For now, the declarative view supports 'dark' | 'light' string themes
-  // Custom theme object support would require additional native view props
-
   return /*#__PURE__*/_jsx(NativeView, {
     ...rest,
-    theme: resolvedTheme,
+    theme: typeof theme === 'string' ? theme : undefined,
     layoutDirection: layoutDirection,
     categoryBarPosition: categoryBarPosition,
     columns: columns,

package/lib/module/EmojiSheetView.js.map

@@ -1 +1 @@
-{"version":3,"names":["requireNativeView","jsx","_jsx","NativeView","EmojiSheetView","onEmojiSelected","onDismiss","onOpen","theme","translations","layoutDirection","categoryBarPosition","columns","emojiSize","recentLimit","showSearch","showRecents","enableSkinTones","enableHaptics","enableAnimations","excludeEmojis","rest","resolvedTheme","searchPlaceholder","noResultsText","categoryNames","nativeEvent","emoji","name","id","undefined"],"sourceRoot":"../../src","sources":["EmojiSheetView.tsx"],"mappings":";;AAAA,SAASA,iBAAiB,QAAQ,MAAM;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAOzC,MAAMC,UAA0D,GAC9DH,iBAAiB,CAAC,YAAY,CAAC;AAEjC,eAAe,SAASI,cAAcA,CAAC;EACrCC,eAAe;EACfC,SAAS;EACTC,MAAM;EACNC,KAAK;EACLC,YAAY;EACZC,eAAe;EACfC,mBAAmB;EACnBC,OAAO;EACPC,SAAS;EACTC,WAAW;EACXC,UAAU;EACVC,WAAW;EACXC,eAAe;EACfC,aAAa;EACbC,gBAAgB;EAChBC,aAAa;EACb,GAAGC;AACgB,CAAC,EAAE;EACtB,MAAMC,aAAa,GAAG,OAAOd,KAAK,KAAK,QAAQ,GAAG,QAAQ,GAAGA,KAAK;;EAElE;EACA;EACA;;EAEA,oBACEN,IAAA,CAACC,UAAU;IAAA,GACLkB,IAAI;IACRb,KAAK,EAAEc,aAAc;IACrBZ,eAAe,EAAEA,eAAgB;IACjCC,mBAAmB,EAAEA,mBAAoB;IACzCC,OAAO,EAAEA,OAAQ;IACjBC,SAAS,EAAEA,SAAU;IACrBC,WAAW,EAAEA,WAAY;IACzBC,UAAU,EAAEA,UAAW;IACvBC,WAAW,EAAEA,WAAY;IACzBC,eAAe,EAAEA,eAAgB;IACjCC,aAAa,EAAEA,aAAc;IAC7BC,gBAAgB,EAAEA,gBAAiB;IACnCC,aAAa,EAAEA,aAAc;IAC7BG,iBAAiB,EAAEd,YAAY,EAAEc,iBAAkB;IACnDC,aAAa,EAAEf,YAAY,EAAEe,aAAc;IAC3CC,aAAa,EAAEhB,YAAY,EAAEgB,aAAc;IAC3CpB,eAAe,EAAEA,CAAC;MAAEqB;IAAY,CAAC,KAAK;MACpCrB,eAAe,CAACqB,WAAW,CAACC,KAAK,EAAED,WAAW,CAACE,IAAI,EAAEF,WAAW,CAACG,EAAE,CAAC;IACtE,CAAE;IACFvB,SAAS,EAAEA,SAAS,GAAG,MAAMA,SAAS,CAAC,CAAC,GAAGwB,SAAU;IACrDvB,MAAM,EAAEA,MAAM,GAAG,MAAMA,MAAM,CAAC,CAAC,GAAGuB;EAAU,CAC7C,CAAC;AAEN","ignoreList":[]}
+{"version":3,"names":["requireNativeView","jsx","_jsx","NativeView","EmojiSheetView","onEmojiSelected","onDismiss","onOpen","theme","translations","layoutDirection","categoryBarPosition","columns","emojiSize","recentLimit","showSearch","showRecents","enableSkinTones","enableHaptics","enableAnimations","excludeEmojis","rest","undefined","searchPlaceholder","noResultsText","categoryNames","nativeEvent","emoji","name","id"],"sourceRoot":"../../src","sources":["EmojiSheetView.tsx"],"mappings":";;AAAA,SAASA,iBAAiB,QAAQ,MAAM;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAOzC,MAAMC,UAA0D,GAC9DH,iBAAiB,CAAC,YAAY,CAAC;AAEjC,eAAe,SAASI,cAAcA,CAAC;EACrCC,eAAe;EACfC,SAAS;EACTC,MAAM;EACNC,KAAK;EACLC,YAAY;EACZC,eAAe;EACfC,mBAAmB;EACnBC,OAAO;EACPC,SAAS;EACTC,WAAW;EACXC,UAAU;EACVC,WAAW;EACXC,eAAe;EACfC,aAAa;EACbC,gBAAgB;EAChBC,aAAa;EACb,GAAGC;AACgB,CAAC,EAAE;EACtB,oBACEnB,IAAA,CAACC,UAAU;IAAA,GACLkB,IAAI;IACRb,KAAK,EAAE,OAAOA,KAAK,KAAK,QAAQ,GAAGA,KAAK,GAAGc,SAAU;IACrDZ,eAAe,EAAEA,eAAgB;IACjCC,mBAAmB,EAAEA,mBAAoB;IACzCC,OAAO,EAAEA,OAAQ;IACjBC,SAAS,EAAEA,SAAU;IACrBC,WAAW,EAAEA,WAAY;IACzBC,UAAU,EAAEA,UAAW;IACvBC,WAAW,EAAEA,WAAY;IACzBC,eAAe,EAAEA,eAAgB;IACjCC,aAAa,EAAEA,aAAc;IAC7BC,gBAAgB,EAAEA,gBAAiB;IACnCC,aAAa,EAAEA,aAAc;IAC7BG,iBAAiB,EAAEd,YAAY,EAAEc,iBAAkB;IACnDC,aAAa,EAAEf,YAAY,EAAEe,aAAc;IAC3CC,aAAa,EAAEhB,YAAY,EAAEgB,aAAc;IAC3CpB,eAAe,EAAEA,CAAC;MAAEqB;IAAY,CAAC,KAAK;MACpCrB,eAAe,CAACqB,WAAW,CAACC,KAAK,EAAED,WAAW,CAACE,IAAI,EAAEF,WAAW,CAACG,EAAE,CAAC;IACtE,CAAE;IACFvB,SAAS,EAAEA,SAAS,GAAG,MAAMA,SAAS,CAAC,CAAC,GAAGgB,SAAU;IACrDf,MAAM,EAAEA,MAAM,GAAG,MAAMA,MAAM,CAAC,CAAC,GAAGe;EAAU,CAC7C,CAAC;AAEN","ignoreList":[]}

package/lib/typescript/EmojiSheetModule.types.d.ts

@@ -62,7 +62,7 @@ export type EmojiSheetViewProps = ViewProps & {
     onEmojiSelected: (emoji: string, name: string, id: string) => void;
     onDismiss?: () => void;
     onOpen?: () => void;
-    theme?: EmojiSheetTheme | 'dark' | 'light' | 'system';
+    theme?: 'dark' | 'light' | 'system';
     translations?: EmojiSheetTranslations;
     layoutDirection?: 'ltr' | 'rtl' | 'auto';
     categoryBarPosition?: 'top' | 'bottom';

package/lib/typescript/EmojiSheetModule.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EmojiSheetModule.types.d.ts","sourceRoot":"","sources":["../../src/EmojiSheetModule.types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"EmojiSheetModule.types.d.ts","sourceRoot":"","sources":["../../src/EmojiSheetModule.types.ts"],"names":[],"mappings":"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"}

package/lib/typescript/EmojiSheetView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EmojiSheetView.d.ts","sourceRoot":"","sources":["../../src/EmojiSheetView.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAEV,mBAAmB,EACpB,MAAM,0BAA0B,CAAC;AAKlC,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EACrC,eAAe,EACf,SAAS,EACT,MAAM,EACN,KAAK,EACL,YAAY,EACZ,eAAe,EACf,mBAAmB,EACnB,OAAO,EACP,SAAS,EACT,WAAW,EACX,UAAU,EACV,WAAW,EACX,eAAe,EACf,aAAa,EACb,gBAAgB,EAChB,aAAa,EACb,GAAG,IAAI,EACR,EAAE,mBAAmB,2CAgCrB"}
+{"version":3,"file":"EmojiSheetView.d.ts","sourceRoot":"","sources":["../../src/EmojiSheetView.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAEV,mBAAmB,EACpB,MAAM,0BAA0B,CAAC;AAKlC,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EACrC,eAAe,EACf,SAAS,EACT,MAAM,EACN,KAAK,EACL,YAAY,EACZ,eAAe,EACf,mBAAmB,EACnB,OAAO,EACP,SAAS,EACT,WAAW,EACX,UAAU,EACV,WAAW,EACX,eAAe,EACf,aAAa,EACb,gBAAgB,EAChB,aAAa,EACb,GAAG,IAAI,EACR,EAAE,mBAAmB,2CA0BrB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-native-sheet-emojis",
-  "version": "2.0.4",
+  "version": "2.1.1",
   "description": "A fully native emoji picker bottom sheet for React Native. Built with Swift and Kotlin for maximum performance. Features search with multilingual keywords, skin tones, frequently used tracking, theming, and configurable layout.",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",

package/src/EmojiSheetModule.types.ts

@@ -65,7 +65,7 @@ export type EmojiSheetViewProps = ViewProps & {
   onEmojiSelected: (emoji: string, name: string, id: string) => void;
   onDismiss?: () => void;
   onOpen?: () => void;
-  theme?: EmojiSheetTheme | 'dark' | 'light' | 'system';
+  theme?: 'dark' | 'light' | 'system';
   translations?: EmojiSheetTranslations;
   layoutDirection?: 'ltr' | 'rtl' | 'auto';
   categoryBarPosition?: 'top' | 'bottom';

package/src/EmojiSheetView.tsx

@@ -27,16 +27,10 @@ export default function EmojiSheetView({
   excludeEmojis,
   ...rest
 }: EmojiSheetViewProps) {
-  const resolvedTheme = typeof theme === 'object' ? 'custom' : theme;
-
-  // For custom themes, we pass individual color props through the native view
-  // For now, the declarative view supports 'dark' | 'light' string themes
-  // Custom theme object support would require additional native view props
-
   return (
     <NativeView
       {...rest}
-      theme={resolvedTheme}
+      theme={typeof theme === 'string' ? theme : undefined}
       layoutDirection={layoutDirection}
       categoryBarPosition={categoryBarPosition}
       columns={columns}