feat: general improvements and minor bugs

Author: ReneSchwarzer

src/WebExpress.WebUI/Assets/js/webexpress.webui.avatar.dropdown.js

@@ -381,5 +381,5 @@ webexpress.webui.AvatarDropdownCtrl = class extends webexpress.webui.Ctrl {
     }
 };
 
-// Register the class in the controller
+// register the class in the controller
 webexpress.webui.Controller.registerClass("wx-webui-avatar-dropdown", webexpress.webui.AvatarDropdownCtrl);

src/WebExpress.WebUI/WebControl/ControlBreadcrumb.cs

@@ -4,6 +4,7 @@
 using WebExpress.WebCore.Internationalization;
 using WebExpress.WebCore.WebHtml;
 using WebExpress.WebCore.WebPage;
+using WebExpress.WebCore.WebTheme;
 using WebExpress.WebCore.WebUri;
 using WebExpress.WebUI.WebPage;
 
@@ -108,7 +109,7 @@ public override IHtmlNode Render(IRenderControlContext renderContext, IVisualTre
                 }
 
                 var displayText = path.GetDisplayText(renderContext);
-                var pathIcon = path.GetIcon(renderContext);
+                var pathIcon = path.GetIcon(renderContext)?.ApplyIconTheme(visualTree.IconTheme);
 
                 if (last?.IsHidden ?? false)
                 {
@@ -140,7 +141,7 @@ pathIcon is not null
                 else if (endpointContext is PageContext page)
                 {
                     var display = I18N.Translate(renderContext.Request?.Culture, page.PageTitle);
-                    var icon = page?.PageIcon;
+                    var icon = page?.PageIcon?.ApplyIconTheme(visualTree.IconTheme);
 
                     html.Add
                     (

src/WebExpress.WebUI/WebControl/ControlButton.cs

@@ -4,6 +4,7 @@
 using WebExpress.WebCore.Internationalization;
 using WebExpress.WebCore.WebHtml;
 using WebExpress.WebCore.WebIcon;
+using WebExpress.WebCore.WebTheme;
 using WebExpress.WebUI.WebPage;
 
 namespace WebExpress.WebUI.WebControl
@@ -165,7 +166,7 @@ public virtual IHtmlNode Render(IRenderControlContext renderContext, IVisualTree
         {
             var text = Text?.Invoke(renderContext);
             var value = Value?.Invoke(renderContext);
-            var icon = Icon?.Invoke(renderContext);
+            var icon = Icon?.Invoke(renderContext)?.ApplyIconTheme(visualTree?.IconTheme ?? TypeIconTheme.Default);
             var outline = Outline?.Invoke(renderContext) ?? false;
             var primaryAction = PrimaryAction?.Invoke(renderContext);
             var secondaryAction = SecondaryAction?.Invoke(renderContext);

src/WebExpress.WebUI/WebPage/IRenderControlContext.cs

@@ -1,4 +1,4 @@
-using WebExpress.WebCore.WebPage;
+using WebExpress.WebCore.WebPage;
 
 namespace WebExpress.WebUI.WebPage
 {

src/WebExpress.WebUI/WebPage/RenderControlContext.cs

@@ -1,4 +1,4 @@
-using WebExpress.WebCore.WebEndpoint;
+using WebExpress.WebCore.WebEndpoint;
 using WebExpress.WebCore.WebMessage;
 using WebExpress.WebCore.WebPage;
 

src/WebExpress.WebUI/WebPage/VisualTreeControl.cs

@@ -137,6 +137,9 @@ public VisualTreeControl(IComponentHub componentHub, IPageContext pageContext)
             //      convention documented in the Theme model).
             //   3. Otherwise leave Theme null - downstream IconTheme falls back
             //      to TypeIconTheme.Default.
+            // Per-user theme overrides are wired by application code: the
+            // page's Process override calls UseTheme<T>() based on whatever
+            // store the application maintains (session, identity profile, …).
             var applicationContext = pageContext?.ApplicationContext;
             Theme = applicationContext?.DefaultTheme
                 ?? componentHub?.ThemeManager?.Themes
@@ -189,19 +192,37 @@ public VisualTreeControl(IComponentHub componentHub, IPageContext pageContext)
         /// </summary>
         /// <typeparam name="TTheme">The theme type to use.</typeparam>
         /// <returns>The current instance for method chaining.</returns>
-        public virtual VisualTreeControl UseTheme<TTheme>() where TTheme : class, ITheme
+        public virtual VisualTreeControl UseTheme<TTheme>()
+            where TTheme : class, ITheme
         {
             var resolved = _componentHub?.ThemeManager?
                 .GetThemes(_pageContext?.ApplicationContext, typeof(TTheme))
                 ?.FirstOrDefault();
-            if (resolved is null)
+
+            return UseTheme(resolved);
+        }
+
+        /// <summary>
+        /// Overrides the active theme with the supplied resolved theme
+        /// context. The call is a no-op when <paramref name="theme"/> is
+        /// <see langword="null"/>; otherwise the previous theme is replaced
+        /// and <see cref="OnThemeChanged"/> is invoked so subclasses can
+        /// re-apply theme-specific resources. Use this overload when the
+        /// theme has been resolved through a non-type lookup (cookie,
+        /// session, identity preference, …).
+        /// </summary>
+        /// <param name="theme">The theme to activate.</param>
+        /// <returns>The current instance for method chaining.</returns>
+        public virtual VisualTreeControl UseTheme(IThemeContext theme)
+        {
+            if (theme is null || theme == Theme)
             {
                 return this;
             }
 
             var previous = Theme;
-            Theme = resolved;
-            OnThemeChanged(previous, resolved);
+            Theme = theme;
+            OnThemeChanged(previous, theme);
             return this;
         }