diff --git a/.changeset/late-rockets-report.md b/.changeset/late-rockets-report.md new file mode 100644 index 00000000..50be5a38 --- /dev/null +++ b/.changeset/late-rockets-report.md @@ -0,0 +1,5 @@ +--- +"@react-native-documents/picker": patch +--- + +fix(android): remove deprecated activity getters diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index b49571a1..53eebb7e 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -31,7 +31,7 @@ jobs: - name: Install dependencies run: yarn install --immutable - name: Install pods - run: RCT_NEW_ARCH_ENABLED=0 npx pod-install + run: RCT_NEW_ARCH_ENABLED=0 RCT_USE_PREBUILT_RNCORE=1 RCT_USE_RN_DEP=1 npx pod-install working-directory: example/ios - name: Build ios example app on old architecture run: xcodebuild -scheme ReactTestApp -workspace document-picker-example.xcworkspace ONLY_ACTIVE_ARCH=NO -sdk iphonesimulator -configuration Debug diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index a1248e9f..d46ce149 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1304,7 +1304,7 @@ PODS: - ReactCommon/turbomodule/core - ReactNativeDependencies - Yoga - - react-native-document-viewer (1.0.1): + - react-native-document-viewer (1.0.2): - hermes-engine - RCTRequired - RCTTypeSafety @@ -1328,28 +1328,6 @@ PODS: - Yoga - react-native-segmented-control (2.5.7): - React-Core - - react-native-uitextview (2.1.0-rc.0): - - hermes-engine - - RCTRequired - - RCTTypeSafety - - React-Core - - React-Core-prebuilt - - React-debug - - React-Fabric - - React-featureflags - - React-graphics - - React-ImageManager - - React-jsi - - React-NativeModulesApple - - React-RCTFabric - - React-renderercss - - React-rendererdebug - - React-utils - - ReactCodegen - - ReactCommon/turbomodule/bridging - - ReactCommon/turbomodule/core - - ReactNativeDependencies - - Yoga - React-NativeModulesApple (0.81.1): - hermes-engine - React-callinvoker @@ -1724,7 +1702,7 @@ PODS: - ReactCommon/turbomodule/core - ReactNativeDependencies - Yoga - - ReactTestApp-DevSupport (4.4.9): + - ReactTestApp-DevSupport (4.4.10): - React-Core - React-jsi - ReactTestApp-Resources (1.0.0-dev) @@ -1792,7 +1770,6 @@ DEPENDENCIES: - react-native-document-picker (from `../../packages/document-picker`) - react-native-document-viewer (from `../../packages/document-viewer`) - "react-native-segmented-control (from `../../node_modules/@react-native-segmented-control/segmented-control`)" - - react-native-uitextview (from `../../node_modules/react-native-uitextview`) - React-NativeModulesApple (from `../../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`) - React-oscompat (from `../../node_modules/react-native/ReactCommon/oscompat`) - React-perflogger (from `../../node_modules/react-native/ReactCommon/reactperflogger`) @@ -1908,8 +1885,6 @@ EXTERNAL SOURCES: :path: "../../packages/document-viewer" react-native-segmented-control: :path: "../../node_modules/@react-native-segmented-control/segmented-control" - react-native-uitextview: - :path: "../../node_modules/react-native-uitextview" React-NativeModulesApple: :path: "../../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios" React-oscompat: @@ -2020,9 +1995,8 @@ SPEC CHECKSUMS: React-Mapbuffer: bc36232966c55d5b1cbef3b84cb97c4317fa4403 React-microtasksnativemodule: cbabfedcf6c2984e59d07f9ab553f3d277599b1b react-native-document-picker: e06c0a5836adabd1b58e4f956bb3b5b58d7766e2 - react-native-document-viewer: aab4b9b37bebfe95f10679085666ec6fe424fa38 + react-native-document-viewer: 49cf47192ee7e15f4ad25f8fdaef6b4f1ab0cc9c react-native-segmented-control: bf6e0032726727498e18dd437ae88afcdbc18e99 - react-native-uitextview: d24acf59b5d64c9f0ddcd86d23629655460c1f3f React-NativeModulesApple: 055e2d1417c663e7a26fc0847609f503e626e9e1 React-oscompat: 8f2893713639e12c7558750a9f7de3f08ac255b0 React-perflogger: 34b632f94b15e1068f7997e5a68b40a55162ad13 @@ -2055,7 +2029,7 @@ SPEC CHECKSUMS: ReactCommon: 3579ef7cd884fbb5218bed929f25b7b212299700 ReactNativeDependencies: 9444683ddc7eaa98d2289224ce730a7632b705ff ReactNativeHost: 7f059fda99bc0ba0187c19bfe91866c7692d90df - ReactTestApp-DevSupport: f62a6d484c9aff112862cec102aa1b526f7714aa + ReactTestApp-DevSupport: 9b7bbba5e8fed998e763809171d9906a1375f9d3 ReactTestApp-Resources: 1bd9ff10e4c24f2ad87101a32023721ae923bccf RNCAsyncStorage: 3a4f5e2777dae1688b781a487923a08569e27fe4 Yoga: 18b87f28df0aee34fa7370518a35aa8107ba47b9 diff --git a/example/package.json b/example/package.json index eecdd142..ab4d9b50 100644 --- a/example/package.json +++ b/example/package.json @@ -64,7 +64,6 @@ "@react-native-segmented-control/segmented-control": "^2.5.7", "invariant": "^2.2.4", "react": "19.1.0", - "react-native": "^0.81.1", - "react-native-uitextview": "^2.1.0-rc.0" + "react-native": "^0.81.1" } } diff --git a/example/src/components/SelectableText.tsx b/example/src/components/SelectableText.tsx index 735f7e80..8de5f797 100644 --- a/example/src/components/SelectableText.tsx +++ b/example/src/components/SelectableText.tsx @@ -1,7 +1,5 @@ import React from 'react' -import { UITextView } from 'react-native-uitextview' import { Platform, TextInput, Text } from 'react-native' -// note this is not stable yet export type SelectableTextProps = { value: string | Record @@ -9,15 +7,6 @@ export type SelectableTextProps = { } const style = { color: 'black' } as const -const SelectableTextPaper = ({ value, accessibilityLabel }: SelectableTextProps) => { - const toRender = typeof value === 'string' ? value : JSON.stringify(value, null, 2) - return ( - - {toRender} - - ) -} - const SelectableTextFabric = ({ value, accessibilityLabel }: SelectableTextProps) => { const toRender = typeof value === 'string' ? value : JSON.stringify(value, null, 2) return Platform.OS === 'ios' ? ( @@ -35,6 +24,5 @@ const SelectableTextFabric = ({ value, accessibilityLabel }: SelectableTextProps ) } -// @ts-ignore -const isFabricEnabled = global.nativeFabricUIManager !== null -export const SelectableText = isFabricEnabled ? SelectableTextFabric : SelectableTextPaper +// maybe use different implementation for old architecture +export const SelectableText = SelectableTextFabric diff --git a/package.json b/package.json index f86fff66..0840e63d 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "@changesets/cli": "^2.29.6", "@commitlint/cli": "^18.6.1", "@commitlint/config-conventional": "^18.6.3", - "@evilmartians/lefthook": "^1.10.10", + "@evilmartians/lefthook": "^1.13.0", "@jest/globals": "^29.7.0", "@manypkg/cli": "^0.21.4", "@react-native/eslint-config": "^0.81.1", @@ -57,8 +57,8 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.3", "jest": "^29.7.0", - "pod-install": "1.0.1", - "prettier": "^3.4.2", + "pod-install": "1.0.7", + "prettier": "^3.6.2", "typescript": "^5.7.3" }, "packageManager": "yarn@4.9.4" diff --git a/packages/document-picker/android/src/main/java/com/reactnativedocumentpicker/RNDocumentPickerModule.kt b/packages/document-picker/android/src/main/java/com/reactnativedocumentpicker/RNDocumentPickerModule.kt index e79951c2..346901ca 100644 --- a/packages/document-picker/android/src/main/java/com/reactnativedocumentpicker/RNDocumentPickerModule.kt +++ b/packages/document-picker/android/src/main/java/com/reactnativedocumentpicker/RNDocumentPickerModule.kt @@ -83,12 +83,8 @@ class RNDocumentPickerModule(reactContext: ReactApplicationContext) : @ReactMethod override fun pick(opts: ReadableMap, promise: Promise) { - val currentActivity = currentActivity + val currentActivity = reactApplicationContext.currentActivity ?: return rejectWithNullActivity(promise) - if (currentActivity == null) { - rejectWithNullActivity(promise) - return - } if (!promiseWrapper.trySetPromiseRejectingIncoming(promise, "pick")) { return } @@ -145,11 +141,8 @@ class RNDocumentPickerModule(reactContext: ReactApplicationContext) : @ReactMethod override fun pickDirectory(opts: ReadableMap, promise: Promise) { - val currentActivity = currentActivity - if (currentActivity == null) { - rejectWithNullActivity(promise) - return - } + val currentActivity = reactApplicationContext.currentActivity ?: return rejectWithNullActivity(promise) + if (!promiseWrapper.trySetPromiseRejectingIncoming(promise, "pickDirectory")) { return } diff --git a/yarn.lock b/yarn.lock index 2f078de0..4f47a4cc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1936,9 +1936,9 @@ __metadata: languageName: node linkType: hard -"@changesets/apply-release-plan@npm:^7.0.12": - version: 7.0.12 - resolution: "@changesets/apply-release-plan@npm:7.0.12" +"@changesets/apply-release-plan@npm:^7.0.13": + version: 7.0.13 + resolution: "@changesets/apply-release-plan@npm:7.0.13" dependencies: "@changesets/config": "npm:^3.1.1" "@changesets/get-version-range-type": "npm:^0.4.0" @@ -1953,7 +1953,7 @@ __metadata: prettier: "npm:^2.7.1" resolve-from: "npm:^5.0.0" semver: "npm:^7.5.3" - checksum: 10c0/3211e6e75fc50275647fa023ca2187a23b6b2406788f7ef39b38c3486ccf1d068a78b026ec488e46a2e3d135084ba8c152323e8df314cdd6ffbe188bf73bd238 + checksum: 10c0/940f13bc09816f534f912559471af77c29eb31fcfa10a255bdc772573def9fb3ee24e3db710ac1ebbd70a90b03b667d63e535a13c580a150f3730c3798827a01 languageName: node linkType: hard @@ -1981,10 +1981,10 @@ __metadata: linkType: hard "@changesets/cli@npm:^2.29.6": - version: 2.29.6 - resolution: "@changesets/cli@npm:2.29.6" + version: 2.29.7 + resolution: "@changesets/cli@npm:2.29.7" dependencies: - "@changesets/apply-release-plan": "npm:^7.0.12" + "@changesets/apply-release-plan": "npm:^7.0.13" "@changesets/assemble-release-plan": "npm:^6.0.9" "@changesets/changelog-git": "npm:^0.2.1" "@changesets/config": "npm:^3.1.1" @@ -2014,7 +2014,7 @@ __metadata: term-size: "npm:^2.1.0" bin: changeset: bin.js - checksum: 10c0/6e09201df1bc83f45526f7ab3d77b1171c2c74e89639993367acf183b9d0809d02845b9d900f34a5febcd1a963cdad7246e2b9c444da2440760d297aad3aff32 + checksum: 10c0/a868fd39ace25993714f8b80ebb08529e0aba5446266e18edee9e5fd34d529ef6f8fcb7f53fc5831ab99c5721762fe06198aade304799792f1f79b9d37600d04 languageName: node linkType: hard @@ -2442,12 +2442,12 @@ __metadata: languageName: node linkType: hard -"@evilmartians/lefthook@npm:^1.10.10": - version: 1.10.10 - resolution: "@evilmartians/lefthook@npm:1.10.10" +"@evilmartians/lefthook@npm:^1.13.0": + version: 1.13.0 + resolution: "@evilmartians/lefthook@npm:1.13.0" bin: lefthook: bin/index.js - checksum: 10c0/dd8a33e942f18136614ab593bd620016432e4ae37318a53af3d274eb87a180d66b1c7a8b61b5e11eba7478ff867838689c60885d1794b3e1367604623e0c5bda + checksum: 10c0/0679feae801136900f1ffbe21b74982fcd414391f2b23b14576387b19d6000308343cbf8de2b1510a41f6fd6933a27c2d277879207f17bfa98f235bad91fb29b conditions: (os=darwin | os=linux | os=win32) & (cpu=x64 | cpu=arm64 | cpu=ia32) languageName: node linkType: hard @@ -4230,9 +4230,9 @@ __metadata: linkType: hard "@types/prop-types@npm:*": - version: 15.7.13 - resolution: "@types/prop-types@npm:15.7.13" - checksum: 10c0/1b20fc67281902c6743379960247bc161f3f0406ffc0df8e7058745a85ea1538612109db0406290512947f9632fe9e10e7337bf0ce6338a91d6c948df16a7c61 + version: 15.7.15 + resolution: "@types/prop-types@npm:15.7.15" + checksum: 10c0/b59aad1ad19bf1733cf524fd4e618196c6c7690f48ee70a327eb450a42aab8e8a063fbe59ca0a5701aebe2d92d582292c0fb845ea57474f6a15f6994b0e260b2 languageName: node linkType: hard @@ -4251,12 +4251,12 @@ __metadata: linkType: hard "@types/react@npm:^18.3.18": - version: 18.3.18 - resolution: "@types/react@npm:18.3.18" + version: 18.3.24 + resolution: "@types/react@npm:18.3.24" dependencies: "@types/prop-types": "npm:*" csstype: "npm:^3.0.2" - checksum: 10c0/8fb2b00672072135d0858dc9db07873ea107cc238b6228aaa2a9afd1ef7a64a7074078250db38afbeb19064be8ea6af5eac32d404efdd5f45e093cc4829d87f8 + checksum: 10c0/9e188fa8e50f172cf647fc48fea2e04d88602afff47190b697de281a8ac88df9ee059864757a2a438ff599eaf9276d9a9e0e60585e88f7d57f01a2e4877d37ec languageName: node linkType: hard @@ -9222,7 +9222,17 @@ __metadata: languageName: node linkType: hard -"import-fresh@npm:^3.0.0, import-fresh@npm:^3.2.1, import-fresh@npm:^3.3.0": +"import-fresh@npm:^3.0.0": + version: 3.3.1 + resolution: "import-fresh@npm:3.3.1" + dependencies: + parent-module: "npm:^1.0.0" + resolve-from: "npm:^4.0.0" + checksum: 10c0/bf8cc494872fef783249709385ae883b447e3eb09db0ebd15dcead7d9afe7224dad7bd7591c6b73b0b19b3c0f9640eb8ee884f01cfaf2887ab995b0b36a0cbec + languageName: node + linkType: hard + +"import-fresh@npm:^3.2.1, import-fresh@npm:^3.3.0": version: 3.3.0 resolution: "import-fresh@npm:3.3.0" dependencies: @@ -9440,7 +9450,7 @@ __metadata: languageName: node linkType: hard -"is-core-module@npm:^2.13.0, is-core-module@npm:^2.5.0": +"is-core-module@npm:^2.13.0": version: 2.15.1 resolution: "is-core-module@npm:2.15.1" dependencies: @@ -9449,7 +9459,7 @@ __metadata: languageName: node linkType: hard -"is-core-module@npm:^2.16.0": +"is-core-module@npm:^2.16.0, is-core-module@npm:^2.5.0": version: 2.16.1 resolution: "is-core-module@npm:2.16.1" dependencies: @@ -10434,11 +10444,11 @@ __metadata: linkType: hard "jiti@npm:^1.21.6": - version: 1.21.6 - resolution: "jiti@npm:1.21.6" + version: 1.21.7 + resolution: "jiti@npm:1.21.7" bin: jiti: bin/jiti.js - checksum: 10c0/05b9ed58cd30d0c3ccd3c98209339e74f50abd9a17e716f65db46b6a35812103f6bde6e134be7124d01745586bca8cc5dae1d0d952267c3ebe55171949c32e56 + checksum: 10c0/77b61989c758ff32407cdae8ddc77f85e18e1a13fc4977110dbd2e05fc761842f5f71bce684d9a01316e1c4263971315a111385759951080bbfe17cbb5de8f7a languageName: node linkType: hard @@ -12959,6 +12969,15 @@ __metadata: languageName: node linkType: hard +"pod-install@npm:1.0.7": + version: 1.0.7 + resolution: "pod-install@npm:1.0.7" + bin: + pod-install: build/index.js + checksum: 10c0/56d2d08d245c6f1f44642c31825b3e8c7aff0342ebd6eaff3f6a82126b371d7212f29c2e1a13af8eecc2a23905259e0c02898834b7d62b998f0f2aad776ab206 + languageName: node + linkType: hard + "portscanner@npm:^2.2.0": version: 2.2.0 resolution: "portscanner@npm:2.2.0" @@ -13001,12 +13020,12 @@ __metadata: languageName: node linkType: hard -"prettier@npm:^3.4.2": - version: 3.4.2 - resolution: "prettier@npm:3.4.2" +"prettier@npm:^3.6.2": + version: 3.6.2 + resolution: "prettier@npm:3.6.2" bin: prettier: bin/prettier.cjs - checksum: 10c0/99e076a26ed0aba4ebc043880d0f08bbb8c59a4c6641cdee6cdadf2205bdd87aa1d7823f50c3aea41e015e99878d37c58d7b5f0e663bba0ef047f94e36b96446 + checksum: 10c0/488cb2f2b99ec13da1e50074912870217c11edaddedeadc649b1244c749d15ba94e846423d062e2c4c9ae683e2d65f754de28889ba06e697ac4f988d44f45812 languageName: node linkType: hard @@ -13359,7 +13378,6 @@ __metadata: react: "npm:19.1.0" react-native: "npm:^0.81.1" react-native-test-app: "npm:^4.4.9" - react-native-uitextview: "npm:^2.1.0-rc.0" ts-node: "npm:^10.9.2" wdio-wait-for: "npm:^3.0.11" languageName: unknown @@ -13372,7 +13390,7 @@ __metadata: "@changesets/cli": "npm:^2.29.6" "@commitlint/cli": "npm:^18.6.1" "@commitlint/config-conventional": "npm:^18.6.3" - "@evilmartians/lefthook": "npm:^1.10.10" + "@evilmartians/lefthook": "npm:^1.13.0" "@jest/globals": "npm:^29.7.0" "@manypkg/cli": "npm:^0.21.4" "@react-native/eslint-config": "npm:^0.81.1" @@ -13381,15 +13399,15 @@ __metadata: eslint-config-prettier: "npm:^9.1.0" eslint-plugin-prettier: "npm:^5.2.3" jest: "npm:^29.7.0" - pod-install: "npm:1.0.1" - prettier: "npm:^3.4.2" + pod-install: "npm:1.0.7" + prettier: "npm:^3.6.2" typescript: "npm:^5.7.3" languageName: unknown linkType: soft "react-native-test-app@npm:^4.4.9": - version: 4.4.9 - resolution: "react-native-test-app@npm:4.4.9" + version: 4.4.10 + resolution: "react-native-test-app@npm:4.4.10" dependencies: "@rnx-kit/react-native-host": "npm:^0.5.11" "@rnx-kit/tools-react-native": "npm:^2.1.0" @@ -13400,7 +13418,7 @@ __metadata: semver: "npm:^7.3.5" uuid: "npm:^11.0.0" peerDependencies: - "@callstack/react-native-visionos": 0.73 - 0.78 + "@callstack/react-native-visionos": 0.73 - 0.79 "@expo/config-plugins": ">=5.0" react: 18.1 - 19.1 react-native: 0.70 - 0.81 || >=0.82.0-0 <0.82.0 @@ -13420,17 +13438,7 @@ __metadata: init: scripts/init.mjs init-test-app: scripts/init.mjs install-windows-test-app: windows/app.mjs - checksum: 10c0/b67033963763a8f125ca691a28ad8bf9e71379407eb16511aa0ae3f5755785aa633bc624b45d4ea522bd2acbfdde40a7861d11e7be41e0a71b7fa397cb245a43 - languageName: node - linkType: hard - -"react-native-uitextview@npm:^2.1.0-rc.0": - version: 2.1.0-rc.0 - resolution: "react-native-uitextview@npm:2.1.0-rc.0" - peerDependencies: - react: "*" - react-native: "*" - checksum: 10c0/0968832963372c254c3ef7aa09dabd2a3188cf7e2adff78efd95101886580df638b3e8441efe9631fe2cdf3a72f4ea010fdfaed8ef6c5ca7ab0804b729ecc22d + checksum: 10c0/b85c711b456ef77dd63733827568d33a621ac434d8ca5b2d70de5b2d42e8ada1bc43c0307d7e8b5f1df9c0fe2d4367e2747c7703f798edf442f39e982bbf102f languageName: node linkType: hard @@ -14142,7 +14150,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.6.3, semver@npm:^7.0.0, semver@npm:^7.1.3, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0, semver@npm:^7.6.3": +"semver@npm:7.6.3, semver@npm:^7.0.0, semver@npm:^7.1.3, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0, semver@npm:^7.6.3": version: 7.6.3 resolution: "semver@npm:7.6.3" bin: @@ -14160,6 +14168,15 @@ __metadata: languageName: node linkType: hard +"semver@npm:^7.3.4": + version: 7.7.2 + resolution: "semver@npm:7.7.2" + bin: + semver: bin/semver.js + checksum: 10c0/aca305edfbf2383c22571cb7714f48cadc7ac95371b4b52362fb8eeffdfbc0de0669368b82b2b15978f8848f01d7114da65697e56cd8c37b0dab8c58e543f9ea + languageName: node + linkType: hard + "send@npm:0.19.0": version: 0.19.0 resolution: "send@npm:0.19.0"