react-native-nitro-country-picker 0.1.1 → 0.1.3

package/README.md

@@ -11,9 +11,9 @@ A Promise-based, native country picker for React Native, powered by Nitro Module
 [![Android](https://img.shields.io/badge/Android-API%2024%2B-3DDC84?style=for-the-badge&logo=android&logoColor=white)](https://developer.android.com/)
 [![Nitro Modules](https://img.shields.io/badge/Nitro%20Modules-Enabled-ff6b00?style=for-the-badge)](https://nitro.margelo.com/)
 
-| Preview 1                                                                                                                          | Preview 2                                                                                                             |
-| ---------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- |
-| <img width="350" height="781" alt="Image" src="https://github.com/user-attachments/assets/4205fe25-c4db-47a2-82b9-0c37ed1dda79" /> | <img width="350" alt="Image" src="https://github.com/user-attachments/assets/e639b1e0-d702-4d93-9444-12528d560942" /> |
+| Preview 1                                                                    | Preview 2                                                                            |
+| ---------------------------------------------------------------------------- | ------------------------------------------------------------------------------------ |
+| <img width="350" height="781" alt="iOS Preview" src="./images/cp-ios.png" /> | <img width="350" height="781" alt="Android Preview" src="./images/cp-android.png" /> |
 
 This library provides a single async API that opens a native picker and returns structured country data.
 
@@ -61,6 +61,12 @@ or
 yarn add react-native-nitro-country-picker react-native-nitro-modules
 ```
 
+or
+
+```bash
+pnpm add react-native-nitro-country-picker react-native-nitro-modules
+```
+
 ### iOS Setup
 
 ```bash
@@ -183,10 +189,10 @@ To run the included example app:
 
 ```bash
 cd example
-yarn install
-yarn ios
+pnpm install
+pnpm ios
 # or
-yarn android
+pnpm android
 ```
 
 ---

package/android/build.gradle

@@ -10,7 +10,7 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:8.7.2"
+    classpath "com.android.tools.build:gradle:8.12.0"
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${getExtOrDefault('kotlinVersion')}"
     classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:${getExtOrDefault('kotlinVersion')}"
@@ -36,11 +36,11 @@ def getExtOrIntegerDefault(name) {
 android {
   namespace "com.margelo.nitro.nitrocountrypicker"
 
-  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
+  compileSdk getExtOrIntegerDefault("compileSdkVersion")
 
   defaultConfig {
-    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
-    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+    minSdk getExtOrIntegerDefault("minSdkVersion")
+    targetSdk getExtOrIntegerDefault("targetSdkVersion")
 
     externalNativeBuild {
       cmake {
@@ -66,25 +66,27 @@ android {
     }
   }
 
-  packagingOptions {
-    excludes = [
-            "META-INF",
-            "META-INF/**",
-            "**/libc++_shared.so",
-            "**/libfbjni.so",
-            "**/libjsi.so",
-            "**/libfolly_json.so",
-            "**/libfolly_runtime.so",
-            "**/libglog.so",
-            "**/libhermes.so",
-            "**/libhermes-executor-debug.so",
-            "**/libhermes_executor.so",
-            "**/libreactnative.so",
-            "**/libreactnativejni.so",
-            "**/libturbomodulejsijni.so",
-            "**/libreact_nativemodule_core.so",
-            "**/libjscexecutor.so"
-    ]
+  packaging {
+    resources {
+      excludes += [
+              "META-INF",
+              "META-INF/**",
+              "**/libc++_shared.so",
+              "**/libfbjni.so",
+              "**/libjsi.so",
+              "**/libfolly_json.so",
+              "**/libfolly_runtime.so",
+              "**/libglog.so",
+              "**/libhermes.so",
+              "**/libhermes-executor-debug.so",
+              "**/libhermes_executor.so",
+              "**/libreactnative.so",
+              "**/libreactnativejni.so",
+              "**/libturbomodulejsijni.so",
+              "**/libreact_nativemodule_core.so",
+              "**/libjscexecutor.so"
+      ]
+    }
   }
 
   buildFeatures {
@@ -99,7 +101,7 @@ android {
     }
   }
 
-  lintOptions {
+  lint {
     disable "GradleCompatible"
   }
 

package/android/gradle.properties

@@ -1,5 +1,5 @@
-NitroCountryPicker_kotlinVersion=2.0.21
+NitroCountryPicker_kotlinVersion=2.1.20
 NitroCountryPicker_minSdkVersion=24
-NitroCountryPicker_targetSdkVersion=34
+NitroCountryPicker_targetSdkVersion=36
 NitroCountryPicker_compileSdkVersion=36
 NitroCountryPicker_ndkVersion=27.1.12297006

package/lib/typescript/src/index.d.ts

@@ -1,4 +1,4 @@
-import type { IPickedCountry, PickCountryOptions } from './NitroCountryPicker.nitro';
+import type { IPickedCountry, PickCountryOptions } from './NitroCountryPicker.nitro.js';
 export declare function pickCountry(options?: PickCountryOptions): Promise<IPickedCountry | null>;
 export declare function getLastPickedCountry(): IPickedCountry | null;
 //# sourceMappingURL=index.d.ts.map

package/lib/typescript/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,cAAc,EAEd,kBAAkB,EACnB,MAAM,4BAA4B,CAAC;AAKpC,wBAAgB,WAAW,CACzB,OAAO,CAAC,EAAE,kBAAkB,GAC3B,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAEhC;AAED,wBAAgB,oBAAoB,IAAI,cAAc,GAAG,IAAI,CAE5D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,cAAc,EAEd,kBAAkB,EACnB,MAAM,+BAA4B,CAAC;AAKpC,wBAAgB,WAAW,CACzB,OAAO,CAAC,EAAE,kBAAkB,GAC3B,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAEhC;AAED,wBAAgB,oBAAoB,IAAI,cAAc,GAAG,IAAI,CAE5D"}

package/nitrogen/generated/android/c++/JIPickedCountry.hpp

@@ -17,7 +17,7 @@ namespace margelo::nitro::nitrocountrypicker {
   using namespace facebook;
 
   /**
-   * The C++ JNI bridge between the C++ struct "IPickedCountry" and the the Kotlin data class "IPickedCountry".
+   * The C++ JNI bridge between the C++ struct "IPickedCountry" and the Kotlin data class "IPickedCountry".
    */
   struct JIPickedCountry final: public jni::JavaClass<JIPickedCountry> {
   public:

package/nitrogen/generated/android/c++/JPickCountryOptions.hpp

@@ -18,7 +18,7 @@ namespace margelo::nitro::nitrocountrypicker {
   using namespace facebook;
 
   /**
-   * The C++ JNI bridge between the C++ struct "PickCountryOptions" and the the Kotlin data class "PickCountryOptions".
+   * The C++ JNI bridge between the C++ struct "PickCountryOptions" and the Kotlin data class "PickCountryOptions".
    */
   struct JPickCountryOptions final: public jni::JavaClass<JPickCountryOptions> {
   public:

package/nitrogen/generated/android/kotlin/com/margelo/nitro/nitrocountrypicker/IPickedCountry.kt

@@ -9,6 +9,7 @@ package com.margelo.nitro.nitrocountrypicker
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
+import java.util.Objects
 
 
 /**
@@ -29,6 +30,22 @@ data class IPickedCountry(
 ) {
   /* primary constructor */
 
+  override fun equals(other: Any?): Boolean {
+    if (this === other) return true
+    if (other !is IPickedCountry) return false
+    return Objects.deepEquals(this.name, other.name)
+      && Objects.deepEquals(this.dialCode, other.dialCode)
+      && Objects.deepEquals(this.code, other.code)
+  }
+
+  override fun hashCode(): Int {
+    return arrayOf<Any?>(
+      name,
+      dialCode,
+      code
+    ).contentDeepHashCode()
+  }
+
   companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/nitrocountrypicker/PickCountryOptions.kt

@@ -9,6 +9,7 @@ package com.margelo.nitro.nitrocountrypicker
 
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
+import java.util.Objects
 
 
 /**
@@ -23,6 +24,18 @@ data class PickCountryOptions(
 ) {
   /* primary constructor */
 
+  override fun equals(other: Any?): Boolean {
+    if (this === other) return true
+    if (other !is PickCountryOptions) return false
+    return Objects.deepEquals(this.headerTitle, other.headerTitle)
+  }
+
+  override fun hashCode(): Int {
+    return arrayOf<Any?>(
+      headerTitle
+    ).contentDeepHashCode()
+  }
+
   companion object {
     /**
      * Constructor called from C++

package/nitrogen/generated/android/kotlin/com/margelo/nitro/nitrocountrypicker/Variant_NullType_IPickedCountry.kt

@@ -21,6 +21,22 @@ sealed class Variant_NullType_IPickedCountry {
   @DoNotStrip
   data class Second(@DoNotStrip val value: IPickedCountry): Variant_NullType_IPickedCountry()
 
+  inline fun <reified T> asType(): T? {
+    return when (this) {
+      is First -> (value) as? T
+      is Second -> (value) as? T
+    }
+  }
+  inline fun <reified T> isType(): Boolean {
+    return asType<T>() != null
+  }
+  inline fun <R> match(first: (NullType) -> R, second: (IPickedCountry) -> R): R {
+    return when (this) {
+      is First -> first(value)
+      is Second -> second(value)
+    }
+  }
+
   val isFirst: Boolean
     get() = this is First
   val isSecond: Boolean
@@ -35,13 +51,6 @@ sealed class Variant_NullType_IPickedCountry {
     return value
   }
 
-  inline fun <R> match(first: (NullType) -> R, second: (IPickedCountry) -> R): R {
-    return when (this) {
-      is First -> first(value)
-      is Second -> second(value)
-    }
-  }
-
   companion object {
     @JvmStatic
     @DoNotStrip

package/nitrogen/generated/ios/NitroCountryPicker+autolinking.rb

@@ -56,5 +56,7 @@ def add_nitrogen_files(spec)
     "SWIFT_OBJC_INTEROP_MODE" => "objcxx",
     # Enables stricter modular headers
     "DEFINES_MODULE" => "YES",
+    # Disable auto-generated ObjC header for Swift (Static linkage on Xcode 26.4 breaks here)
+    "SWIFT_INSTALL_OBJC_HEADER" => "NO",
   })
 end

package/nitrogen/generated/ios/swift/Variant_NullType_IPickedCountry.swift

@@ -16,3 +16,15 @@ public indirect enum Variant_NullType_IPickedCountry {
   case first(NullType)
   case second(IPickedCountry)
 }
+
+public extension Variant_NullType_IPickedCountry {
+  func asType<T>(_ type: T.Type = T.self) -> T? {
+    switch self {
+      case .first(let value): return value as? T
+      case .second(let value): return value as? T
+    }
+  }
+  func isType<T>(_ type: T.Type = T.self) -> Bool {
+    return self.asType(type) != nil
+  }
+}

package/package.json

@@ -1,16 +1,21 @@
 {
   "name": "react-native-nitro-country-picker",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Native country picker module, powered by NitroModules",
-  "main": "./lib/module/index.js",
-  "types": "./lib/typescript/src/index.d.ts",
-  "exports": {
-    ".": {
-      "source": "./src/index.tsx",
-      "types": "./lib/typescript/src/index.d.ts",
-      "default": "./lib/module/index.js"
-    },
-    "./package.json": "./package.json"
+  "keywords": [
+    "android",
+    "ios",
+    "react-native"
+  ],
+  "homepage": "https://github.com/Doko-Demo-Doa/react-native-nitro-country-picker#readme",
+  "bugs": {
+    "url": "https://github.com/Doko-Demo-Doa/react-native-nitro-country-picker/issues"
+  },
+  "license": "MIT",
+  "author": "Quan Pham <doraemonfanclub@gmail.com> (https://github.com/Doko-Demo-Doa)",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Doko-Demo-Doa/react-native-nitro-country-picker.git"
   },
   "files": [
     "src",
@@ -33,108 +38,94 @@
     "!**/__mocks__",
     "!**/.*"
   ],
+  "main": "./lib/module/index.js",
+  "types": "./lib/typescript/src/index.d.ts",
+  "exports": {
+    ".": {
+      "react-native-nitro-country-picker-source": "./src/index.tsx",
+      "types": "./lib/typescript/src/index.d.ts",
+      "default": "./lib/module/index.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  },
   "scripts": {
-    "example": "yarn workspace react-native-nitro-country-picker-example",
-    "test": "jest",
-    "typecheck": "tsc",
-    "lint": "eslint \"**/*.{js,ts,tsx}\"",
+    "example": "pnpm --filter react-native-nitro-country-picker-example",
     "clean": "del-cli android/build example/android/build example/android/app/build example/ios/build lib",
+    "postinstall": "node scripts/link-android-deps.js",
     "prepare": "bob build",
     "nitrogen": "nitrogen",
+    "typecheck": "tsc",
+    "lint": "oxlint",
+    "lint:fix": "oxlint --fix",
+    "format": "oxfmt",
+    "format:check": "oxfmt --check",
+    "test": "jest",
     "release": "release-it --only-version"
   },
-  "keywords": [
-    "react-native",
-    "ios",
-    "android"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Doko-Demo-Doa/react-native-nitro-country-picker.git"
-  },
-  "author": "Quan Pham <doraemonfanclub@gmail.com> (https://github.com/Doko-Demo-Doa)",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/Doko-Demo-Doa/react-native-nitro-country-picker/issues"
-  },
-  "homepage": "https://github.com/Doko-Demo-Doa/react-native-nitro-country-picker#readme",
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
-  },
   "devDependencies": {
-    "@commitlint/config-conventional": "^20.5.0",
-    "@eslint/compat": "^2.0.3",
-    "@eslint/eslintrc": "^3.3.5",
-    "@eslint/js": "^10.0.1",
-    "@evilmartians/lefthook": "^2.1.4",
-    "@react-native/babel-preset": "0.84.1",
-    "@react-native/eslint-config": "^0.84.1",
-    "@release-it/conventional-changelog": "^10.0.6",
-    "@types/jest": "30.0.0",
-    "@types/react": "^19.1.8",
-    "commitlint": "^20.5.0",
+    "@commitlint/config-conventional": "^21.2.0",
+    "@jest/globals": "^29.7.0",
+    "@react-native/babel-preset": "0.86.0",
+    "@react-native/eslint-plugin": "0.86.0",
+    "@react-native/jest-preset": "0.86.0",
+    "@release-it/conventional-changelog": "^11.0.1",
+    "@types/react": "^19.2.17",
+    "commitlint": "^21.2.1",
     "del-cli": "^7.0.0",
-    "eslint": "^9.32.0",
-    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-ft-flow": "^3.0.11",
-    "eslint-plugin-prettier": "^5.5.5",
-    "jest": "^30.3.0",
-    "nitrogen": "^0.35.3",
-    "prettier": "^3.8.1",
-    "react": "19.2.4",
-    "react-native": "0.84.1",
-    "react-native-builder-bob": "^0.41.0",
-    "react-native-nitro-modules": "^0.35.3",
-    "release-it": "^19.2.4",
-    "turbo": "^2.9.3",
-    "typescript": "^6.0.2"
+    "eslint-plugin-react-native": "^5.0.0",
+    "jest": "^29.7.0",
+    "lefthook": "^2.1.10",
+    "nitrogen": "^0.36.1",
+    "oxfmt": "^0.58.0",
+    "oxlint": "^1.73.0",
+    "react": "19.2.7",
+    "react-native": "0.86.0",
+    "react-native-builder-bob": "^0.43.0",
+    "react-native-nitro-modules": "^0.36.1",
+    "release-it": "^20.2.1",
+    "turbo": "^2.10.4",
+    "typescript": "^6.0.3"
   },
   "peerDependencies": {
     "react": "*",
     "react-native": "*",
-    "react-native-nitro-modules": "^0.26.4"
-  },
-  "workspaces": [
-    "example"
-  ],
-  "packageManager": "yarn@4.13.0",
-  "jest": {
-    "preset": "react-native",
-    "modulePathIgnorePatterns": [
-      "<rootDir>/example/node_modules",
-      "<rootDir>/lib/"
-    ]
+    "react-native-nitro-modules": "^0.36.1"
   },
   "commitlint": {
     "extends": [
       "@commitlint/config-conventional"
     ]
   },
-  "release-it": {
-    "git": {
-      "commitMessage": "chore: release ${version}",
-      "tagName": "v${version}"
-    },
-    "npm": {
-      "publish": true
-    },
-    "github": {
-      "release": true
-    },
-    "plugins": {
-      "@release-it/conventional-changelog": {
-        "preset": {
-          "name": "angular"
-        }
-      }
+  "jest": {
+    "modulePathIgnorePatterns": [
+      "<rootDir>/example/node_modules",
+      "<rootDir>/lib/"
+    ],
+    "preset": "@react-native/jest-preset",
+    "testEnvironmentOptions": {
+      "customExportConditions": [
+        "require",
+        "react-native",
+        "react-native-nitro-country-picker-source"
+      ]
     }
   },
-  "prettier": {
-    "quoteProps": "consistent",
-    "singleQuote": true,
-    "tabWidth": 2,
-    "trailingComma": "es5",
-    "useTabs": false
+  "packageManager": "pnpm@11.10.0",
+  "create-react-native-library": {
+    "type": "nitro-module",
+    "languages": "kotlin-swift",
+    "tools": [
+      "oxlint",
+      "jest",
+      "lefthook",
+      "release-it"
+    ],
+    "version": "0.57.2"
   },
   "react-native-builder-bob": {
     "source": "src",
@@ -161,15 +152,23 @@
       ]
     ]
   },
-  "create-react-native-library": {
-    "languages": "kotlin-swift",
-    "type": "nitro-module",
-    "tools": [
-      "eslint",
-      "lefthook",
-      "release-it",
-      "jest"
-    ],
-    "version": "0.57.2"
+  "release-it": {
+    "git": {
+      "commitMessage": "chore: release ${version}",
+      "tagName": "v${version}"
+    },
+    "npm": {
+      "publish": true
+    },
+    "github": {
+      "release": true
+    },
+    "plugins": {
+      "@release-it/conventional-changelog": {
+        "preset": {
+          "name": "angular"
+        }
+      }
+    }
   }
 }