@situm/react-native 3.0.0-beta.2 → 3.0.0-beta.4

package/src/utils/requestPermission.ts

@@ -11,24 +11,30 @@ const checkIOSPermissions = async () => {
   let granted = await request(PERMISSIONS.IOS.LOCATION_WHEN_IN_USE);
 
   if (granted === RESULTS.GRANTED) {
-    console.info("LOCATION_WHEN_IN_USE permission granted");
+    console.info(
+      "Situm > permissionns > LOCATION_WHEN_IN_USE permission granted"
+    );
 
     //@ts-ignore
     if (parseInt(Platform.Version, 10) > 12) {
       granted = await request(PERMISSIONS.IOS.BLUETOOTH_PERIPHERAL);
 
       if (granted === RESULTS.GRANTED) {
-        console.info("BLUETOOTH_PERIPHERAL permission granted");
+        console.info(
+          "Situm > permissionns > BLUETOOTH_PERIPHERAL permission granted"
+        );
         return true;
       } else {
-        throw "BLUETOOTH_PERIPHERAL permission not granted";
+        throw "Situm > permissionns > BLUETOOTH_PERIPHERAL permission not granted";
       }
     } else {
-      console.warn("BLUETOOTH_PERIPHERAL permissions not required");
+      console.warn(
+        "Situm > permissionns > BLUETOOTH_PERIPHERAL permissions not required"
+      );
       return true;
     }
   } else {
-    throw "ACCESS_FINE_LOCATION denied";
+    throw "Situm > permissionns > ACCESS_FINE_LOCATION denied";
   }
 };
 
@@ -36,7 +42,7 @@ const checkAndroidPermissions = async () => {
   let granted;
   //@ts-ignore
   if (Platform.Version > 30) {
-    console.log("ANDROID VERSION > 30");
+    console.log("Situm > permissionns > ANDROID VERSION > 30");
     granted = await requestMultiple([
       PERMISSIONS.ANDROID.ACCESS_FINE_LOCATION,
       PERMISSIONS.ANDROID.BLUETOOTH_CONNECT,
@@ -49,21 +55,21 @@ const checkAndroidPermissions = async () => {
       granted["android.permission.BLUETOOTH_SCAN"] === RESULTS.GRANTED
     ) {
       console.info(
-        "ACCESS_FINE_LOCATION, BLUETOOTH_CONNECT and BLUETOOTH_SCAN permissions granted"
+        "Situm > permissionns > ACCESS_FINE_LOCATION, BLUETOOTH_CONNECT and BLUETOOTH_SCAN permissions granted"
       );
       return true;
     }
 
-    throw "ACCESS_FINE_LOCATION, BLUETOOTH_CONNECT and BLUETOOTH_SCAN permissions not granted";
+    throw "Situm > permissionns > ACCESS_FINE_LOCATION, BLUETOOTH_CONNECT and BLUETOOTH_SCAN permissions not granted";
   } else {
     console.info("ANDROID VERSION < 30");
     granted = await request(PERMISSIONS.ANDROID.ACCESS_FINE_LOCATION);
 
     if (granted === RESULTS.GRANTED) {
-      console.info("ACCESS_FINE_LOCATION granted");
+      console.info("Situm > permissionns > ACCESS_FINE_LOCATION granted");
       return true;
     } else {
-      throw "ACCESS_FINE_LOCATION permission not granted";
+      throw "Situm > permissionns > ACCESS_FINE_LOCATION permission not granted";
     }
   }
 };
@@ -71,7 +77,10 @@ const checkAndroidPermissions = async () => {
 const requestPermission = () =>
   // eslint-disable-next-line no-async-promise-executor
   new Promise<void>(async (resolve, reject) => {
-    console.log("Retrieving permissions for platform " + Platform.OS);
+    console.log(
+      "Situm > permissionns > Retrieving permissions for platform " +
+        Platform.OS
+    );
     if (Platform.OS === "ios") {
       await checkIOSPermissions()
         .then(() => resolve())
@@ -88,7 +97,7 @@ const requestPermission = () =>
         });
     }
 
-    reject(`Platform ${Platform.OS} not supported`);
+    reject(`Situm > permissionns > Platform ${Platform.OS} not supported`);
   });
 
 export default requestPermission;

package/src/wayfinding/components/MapView.tsx

@@ -193,7 +193,7 @@ const MapView = React.forwardRef<MapViewRef, MapViewProps>(
         }
         sendMessageToViewer(webViewRef.current, Mapper.selectPoi(poiId));
       },
