kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3924 from sbwalker/dev

Browse Source 
call JS Interop in Interactive render mode, use PageState.Site.Themes rather than calling ThemeService from Control Panel
This commit is contained in:
Shaun Walker 2024-02-29 15:38:23 -05:00 committed by GitHub
commit e23ac8496e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
View File

@ -185,9 +185,12 @@
<div class="col text-center"> <div class="col text-center">
<label for="Container" class="control-label">@Localizer["Container"]</label> <label for="Container" class="control-label">@Localizer["Container"]</label>
<select class="form-select" @bind="@_containerType"> <select class="form-select" @bind="@_containerType">
@foreach (var container in _containers) @if (_containers != null)
{ {
<option value="@container.TypeName">@container.Name</option> foreach (var container in _containers)
{
<option value="@container.TypeName">@container.Name</option>
}
} }
</select> </select>
</div> </div>
@ -284,8 +287,7 @@
} }
} }
var themes = await ThemeService.GetThemesAsync(); _containers = ThemeService.GetContainerControls(PageState.Site.Themes, PageState.Page.ThemeType);
_containers = ThemeService.GetContainerControls(themes, PageState.Page.ThemeType);
_containerType = PageState.Site.DefaultContainerType; _containerType = PageState.Site.DefaultContainerType;
_allModuleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId); _allModuleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
_moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(_category)).ToList(); _moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(_category)).ToList();

7
Oqtane.Client/UI/SiteRouter.razor
View File

@ -299,9 +299,12 @@
RenderId = Guid.NewGuid(), RenderId = Guid.NewGuid(),
Refresh = false Refresh = false
}; };
OnStateChange?.Invoke(_pagestate); OnStateChange?.Invoke(_pagestate);
await ScrollToFragment(_pagestate.Uri);
if (PageState.RenderMode == RenderModes.Interactive)
{
await ScrollToFragment(_pagestate.Uri);
}
} }
else else
{ {