react-native-steerpath-smart-map 1.29.4 → 2.0.0-alpha.1

package/src/SmartMapManager.ts

@@ -1,15 +1,14 @@
 /* eslint-disable prefer-destructuring */
 import { NativeModules, Platform } from "react-native";
-import { ConfigSDK } from './SmartMapViewProps';
+export type ConfigSDK = {
+  apiKey: string;
+  configFilePath?: string | null;
+  configString?: string | null;
+}
 
 const RNSmartMapManager = NativeModules.RNSmartMapManager;
 
-interface FetchVersionResponse {
-  smartSDKVersion: string;
-  mapboxSDKVersion: string;
-}
-
-export interface LiveConfig {
+export type LiveConfig = {
   transmit?: {
     id: string;
     password: string;
@@ -49,13 +48,6 @@ export const SmartMapManager = {
       configString,
     });
   },
-  /**
-   * 
-   * @deprecated Use loginToLive instead.
-   */
-  setLiveConfig(config: LiveConfig | null): void {
-    RNSmartMapManager.setLiveConfig(config);
-  },
   /**
    * Share user location by setting transmit options and show live updates on map by setting receive options.
    * 
@@ -72,10 +64,11 @@ export const SmartMapManager = {
   logoutFromLive(): void {
     RNSmartMapManager.logoutFromLive();
   },
-  fetchVersions(callback: (versions: FetchVersionResponse) => void) {
-    RNSmartMapManager.fetchVersions(callback);
+  /**
+   * 
+   * @returns Native (iOS/Android) Smart SDK version as a string
+   */
+  fetchVersion(): Promise<string> {
+    return RNSmartMapManager.fetchVersion();
   },
-  setLanguage(languageCode: String): void {
-    RNSmartMapManager.setLanguage(languageCode);
-  }
 };

package/src/SmartMapManager.web.ts

@@ -1,38 +1,17 @@
-/* eslint-disable prefer-destructuring */
-import { steerpath } from "steerpath-smart-sdk";
-
-type SmartSDK = {
-  setLanguage(languageCode: String): void;
-}
-let smartSDKInstance: SmartSDK = {
-  setLanguage: () => {}
-}
-
 export const SmartMapManager = {
-  start(apiKey: string, config?: Record<string, unknown> | string): void {
-    const smartSDK = new steerpath.SmartSDK();
-    smartSDKInstance = smartSDK;
-    smartSDK.start(apiKey, config);
+  start(): void {
+    // No web implementation
   },
-  /**
-   * Not implemented for web. Use start() instead.
-   */
   startWithConfig(): void{
      // No web implementation
   },
-  setLanguage(languageCode: String): void {
-    smartSDKInstance.setLanguage(languageCode);
-  },
-  setLiveConfig(): void {
-    // No web implementation
-  },
   loginToLive(): void {
     // No web implementation
   },
   logoutFromLive(): void {
     // No web implementation
   },
-  fetchVersions(): void {
+  fetchVersion(): void {
     // No web implementation
   }
 };

package/src/index.ts

@@ -1,5 +1,4 @@
-export * from './SmartGeofenceManager'
 export * from './SmartMapManager'
-export * from './SmartMapView'
-export * from './SmartMapViewProps'
-export * from './SmartLocationManager'
+export * from './SmartLocationManager'
+export type { ConfigSDK, LiveConfig } from './SmartMapManager'
+export type { LocationResponse } from './SmartLocationManager'

package/tsconfig.json

@@ -1,18 +1,20 @@
 {
   "compilerOptions": {
-    "outDir": "dist",
+    "outDir": "lib/typescript",
     "declaration": true,
     "allowSyntheticDefaultImports": true,
     "esModuleInterop": true,
     "jsx": "react",
-    "lib": ["es6", "dom", "dom.iterable"],
-    "moduleResolution": "node",
-    "typeRoots": ["./src/typings"],
+    "lib": [
+      "esnext",
+      "dom"
+    ],
+    "moduleResolution": "bundler",
     "strict": true,
-    "target": "es5",
+    "target": "esnext",
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
-    "module": "es2015",
+    "module": "esnext",
     "resolveJsonModule": true,
     "noImplicitAny": false
   },
@@ -20,7 +22,10 @@
     "node_modules",
     "babel.config.js",
     "metro.config.js",
-    "jest.config.js"
+    "jest.config.js",
+    "example"
   ],
-  "include": ["src"]
-}
+  "include": [
+    "src"
+  ]
+}

