Skip to content

JSObjectReference follow-up #25244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 26, 2020
Merged

JSObjectReference follow-up #25244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Components/Ignitor/src/BlazorClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ public async Task<bool> ConnectAsync(Uri uri, bool connectAutomatically = true,
_hubConnection = builder.Build();

HubConnection.On<int, string>("JS.AttachComponent", OnAttachComponent);
HubConnection.On<int, string, string>("JS.BeginInvokeJS", OnBeginInvokeJS);
HubConnection.On<int, string, string, int, long>("JS.BeginInvokeJS", OnBeginInvokeJS);
HubConnection.On<string>("JS.EndInvokeDotNet", OnEndInvokeDotNet);
HubConnection.On<int, byte[]>("JS.RenderBatch", OnRenderBatch);
HubConnection.On<string>("JS.Error", OnError);
Expand Down Expand Up @@ -401,9 +401,9 @@ private void OnAttachComponent(int componentId, string domSelector)
NextAttachComponentReceived?.Completion?.TrySetResult(call);
}

private void OnBeginInvokeJS(int asyncHandle, string identifier, string argsJson)
private void OnBeginInvokeJS(int asyncHandle, string identifier, string argsJson, int resultType, long targetInstanceId)
{
var call = new CapturedJSInteropCall(asyncHandle, identifier, argsJson);
var call = new CapturedJSInteropCall(asyncHandle, identifier, argsJson, resultType, targetInstanceId);
Operations?.JSInteropCalls.Enqueue(call);
JSInterop?.Invoke(call);

Expand Down
6 changes: 5 additions & 1 deletion src/Components/Ignitor/src/CapturedJSInteropCall.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,19 @@ namespace Ignitor
{
public class CapturedJSInteropCall
{
public CapturedJSInteropCall(int asyncHandle, string identifier, string argsJson)
public CapturedJSInteropCall(int asyncHandle, string identifier, string argsJson, int resultType, long targetInstanceId)
{
AsyncHandle = asyncHandle;
Identifier = identifier;
ArgsJson = argsJson;
ResultType = resultType;
TargetInstanceId = targetInstanceId;
}

public int AsyncHandle { get; }
public string Identifier { get; }
public string ArgsJson { get; }
public int ResultType { get; }
public long TargetInstanceId { get; }
}
}