huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

In BrowserUriHelper, change URI caching logic to be more defensive in case OnLocationChanged isn't being used

This commit is contained in:
Steve Sanderson 2018-02-23 11:05:29 +00:00
parent f684203721
commit 8e57261167
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Microsoft.AspNetCore.Blazor.Browser/Services/BrowserUriHelper.cs
View File

@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Blazor.Browser.Services
// safety concerns due to the static state. // safety concerns due to the static state.
static readonly string _functionPrefix = typeof(BrowserUriHelper).FullName; static readonly string _functionPrefix = typeof(BrowserUriHelper).FullName;
static bool _hasEnabledNavigationInterception; static bool _hasEnabledNavigationInterception;
static string _currentAbsoluteUri; static string _cachedAbsoluteUri;
static EventHandler<string> _onLocationChanged; static EventHandler<string> _onLocationChanged;
static string _baseUriString; static string _baseUriString;
static Uri _baseUri; static Uri _baseUri;
@ -37,6 +37,8 @@ namespace Microsoft.AspNetCore.Blazor.Browser.Services
{ {
// We could consider deactivating the JS-side enableNavigationInteception // We could consider deactivating the JS-side enableNavigationInteception
// if there are no remaining listeners, but we don't need that currently. // if there are no remaining listeners, but we don't need that currently.
// If we ever do that, will also need to change the logic inside GetAbsoluteUri
// so it knows not to continue using the cached URI.
_onLocationChanged -= value; _onLocationChanged -= value;
} }
} }
@ -51,13 +53,24 @@ namespace Microsoft.AspNetCore.Blazor.Browser.Services
/// <inheritdoc /> /// <inheritdoc />
public string GetAbsoluteUri() public string GetAbsoluteUri()
{ {
if (_currentAbsoluteUri == null) if (_cachedAbsoluteUri == null)
{ {
_currentAbsoluteUri = RegisteredFunction.InvokeUnmarshalled<string>( var newUri = RegisteredFunction.InvokeUnmarshalled<string>(
$"{_functionPrefix}.getLocationHref"); $"{_functionPrefix}.getLocationHref");
}
return _currentAbsoluteUri; if (_hasEnabledNavigationInterception)
{
// Once we turn on navigation interception, we no longer have to query
// the browser for its URI each time (because we'd know if it had changed)
_cachedAbsoluteUri = newUri;
}
return newUri;
}
else
{
return _cachedAbsoluteUri;
}
} }
/// <inheritdoc /> /// <inheritdoc />
@ -105,7 +118,7 @@ namespace Microsoft.AspNetCore.Blazor.Browser.Services
private static void NotifyLocationChanged(string newAbsoluteUri) private static void NotifyLocationChanged(string newAbsoluteUri)
{ {
_currentAbsoluteUri = newAbsoluteUri; _cachedAbsoluteUri = newAbsoluteUri;
_onLocationChanged?.Invoke(null, newAbsoluteUri); _onLocationChanged?.Invoke(null, newAbsoluteUri);
} }