package/.eslintrc.json

@@ -1,81 +0,0 @@
-{
-  "env": {
-    "browser": true,
-    "es6": true
-  },
-  "extends": [
-    "eslint:recommended",
-    "plugin:react/recommended",
-    "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended"
-  ],
-  "globals": {
-    "Atomics": "readonly",
-    "SharedArrayBuffer": "readonly"
-  },
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "ecmaFeatures": {
-      "jsx": true
-    },
-    "ecmaVersion": 11,
-    "sourceType": "module"
-  },
-  "plugins": ["react", "@typescript-eslint"],
-  "rules": {
-    "no-plusplus": "off",
-    "react-hooks/rules-of-hooks": "error",
-    "react-hooks/exhaustive-deps": "warn",
-    "react/jsx-filename-extension": "off",
-    "@typescript-eslint/no-use-before-define": "off",
-    "@typescript-eslint/explicit-function-return-type": "off",
-    "no-param-reassign": "off",
-    "no-use-before-define": "off",
-    "import/prefer-default-export": "off",
-    "react/prop-types": "off",
-    "class-methods-use-this": "off",
-    "import/no-extraneous-dependencies": "off",
-    "import/newline-after-import": "off",
-    "@typescript-eslint/no-var-requires": "off",
-    "@typescript-eslint/no-unused-vars": "off",
-    "@typescript-eslint/camelcase": "off",
-    "react/jsx-indent": "off",
-    "prefer-const": "off",
-    "consistent-return": "off",
-    "@typescript-eslint/semi": "off",
-    "array-callback-return": "off",
-    "react/jsx-boolean-value": "off",
-    "react/jsx-curly-brace-presence": "off",
-    "react/jsx-curly-newline": "off",
-    "no-else-return": "off",
-    "no-inner-declarations": "off",
-    "no-unused-expressions": "off",
-    "@typescript-eslint/prefer-interface": "off",
-    "@typescript-eslint/array-type": "off",
-    "@typescript-eslint/no-dupe-class-members": "off",
-    "@typescript-eslint/no-implied-eval": "off",
-    "@typescript-eslint/no-throw-literal": "off",
-    "@typescript-eslint/no-unused-expressions": "off",
-    "spaced-comment": "off",
-    "no-console": "off",
-    "no-useless-return": "warn",
-    "no-prototype-builtins": "warn",
-    "react/jsx-wrap-multilines": "off",
-    "react/jsx-props-no-spreading": "off",
-    "@typescript-eslint/no-explicit-any": "error",
-    "func-names": "off",
-    "import/no-cycle": "warn",
-    "no-nested-ternary": "warn",
-    "global-require": "warn",
-    "no-underscore-dangle": "warn",
-    "react/no-array-index-key": "warn",
-    "no-lonely-if": "off"
-  },
-  "settings": {
-    "import/resolver": {
-      "node": {
-        "extensions": [".js", ".jsx", ".ts", ".tsx"]
-      }
-    }
-  }
-}

package/android/src/main/java/com/steerpath/rnsmartmap/RNEventKeys.java

@@ -1,29 +0,0 @@
-package com.steerpath.rnsmartmap;
-
-public class RNEventKeys {
-
-    // MAP EVENTS
-    public static final String MAP_LOADED = "onMapLoaded";
-    public static final String MAP_CLICKED = "onMapClicked";
-    public static final String USER_FLOOR_CHANGED = "onUserFloorChanged";
-    public static final String VISIBLE_FLOOR_CHANGED = "onVisibleFloorChanged";
-    public static final String SEARCH_RESULT_SELECTED = "onSearchResultSelected";
-    public static final String SEARCH_CATEGORY_SELECTED = "onSearchCategorySelected";
-
-    // USER TASK
-    public static final String USER_TASK_RESPONSE = "onUserTaskResponse";
-
-    // VIEW STATUS
-    public static final String VIEW_STATUS_CHANGED = "onViewStatusChanged";
-    public static final String BOTTOMSHEET_STATE_CHANGED = "onBottomSheetStateChanged";
-
-    // NAVIGATION EVENTS
-    public static final String NAVIGATION_FAILED = "onNavigationFailed";
-    public static final String NAVIGATION_ENDED = "onNavigationEnded";
-    public static final String NAVIGATION_STARTED = "onNavigationStarted";
-    public static final String NAVIGATION_PREVIEW_APPEARED = "onNavigationPreviewAppeared";
-    public static final String NAVIGATION_DESTINATION_REACHED = "onNavigationDestinationReached";
-    public static final String ON_BACK_PRESSED = "onBackPressed";
-
-    public static final String ON_LOCATION_CHANGED = "locationChanged";
-}

