Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions docs-validation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@
"@react-native-camera-roll/camera-roll": "^7.8.1",
"@react-native-clipboard/clipboard": "^1.14.1",
"@react-native-documents/picker": "^10.1.0",
"@react-native-firebase/messaging": "^14.7.0",
"@react-native-firebase/messaging": "^19.3.0",
"@react-navigation/native": "^6.1.17",
"@react-navigation/native-stack": "^6.10.0",
"@sendbird/chat": "^4.19.2",
"@sendbird/chat": "^4.20.2",
"date-fns": "^4.1.0",
"react": "18.2.0",
"react-native": "0.74.3",
"react": "19.1.1",
"react-native": "0.82.1",
"react-native-create-thumbnail": "^2.0.0",
"react-native-file-access": "^3.1.0",
"react-native-image-picker": "^7.1.2",
"react-native-mmkv": "^2.12.2",
"react-native-nitro-modules": "^0.29.4",
"react-native-nitro-sound": "^0.2.0",
"react-native-permissions": "^3.10.1",
"react-native-safe-area-context": "^4.10.8",
"react-native-permissions": "^5.3.0",
"react-native-safe-area-context": "^5.5.2",
"react-native-video": "^6.3.0"
},
"devDependencies": {
Expand All @@ -45,7 +45,7 @@
"metro-react-native-babel-preset": "^0.66.2",
"react-dom": "17.0.2",
"react-native-monorepo-tools": "^1.1.4",
"react-test-renderer": "18.3.1",
"typescript": "5.2.2"
"react-test-renderer": "19.1.1",
"typescript": "5.8.3"
}
}
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@
"patch-package": "^6.4.7",
"postinstall-postinstall": "^2.1.0",
"prettier": "^2.8.8",
"react": "18.2.0",
"react-native": "0.74.3",
"react-native-builder-bob": "^0.18.2",
"react": "19.1.1",
"react-native": "0.82.1",
"react-native-builder-bob": "^0.18.0",
"react-native-fast-image": "^8.6.3",
"react-native-safe-area-context": "^4.10.8",
"react-test-renderer": "^18.3.1",
"react-native-safe-area-context": "^5.5.2",
"react-test-renderer": "19.1.1",
"typedoc": "^0.25.3",
"typescript": "5.2.2",
"typescript": "5.8.3",
"yalc": "^1.0.0-pre.53"
},
"jest": {
Expand Down Expand Up @@ -98,7 +98,7 @@
]
},
"resolutions": {
"@sendbird/chat": "4.19.2",
"@sendbird/chat": "4.20.2",
"@types/react": "^18"
}
}
6 changes: 3 additions & 3 deletions packages/uikit-chat-hooks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@
"devDependencies": {
"@sendbird/uikit-testing-tools": "3.11.3",
"@types/react": "*",
"react": "18.2.0",
"react": "19.1.1",
"react-native-builder-bob": "^0.18.0",
"typescript": "5.2.2"
"typescript": "5.8.3"
},
"peerDependencies": {
"@sendbird/chat": "^4.19.2",
"@sendbird/chat": "^4.20.2",
"react": ">=16.13.1"
},
"react-native-builder-bob": {
Expand Down
8 changes: 4 additions & 4 deletions packages/uikit-react-native-foundation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@
"devDependencies": {
"@types/react": "*",
"@types/react-native": "*",
"react": "18.2.0",
"react-native": "0.74.3",
"react": "19.1.1",
"react-native": "0.82.1",
"react-native-builder-bob": "^0.18.0",
"react-native-fast-image": "^8.6.3",
"react-native-safe-area-context": "^4.10.8",
"typescript": "5.2.2"
"react-native-safe-area-context": "^5.5.2",
"typescript": "5.8.3"
},
"peerDependencies": {
"react": ">=17.0.2",
Expand Down
36 changes: 18 additions & 18 deletions packages/uikit-react-native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,21 +68,21 @@
"access": "public"
},
"dependencies": {
"@openspacelabs/react-native-zoomable-view": "^2.1.5",
"@openspacelabs/react-native-zoomable-view": "<2.3.0",
"@sendbird/uikit-chat-hooks": "3.11.3",
"@sendbird/uikit-react-native-foundation": "3.11.3",
"@sendbird/uikit-tools": "0.0.15",
"@sendbird/uikit-utils": "3.11.3"
},
"devDependencies": {
"@bam.tech/react-native-image-resizer": "^3.0.4",
"@bam.tech/react-native-image-resizer": "^3.0.11",
"@react-native-async-storage/async-storage": "^1.17.6",
"@react-native-camera-roll/camera-roll": "^7.8.1",
"@react-native-clipboard/clipboard": "^1.14.1",
"@react-native-community/netinfo": "^11.3.2",
"@react-native-documents/picker": "^10.0.0",
"@react-native-firebase/app": "^14.4.0",
"@react-native-firebase/messaging": "^14.4.0",
"@react-native-documents/picker": "^10.1.0",
"@react-native-firebase/app": "^19.3.0",
"@react-native-firebase/messaging": "^19.3.0",
"@types/react": "*",
"@types/react-native": "*",
"date-fns": ">=2.28.0",
Expand All @@ -101,21 +101,21 @@
"glob": "^7.2.0",
"inquirer": "^8.2.0",
"js-convert-case": "^4.2.0",
"react": "18.2.0",
"react-native": "0.74.3",
"react": "19.1.1",
"react-native": "0.82.1",
"react-native-audio-recorder-player": "^3.6.10",
"react-native-builder-bob": "^0.18.0",
"react-native-create-thumbnail": "^2.0.0",
"react-native-create-thumbnail": "^2.1.1",
"react-native-document-picker": "^9.3.0",
"react-native-file-access": "^3.1.0",
"react-native-image-picker": "^7.1.2",
"react-native-mmkv": "^2.12.2",
"react-native-nitro-modules": "^0.29.4",
"react-native-nitro-sound": "^0.2.0",
"react-native-permissions": "^3.10.1",
"react-native-safe-area-context": "^4.10.8",
"react-native-video": "^6.3.0",
"typescript": "5.2.2"
"react-native-file-access": "^3.1.1",
"react-native-image-picker": "^8.2.0",
"react-native-mmkv": "^4.0.0",
"react-native-nitro-modules": "^0.31.5",
"react-native-nitro-sound": "^0.2.9",
"react-native-permissions": "^5.3.0",
"react-native-safe-area-context": "^5.5.2",
"react-native-video": "^6.16.1",
"typescript": "5.8.3"
},
"peerDependencies": {
"@bam.tech/react-native-image-resizer": ">=3.0.0",
Expand All @@ -125,7 +125,7 @@
"@react-native-community/netinfo": ">=9.3.0",
"@react-native-documents/picker": ">=10.0.0",
"@react-native-firebase/messaging": ">=14.4.0",
"@sendbird/chat": "^4.19.2",
"@sendbird/chat": "^4.20.2",
"@sendbird/react-native-scrollview-enhancer": "*",
"@sendbird/uikit-tools": ">=0.0.10",
"date-fns": ">=2.28.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
useToast,
useUIKitTheme,
} from '@sendbird/uikit-react-native-foundation';
import Icon from '@sendbird/uikit-react-native-foundation/src/components/Icon';
import { Icon } from '@sendbird/uikit-react-native-foundation';
import { ifThenOr, useSafeAreaPadding } from '@sendbird/uikit-utils';

import { useLocalization, usePlatformService } from '../../../hooks/useContext';
Expand Down
8 changes: 4 additions & 4 deletions packages/uikit-testing-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,16 @@
"access": "public"
},
"devDependencies": {
"@sendbird/chat": "^4.19.2",
"@sendbird/chat": "^4.20.2",
"@sendbird/uikit-utils": "3.11.3",
"@types/jest": "^29.4.0",
"@types/react": "*",
"@types/react-native": "*",
"jest": "^29.4.3",
"react": "18.2.0",
"react-native": "0.74.3",
"react": "19.1.1",
"react-native": "0.82.1",
"react-native-builder-bob": "^0.18.0",
"typescript": "5.2.2"
"typescript": "5.8.3"
},
"react-native-builder-bob": {
"source": "src",
Expand Down
8 changes: 4 additions & 4 deletions packages/uikit-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@
"@types/react": "*",
"@types/react-native": "*",
"date-fns": ">=2.28.0",
"react": "18.2.0",
"react-native": "0.74.3",
"react": "19.1.1",
"react-native": "0.82.1",
"react-native-builder-bob": "^0.18.0",
"typescript": "5.2.2"
"typescript": "5.8.3"
},
"peerDependencies": {
"@sendbird/chat": "^4.19.2",
"@sendbird/chat": "^4.20.2",
"date-fns": ">=2.28.0",
"react": ">=17.0.2",
"react-native": ">=0.65.0"
Expand Down
6 changes: 4 additions & 2 deletions packages/uikit-utils/src/sendbird/message.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export function getAvailableUriFromFileMessage(message: SendbirdFileMessage) {
return message.url;
}

type RawSendbirdDataPayload = { sendbird: string | object };
type RawSendbirdDataPayload = { sendbird: string | SendbirdDataPayload };
export function isSendbirdNotification(dataPayload?: {
[key: string]: string | object;
}): dataPayload is RawSendbirdDataPayload {
Expand All @@ -128,7 +128,9 @@ export function isSendbirdNotification(dataPayload?: {
}

export function parseSendbirdNotification(dataPayload: RawSendbirdDataPayload): SendbirdDataPayload {
return typeof dataPayload.sendbird === 'string' ? JSON.parse(dataPayload.sendbird) : dataPayload.sendbird;
return typeof dataPayload.sendbird === 'string'
? JSON.parse(dataPayload.sendbird)
: (dataPayload.sendbird as SendbirdDataPayload);
}

export function shouldRenderParentMessage(
Expand Down
2 changes: 2 additions & 0 deletions sample/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ local.properties
.cxx/
*.keystore
!debug.keystore
.kotlin/

# node.js
#
Expand Down Expand Up @@ -72,3 +73,4 @@ yarn-error.log
!.yarn/releases
!.yarn/sdks
!.yarn/versions

24 changes: 15 additions & 9 deletions sample/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ apply plugin: "com.facebook.react"
*/
react {
/* Folders */
// The root of your project, i.e. where "package.json" lives. Default is '..'
// The root of your project, i.e. where "package.json" lives. Default is '../..'
root = file("../../")
// The folder where the react-native NPM package is. Default is ../node_modules/react-native
// The folder where the react-native NPM package is. Default is ../../node_modules/react-native
reactNativeDir = file("../../../node_modules/react-native")
// The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
// The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
codegenDir = file("../../../node_modules/@react-native/codegen")
// The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
// The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
cliFile = file("../../../node_modules/react-native/cli.js")

/* Variants */
Expand Down Expand Up @@ -47,10 +47,13 @@ react {
/* Hermes Commands */
// The hermes compiler command to run. By default it is 'hermesc'
// 2024.07.11 NOTE: update path to hoisted node_modules
hermesCommand = "../node_modules/react-native/sdks/hermesc/%OS-BIN%/hermesc"
hermesCommand = "../../../node_modules/react-native/sdks/hermesc/%OS-BIN%/hermesc"
//
// The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
// hermesFlags = ["-O", "-output-source-map"]

/* Autolinking */
autolinkLibrariesWithApp()
}

/**
Expand All @@ -62,9 +65,14 @@ def enableProguardInReleaseBuilds = false
* The preferred build flavor of JavaScriptCore (JSC)
*
* For example, to use the international variant, you can use:
* `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
* `def jscFlavor = io.github.react-native-community:jsc-android-intl:2026004.+`
*
* The international variant includes ICU i18n library and necessary data
* allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
* give correct results when using with locales other than en-US. Note that
* this variant is about 6MiB larger per architecture than default.
*/
def jscFlavor = 'org.webkit:android-jsc:+'
def jscFlavor = 'io.github.react-native-community:jsc-android:2026004.+'

/**
* Architectures to build native code for in debug.
Expand Down Expand Up @@ -116,5 +124,3 @@ dependencies {
implementation jscFlavor
}
}

apply from: file("../../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
9 changes: 0 additions & 9 deletions sample/android/app/src/debug/AndroidManifest.xml

This file was deleted.

4 changes: 2 additions & 2 deletions sample/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:allowBackup="false"
android:theme="@style/AppTheme"
android:supportsRtl="true"
>
android:usesCleartextTraffic="${usesCleartextTraffic}"
android:supportsRtl="true">
<activity
android:name=".MainActivity"
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,40 +4,24 @@ import android.app.Application
import com.facebook.react.PackageList
import com.facebook.react.ReactApplication
import com.facebook.react.ReactHost
import com.facebook.react.ReactNativeHost
import com.facebook.react.ReactPackage
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
import com.facebook.react.defaults.DefaultReactNativeHost
import com.facebook.soloader.SoLoader

class MainApplication : Application(), ReactApplication {

override val reactNativeHost: ReactNativeHost =
object : DefaultReactNativeHost(this) {
override fun getPackages(): List<ReactPackage> =
PackageList(this).packages.apply {
// Packages that cannot be autolinked yet can be added manually here, for example:
// add(MyReactNativePackage())
}

override fun getJSMainModuleName(): String = "index"

override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG

override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
}

override val reactHost: ReactHost
get() = getDefaultReactHost(applicationContext, reactNativeHost)
override val reactHost: ReactHost by lazy {
getDefaultReactHost(
context = applicationContext,
packageList =
PackageList(this).packages.apply {
// Packages that cannot be autolinked yet can be added manually here, for example:
// add(MyReactNativePackage())
},
)
}

override fun onCreate() {
super.onCreate()
SoLoader.init(this, false)
if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
// If you opted-in for the New Architecture, we load the native entry point for this app.
load()
}
loadReactNative(this)
}
}
Loading
Loading