@getuserfeedback/react-native 4.0.12 → 4.0.20

package/dist/native-view-host-projection.js

@@ -1,7 +1,8 @@
-import { createElement, Fragment, useCallback, useEffect, useMemo, useRef, useSyncExternalStore, } from "react";
+import { createElement, Fragment, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useSyncExternalStore, } from "react";
 import { NativeViewPresentationSurface } from "./native-view-presentation-surface.js";
 import { ViewWebViewHost } from "./view-webview-host.js";
 function NativeViewHostProjectionEntry({ controller, nativeViewComponent, onInvalidMessage, record, webViewComponent, webViewProps, }) {
+    var _a;
     const detachConnectionRef = useRef(null);
     const detachConnection = useCallback(() => {
         const detach = detachConnectionRef.current;
@@ -18,6 +19,24 @@ function NativeViewHostProjectionEntry({ controller, nativeViewComponent, onInva
         }
     }, [controller, record.allocationId]);
     const presentedWebViewProps = useMemo(() => (Object.assign(Object.assign({}, webViewProps), { style: [webViewProps === null || webViewProps === void 0 ? void 0 : webViewProps.style, { flex: 1 }] })), [webViewProps]);
+    const layoutTransactionId = (_a = record.size) === null || _a === void 0 ? void 0 : _a.layoutTransactionId;
+    useLayoutEffect(() => {
+        if (!layoutTransactionId) {
+            return;
+        }
+        controller.commitViewLayoutTransaction({
+            allocationId: record.allocationId,
+            layoutReportRevision: record.layoutReportRevision,
+            layoutTransactionId,
+            viewId: record.viewId,
+        });
+    }, [
+        controller,
+        layoutTransactionId,
+        record.allocationId,
+        record.layoutReportRevision,
+        record.viewId,
+    ]);
     useEffect(() => detachConnection, [detachConnection]);
     return createElement(NativeViewPresentationSurface, { nativeViewComponent, record }, createElement(ViewWebViewHost, {
         generation: record.generation,

package/dist/native-view-presentation-surface.js

@@ -28,7 +28,7 @@ const PREPARING_VIEW_FRAME_STYLE = {
     height: "100%",
     width: "100%",
 };
-const PRESENTED_VIEW_FRAME_STYLE = {
+const MEASURED_VIEW_FRAME_STYLE = {
     maxHeight: "100%",
     maxWidth: "100%",
 };
@@ -51,16 +51,17 @@ const resolveNativeView = () => {
     return reactNativeModule.View;
 };
 export function NativeViewPresentationSurface({ children, nativeViewComponent, record, }) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const NativeView = nativeViewComponent !== null && nativeViewComponent !== void 0 ? nativeViewComponent : resolveNativeView();
     const isPresented = record.isActive && record.size !== null;
-    const cornerRadii = toNativeWidgetCornerRadii((_a = record.size) === null || _a === void 0 ? void 0 : _a.frameAppearance);
-    const shadow = toNativeWidgetFrameShadow(((_c = (_b = record.size) === null || _b === void 0 ? void 0 : _b.frameAppearance) === null || _c === void 0 ? void 0 : _c.kind) === "page"
+    const hasMeasuredFrame = isPresented || ((_a = record.size) === null || _a === void 0 ? void 0 : _a.layoutTransactionId) !== undefined;
+    const cornerRadii = toNativeWidgetCornerRadii((_b = record.size) === null || _b === void 0 ? void 0 : _b.frameAppearance);
+    const shadow = toNativeWidgetFrameShadow(((_d = (_c = record.size) === null || _c === void 0 ? void 0 : _c.frameAppearance) === null || _d === void 0 ? void 0 : _d.kind) === "page"
         ? record.size.frameAppearance.resolvedBoxShadow
         : undefined);
     const nativeBoxShadow = toNativeWidgetSupportedBoxShadow(shadow, resolveNativeWidgetBoxShadowSupport());
     const frameOverlayShadowStyle = nativeBoxShadow === undefined ? {} : { boxShadow: nativeBoxShadow };
-    const borderStyle = toNativeWidgetResolvedBorderStyle(((_e = (_d = record.size) === null || _d === void 0 ? void 0 : _d.frameAppearance) === null || _e === void 0 ? void 0 : _e.kind) === "page"
+    const borderStyle = toNativeWidgetResolvedBorderStyle(((_f = (_e = record.size) === null || _e === void 0 ? void 0 : _e.frameAppearance) === null || _f === void 0 ? void 0 : _f.kind) === "page"
         ? record.size.frameAppearance.resolvedBorder
         : undefined);
     const cornerRadiusStyle = {
@@ -71,7 +72,7 @@ export function NativeViewPresentationSurface({ children, nativeViewComponent, r
     };
     return createElement(NativeView, {
         pointerEvents: isPresented ? "box-none" : "none",
-        style: Object.assign(Object.assign(Object.assign({}, HOST_SURFACE_STYLE), (((_f = record.size) === null || _f === void 0 ? void 0 : _f.placement) === "docked-top"
+        style: Object.assign(Object.assign(Object.assign({}, HOST_SURFACE_STYLE), (((_g = record.size) === null || _g === void 0 ? void 0 : _g.placement) === "docked-top"
             ? TOP_PLACEMENT_STYLE
             : BOTTOM_PLACEMENT_STYLE)), (isPresented
             ? PRESENTED_HOST_SURFACE_STYLE
@@ -79,8 +80,8 @@ export function NativeViewPresentationSurface({ children, nativeViewComponent, r
         testID: `gx-native-view-presentation-${record.viewId}`,
     }, createElement(NativeView, {
         pointerEvents: isPresented ? "auto" : "none",
-        style: isPresented
-            ? Object.assign(Object.assign(Object.assign({}, PRESENTED_VIEW_FRAME_STYLE), cornerRadiusStyle), { height: (_g = record.size) === null || _g === void 0 ? void 0 : _g.height, width: (_h = record.size) === null || _h === void 0 ? void 0 : _h.width }) : PREPARING_VIEW_FRAME_STYLE,
+        style: hasMeasuredFrame
+            ? Object.assign(Object.assign(Object.assign({}, MEASURED_VIEW_FRAME_STYLE), cornerRadiusStyle), { height: (_h = record.size) === null || _h === void 0 ? void 0 : _h.height, width: (_j = record.size) === null || _j === void 0 ? void 0 : _j.width }) : PREPARING_VIEW_FRAME_STYLE,
         testID: `gx-native-view-frame-${record.viewId}`,
     }, createElement(NativeView, {
         style: Object.assign(Object.assign({}, VIEW_FRAME_CONTENT_STYLE), cornerRadiusStyle),

package/dist/native-view-record-controller.d.ts

@@ -8,6 +8,7 @@ export type NativeViewRecord = Readonly<{
     generation: number;
     instanceId: string;
     isActive: boolean;
+    layoutReportRevision: number;
     openRequest: Readonly<OpenRequestMetadata> | undefined;
     size: NativeViewSizeReport | null;
     srcdoc: string;
@@ -18,6 +19,12 @@ export type NativeViewRecordController = {
         allocationId: number;
         connection: ViewWebViewHostConnection;
     }): (() => void) | null;
+    commitViewLayoutTransaction(input: {
+        allocationId: number;
+        layoutReportRevision: number;
+        layoutTransactionId: string;
+        viewId: string;
+    }): void;
     dispose(): void;
     getSnapshot(): readonly NativeViewRecord[];
     subscribe(listener: () => void): () => void;

package/dist/native-view-record-controller.js

@@ -1,5 +1,5 @@
 import { coreViewHostActionSchema, } from "@getuserfeedback/protocol/internal/core-view-host-actions";
-import { actionRequestCloseViewSchema, buildEventViewSize, eventViewSizeSchema, } from "@getuserfeedback/protocol/internal/view-host-control-messages";
+import { actionRequestCloseViewSchema, buildEventLayoutTransactionCommitted, buildEventViewSize, eventViewSizeSchema, } from "@getuserfeedback/protocol/internal/view-host-control-messages";
 import { buildEventViewClosed, buildEventViewPrerendered, } from "@getuserfeedback/protocol/internal/view-host-lifecycle-events";
 import { createViewPreparationReadinessRegistry, createViewPreparationRegistry, } from "./view-orchestration-runtime.js";
 const createNativeViewReadinessRegistry = () => createViewPreparationReadinessRegistry();
@@ -51,6 +51,9 @@ export function createNativeViewRecordController(input) {
         return true;
     };
     const closeEntry = (entry) => {
+        if (entries.get(entry.viewId) !== entry) {
+            return;
+        }
         if (!preparations.cancel(entry.viewId)) {
             removeEntry(entry);
         }
@@ -69,11 +72,15 @@ export function createNativeViewRecordController(input) {
             generation: action.gen,
             instanceId: action.instanceId,
             isActive: false,
+            isClosing: false,
             isPreparationCommitted: false,
+            layoutReportRevision: 0,
             openRequest: toOpenRequestMetadata(action.openRequest),
             preparation,
             size: null,
             srcdoc: action.srcdoc,
+            committedLayoutReportOccurrence: null,
+            viewConnection: null,
             viewReadinessDetach: null,
             viewId: action.viewId,
         };
@@ -140,6 +147,10 @@ export function createNativeViewRecordController(input) {
         }));
     };
     const closeViewFromRequest = (entry, request) => {
+        if (entry.isClosing) {
+            return;
+        }
+        entry.isClosing = true;
         try {
             input.coreConnection.transport.postMessage(Object.assign(Object.assign({}, request), { viewId: entry.viewId }));
             input.coreConnection.transport.postMessage(buildEventViewClosed({
@@ -161,6 +172,39 @@ export function createNativeViewRecordController(input) {
     };
     const stopCoreTransport = input.coreConnection.transport.subscribe(handleCoreMessage);
     return {
+        commitViewLayoutTransaction({ allocationId, layoutReportRevision, layoutTransactionId, viewId, }) {
+            var _a, _b;
+            if (coreConnectionFailed || disposed) {
+                return;
+            }
+            const entry = entries.get(viewId);
+            const connection = entry === null || entry === void 0 ? void 0 : entry.viewConnection;
+            if (!entry ||
+                entry.allocationId !== allocationId ||
+                !connection ||
+                entry.layoutReportRevision !== layoutReportRevision ||
+                ((_a = entry.size) === null || _a === void 0 ? void 0 : _a.layoutTransactionId) !== layoutTransactionId ||
+                (((_b = entry.committedLayoutReportOccurrence) === null || _b === void 0 ? void 0 : _b.layoutReportRevision) ===
+                    layoutReportRevision &&
+                    entry.committedLayoutReportOccurrence.layoutTransactionId ===
+                        layoutTransactionId)) {
+                return;
+            }
+            entry.committedLayoutReportOccurrence = {
+                layoutReportRevision,
+                layoutTransactionId,
+            };
+            try {
+                connection.transport.postMessage(buildEventLayoutTransactionCommitted({
+                    gen: entry.generation,
+                    layoutTransactionId,
+                    viewId,
+                }));
+            }
+            catch (error) {
+                failCoreConnection(error, "Native view layout commit delivery failed");
+            }
+        },
         attachViewReadinessConnection({ allocationId, connection }) {
             if (coreConnectionFailed || disposed) {
                 return null;
@@ -187,6 +231,8 @@ export function createNativeViewRecordController(input) {
                 connectionReadiness.release();
                 if (entry.viewReadinessDetach === detach) {
                     entry.viewReadinessDetach = null;
+                    entry.viewConnection = null;
+                    entry.committedLayoutReportOccurrence = null;
                     if (entry.size !== null) {
                         entry.size = null;
                         if (!disposed && entries.get(viewId) === entry) {
@@ -235,6 +281,7 @@ export function createNativeViewRecordController(input) {
                 }
                 const size = toViewSizeReport(parsed.data);
                 entry.size = size;
+                entry.layoutReportRevision += 1;
                 const readySize = connectionReadiness.recordSize(size);
                 if (readySize) {
                     deliverReadiness(readySize);
@@ -267,6 +314,8 @@ export function createNativeViewRecordController(input) {
                 return null;
             }
             entry.viewReadinessDetach = detach;
+            entry.viewConnection = connection;
+            entry.committedLayoutReportOccurrence = null;
             previousDetach === null || previousDetach === void 0 ? void 0 : previousDetach();
             if (entry.size !== null) {
                 entry.size = null;
@@ -320,6 +369,7 @@ function toRecord(entry) {
         generation: entry.generation,
         instanceId: entry.instanceId,
         isActive: entry.isActive,
+        layoutReportRevision: entry.layoutReportRevision,
         openRequest: entry.openRequest,
         size: entry.size,
         srcdoc: entry.srcdoc,
@@ -354,6 +404,7 @@ function toViewSizeReport(event) {
         width: event.width,
         height: event.height,
         intrinsicWidth: event.intrinsicWidth,
+        viewportRevision: event.viewportRevision,
         frameAppearance: event.frameAppearance,
         placement: event.placement,
         transitionPolicy: event.transitionPolicy,

package/dist/version.js

@@ -3,4 +3,4 @@ const reactNativeSdkVersion = typeof __GX_REACT_NATIVE_SDK_VERSION__ === "string
     : "";
 // Build scripts patch this fallback to the package version for published artifacts.
 // Source-linked workspace usage keeps the local fallback.
-export const REACT_NATIVE_SDK_VERSION = reactNativeSdkVersion.length > 0 ? reactNativeSdkVersion : "4.0.12";
+export const REACT_NATIVE_SDK_VERSION = reactNativeSdkVersion.length > 0 ? reactNativeSdkVersion : "4.0.20";

package/dist/view-webview-bridge-adapter.js

@@ -81,6 +81,7 @@ const buildViewHostBootstrapScript = () => {
             width: measurement.width,
             height: measurement.height,
             intrinsicWidth: measurement.intrinsicWidth,
+            viewportRevision: measurement.viewportRevision,
             frameAppearance: measurement.frameAppearance,
             placement: measurement.placement,
             transitionPolicy: measurement.transitionPolicy,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getuserfeedback/react-native",
-  "version": "4.0.12",
+  "version": "4.0.20",
   "description": "getuserfeedback React Native SDK",
   "keywords": [
     "getuserfeedback",
@@ -44,8 +44,8 @@
     "lint": "biome check ."
   },
   "dependencies": {
-    "@getuserfeedback/protocol": "^3.25.2",
-    "@getuserfeedback/sdk": "^0.12.14",
+    "@getuserfeedback/protocol": "^3.30.1",
+    "@getuserfeedback/sdk": "^0.12.20",
     "robot3": "^1.2.0"
   },
   "peerDependencies": {