Fix #7261: Menu separator respect visible property (#7263)

primefaces · Sep 27, 2024 · a280a57 · a280a57
1 parent 92de1eb
commit a280a57
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 4 deletions.
diff --git a/components/lib/contextmenu/ContextMenuSub.js b/components/lib/contextmenu/ContextMenuSub.js
@@ -293,6 +293,10 @@ export const ContextMenuSub = React.memo(
         };
 
         const createItem = (processedItem, index) => {
+            if (processedItem.visible === false) {
+                return null;
+            }
+
             return processedItem.separator ? createSeparator(index) : createMenuItem(processedItem, index);
         };
 

diff --git a/components/lib/menu/Menu.js b/components/lib/menu/Menu.js
@@ -335,10 +335,6 @@ export const Menu = React.memo(
         };
 
         const createMenuItem = (item, index, parentId = null) => {
-            if (item.visible === false) {
-                return null;
-            }
-
             const menuContext = { item, index, parentId };
             const linkClassName = classNames('p-menuitem-link', { 'p-disabled': item.disabled });
             const iconClassName = classNames('p-menuitem-icon', item.icon);
@@ -427,6 +423,10 @@ export const Menu = React.memo(
         };
 
         const createItem = (item, index) => {
+            if (item.visible === false) {
+                return null;
+            }
+
             return item.separator ? createSeparator(item, index) : item.items ? createSubmenu(item, index) : createMenuItem(item, index);
         };
 

diff --git a/components/lib/menubar/MenubarSub.js b/components/lib/menubar/MenubarSub.js
@@ -265,6 +265,10 @@ export const MenubarSub = React.memo(
         };
 
         const createItem = (processedItem, index) => {
+            if (processedItem.visible === false) {
+                return null;
+            }
+
             return getItemProp(processedItem, 'separator') ? createSeparator(processedItem, index) : createMenuitem(processedItem, index);
         };
 

diff --git a/components/lib/panelmenu/PanelMenuSub.js b/components/lib/panelmenu/PanelMenuSub.js
@@ -258,6 +258,10 @@ export const PanelMenuSub = React.memo(
         };
 
         const createItem = (item, index) => {
+            if (item.visible === false) {
+                return null;
+            }
+
             return getItemProp(item, 'separator') ? createSeparator(index) : createMenuItem(item, index);
         };
 

diff --git a/components/lib/slidemenu/SlideMenuSub.js b/components/lib/slidemenu/SlideMenuSub.js
@@ -174,6 +174,10 @@ export const SlideMenuSub = React.memo((props) => {
     };
 
     const createItem = (item, index) => {
+        if (item.visible === false) {
+            return null;
+        }
+
         return item.separator ? createSeparator(index) : createMenuitem(item, index);
     };
 

diff --git a/components/lib/tieredmenu/TieredMenuSub.js b/components/lib/tieredmenu/TieredMenuSub.js
@@ -273,6 +273,10 @@ export const TieredMenuSub = React.memo(
         };
 
         const createItem = (processedItem, index) => {
+            if (processedItem.visible === false) {
+                return null;
+            }
+
             return getItemProp(processedItem, 'separator') ? createSeparator(index) : createMenuItem(processedItem, index);
         };