react-native-map-link 3.2.0 → 3.2.1

package/lib/components/popup/Popup.d.ts

@@ -1,11 +1,13 @@
 import React from 'react';
-import { ModalProps, ViewStyle, TextStyle, ImageStyle } from 'react-native';
-interface PopupProps {
+import type { ImageStyle, ModalProps, ViewStyle, TextStyle } from 'react-native';
+import type { MapId, ShowLocationProps } from '../../type';
+export interface PopupProps {
     isVisible: boolean;
+    setIsVisible: (isVisible: boolean) => void;
     showHeader?: boolean;
-    customHeader?: JSX.Element;
-    customFooter?: JSX.Element;
-    onAppPressed: (app: string) => void;
+    customHeader?: React.ReactNode;
+    customFooter?: React.ReactNode;
+    onAppPressed: (app: MapId) => void;
     onCancelPressed: () => void;
     style?: {
         container?: ViewStyle;
@@ -21,19 +23,6 @@ interface PopupProps {
         activityIndicatorContainer?: ViewStyle;
     };
     modalProps?: ModalProps;
-    options: {
-        dialogTitle?: string;
-        dialogMessage?: string;
-        cancelText?: string;
-        appTitles?: Record<string, string>;
-        alwaysIncludeGoogle?: boolean;
-        naverCallerName?: string;
-        latitude: number;
-        longitude: number;
-        title?: string;
-    };
-    appsWhiteList?: string[];
-    setIsVisible: (isVisible: boolean) => void;
+    options: ShowLocationProps;
 }
 export declare const Popup: React.FC<PopupProps>;
-export {};

package/lib/components/popup/Popup.js

@@ -36,7 +36,7 @@ const PopupHeader_1 = __importDefault(require("./PopupHeader"));
 const PopupBody_1 = __importDefault(require("./PopupBody"));
 const __1 = require("../..");
 const SCREEN_HEIGHT = react_native_1.Dimensions.get('screen').height;
-const Popup = ({ isVisible, showHeader = true, customHeader, customFooter, onAppPressed, onCancelPressed, style = {}, modalProps, options, appsWhiteList, setIsVisible, }) => {
+const Popup = ({ isVisible, showHeader = true, customHeader, customFooter, onAppPressed, onCancelPressed, style = {}, modalProps, options, setIsVisible, }) => {
     const [apps, setApps] = (0, react_1.useState)([]);
     const [isLoading, setIsLoading] = (0, react_1.useState)(true);
     const [titles, setTitles] = (0, react_1.useState)({});
@@ -46,9 +46,9 @@ const Popup = ({ isVisible, showHeader = true, customHeader, customFooter, onApp
                 alwaysIncludeGoogle: options.alwaysIncludeGoogle,
                 naverCallerName: options.naverCallerName,
             }));
-            if (appsWhiteList && appsWhiteList.length) {
-                (0, utils_1.checkNotSupportedApps)(appsWhiteList);
-                appsData = appsData.filter((appName) => appsWhiteList.includes(appName));
+            if (options.appsWhiteList && options.appsWhiteList.length) {
+                (0, utils_1.checkNotSupportedApps)(options.appsWhiteList);
+                appsData = appsData.filter((appName) => options.appsWhiteList?.includes(appName));
             }
             setApps(appsData);
             setIsLoading(false);
@@ -56,9 +56,9 @@ const Popup = ({ isVisible, showHeader = true, customHeader, customFooter, onApp
         loadApps();
         setTitles((0, constants_1.generateTitles)(options.appTitles));
     }, [
-        appsWhiteList,
         options.alwaysIncludeGoogle,
         options.appTitles,
+        options.appsWhiteList,
         options.naverCallerName,
     ]);
     const _onAppPressed = (app) => {

package/lib/components/popup/PopupBody.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
-import { ViewStyle, TextStyle, ImageStyle } from 'react-native';
+import type { ImageStyle, TextStyle, ViewStyle } from 'react-native';
+import type { MapId } from '../../type';
 declare const PopupBody: ({ isLoading, style: { activityIndicatorContainer: styleActivityIndicatorContainer, separatorStyle: styleSeparatorStyle, itemContainer: styleItemContainer, image: styleImage, itemText: styleItemText, }, apps, onAppPressed, titles, }: {
     isLoading: boolean;
     style: {
@@ -9,8 +10,8 @@ declare const PopupBody: ({ isLoading, style: { activityIndicatorContainer: styl
         image?: ImageStyle;
         itemText?: TextStyle;
     };
-    apps: string[];
-    onAppPressed: (app: string) => void;
+    apps: MapId[];
+    onAppPressed: (app: MapId) => void;
     titles: Record<string, string>;
 }) => React.JSX.Element;
 export default PopupBody;

package/lib/components/popup/PopupFlatList.d.ts

@@ -1,10 +1,10 @@
 import React from 'react';
+import type { ListRenderItem } from 'react-native';
+import type { MapId } from '../../type';
 declare const PopupFlatList: ({ separator, data, renderItem, keyExtractor, }: {
-    separator: JSX.Element;
-    data: string[];
-    renderItem: ({ item }: {
-        item: string;
-    }) => JSX.Element;
-    keyExtractor: (item: string) => string;
+    separator: React.ReactNode;
+    data: MapId[];
+    renderItem: ListRenderItem<MapId>;
+    keyExtractor: (item: MapId) => string;
 }) => React.JSX.Element;
 export default PopupFlatList;

package/lib/components/popup/PopupFooter.d.ts

@@ -1,15 +1,14 @@
-/// <reference types="react" />
-/// <reference types="react" />
-import { ViewStyle, TextStyle } from 'react-native';
+import React from 'react';
+import type { TextStyle, ViewStyle } from 'react-native';
 declare const PopupFooter: ({ customFooter, onCancelPressed, style: { cancelButtonContainer: styleCancelButtonContainer, cancelButtonText: styleCancelButtonText, }, options, }: {
-    customFooter?: JSX.Element | undefined;
+    customFooter?: React.ReactNode;
     onCancelPressed: () => void;
     style: {
         cancelButtonContainer?: ViewStyle;
         cancelButtonText?: TextStyle;
     };
     options: {
-        cancelText?: string;
+        cancelText?: string | null;
     };
-}) => JSX.Element;
+}) => string | number | true | Iterable<React.ReactNode> | React.JSX.Element;
 export default PopupFooter;

package/lib/components/popup/PopupHeader.d.ts

@@ -1,17 +1,16 @@
-/// <reference types="react" />
-/// <reference types="react" />
-import { ViewStyle, TextStyle } from 'react-native';
+import React from 'react';
+import type { TextStyle, ViewStyle } from 'react-native';
 declare const PopupHeader: ({ showHeader, customHeader, style: { headerContainer: styleHeaderContainer, titleText: styleTitleText, subtitleText: styleSubtitleText, }, options, }: {
     showHeader: boolean;
-    customHeader?: JSX.Element | undefined;
+    customHeader?: React.ReactNode;
     style: {
         headerContainer?: ViewStyle;
         titleText?: TextStyle;
         subtitleText?: TextStyle;
     };
     options: {
-        dialogTitle?: string;
-        dialogMessage?: string;
+        dialogTitle?: string | null;
+        dialogMessage?: string | null;
     };
-}) => JSX.Element | null;
+}) => string | number | true | Iterable<React.ReactNode> | React.JSX.Element | null;
 export default PopupHeader;

package/lib/components/popup/PopupItem.d.ts

@@ -1,13 +1,14 @@
 import React from 'react';
-import { ViewStyle, TextStyle, ImageStyle } from 'react-native';
+import type { ImageStyle, TextStyle, ViewStyle } from 'react-native';
+import type { MapId } from '../../type';
 declare const PopupItem: ({ item, style: { itemContainer: styleItemContainer, image: styleImage, itemText: styleItemText, }, onAppPressed, titles, }: {
-    item: string;
+    item: MapId;
     style: {
         itemContainer?: ViewStyle;
         image?: ImageStyle;
         itemText?: TextStyle;
     };
-    onAppPressed: (app: string) => void;
-    titles: Record<string, string>;
+    onAppPressed: (app: MapId) => void;
+    titles: Record<MapId, string>;
 }) => React.JSX.Element;
 export default PopupItem;

package/lib/components/popup/PopupSeparator.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ViewStyle } from 'react-native';
+import type { ViewStyle } from 'react-native';
 declare const PopupSeparator: ({ style: { separatorStyle: styleSeparator }, }: {
     style: {
         separatorStyle?: ViewStyle;

package/lib/constants.d.ts

@@ -1,8 +1,9 @@
+import type { MapId } from './type';
 export declare const isIOS: boolean;
 export declare const generatePrefixes: ({ alwaysIncludeGoogle, naverCallerName, }: {
     alwaysIncludeGoogle?: boolean | undefined;
     naverCallerName?: string | undefined;
-}) => Record<string, string>;
+}) => Record<MapId, string>;
 export declare const prefixForGoogleMaps: (alwaysIncludeGoogle?: boolean) => string;
 export declare const generateTitles: (titles?: Record<string, string>) => Record<string, string>;
 export declare const icons: Record<string, number>;

package/lib/index.d.ts

@@ -1,5 +1,6 @@
-import { GetAppsProps, GetAppsResponse, ShowLocationProps } from './type';
-export type { DirectionMode, GetAppsProps, GetAppsResponse, MapId, MapLinkOptions, PopupProps, PopupStyleProp, SharedOptions, ShowLocationProps, } from './type';
+import { GetAppsProps, GetAppsResponse, MapId, ShowLocationProps } from './type';
+export type { DirectionMode, GetAppsProps, GetAppsResponse, MapId, SharedOptions, ShowLocationProps, } from './type';
 export { Popup } from './components/popup/Popup';
-export declare const showLocation: ({ latitude, longitude, sourceLatitude, sourceLongitude, appleIgnoreLatLon, alwaysIncludeGoogle, googleForceLatLon, googlePlaceId, title: customTitle, app: customApp, dialogTitle: customDialogTitle, dialogMessage: customDialogMessage, cancelText: customCancelText, appsWhiteList: customAppsWhiteList, appTitles, naverCallerName, directionsMode, }: ShowLocationProps) => Promise<string | null | undefined>;
+export type { PopupProps } from './components/popup/Popup';
+export declare const showLocation: ({ latitude, longitude, sourceLatitude, sourceLongitude, appleIgnoreLatLon, alwaysIncludeGoogle, googleForceLatLon, googlePlaceId, title: customTitle, app: customApp, dialogTitle: customDialogTitle, dialogMessage: customDialogMessage, cancelText: customCancelText, appsWhiteList: customAppsWhiteList, appTitles, naverCallerName, directionsMode, }: ShowLocationProps) => Promise<MapId | null | undefined>;
 export declare function getApps({ alwaysIncludeGoogle, appsWhiteList, appTitles, naverCallerName, ...rest }: GetAppsProps): Promise<GetAppsResponse[]>;

package/lib/type.d.ts

@@ -1,7 +1,6 @@
-import * as React from 'react';
-import { ViewStyle, StyleProp, ImageStyle, TextStyle, ImageSourcePropType } from 'react-native';
+import type { ImageSourcePropType } from 'react-native';
 /** id for map application. this is the id that is passed to the `app` option */
-export type MapId = 'apple-maps' | 'google-maps' | 'citymapper' | 'uber' | 'lyft' | 'transit' | 'truckmap' | 'waze' | 'yandex' | 'moovit' | 'yandex-maps' | 'yandex-taxi' | 'kakaomap' | 'tmap' | 'mapycz' | 'maps-me' | 'osmand' | 'gett' | 'navermap' | 'dgis' | 'liftago' | 'petalmaps';
+export type MapId = 'apple-maps' | 'google-maps' | 'citymapper' | 'uber' | 'lyft' | 'transit' | 'truckmap' | 'waze' | 'yandex' | 'moovit' | 'yandex-maps' | 'yandex-taxi' | 'kakaomap' | 'tmap' | 'mapycz' | 'maps-me' | 'osmand' | 'gett' | 'navermap' | 'dgis' | 'liftago' | 'petalmaps' | 'sygic';
 export type DirectionMode = 'car' | 'walk' | 'public-transport' | 'bike';
 /** options shared across different types */
 export interface SharedOptions {
@@ -10,55 +9,6 @@ export interface SharedOptions {
     /** custom titles to display for each app instead of using default titles. */
     appTitles?: Partial<Record<MapId, string>>;
 }
-export interface MapLinkOptions extends SharedOptions {
-    latitude: number | string;
-    longitude: number | string;
-    /** optionally specify starting location for directions */
-    sourceLatitude?: number;
-    /** not optional if `sourceLatitude` is specified */
-    sourceLongitude?: number;
-    /** optional, true will always add Google Maps to iOS and open in Safari, even if app is not installed (default: false) */
-    alwaysIncludeGoogle?: boolean;
-    googleForceLatLon?: boolean;
-    appleIgnoreLatLon?: boolean;
-    googlePlaceId?: string;
-    title?: string;
-    /** optionally specify specific app to use */
-    app?: MapId;
-    /** optional (default: 'Open in Maps') */
-    dialogTitle?: string;
-    /** optional (default: 'What app would you like to use?') */
-    dialogMessage?: string;
-    cancelText?: string;
-    /** to link into Naver Map You should provide your appname which is the bundle ID in iOS and applicationId in android. */
-    naverCallerName?: string;
-    directionsMode?: DirectionMode;
-}
-export interface PopupStyleProp {
-    container?: StyleProp<ViewStyle>;
-    itemContainer?: StyleProp<ViewStyle>;
-    image?: StyleProp<ImageStyle>;
-    itemText?: StyleProp<TextStyle>;
-    headerContainer?: StyleProp<ViewStyle>;
-    titleText?: StyleProp<TextStyle>;
-    subtitleText?: StyleProp<TextStyle>;
-    cancelButtonContainer?: StyleProp<ViewStyle>;
-    cancelButtonText?: StyleProp<TextStyle>;
-    separatorStyle?: StyleProp<ViewStyle>;
-    activityIndicatorContainer?: StyleProp<ViewStyle>;
-}
-export interface PopupProps extends SharedOptions {
-    isVisible: boolean;
-    showHeader?: boolean;
-    customHeader?: React.ReactNode;
-    customFooter?: React.ReactNode;
-    onCancelPressed: () => void;
-    onBackButtonPressed: () => void;
-    onAppPressed: (appName: MapId) => void;
-    style?: PopupStyleProp;
-    modalProps?: object;
-    options: MapLinkOptions;
-}
 export type GetAppsResponse = {
     id: MapId;
     name: string;
@@ -76,17 +26,13 @@ export interface ShowLocationProps {
     googleForceLatLon?: boolean;
     googlePlaceId?: number | string;
     title?: string | null;
-    app?: string | null;
+    app?: MapId | null;
     dialogTitle?: string | null;
     dialogMessage?: string | null;
     cancelText?: string | null;
     appsWhiteList?: string[] | null;
-    appTitles?: Record<string, string>;
-    naverCallerName?: string;
-    directionsMode?: 'car' | 'walk' | 'public-transport' | 'bike' | undefined;
-}
-export interface GetAppsProps extends ShowLocationProps {
-    alwaysIncludeGoogle?: boolean;
-    appsWhiteList?: string[] | null;
+    appTitles?: Partial<Record<MapId, string>>;
     naverCallerName?: string;
+    directionsMode?: DirectionMode;
 }
+export type GetAppsProps = ShowLocationProps;

package/lib/utils.d.ts

@@ -1,4 +1,5 @@
-export declare const getAvailableApps: (prefixes: Record<string, string>) => Promise<string[]>;
+import type { MapId } from './type';
+export declare const getAvailableApps: (prefixes: Record<string, string>) => Promise<MapId[]>;
 export declare const isAppInstalled: (app: string, prefixes: Record<string, string>) => Promise<boolean>;
 export declare const isSupportedApp: (app: string) => boolean;
 export declare const getNotSupportedApps: (apps: string[]) => string[];
@@ -10,7 +11,7 @@ export declare const askAppChoice: ({ dialogTitle, dialogMessage, cancelText, ap
     appsWhiteList: string[] | null | undefined;
     prefixes: Record<string, string>;
     appTitles: Record<string, string> | null | undefined;
-}) => Promise<string | null>;
+}) => Promise<MapId | null>;
 export declare const getDirectionsModeAppleMaps: (directionsMode: 'car' | 'walk' | 'public-transport' | 'bike' | undefined) => string | undefined;
 export declare const getDirectionsModeGoogleMaps: (directionsMode: 'car' | 'walk' | 'public-transport' | 'bike' | undefined) => string | undefined;
 export declare const getDirectionsModeSygic: (directionsMode: 'car' | 'walk' | 'public-transport' | 'bike' | undefined) => string | undefined;

package/lib/utils.js

@@ -5,7 +5,7 @@ const react_native_1 = require("react-native");
 const constants_1 = require("./constants");
 const getAvailableApps = async (prefixes) => {
     const availableApps = [];
-    await Promise.all(Object.entries(prefixes).map(async ([app, _]) => {
+    await Promise.all(Object.keys(prefixes).map(async (app) => {
         try {
             const isInstalled = await (0, exports.isAppInstalled)(app, prefixes);
             if (isInstalled) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-map-link",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "Open the map app of the user's choice with a specific location.",
   "source": "src/index",
   "main": "lib/index.js",