Refactor ElementHandle

hardkoded · Dec 26, 2024 · f5039f5 · f5039f5
1 parent e1b7456
commit f5039f5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/lib/PuppeteerSharp/Cdp/CdpElementHandle.cs b/lib/PuppeteerSharp/Cdp/CdpElementHandle.cs
@@ -37,13 +37,18 @@ public class CdpElementHandle : ElementHandle
 
     internal CdpElementHandle(
         IsolatedWorld world,
-        RemoteObject remoteObject) : base(world, remoteObject)
+        RemoteObject remoteObject)
     {
         Handle = new CdpJSHandle(world, remoteObject);
         Logger = Realm.Environment.Client.Connection.LoggerFactory.CreateLogger(GetType());
         _cdpFrame = Realm.Frame as CdpFrame;
     }
 
+    /// <inheritdoc />
+    public override RemoteObject RemoteObject => Handle.RemoteObject;
+
+    internal override IsolatedWorld Realm => Handle.Realm;
+
     /// <summary>
     /// Logger.
     /// </summary>

diff --git a/lib/PuppeteerSharp/Cdp/CdpJSHandle.cs b/lib/PuppeteerSharp/Cdp/CdpJSHandle.cs
@@ -31,11 +31,18 @@ namespace PuppeteerSharp.Cdp;
 /// <inheritdoc/>
 public class CdpJSHandle : JSHandle
 {
-    internal CdpJSHandle(IsolatedWorld world, RemoteObject remoteObject) : base(world, remoteObject)
+    internal CdpJSHandle(IsolatedWorld world, RemoteObject remoteObject)
     {
         Logger = Client.Connection.LoggerFactory.CreateLogger(GetType());
+        Realm = world;
+        RemoteObject = remoteObject;
     }
 
+    /// <inheritdoc/>
+    public override RemoteObject RemoteObject { get; }
+
+    internal override IsolatedWorld Realm { get; }
+
     /// <summary>
     /// Logger.
     /// </summary>

diff --git a/lib/PuppeteerSharp/ElementHandle.cs b/lib/PuppeteerSharp/ElementHandle.cs
@@ -19,9 +19,7 @@ public abstract class ElementHandle : JSHandle, IElementHandle
     {
         private ElementHandle _isolatedHandle;
 
-        internal ElementHandle(
-            IsolatedWorld world,
-            RemoteObject remoteObject) : base(world, remoteObject)
+        internal ElementHandle()
         {
         }
 

diff --git a/lib/PuppeteerSharp/JSHandle.cs b/lib/PuppeteerSharp/JSHandle.cs
@@ -9,21 +9,19 @@ namespace PuppeteerSharp
     /// <inheritdoc/>
     public abstract class JSHandle : IJSHandle
     {
-        internal JSHandle(IsolatedWorld world, RemoteObject remoteObject)
+        internal JSHandle()
         {
-            Realm = world;
-            RemoteObject = remoteObject;
         }
 
         /// <inheritdoc/>
         public bool Disposed { get; protected set; }
 
         /// <inheritdoc/>
-        public RemoteObject RemoteObject { get; }
+        public abstract RemoteObject RemoteObject { get; }
 
         internal Func<Task> DisposeAction { get; set; }
 
-        internal IsolatedWorld Realm { get; }
+        internal abstract IsolatedWorld Realm { get; }
 
         internal Frame Frame => Realm.Environment as Frame;