@getuserfeedback/react-native 4.0.29 → 5.0.6

package/dist/view-webview-host-controller.d.ts

@@ -15,6 +15,7 @@ export declare const createViewWebViewHostController: (input: {
     generation: number;
     onConnected: (connection: ViewWebViewHostConnection) => void;
     onDisconnected?: () => void;
+    onActivationRetryExhausted?: (error: Error) => void;
     activationRetryIntervalMs?: number;
     activationRetryTimeoutMs?: number;
 }) => ViewWebViewHostController;

package/dist/view-webview-host-controller.js

@@ -25,6 +25,7 @@ export const createViewWebViewHostController = (input) => {
             });
         },
         onDisconnected: input.onDisconnected,
+        onActivationRetryExhausted: input.onActivationRetryExhausted,
         activationRetryIntervalMs: input.activationRetryIntervalMs,
         activationRetryTimeoutMs: input.activationRetryTimeoutMs,
     });

package/dist/view-webview-host.d.ts

@@ -6,8 +6,8 @@ export type ViewWebViewHostProps = {
     srcdoc: string;
     onConnected: (connection: ViewWebViewHostConnection) => void;
     onDisconnected?: () => void;
+    onActivationRetryExhausted?: (error: Error) => void;
     onInvalidMessage?: (error: Error, value: unknown) => void;
     webViewComponent?: ComponentType<Record<string, unknown>>;
-    webViewProps?: Record<string, unknown>;
 };
 export declare function ViewWebViewHost(props: ViewWebViewHostProps): ReactElement;

package/dist/view-webview-host.js

