add OnPageStart (TLabAltoh/TLabWebViewVR#35)

TLabAltoh · Jan 8, 2025 · 3c919b3 · 3c919b3
1 parent 6ad0d6d
commit 3c919b3
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 40 deletions.
diff --git a/Plugins/Android/libTLabWebView-release.aar b/Plugins/Android/libTLabWebView-release.aar
diff --git a/Resources/TLab/WebView/Samples/Scripts/JS/disable-beforunload.txt b/Resources/TLab/WebView/Samples/Scripts/JS/disable-beforunload.txt
@@ -0,0 +1,8 @@
+const originalAddEventListener = window.addEventListener;
+window.addEventListener = function (type, listener, options) {
+    if (type === 'beforeunload') {
+        console.warn("Blocked a 'beforeunload' listener from being added.");
+        return;
+    }
+    originalAddEventListener.call(this, type, listener, options);
+};
diff --git a/...JS/remove-event-from-beforunload.txt.meta → ...s/Scripts/JS/disable-beforunload.txt.meta b/...JS/remove-event-from-beforunload.txt.meta → ...s/Scripts/JS/disable-beforunload.txt.meta
diff --git a/Resources/TLab/WebView/Samples/Scripts/JS/remove-event-from-beforunload.txt b/Resources/TLab/WebView/Samples/Scripts/JS/remove-event-from-beforunload.txt
diff --git a/Runtime/Browser.cs b/Runtime/Browser.cs
@@ -226,6 +226,9 @@ public void DispatchMessageQueue()
 				var message = new EventCallback.Message(@object);
 				switch ((EventCallback.Type)message.type)
 				{
+					case EventCallback.Type.OnPageStart:
+						m_eventCallback.onPageStart.Invoke(message.payload);
+						break;
 					case EventCallback.Type.OnPageFinish:
 						m_eventCallback.onPageFinish.Invoke(message.payload);
 						break;

diff --git a/Runtime/Common.cs b/Runtime/Common.cs
@@ -141,6 +141,7 @@ public class EventCallback
 		public enum Type
 		{
 			Raw,
+			OnPageStart,
 			OnPageFinish,
 			OnDownload,
 			OnDownloadStart,
@@ -159,6 +160,7 @@ public Message(string json) : base(json) { }
 			public string payload;
 		}
 
+		public UnityEvent<string> onPageStart;
 		public UnityEvent<string> onPageFinish;
 		public UnityEvent<Download.Request> onDownload;
 		public UnityEvent<Download.EventInfo> onDownloadError;

diff --git a/Runtime/Sample/JSSnippets.cs b/Runtime/Sample/JSSnippets.cs
@@ -6,9 +6,9 @@ public class JSSnippets : MonoBehaviour
     {
         [SerializeField] private BrowserContainer m_container;
 
-        public void RemoveEventFromBeforeUnload()
+        public void DisableBeforeUnload()
         {
-            var js = Resources.Load<TextAsset>("TLab/WebView/Samples/Scripts/JS/remove-event-from-beforunload")?.ToString();
+            var js = Resources.Load<TextAsset>("TLab/WebView/Samples/Scripts/JS/disable-beforunload")?.ToString();
             m_container.browser.EvaluateJS(js);
         }
     }

diff --git a/Samples/Scenes/Mobile Sample.unity b/Samples/Scenes/Mobile Sample.unity
@@ -1999,27 +1999,27 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3168540923415432720, guid: 4272bd6725bd64846b07be9b4d76ad90, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3168540923415432720, guid: 4272bd6725bd64846b07be9b4d76ad90, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3168540923415432720, guid: 4272bd6725bd64846b07be9b4d76ad90, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 251
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3168540923415432720, guid: 4272bd6725bd64846b07be9b4d76ad90, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 44
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3168540923415432720, guid: 4272bd6725bd64846b07be9b4d76ad90, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 125.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3168540923415432720, guid: 4272bd6725bd64846b07be9b4d76ad90, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -32
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3182255550635536445, guid: 4272bd6725bd64846b07be9b4d76ad90, type: 3}
       propertyPath: m_AnchorMax.y
@@ -2517,6 +2517,10 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5712475638812610771, guid: 4272bd6725bd64846b07be9b4d76ad90, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5790450369921081937, guid: 4272bd6725bd64846b07be9b4d76ad90, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -2639,27 +2643,27 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6573493046413690567, guid: 4272bd6725bd64846b07be9b4d76ad90, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6573493046413690567, guid: 4272bd6725bd64846b07be9b4d76ad90, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6573493046413690567, guid: 4272bd6725bd64846b07be9b4d76ad90, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 251
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6573493046413690567, guid: 4272bd6725bd64846b07be9b4d76ad90, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 44
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6573493046413690567, guid: 4272bd6725bd64846b07be9b4d76ad90, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 386.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6573493046413690567, guid: 4272bd6725bd64846b07be9b4d76ad90, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -32
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6629513091902531475, guid: 4272bd6725bd64846b07be9b4d76ad90, type: 3}
       propertyPath: m_AnchorMax.y