fix(google-maps): info window

triniwiz · triniwiz · commit 56be6e02fe7b · 2024-09-20T20:38:52.000-04:00
diff --git a/packages/google-maps/index.android.ts b/packages/google-maps/index.android.ts
@@ -1,4 +1,4 @@
-import { Application, Color, Device, EventData, ImageSource, Utils, View } from '@nativescript/core';
+import { Application, Color, Device, EventData, GridLayout, ImageSource, Utils, View } from '@nativescript/core';
 import { isNullOrUndefined } from '@nativescript/core/utils/types';
 import {
 	ActiveBuildingEvent,
@@ -310,21 +310,28 @@ export class MapView extends MapViewBase {
 								if (info) {
 									owner.notify(info);
 									if (info.view instanceof View) {
-										if (!info.view.parent && !info.view?.nativeView) {
-											owner._addView(info.view);
-										}
-										if (info.view.nativeView && !(<any>marker)._view) {
-											(<any>marker)._view = new android.widget.RelativeLayout(owner._context);
-										}
-										const parent = info.view.nativeView?.getParent?.();
-										if (info.view.nativeView && parent !== (<any>marker)._view) {
-											if (parent && parent.removeView) {
-												parent.removeView(info.view.nativeView);
+										let container = (<any>marker)._view as never as GridLayout;
+										if (!container) {
+											container = new GridLayout();
+											(<any>marker)._view = container;
+											const activity = Utils.android.getCurrentActivity();
+											container._setupAsRootView(activity);
+											container._setupUI(activity);
+											container.callLoaded();
+										} else {
+											if (info.view.parent !== container) {
+												container.removeChildren();
 											}
-											const container: android.widget.RelativeLayout = (<any>marker)._view;
-											container.addView(info.view.nativeView);
 										}
-										return (<any>marker)?._view ?? null;
+
+										if (!info.view.parent) {
+											container.addChild(info.view);
+										} else if (info.view.parent !== container) {
+											(<GridLayout>info?.view?.parent)?.removeChild?.(info.view);
+											container.addChild(info.view);
+										}
+
+										return info.view.nativeView;
 									} else if (info.view instanceof android.view.View) {
 										return info.view;
 									}
diff --git a/packages/google-maps/index.ios.ts b/packages/google-maps/index.ios.ts
@@ -1,4 +1,4 @@
-import { Color, EventData, ImageSource, Utils, View } from '@nativescript/core';
+import { Color, EventData, GridLayout, ImageSource, Utils, View } from '@nativescript/core';
 import { isNullOrUndefined } from '@nativescript/core/utils/types';
 import {
 	ActiveBuildingEvent,
@@ -478,21 +478,27 @@ class GMSMapViewDelegateImpl extends NSObject implements GMSMapViewDelegate {
 			owner.notify(event);
 
 			if (event.view instanceof View) {
-				if (!event.view.parent && !event.view?.nativeView) {
-					owner._addView(event.view);
-				}
-				if (event.view.nativeView && !(<any>marker)._view) {
-					(<any>marker)._view = UIView.new();
-				}
-				const parent = event.view.nativeView?.superview;
-				if (event.view.nativeView && parent !== (<any>marker)._view) {
-					if (parent) {
-						event.view.nativeView.removeFromSuperview();
+				let container = (<any>marker)._view as never as GridLayout;
+				if (!container) {
+					container = new GridLayout();
+					(<any>marker)._view = container;
+					container._setupAsRootView({});
+					container._setupUI({});
+					container.callLoaded();
+				} else {
+					if (event.view.parent !== container) {
+						container.removeChildren();
 					}
-					const container: UIView = (<any>marker)._view;
-					container.addSubview(event.view.nativeView);
 				}
-				return (<any>marker)?._view ?? null;
+
+				if (!event.view.parent) {
+					container.addChild(event.view);
+				} else if (event.view.parent !== container) {
+					(<GridLayout>event?.view?.parent)?.removeChild?.(event.view);
+					container.addChild(event.view);
+				}
+
+				return event.view.nativeView;
 			} else if (event.view instanceof UIView) {
 				return event.view;
 			}
diff --git a/packages/google-maps/package.json b/packages/google-maps/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/google-maps",
-	"version": "1.7.2",
+	"version": "1.7.4",
 	"description": "Google Maps SDK",
 	"main": "index",
 	"typings": "index.d.ts",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@nativescript/google-maps",`
`3`		`- "version": "1.7.2",`
	`3`	`+ "version": "1.7.4",`
`4`	`4`	`"description": "Google Maps SDK",`
`5`	`5`	`"main": "index",`
`6`	`6`	`"typings": "index.d.ts",`