@@ -3,7 +3,7 @@ import { buildViewWebViewBridgeScript, parseViewWebViewBridgeMessage, toExternal
 import { createViewWebViewHostController, } from "./view-webview-host-controller.js";
 import { WebViewDocumentHost } from "./webview-document-host.js";
 let nextBridgeId = 0;
-function ViewWebViewHostDocument({ generation, onConnected, onDisconnected, onInvalidMessage, srcdoc, viewId, webViewComponent, webViewProps, }) {
+function ViewWebViewHostDocument({ generation, onConnected, onDisconnected, onActivationRetryExhausted, onInvalidMessage, srcdoc, viewId, webViewComponent, }) {
     const bridgeIdRef = useRef(null);
     if (bridgeIdRef.current === null) {
         nextBridgeId += 1;
@@ -27,23 +27,19 @@ function ViewWebViewHostDocument({ generation, onConnected, onDisconnected, onIn
                 var _a;
                 (_a = onDisconnectedRef.current) === null || _a === void 0 ? void 0 : _a.call(onDisconnectedRef);
             },
+            onActivationRetryExhausted,
         });
     }
     const controller = controllerRef.current;
     const buildDocumentStartScript = useMemo(() => () => buildViewWebViewBridgeScript({ bridgeId, phase: "documentStart" }), [bridgeId]);
     const source = useMemo(() => toExternalViewSource({ bridgeId, srcdoc }), [bridgeId, srcdoc]);
-    const resolvedWebViewProps = useMemo(() => {
-        var _a;
-        return (Object.assign(Object.assign({}, webViewProps), { originWhitelist: (_a = webViewProps === null || webViewProps === void 0 ? void 0 : webViewProps.originWhitelist) !== null && _a !== void 0 ? _a : ["*"] }));
-    }, [webViewProps]);
     return createElement((WebViewDocumentHost), {
-        bridgeId,
         buildDocumentStartScript,
         controller,
         parseMessage: parseViewWebViewBridgeMessage,
         source,
         webViewComponent,
-        webViewProps: resolvedWebViewProps,
+        webViewRole: "view",
         onInvalidMessage,
     });
 }

package/dist/webview-document-host.d.ts

@@ -1,13 +1,12 @@
 import { type ComponentType, type ReactElement } from "react";
 import type { WebViewBridgeMessageIdentity, WebViewHostController } from "./webview-host-controller.js";
 export type WebViewDocumentHostProps<TMessage extends WebViewBridgeMessageIdentity> = {
-    bridgeId: string;
     buildDocumentStartScript: () => string;
     controller: WebViewHostController<TMessage>;
     parseMessage: (value: unknown) => TMessage;
     source: Record<string, unknown>;
     webViewComponent?: ComponentType<Record<string, unknown>>;
-    webViewProps?: Record<string, unknown>;
+    webViewRole: "core" | "view";
     onInvalidMessage?: (error: Error, value: unknown) => void;
 };
-export declare function WebViewDocumentHost<TMessage extends WebViewBridgeMessageIdentity>({ bridgeId, buildDocumentStartScript, controller, parseMessage, source, webViewComponent, webViewProps, onInvalidMessage, }: WebViewDocumentHostProps<TMessage>): ReactElement;
+export declare function WebViewDocumentHost<TMessage extends WebViewBridgeMessageIdentity>({ buildDocumentStartScript, controller, parseMessage, source, webViewComponent, webViewRole, onInvalidMessage, }: WebViewDocumentHostProps<TMessage>): ReactElement;

package/dist/webview-document-host.js

@@ -1,4 +1,13 @@
 import { createElement, useCallback, useEffect, useMemo, useRef, } from "react";
+const CORE_WEBVIEW_STYLE = {
+    height: 1,
+    left: -10000,
+    opacity: 0,
+    position: "absolute",
+    top: 0,
+    width: 1,
+};
+const VIEW_WEBVIEW_STYLE = { flex: 1 };
 const resolveWebViewComponent = () => {
     var _a;
     const webViewModule = require("react-native-webview");
@@ -19,46 +28,32 @@ const toMessageData = (value) => {
         return value;
     }
 };
-const toEventHandler = (value) => typeof value === "function" ? value : undefined;
-const toInjectionScript = (value) => typeof value === "string" && value.length > 0 ? value : undefined;
-const toTruthyInjectionScript = (value) => {
-    const script = toInjectionScript(value);
-    return script ? `${script}\ntrue;` : undefined;
-};
-const composeInjectionScripts = (bridgeScript, callerScript) => {
-    const script = toInjectionScript(callerScript);
-    return script ? `${bridgeScript}\n${script}\ntrue;` : bridgeScript;
-};
-const isBridgeMessageCandidate = (value, bridgeId) => typeof value === "object" &&
-    value !== null &&
-    "bridgeId" in value &&
-    value.bridgeId === bridgeId;
-export function WebViewDocumentHost({ bridgeId, buildDocumentStartScript, controller, parseMessage, source, webViewComponent, webViewProps, onInvalidMessage, }) {
+export function WebViewDocumentHost({ buildDocumentStartScript, controller, parseMessage, source, webViewComponent, webViewRole, onInvalidMessage, }) {
     const WebView = webViewComponent !== null && webViewComponent !== void 0 ? webViewComponent : resolveWebViewComponent();
     const onInvalidMessageRef = useRef(onInvalidMessage);
     onInvalidMessageRef.current = onInvalidMessage;
     const documentStartBridgeScript = useMemo(() => buildDocumentStartScript(), [buildDocumentStartScript]);
-    const callerOnLoadStart = toEventHandler(webViewProps === null || webViewProps === void 0 ? void 0 : webViewProps.onLoadStart);
-    const callerOnLoad = toEventHandler(webViewProps === null || webViewProps === void 0 ? void 0 : webViewProps.onLoad);
-    const callerOnMessage = toEventHandler(webViewProps === null || webViewProps === void 0 ? void 0 : webViewProps.onMessage);
-    useEffect(() => () => {
-        controller.detach();
+    const webViewHandleRef = useRef(null);
+    useEffect(() => {
+        const currentHandle = webViewHandleRef.current;
+        if (currentHandle) {
+            controller.attach(currentHandle);
+        }
+        return () => {
+            controller.detach();
+        };
     }, [controller]);
     const setWebViewRef = useCallback((handle) => {
         if (!handle || typeof handle.injectJavaScript !== "function") {
+            webViewHandleRef.current = null;
             controller.detach();
             return;
         }
+        webViewHandleRef.current = handle;
         controller.attach(handle);
     }, [controller]);
-    const handleLoadStart = useCallback((event) => {
-        controller.beginLoad();
-        callerOnLoadStart === null || callerOnLoadStart === void 0 ? void 0 : callerOnLoadStart(event);
-    }, [callerOnLoadStart, controller]);
-    const handleLoad = useCallback((event) => {
-        controller.completeLoad();
-        callerOnLoad === null || callerOnLoad === void 0 ? void 0 : callerOnLoad(event);
-    }, [callerOnLoad, controller]);
+    const handleLoadStart = useCallback(() => controller.beginLoad(), [controller]);
+    const handleLoad = useCallback(() => controller.completeLoad(), [controller]);
     const handleMessage = useCallback((event) => {
         var _a, _b;
         const value = toMessageData((_a = event.nativeEvent) === null || _a === void 0 ? void 0 : _a.data);
@@ -67,14 +62,16 @@ export function WebViewDocumentHost({ bridgeId, buildDocumentStartScript, contro
             message = parseMessage(value);
         }
         catch (error) {
-            if (!callerOnMessage || isBridgeMessageCandidate(value, bridgeId)) {
-                (_b = onInvalidMessageRef.current) === null || _b === void 0 ? void 0 : _b.call(onInvalidMessageRef, error instanceof Error ? error : new Error(String(error)), value);
-            }
-            callerOnMessage === null || callerOnMessage === void 0 ? void 0 : callerOnMessage(event);
+            (_b = onInvalidMessageRef.current) === null || _b === void 0 ? void 0 : _b.call(onInvalidMessageRef, error instanceof Error ? error : new Error(String(error)), value);
             return;
         }
         controller.handleMessage(message);
-        callerOnMessage === null || callerOnMessage === void 0 ? void 0 : callerOnMessage(event);
-    }, [bridgeId, callerOnMessage, controller, parseMessage]);
-    return createElement(WebView, Object.assign(Object.assign({}, webViewProps), { injectedJavaScript: toTruthyInjectionScript(webViewProps === null || webViewProps === void 0 ? void 0 : webViewProps.injectedJavaScript), injectedJavaScriptBeforeContentLoaded: composeInjectionScripts(documentStartBridgeScript, webViewProps === null || webViewProps === void 0 ? void 0 : webViewProps.injectedJavaScriptBeforeContentLoaded), onLoad: handleLoad, onLoadStart: handleLoadStart, onMessage: handleMessage, ref: setWebViewRef, source }));
+    }, [controller, parseMessage]);
+    return createElement(WebView, Object.assign(Object.assign({}, (webViewRole === "core"
+        ? {
+            containerStyle: CORE_WEBVIEW_STYLE,
+            pointerEvents: "none",
+            style: CORE_WEBVIEW_STYLE,
+        }
+        : { originWhitelist: ["*"], style: VIEW_WEBVIEW_STYLE })), { injectedJavaScriptBeforeContentLoaded: documentStartBridgeScript, onLoad: handleLoad, onLoadStart: handleLoadStart, onMessage: handleMessage, ref: setWebViewRef, source }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getuserfeedback/react-native",
-  "version": "4.0.29",
+  "version": "5.0.6",
   "description": "getuserfeedback React Native SDK",
   "keywords": [
     "getuserfeedback",
@@ -44,8 +44,8 @@
     "lint": "biome check ."
   },
   "dependencies": {
-    "@getuserfeedback/protocol": "^3.30.3",
-    "@getuserfeedback/sdk": "^0.12.26",
+    "@getuserfeedback/protocol": "^3.31.0",
+    "@getuserfeedback/sdk": "^0.12.35",
     "robot3": "^1.2.0"
   },
   "peerDependencies": {

package/dist/host-viewport.d.ts

@@ -1,3 +0,0 @@
-import type { WidgetHostProps } from "./widget-host.js";
-export type HostViewport = NonNullable<WidgetHostProps["hostViewport"]>;
-export declare function useResolvedHostViewport(explicitHostViewport: HostViewport | undefined): HostViewport | undefined;

package/dist/host-viewport.js

@@ -1,69 +0,0 @@
-import { useEffect, useMemo, useState } from "react";
-function isHostViewport(value) {
-    return (typeof value === "object" &&
-        value !== null &&
-        "width" in value &&
-        typeof value.width === "number" &&
-        Number.isFinite(value.width) &&
-        value.width > 0 &&
-        "height" in value &&
-        typeof value.height === "number" &&
-        Number.isFinite(value.height) &&
-        value.height > 0);
-}
-function toHostViewport(value) {
-    return isHostViewport(value)
-        ? {
-            height: value.height,
-            width: value.width,
-        }
-        : undefined;
-}
-function resolveReactNativeDimensions() {
-    var _a;
-    try {
-        const reactNativeModule = require("react-native");
-        return (_a = reactNativeModule.Dimensions) !== null && _a !== void 0 ? _a : null;
-    }
-    catch (_b) {
-        return null;
-    }
-}
-function readWindowViewport(dimensions) {
-    if (!dimensions) {
-        return undefined;
-    }
-    return toHostViewport(dimensions.get("window"));
-}
-function useReactNativeWindowViewport(enabled) {
-    const dimensions = useMemo(() => (enabled ? resolveReactNativeDimensions() : null), [enabled]);
-    const [viewport, setViewport] = useState(() => readWindowViewport(dimensions));
-    useEffect(() => {
-        if (!enabled) {
-            setViewport(undefined);
-            return;
-        }
-        setViewport(readWindowViewport(dimensions));
-        if (!(dimensions === null || dimensions === void 0 ? void 0 : dimensions.addEventListener)) {
-            return;
-        }
-        const handleChange = (event) => {
-            var _a;
-            setViewport((_a = toHostViewport(event.window)) !== null && _a !== void 0 ? _a : readWindowViewport(dimensions));
-        };
-        const subscription = dimensions.addEventListener("change", handleChange);
-        return () => {
-            var _a;
-            if (subscription === null || subscription === void 0 ? void 0 : subscription.remove) {
-                subscription.remove();
-                return;
-            }
-            (_a = dimensions.removeEventListener) === null || _a === void 0 ? void 0 : _a.call(dimensions, "change", handleChange);
-        };
-    }, [dimensions, enabled]);
-    return viewport !== null && viewport !== void 0 ? viewport : readWindowViewport(dimensions);
-}
-export function useResolvedHostViewport(explicitHostViewport) {
-    const measuredHostViewport = useReactNativeWindowViewport(explicitHostViewport === undefined);
-    return explicitHostViewport !== null && explicitHostViewport !== void 0 ? explicitHostViewport : measuredHostViewport;
-}

package/dist/index.d.ts

@@ -1,91 +0,0 @@
-import type { AppEventExternalId, AppEventJsonValue, PublicCommandPayload } from "@getuserfeedback/protocol";
-import type { WebViewCommandEnvelope, WebViewTransportNativeMessage, WebViewTransportWebMessage } from "@getuserfeedback/protocol/webview-transport";
-import type { ConfigureOptions, InitOptions } from "@getuserfeedback/sdk";
-import { type ReactElement, type ReactNode } from "react";
-import { type CommandSettledEvent, type CommandSettledSuccessDetail } from "./provider-command-helpers.js";
-import { WidgetHost, type WidgetHostProps, type WidgetHostSource } from "./widget-host.js";
-export { REACT_NATIVE_SDK_VERSION } from "./version.js";
-export { buildNativeMessageInjectionScript, buildWebViewBridgeScript, } from "./webview-bridge-script.js";
-export { WidgetHost, type WidgetHostProps, type WidgetHostSource };
-export type ReactNativeWidgetCommandEnvelope = WebViewCommandEnvelope;
-export type ReactNativeWidgetCommand = ReactNativeWidgetCommandEnvelope["command"];
-export type ReactNativeWidgetNativeMessage = WebViewTransportNativeMessage;
-export type ReactNativeWidgetWebMessage = WebViewTransportWebMessage;
-type IdentifyTraits = Record<string, unknown>;
-type TrackProperties = Record<string, AppEventJsonValue>;
-type OpenCommand = Extract<PublicCommandPayload, {
-    kind: "open";
-}>;
-type PrerenderCommand = Extract<PublicCommandPayload, {
-    kind: "prerender";
-}>;
-type IdentifyOptions = {
-    externalIds?: AppEventExternalId[];
-};
-type TrackOptions = {
-    externalIds?: AppEventExternalId[];
-};
-export type OpenFlowOptions = Pick<OpenCommand, "hideCloseButton" | "metadata">;
-export type PrerenderFlowOptions = Pick<PrerenderCommand, "hideCloseButton">;
-type HostContext = Extract<PublicCommandPayload, {
-    kind: "updateHostContext";
-}>["context"];
-export interface ReactNativeCommandResult {
-    envelope: ReactNativeWidgetCommandEnvelope;
-    message: ReactNativeWidgetNativeMessage;
-    settlement?: CommandSettledEvent["detail"];
-    settlementResult?: CommandSettledSuccessDetail["result"];
-}
-export interface ReactNativeCommandOptions {
-    idempotencyKey?: string;
-}
-export interface ReactNativeFlowRun {
-    readonly flowId: string;
-    open: (options?: OpenFlowOptions) => Promise<void>;
-    prefetch: () => Promise<void>;
-    prerender: (options?: PrerenderFlowOptions) => Promise<void>;
-    close: () => Promise<void>;
-}
-export interface ReactNativeGetUserFeedbackClient {
-    readonly instanceId: string;
-    readonly nativeMessages: readonly ReactNativeWidgetNativeMessage[];
-    enqueueCommand: (command: ReactNativeWidgetCommand, options?: ReactNativeCommandOptions) => Promise<ReactNativeCommandResult>;
-    configure: (opts: ConfigureOptions, options?: ReactNativeCommandOptions) => Promise<ReactNativeCommandResult>;
-    identify: {
-        (userId: string, traits?: IdentifyTraits, options?: IdentifyOptions): Promise<ReactNativeCommandResult>;
-        (traits: IdentifyTraits, placeholder: undefined, options?: IdentifyOptions): Promise<ReactNativeCommandResult>;
-        (traits: IdentifyTraits, options?: IdentifyOptions): Promise<ReactNativeCommandResult>;
-    };
-    track: (eventName: string, properties?: TrackProperties, options?: TrackOptions) => Promise<ReactNativeCommandResult>;
-    flow: (flowId: string) => ReactNativeFlowRun;
-    close: () => Promise<ReactNativeCommandResult>;
-    reset: (options?: ReactNativeCommandOptions) => Promise<ReactNativeCommandResult>;
-    updateHostContext: (context: HostContext, options?: ReactNativeCommandOptions) => Promise<ReactNativeCommandResult>;
-    emitHostSignal: (name: string, data?: unknown, options?: ReactNativeCommandOptions) => Promise<ReactNativeCommandResult>;
-    handleWebMessage: (message: ReactNativeWidgetWebMessage) => void;
-}
-interface GetUserFeedbackProviderBaseProps {
-    children?: ReactNode;
-    initOptions: InitOptions;
-    configureOptions?: ConfigureOptions;
-    instanceId?: string;
-    onWebMessage?: (message: WebViewTransportWebMessage) => void;
-    onInvalidWebMessage?: (error: Error, rawMessage: unknown) => void;
-    onCommandError?: (error: Error) => void;
-    autoInit?: boolean;
-    commandTimeoutMs?: number;
-    hostViewport?: WidgetHostProps["hostViewport"];
-    webViewComponent?: WidgetHostProps["webViewComponent"];
-    webViewProps?: WidgetHostProps["webViewProps"];
-}
-export type GetUserFeedbackProviderProps = GetUserFeedbackProviderBaseProps & ({
-    loaderUrl: string;
-    source?: WidgetHostSource;
-} | {
-    loaderUrl?: string;
-    source: WidgetHostSource;
-});
-export type GetUserFeedbackNativeContextValue = ReactNativeGetUserFeedbackClient;
-export declare function GetUserFeedbackProvider({ autoInit, children, commandTimeoutMs, configureOptions, hostViewport, instanceId: instanceIdProp, initOptions, loaderUrl, onCommandError, onInvalidWebMessage, onWebMessage, source, webViewComponent, webViewProps, }: GetUserFeedbackProviderProps): ReactElement;
-export declare function useGetUserFeedbackNative(): GetUserFeedbackNativeContextValue;
-export declare const useGetUserFeedback: typeof useGetUserFeedbackNative;