Moo 1825/fix get current location (#249)

Author: UrazAkgultan

packages/jsActions/nanoflow-actions-native/CHANGELOG.md

@@ -6,7 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+
+### Fixed
+
+-   We've updated @react-native-community/geolocation to version 3.4.0 to resolve location-related issues.
+
 ## [5.0.0] Nanoflow Commons - 2024-12-3
+
 ### Changed
 
 -   Updated @mendix/pluggable-widgets-tools from version v9.0.0 to v10.15.0.

packages/jsActions/nanoflow-actions-native/package.json

@@ -25,11 +25,10 @@
   },
   "dependencies": {
     "@react-native-async-storage/async-storage": "2.0.0",
-    "@react-native-community/geolocation": "2.0.2",
+    "@react-native-community/geolocation": "3.4.0",
     "invariant": "^2.2.4",
     "js-base64": "~3.7.2",
-    "react-native-geocoder": "0.5.0",
-    "react-native-geolocation-service": "5.2.0"
+    "react-native-geocoder": "0.5.0"
   },
   "devDependencies": {
     "@mendix/pluggable-widgets-tools": "^10.0.1",

packages/jsActions/nanoflow-actions-native/src/geolocation/GetCurrentLocation.ts

@@ -9,8 +9,7 @@ import { Big } from "big.js";
 import Geolocation, {
     GeolocationError,
     GeolocationOptions,
-    GeolocationResponse,
-    GeolocationStatic
+    GeolocationResponse
 } from "@react-native-community/geolocation";
 
 import type { Platform, NativeModules } from "react-native";
@@ -41,11 +40,7 @@ export async function GetCurrentLocation(
     // BEGIN USER CODE
 
     let reactNativeModule: { NativeModules: typeof NativeModules; Platform: typeof Platform } | undefined;
-    let geolocationModule:
-        | Geolocation
-        | GeolocationStatic
-        | typeof import("react-native-geolocation-service")
-        | undefined;
+    let geolocationModule: typeof import("@react-native-community/geolocation").default | Geolocation;
 
     if (navigator && navigator.product === "ReactNative") {
         reactNativeModule = require("react-native");
@@ -55,7 +50,7 @@ export async function GetCurrentLocation(
         }
 
         if (reactNativeModule.NativeModules.RNFusedLocation) {
-            geolocationModule = (await import("react-native-geolocation-service")).default;
+            geolocationModule = (await import("@react-native-community/geolocation")).default;
         } else if (reactNativeModule.NativeModules.RNCGeolocation) {
             geolocationModule = Geolocation;
         } else {

packages/jsActions/nanoflow-actions-native/src/geolocation/GetCurrentLocationMinimumAccuracy.ts

@@ -9,8 +9,7 @@ import { Big } from "big.js";
 import Geolocation, {
     GeolocationError,
     GeolocationOptions,
-    GeolocationResponse,
-    GeolocationStatic
+    GeolocationResponse
 } from "@react-native-community/geolocation";
 
 import type { Platform, NativeModules } from "react-native";
@@ -45,11 +44,7 @@ export async function GetCurrentLocationMinimumAccuracy(
     // BEGIN USER CODE
 
     let reactNativeModule: { NativeModules: typeof NativeModules; Platform: typeof Platform } | undefined;
-    let geolocationModule:
-        | Geolocation
-        | GeolocationStatic
-        | typeof import("react-native-geolocation-service")
-        | undefined;
+    let geolocationModule: typeof import("@react-native-community/geolocation").default | Geolocation;
 
     if (navigator && navigator.product === "ReactNative") {
         reactNativeModule = require("react-native");
@@ -59,7 +54,7 @@ export async function GetCurrentLocationMinimumAccuracy(
         }
 
         if (reactNativeModule.NativeModules.RNFusedLocation) {
-            geolocationModule = (await import("react-native-geolocation-service")).default;
+            geolocationModule = (await import("@react-native-community/geolocation")).default;
         } else if (reactNativeModule.NativeModules.RNCGeolocation) {
             geolocationModule = Geolocation;
         } else {

packages/jsActions/nanoflow-actions-native/src/geolocation/RequestLocationPermission.ts

@@ -5,7 +5,7 @@
 // - the code between BEGIN USER CODE and END USER CODE
 // - the code between BEGIN EXTRA CODE and END EXTRA CODE
 // Other code you write will be lost the next time you deploy the project.
-import Geolocation, { GeolocationStatic } from "@react-native-community/geolocation";
+import Geolocation, { GeolocationError } from "@react-native-community/geolocation";
 
 import type { GeolocationServiceStatic, AuthorizationResult } from "../../typings/Geolocation";
 
@@ -20,11 +20,7 @@ export async function RequestLocationPermission(): Promise<boolean> {
     // BEGIN USER CODE
 
     let reactNativeModule: typeof import("react-native") | undefined;
-    let geolocationModule:
-        | Geolocation
-        | GeolocationStatic
-        | typeof import("react-native-geolocation-service")
-        | undefined;
+    let geolocationModule: typeof import("@react-native-community/geolocation").default;
 
     const hasPermissionIOS = async (): Promise<boolean> => {
         const openSetting = (): void => {
@@ -122,13 +118,15 @@ export async function RequestLocationPermission(): Promise<boolean> {
                           status => status === reactNativeModule?.PermissionsAndroid.RESULTS.GRANTED
                       )
             );
-        } else if (geolocationModule && (geolocationModule as GeolocationStatic).requestAuthorization) {
-            try {
-                (geolocationModule as GeolocationStatic).requestAuthorization();
-                return Promise.resolve(true);
-            } catch (error) {
-                return Promise.reject(error);
-            }
+        } else if (geolocationModule) {
+            geolocationModule.requestAuthorization(
+                () => {
+                    return Promise.resolve(true);
+                },
+                (err: GeolocationError) => {
+                    return Promise.reject(err);
+                }
+            );
         }
 
         return false;
@@ -142,7 +140,7 @@ export async function RequestLocationPermission(): Promise<boolean> {
         }
 
         if (reactNativeModule.NativeModules.RNFusedLocation) {
-            geolocationModule = (await import("react-native-geolocation-service")).default;
+            geolocationModule = (await import("@react-native-community/geolocation")).default;
             return hasLocationPermission();
         } else if (reactNativeModule.NativeModules.RNCGeolocation) {
             geolocationModule = Geolocation;

packages/jsActions/nanoflow-actions-native/typings/Geolocation.d.ts

@@ -9,7 +9,7 @@ import type {
     watchPosition,
     clearWatch,
     stopObserving
-} from "react-native-geolocation-service";
+} from "@react-native-community/geolocation";
 
 type GeolocationServiceStatic = {
     getCurrentPosition: typeof getCurrentPosition;

yarn.lock

@@ -4089,13 +4089,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-native-community/geolocation@npm:2.0.2":
-  version: 2.0.2
-  resolution: "@react-native-community/geolocation@npm:2.0.2"
+"@react-native-community/geolocation@npm:3.4.0":
+  version: 3.4.0
+  resolution: "@react-native-community/geolocation@npm:3.4.0"
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: 10/4722abdbc963cd392c38d6712612a55cf6c933e6c87d523196ca62761ecd9764dd7a6906c7fa4850ea5a2ea35b1997fd09322aff6eac5690d335692c8e83d915
+  checksum: 10/e8f9c487dbea6ae0540185f07d92aca68a1efc823ef572492776b7533be9eebe0234374b9a34f1837899a15e98dbd7673e906380442c19313405bccf7f3e42b1
   languageName: node
   linkType: hard
 
@@ -13495,13 +13495,12 @@ __metadata:
   dependencies:
     "@mendix/pluggable-widgets-tools": "npm:^10.0.1"
     "@react-native-async-storage/async-storage": "npm:2.0.0"
-    "@react-native-community/geolocation": "npm:2.0.2"
+    "@react-native-community/geolocation": "npm:3.4.0"
     eslint: "npm:^7.32.0"
     invariant: "npm:^2.2.4"
     js-base64: "npm:~3.7.2"
     mendix: "npm:~10.0.9976"
     react-native-geocoder: "npm:0.5.0"
-    react-native-geolocation-service: "npm:5.2.0"
     rollup: "npm:^2.79.2"
   languageName: unknown
   linkType: soft
@@ -15500,13 +15499,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-geolocation-service@npm:5.2.0":
-  version: 5.2.0
-  resolution: "react-native-geolocation-service@npm:5.2.0"
-  checksum: 10/4562ba419c63fa2f4c375ad3aeb3c3f845f5814c7f80fa4eb7f5b875c9296d2615f06a0cd576cf55553baa509007ab2f439fb1f2f2fceb47df15644d7a16ab21
-  languageName: node
-  linkType: hard
-
 "react-native-gesture-handler@npm:2.16.2":
   version: 2.16.2
   resolution: "react-native-gesture-handler@npm:2.16.2"