expo-native-sheet-emojis 1.1.0 → 1.2.1

package/android/build.gradle

@@ -20,11 +20,11 @@ buildscript {
 android {
     namespace "expo.community.modules.emojisheet"
 
-    compileSdkVersion safeExtGet("compileSdkVersion", 34)
+    compileSdkVersion safeExtGet("compileSdkVersion", 35)
 
     defaultConfig {
-        minSdkVersion safeExtGet("minSdkVersion", 21)
-        targetSdkVersion safeExtGet("targetSdkVersion", 34)
+        minSdkVersion safeExtGet("minSdkVersion", 24)
+        targetSdkVersion safeExtGet("targetSdkVersion", 35)
         versionCode 1
         versionName "1.0.0"
     }
@@ -45,5 +45,7 @@ android {
         implementation "androidx.recyclerview:recyclerview:1.3.2"
         implementation "androidx.appcompat:appcompat:1.6.1"
         implementation "com.google.android.material:material:1.11.0"
+        implementation "androidx.emoji2:emoji2:1.6.0"
+        implementation "androidx.emoji2:emoji2-views-helper:1.6.0"
     }
 }

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

@@ -1,6 +1,7 @@
 package expo.community.modules.emojisheet
 
 import android.content.Context
+import android.os.Build
 import org.json.JSONArray
 
 data class EmojiItem(
@@ -37,6 +38,7 @@ object EmojiData {
         val json = context.assets.open("emojis.json").bufferedReader().use { it.readText() }
         val array = JSONArray(json)
         val categories = mutableListOf<EmojiCategory>()
+        val maxVersion = maxSupportedEmojiVersion()
         for (i in 0 until array.length()) {
             val obj = array.getJSONObject(i)
             val title = obj.getString("title")
@@ -44,6 +46,8 @@ object EmojiData {
             val items = mutableListOf<EmojiItem>()
             for (j in 0 until dataArray.length()) {
                 val item = dataArray.getJSONObject(j)
+                val emojiVersion = item.getString("v").toDoubleOrNull() ?: 0.0
+                if (emojiVersion > maxVersion) continue
                 val keywordsArray = item.getJSONArray("keywords")
                 val keywords = mutableListOf<String>()
                 for (k in 0 until keywordsArray.length()) {
@@ -65,6 +69,21 @@ object EmojiData {
         return categories
     }
 
+    // API level → max Unicode emoji version (conservative estimates)
+    private fun maxSupportedEmojiVersion(): Double {
+        return when {
+            Build.VERSION.SDK_INT >= 35 -> 16.0
+            Build.VERSION.SDK_INT >= 34 -> 15.0
+            Build.VERSION.SDK_INT >= 33 -> 15.0
+            Build.VERSION.SDK_INT >= 32 -> 14.0
+            Build.VERSION.SDK_INT >= 31 -> 14.0
+            Build.VERSION.SDK_INT >= 30 -> 13.1
+            Build.VERSION.SDK_INT >= 29 -> 12.1
+            Build.VERSION.SDK_INT >= 28 -> 11.0
+            else -> 11.0
+        }
+    }
+
     fun displayName(categoryTitle: String, customNames: Map<String, String>? = null): String {
         customNames?.get(categoryTitle)?.let { return it }
         return categoryDisplayNames[categoryTitle] ?: categoryTitle.replace("_", " ")

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

@@ -8,6 +8,9 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.animation.AccelerateDecelerateInterpolator
 import android.view.WindowManager
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
 import android.widget.FrameLayout
 import android.widget.LinearLayout
 import com.google.android.material.bottomsheet.BottomSheetBehavior
@@ -240,6 +243,18 @@ class EmojiSheetModule : Module() {
 
         bottomSheet.setContentView(container)
 
+        ViewCompat.setOnApplyWindowInsetsListener(container) { view, insets ->
+            val imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime())
+            val systemBarInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            view.setPadding(
+                systemBarInsets.left,
+                0,
+                systemBarInsets.right,
+                maxOf(imeInsets.bottom, systemBarInsets.bottom)
+            )
+            WindowInsetsCompat.CONSUMED
+        }
+
         // Strip ALL backgrounds from BottomSheet internals
         bottomSheet.setOnShowListener { dlg ->
             val d = dlg as BottomSheetDialog
@@ -252,7 +267,9 @@ class EmojiSheetModule : Module() {
             pickerView.loadDataAsync()
         }
 
-        bottomSheet.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
+        bottomSheet.window?.let { window ->
+            WindowCompat.setDecorFitsSystemWindows(window, false)
+        }
         bottomSheet.window?.setDimAmount(backdropOpacity)
 
         bottomSheet.behavior.apply {

package/ios/EmojiSheetModule.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name           = 'EmojiSheetModule'
-  s.version        = '1.1.0'
+  s.version        = '1.2.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/EmojiSheetUIView.swift

@@ -393,6 +393,23 @@ class EmojiSheetUIView: UIView,
         }
     }
 
+    // iOS version → max Unicode emoji version. Source: https://emojipedia.org/apple
+    // Cases MUST remain ordered most-specific first (Swift evaluates top-to-bottom).
+    private static func maxSupportedEmojiVersion() -> Double {
+        let osVersion = ProcessInfo.processInfo.operatingSystemVersion
+        switch (osVersion.majorVersion, osVersion.minorVersion) {
+        case (18, 4...): return 16.0
+        case (18, _):    return 15.1
+        case (17, 4...): return 15.1
+        case (17, _):    return 15.0
+        case (16, 4...): return 15.0
+        case (16, _):    return 14.0
+        case (15, 4...): return 14.0
+        case (15, _):    return 13.1
+        default:         return 13.1
+        }
+    }
+
     private static func parseEmojiJSON() -> [EmojiSection] {
         let bundle = Bundle(for: EmojiSheetUIView.self)
         guard let url = bundle.url(forResource: "emojis", withExtension: "json"),
@@ -402,6 +419,7 @@ class EmojiSheetUIView: UIView,
             return []
         }
 
+        let maxVersion = Self.maxSupportedEmojiVersion()
         return json.compactMap { sectionDict -> EmojiSection? in
             guard let title = sectionDict["title"] as? String,
                   let items = sectionDict["data"] as? [[String: Any]]
@@ -418,6 +436,8 @@ class EmojiSheetUIView: UIView,
                 else {
                     return nil
                 }
+                let emojiVersion = Double(v) ?? 0
+                guard emojiVersion <= maxVersion else { return nil }
                 return EmojiItem(emoji: emoji, name: name, version: v, toneEnabled: toneEnabled, keywords: keywords, id: id)
             }
             return EmojiSection(title: title, data: emojis)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-native-sheet-emojis",
-  "version": "1.1.0",
+  "version": "1.2.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",