package/android/src/main/java/com/steerpath/rnsmartmap/RNSmartGeofenceManager.java

@@ -1,103 +0,0 @@
-package com.steerpath.rnsmartmap;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.Callback;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
-import com.steerpath.smart.SmartGeofenceManager;
-import com.steerpath.smart.listeners.FenceEventListener;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-public class RNSmartGeofenceManager extends ReactContextBaseJavaModule implements FenceEventListener {
-
-    private final ReactApplicationContext appContext;
-
-    public RNSmartGeofenceManager(@Nonnull ReactApplicationContext reactContext) {
-        super(reactContext);
-        this.appContext = reactContext;
-    }
-
-    @Nonnull
-    @Override
-    public String getName() {
-        return "RNSmartGeofenceManager";
-    }
-
-    @ReactMethod
-    public void startListening() {
-        SmartGeofenceManager.addListener(this);
-    }
-
-    @ReactMethod
-    public void stopListening() {
-        SmartGeofenceManager.removeListener(this);
-    }
-
-    @ReactMethod
-    public void addGeofence(String localRef, String buildingRef, Callback callback) {
-        SmartGeofenceManager.addGeofence(localRef, buildingRef, (String response) -> {
-            callback.invoke(null, response);
-        });
-    }
-
-    @ReactMethod
-    public void removeGeofence(String localRef, String buildingRef) {
-        SmartGeofenceManager.removeGeofence(localRef, buildingRef);
-    }
-
-    @ReactMethod
-    public void addBeaconfence(String beaconId, Number radiusInM, Number loiteringDelayInMs, Callback callback) {
-        SmartGeofenceManager.addBeaconfence(beaconId, radiusInM.intValue(), loiteringDelayInMs.intValue(), (String response) -> {
-            callback.invoke(null, response);
-        });
-    }
-
-    @ReactMethod
-    public void removeBeaconfence(String beaconId) {
-        SmartGeofenceManager.removeBeaconfence(beaconId);
-    }
-
-    @Override
-    public void onGeofenceEnter(String localRef, String buildingRef) {
-        WritableMap params = Arguments.createMap();
-        params.putString("localRef", localRef);
-        params.putString("buildingRef", buildingRef);
-        sendEvent(appContext, "GeofenceEntered", params);
-    }
-
-    @Override
-    public void onGeofenceExit(String localRef, String buildingRef) {
-        WritableMap params = Arguments.createMap();
-        params.putString("localRef", localRef);
-        params.putString("buildingRef", buildingRef);
-        sendEvent(appContext, "GeofenceExited", params);
-    }
-
-    @Override
-    public void onBeaconfenceEnter(String beaconId) {
-        WritableMap params = Arguments.createMap();
-        params.putString("beaconId", beaconId);
-        sendEvent(appContext, "BeaconfenceEntered", params);
-    }
-
-    @Override
-    public void onBeaconfenceExit(String beaconId) {
-        WritableMap params = Arguments.createMap();
-        params.putString("beaconId", beaconId);
-        sendEvent(appContext, "BeaconfenceExited", params);
-    }
-
-    private void sendEvent(ReactContext reactContext,
-                           String eventName,
-                           @Nullable WritableMap params) {
-        reactContext
-                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                .emit(eventName, params);
-    }
-}

package/android/src/main/java/com/steerpath/rnsmartmap/RNSmartMapModule.java

