merge master into v3

apache · Oct 31, 2024 · c00d08e · c00d08e
2 parents f7432e6 + 2d9054a
commit c00d08e
Showing 1 changed file with 4 additions and 15 deletions.
diff --git a/...rg/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java b/...rg/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
@@ -75,19 +75,12 @@ private CssMenuItem(final String name, final Menuable.Kind menuableKind) {
     }
 
     private final List<CssMenuItem> subMenuItems = _Lists.newArrayList();
-    protected void addSubMenuItem(final CssMenuItem cssMenuItem) {
+    protected final void addSubMenuItem(final CssMenuItem cssMenuItem) {
         subMenuItems.add(cssMenuItem);
     }
     public Can<CssMenuItem> getSubMenuItems() {
         return Can.ofCollection(subMenuItems);
     }
-    /**
-     * @param menuItems we assume these have the correct parent already set
-     */
-    public void replaceSubMenuItems(final List<CssMenuItem> menuItems) {
-        subMenuItems.clear();
-        subMenuItems.addAll(menuItems);
-    }
     public boolean hasSubMenuItems() {
         return subMenuItems.size() > 0;
     }
@@ -107,19 +100,17 @@ void addTo(final MarkupContainer markupContainer) {
     private Component addMenuItemComponentTo(final MarkupContainer markupContainer) {
 
         var linkAndLabel = getLinkAndLabel();
-        var actionLink = getLinkAndLabel().getUiComponent();
+        var actionLink = linkAndLabel.getUiComponent();
 
         var label = Wkt.labelAdd(markupContainer, CssMenuItem.ID_MENU_LABEL, this::getName);
 
         if (actionLink != null) {
 
             // show link...
             markupContainer.add(actionLink);
-            actionLink.add(label);
 
-            WktDecorators.decorateCssMenuItem(
-                    linkAndLabel.getUiComponent(), 
-                    label, 
+            WktDecorators.decorateMenuAction(
+                    actionLink, actionLink, label, 
                     ActionDecorationModel.builder(linkAndLabel)
                         .actionStyle(ActionStyle.MENU_ITEM)
                         .build());
@@ -138,8 +129,6 @@ private Component addMenuItemComponentTo(final MarkupContainer markupContainer)
 
             label.add(new AttributeModifier("class", Model.of("disabled")));
 
-            markupContainer.add(label);
-
             return label;
         }
     }