-      [pois, navigation.status]
+      [pois, navigation?.status]
     );
 
     useImperativeHandle(

package/src/wayfinding/hooks/index.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { useEffect, useRef, useState } from "react";
+import { useContext, useEffect, useRef, useState } from "react";
 
 import {
   type Building,
@@ -41,6 +41,7 @@ import {
   setPois,
   setSdkInitialized,
   State,
+  UseSitumContext,
 } from "../store/index";
 import { useDispatch, useSelector } from "../store/utils";
 
@@ -63,7 +64,7 @@ export const useCallbackRef = <T>(fn: T, deps: any[]) => {
   return fnRef;
 };
 
-const useSitum = () => {
+export const useSitumInternal = () => {
   const dispatch = useDispatch();
   const isSdkInitialized = useSelector(selectIsSdkInitialized);
   const user = useSelector(selectUser);
@@ -142,7 +143,7 @@ const useSitum = () => {
   // Cartography
   const initializeBuildings = async () =>
     new Promise<Building[]>((resolve, reject) => {
-      console.debug("Retrieving buildings from Situm API");
+      console.debug("Situm > hook > Retrieving buildings from Situm API");
 
       SitumPlugin.fetchBuildings(
         (buildingArray: Building[]) => {
@@ -154,7 +155,7 @@ const useSitum = () => {
           console.error(
             `Situm > hook > Could not retrieve buildings: ${_error}`
           );
-          reject(`Could not retrieve buildings: ${_error}`);
+          reject(`Situm > hook> Could not retrieve buildings: ${_error}`);
           dispatch(setError({ message: _error, code: 3011 } as SDKError));
         }
       );
@@ -236,11 +237,12 @@ const useSitum = () => {
       },
       locationOptions
     );
-    console.debug(`Successfully started positioning`);
+    console.debug(`Situm > hook > Successfully started positioning`);
   };
 
   const stopPositioning = async () => {
-    console.debug(`Stopping positioning ...`);
+    console.debug(`Situm > hook > Stopping positioning…`);
+
     SitumPlugin.stopPositioning((success: boolean) => {
       if (success) {
         dispatch(resetLocation());
@@ -258,7 +260,8 @@ const useSitum = () => {
     to: Position,
     directionsOptions?: any
   ): Promise<State["directions"]> => {
-    console.debug("Requesting directions");
+    console.debug("Situm > hook > Requesting directions");
+
     const fromPoint = {
       floorIdentifier: from.floorIdentifier,
       buildingIdentifier: from.buildingIdentifier,
@@ -306,7 +309,7 @@ const useSitum = () => {
 
     if (!poiDestination || (!poiOrigin && originId !== -1) || lockDirections) {
       console.debug(
-        `Situm > hook >Could not compute route for origin: ${originId} or destination: ${destinationId} (lockDirections: ${lockDirections})`
+        `Situm > hook > Could not compute route for origin: ${originId} or destination: ${destinationId} (lockDirections: ${lockDirections})`
       );
       return;
     }
@@ -363,6 +366,7 @@ const useSitum = () => {
     originId: number;
     updateRoute?: boolean;
   }) => {
+    stopNavigation();
     calculateRoute({
       originId,
       destinationId,
@@ -413,7 +417,7 @@ const useSitum = () => {
   };
 
   const stopNavigation = (): void => {
-    console.debug("Stopping navigation");
+    console.debug("Situm > hook > Stopping navigation");
     if (!navigation || navigation.status === NavigationStatus.STOP) {
       return;
     }
@@ -475,4 +479,14 @@ const useSitum = () => {
   };
 };
 
+const useSitum = () => {
+  const context = useContext(UseSitumContext);
+
+  if (!context) {
+    throw new Error("Situm > hook > No SitumProvider found.");
+  }
+
+  return context.useSitum;
+};
+
 export default useSitum;

package/src/wayfinding/store/index.tsx

@@ -10,7 +10,8 @@ import {
   SDKError,
   SDKNavigation,
 } from "../../sdk/types/index.d";
-import { createReducer } from "./utils";
+import { useSitumInternal } from "../hooks";
+import { createStore } from "./utils";
 
 // TODO: add types
 export type Directions = any;
@@ -52,48 +53,51 @@ export const SitumContext = createContext<
   { state: State; dispatch: React.Dispatch<(s: State) => State> } | undefined
 >(undefined);
 
-const Reducer = createReducer<State>({
-  setWebViewRef: (state: State, payload: State["webViewRef"]) => {
-    return { ...state, webViewRef: payload };
-  },
-  setSdkInitialized: (state: State, payload: State["sdkInitialized"]) => {
-    return { ...state, sdkInitialized: payload };
-  },
-  setAuth: (state: State, payload: State["user"]) => {
-    return { ...state, user: payload };
-  },
-  setLocation: (state: State, payload: State["location"]) => {
-    return { ...state, location: payload };
-  },
-  setLocationStatus: (state: State, payload: LocationStatusName) => {
-    return { ...state, location: { ...state.location, status: payload } };
-  },
-  resetLocation: (state: State) => {
-    return {
-      ...state,
-      location: initialState.location,
-    };
-  },
-  setBuildings: (state: State, payload: State["buildings"]) => {
-    return { ...state, buildings: payload };
-  },
-  setCurrentBuilding: (state: State, payload: State["currentBuilding"]) => {
-    return { ...state, currentBuilding: payload };
-  },
-  setPois: (state: State, payload: State["pois"]) => {
-    return { ...state, pois: payload };
-  },
-  setDirections: (state: State, payload: State["directions"]) => {
-    return { ...state, directions: payload };
-  },
-  setNavigation: (state: State, payload: State["navigation"]) => {
-    return { ...state, navigation: payload };
-  },
-  setDestinationPoiID: (state: State, payload: State["destinationPoiID"]) => {
-    return { ...state, destinationPoiID: payload };
-  },
-  setError: (state: State, payload: State["error"]) => {
-    return { ...state, error: payload };
+const store = createStore<State>({
+  initialState,
+  reducers: {
+    setWebViewRef: (state: State, payload: State["webViewRef"]) => {
+      return { ...state, webViewRef: payload };
+    },
+    setSdkInitialized: (state: State, payload: State["sdkInitialized"]) => {
+      return { ...state, sdkInitialized: payload };
+    },
+    setAuth: (state: State, payload: State["user"]) => {
+      return { ...state, user: payload };
+    },
+    setLocation: (state: State, payload: State["location"]) => {
+      return { ...state, location: payload };
+    },
+    setLocationStatus: (state: State, payload: LocationStatusName) => {
+      return { ...state, location: { ...state.location, status: payload } };
+    },
+    resetLocation: (state: State) => {
+      return {
+        ...state,
+        location: initialState.location,
+      };
+    },
+    setBuildings: (state: State, payload: State["buildings"]) => {
+      return { ...state, buildings: payload };
+    },
+    setCurrentBuilding: (state: State, payload: State["currentBuilding"]) => {
+      return { ...state, currentBuilding: payload };
+    },
+    setPois: (state: State, payload: State["pois"]) => {
+      return { ...state, pois: payload };
+    },
+    setDirections: (state: State, payload: State["directions"]) => {
+      return { ...state, directions: payload };
+    },
+    setNavigation: (state: State, payload: State["navigation"]) => {
+      return { ...state, navigation: payload };
+    },
+    setDestinationPoiID: (state: State, payload: State["destinationPoiID"]) => {
+      return { ...state, destinationPoiID: payload };
+    },
+    setError: (state: State, payload: State["error"]) => {
+      return { ...state, error: payload };
+    },
   },
 });
 
@@ -114,7 +118,7 @@ export const selectLocation = (state: State) => {
 };
 
 export const selectLocationStatus = (state: State) => {
-  return state.location.status;
+  return state.location?.status;
 };
 
 export const selectBuildings = (state: State) => {
@@ -159,16 +163,40 @@ export const {
   setNavigation,
   setDestinationPoiID,
   setError,
-} = Reducer.actions;
+} = store.actions;
+
+/**
+ * Context specifically to store the only instance of our hook.
+ */
+export const UseSitumContext = createContext<{ useSitum: any } | undefined>(
+  undefined
+);
+
+const UseSitumProvider: React.FC<{ children: React.ReactNode }> = ({
+  children,
+}) => {
+  // TODO: if we have this, there is no need to have a context for the rest of the state
+  // as there is only one instance of the hook
+  const useSitum = useSitumInternal();
 
+  return (
+    <UseSitumContext.Provider value={{ useSitum }}>
+      {children}
+    </UseSitumContext.Provider>
+  );
+};
+
+/**
+ * Main context of the application, stores the plugins' state.
+ */
 const SitumProvider: React.FC<
   React.PropsWithChildren<{
     email?: string;
     apiKey?: string;
   }>
 > = ({ email, apiKey, children }) => {
-  const [state, dispatch] = useReducer(Reducer.reducer, {
-    ...initialState,
+  const [state, dispatch] = useReducer(store.reducer, {
+    ...store.initialState,
     user: { email, apiKey },
   });
 
@@ -179,7 +207,7 @@ const SitumProvider: React.FC<
         dispatch,
       }}
     >
-      {children}
+      <UseSitumProvider>{children}</UseSitumProvider>
     </SitumContext.Provider>
   );
 };

package/src/wayfinding/store/utils.ts

@@ -3,20 +3,30 @@ import { useContext } from "react";
 
 import { SitumContext, State } from "./index";
 
-export const createReducer = <T>(
-  reducers: Record<string, (state: T, payload: any) => T>
-) => {
-  // Actions
+export const createReducer = <T>() => {
+  const reducer = (state: T, action: (state: T) => T): T => {
+    return action(state);
+  };
+  return reducer;
+};
+
+export const createStore = <T>({
+  initialState,
+  reducers,
+}: {
+  initialState: T;
+  reducers: Record<string, (state: T, payload: any) => T>;
+}) => {
   const actions = Object.keys(reducers).reduce((acc, r) => {
     acc[r] = (payload: any) => (state: T) => reducers[r](state, payload);
     return acc;
   }, {} as Record<string, (payload?: any) => (state: T) => T>);
 
-  // Reducer
-  const reducer = (state: T, action: (state: T) => T): T => {
-    return action(state);
+  return {
+    initialState,
+    actions,
+    reducer: createReducer<T>(),
   };
-  return { actions, reducer };
 };
 
 export const useSelector = (selector: (state: State) => any) => {

package/android/.idea/android.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/android/.idea/gradle.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="11" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

package/android/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/android.iml" filepath="$PROJECT_DIR$/.idea/android.iml" />
-    </modules>
-  </component>
-</project>

package/android/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>

package/android/.idea/workspace.xml

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="NONE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="db2c412e-9f6b-4909-82d6-141f9aeaf0f6" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/../example/android/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../example/android/app/src/main/AndroidManifest.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../example/src/situm.tsx" beforeDir="false" afterPath="$PROJECT_DIR$/../example/src/situm.tsx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../example/yarn.lock" beforeDir="false" afterPath="$PROJECT_DIR$/../example/yarn.lock" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="ExternalProjectsManager">
-    <system id="GRADLE">
-      <state>
-        <projects_view>
-          <tree_state>
-            <expand />
-            <select />
-          </tree_state>
-        </projects_view>
-      </state>
-    </system>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
-  </component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-  <component name="ProjectId" id="2MVC37412ztjIKQefc86OZl9bne" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.cidr.known.project.marker": "true",
-    "cidr.known.project.marker": "true",
-    "dart.analysis.tool.window.visible": "false",
-    "last_opened_file_path": "/home/alba/Descargas/GitRepos/situm-react-native-plugin/example/android",
-    "show.migrate.to.gradle.popup": "false"
-  }
-}]]></component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="db2c412e-9f6b-4909-82d6-141f9aeaf0f6" name="Changes" comment="" />
-      <created>1677843160978</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1677843160978</updated>
-    </task>
-    <servers />
-  </component>
-</project>

package/android/local.properties

@@ -1,8 +0,0 @@
-## This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Fri Mar 03 12:32:53 CET 2023
-sdk.dir=/home/alba/Android/Sdk