@@ -1,284 +0,0 @@
-package com.steerpath.rnsmartmap;
-
-import android.util.Log;
-
-import com.facebook.react.bridge.Callback;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReadableMapKeySetIterator;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeMap;
-import com.facebook.react.uimanager.NativeViewHierarchyManager;
-import com.facebook.react.uimanager.UIManagerModule;
-import com.steerpath.smart.ObjectSource;
-import com.steerpath.smart.SmartMapCameraOptions;
-import com.steerpath.smart.UserTask;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.HashMap;
-
-import javax.annotation.Nonnull;
-
-public class RNSmartMapModule extends ReactContextBaseJavaModule {
-
-    public static final String NAME = "RNSmartMapModule";
-
-    public RNSmartMapModule(@Nonnull ReactApplicationContext reactContext) {
-        super(reactContext);
-    }
-
-    @Nonnull
-    @Override
-    public String getName() {
-        return NAME;
-    }
-
-    @ReactMethod
-    public void getMapObject(final int tag, final ReadableArray args, final Callback callback) {
-        String localRef = args.getString(0);
-        String buildingRef = args.getString(1);
-        String source;
-
-        if (args.getString(2).equals("MARKER")) {
-            source = ObjectSource.MARKER;
-        } else {
-            source = ObjectSource.STATIC;
-        }
-
-        getUiManager().addUIBlock(nvhm -> {
-            RNSmartMapView mapView = resolveMapView(nvhm, tag, callback);
-            if (mapView == null) {
-                return;
-            }
-
-            mapView.getMap().getMapObject(localRef, buildingRef, source, (smartMapObject, s) -> {
-                if (smartMapObject != null) {
-                    callback.invoke(mapView.smartMapObjectToWritableMap(smartMapObject), s);
-                } else {
-                    callback.invoke(null, s);
-                }
-            });
-        });
-    }
-
-    @ReactMethod
-    public void getMapObjectByProperties(final int tag, final ReadableMap map, final Callback callback) {
-        HashMap<String, Object> properties = new HashMap<>();
-        ReadableMapKeySetIterator iterator = map.keySetIterator();
-
-        while (iterator.hasNextKey()) {
-            String key = iterator.nextKey();
-            switch (map.getType(key)) {
-                case Number:
-                    properties.put(key, map.getDouble(key));
-                    break;
-                case Boolean:
-                    properties.put(key, map.getBoolean(key));
-                    break;
-                case String:
-                    properties.put(key, map.getString(key));
-                    break;
-            }
-        }
-
-        getUiManager().addUIBlock(nvhm -> {
-            RNSmartMapView mapView = resolveMapView(nvhm, tag, callback);
-            if (mapView == null) {
-                return;
-            }
-
-            mapView.getMap().getMapObjectByProperties(properties, (smartMapObject, s) -> {
-                if (smartMapObject != null) {
-                    callback.invoke(mapView.smartMapObjectToWritableMap(smartMapObject), s);
-                } else {
-                    callback.invoke(null, s);
-                }
-            });
-        });
-    }
-
-    @ReactMethod
-    public void animateCameraToObject(final int tag, final ReadableArray args, final Callback callback) {
-        String localRef = args.getString(0);
-        String buildingRef = args.getString(1);
-        double zoom = args.getDouble(2);
-
-        getUiManager().addUIBlock(nvhm -> {
-            RNSmartMapView mapView = resolveMapView(nvhm, tag, callback);
-            if (mapView == null) {
-                return;
-            }
-
-            mapView.getMap().animateCameraToObject(localRef, buildingRef, zoom, callback::invoke);
-        });
-    }
-
-    @ReactMethod
-    public void animateCameraToBuildingRef(final int tag, final ReadableArray args, final Callback callback) {
-        String buildingRef = args.getString(0);
-
-        getUiManager().addUIBlock(nvhm -> {
-            RNSmartMapView mapView = resolveMapView(nvhm, tag, callback);
-            if (mapView == null) {
-                return;
-            }
-
-            mapView.getMap().animateCameraToBuildingRef(buildingRef, callback::invoke);
-        });
-    }
-
-    @ReactMethod
-    public void setCameraToObject(final int tag, final ReadableArray args, final Callback callback) {
-        String localRef = args.getString(0);
-        String buildingRef = args.getString(1);
-        double zoom = args.getDouble(2);
-
-        getUiManager().addUIBlock(nvhm -> {
-            RNSmartMapView mapView = resolveMapView(nvhm, tag, callback);
-            if (mapView == null) {
-                return;
-            }
-
-            mapView.getMap().setCameraToObject(localRef, buildingRef, zoom, callback::invoke);
-        });
-    }
-
-    @ReactMethod
-    public void setCameraToBuildingRef(final int tag, final ReadableArray args, final Callback callback) {
-        String buildingRef = args.getString(0);
-
-        getUiManager().addUIBlock(nvhm -> {
-            RNSmartMapView mapView = resolveMapView(nvhm, tag, callback);
-            if (mapView == null) {
-                return;
-            }
-
-            mapView.getMap().setCameraToBuildingRef(buildingRef, callback::invoke);
-        });
-    }
-
-    @ReactMethod
-    public void getCurrentUserTask(final int tag, final Callback callback) {
-        getUiManager().addUIBlock(nvhm -> {
-            RNSmartMapView mapView = resolveMapView(nvhm, tag, callback);
-            if (mapView == null) {
-                return;
-            }
-
-            UserTask userTask = mapView.getMap().getCurrentUserTask();
-
-            if (userTask == null) {
-                callback.invoke("No active user task available");
-            } else {
-                // TODO: userTask does not have any getters and I cannot return it to JavaScript
-                // side
-                callback.invoke(mapView.getMap().getCurrentUserTask());
-            }
-        });
-    }
-
-    @ReactMethod
-    public void getSmartMapCameraOptions(final int tag, final Callback callback) {
-        getUiManager().addUIBlock(nvhm -> {
-            RNSmartMapView mapView = resolveMapView(nvhm, tag, callback);
-            if (mapView == null) {
-                return;
-            }
-            
-            SmartMapCameraOptions opts = mapView.getMap().getSmartMapCameraOptions();
-            WritableMap map = new WritableNativeMap();
-            map.putDouble("latitude", opts.getLatitude());
-            map.putDouble("longitude", opts.getLongitude());
-            map.putDouble("bearing", opts.getBearing());
-            map.putDouble("pitch", opts.getTilt());
-            map.putDouble("zoomLevel", opts.getZoomLevel());
-            callback.invoke(map);
-        });
-    }
-
-    @ReactMethod
-    public void getWidgetPadding(final int tag, final Callback callback) {
-        getUiManager().addUIBlock(nvhm -> {
-            RNSmartMapView mapView = resolveMapView(nvhm, tag, callback);
-            if (mapView == null) {
-                return;
-            }
-
-            int[] padding = mapView.getMap().getWidgetPadding();
-            WritableMap map = new WritableNativeMap();
-            map.putInt("left", padding[0]);
-            map.putInt("top", padding[1]);
-            map.putInt("right", padding[2]);
-            map.putInt("bottom", padding[3]);
-
-            callback.invoke(map);
-        });
-    }
-
-    @ReactMethod
-    public void onBackPressed(final int tag, final Callback callback) {
-        getUiManager().addUIBlock(nvhm -> {
-            RNSmartMapView mapView = resolveMapView(nvhm, tag, callback);
-            if (mapView == null) {
-                return;
-            }
-
-            if (mapView.getMap() != null) {
-                boolean onBackPressed = mapView.getMap().onBackPressed();
-                callback.invoke(onBackPressed);
-            } else {
-                Log.e("ERROR", "Could not complete method call, SmartMap is null");
-            }
-        });
-    }
-
-    @ReactMethod
-    public void setGeoJson(final int tag, final ReadableArray args, final Callback callback) {
-        getUiManager().addUIBlock(nvhm -> {
-            RNSmartMapView mapView = resolveMapView(nvhm, tag, callback);
-            if (mapView == null) {
-                return;
-            }
-
-            if (mapView.getMap() != null) {
-                String sourceId = args.getString(0);
-                ReadableMap geoJsonMap = args.getMap(1);
-                JSONObject geoJson = null;
-                if (geoJsonMap != null) {
-                    try {
-                        geoJson = Utils.convertMapToJson(geoJsonMap);
-                    } catch (JSONException e) {
-                        e.printStackTrace();
-                    }
-                }
-
-                mapView.getMap().setGeoJson(sourceId, geoJson, callback::invoke);
-            }
-        });
-    }
-
-    private UIManagerModule getUiManager() {
-        final ReactApplicationContext context = getReactApplicationContext();
-        return context.getNativeModule(UIManagerModule.class);
-    }
-
-    private RNSmartMapView resolveMapView(NativeViewHierarchyManager nvhm, final int tag, final Callback callback) {
-        RNSmartMapView mapView = (RNSmartMapView) nvhm.resolveView(tag);
-        if (mapView == null) {
-            callback.invoke("RNSmartMapView not found");
-            return null;
-        }
-
-        if (mapView.getMap() == null) {
-            callback.invoke("RNSmartMapView.smartMapFragment is not valid");
-            return null;
-        }
-
-        return mapView;
-    }
-}