Fix primefaces#6997: MenuBar re-render on props.model changes

melloware · Aug 6, 2024 · 556c9a7 · 556c9a7
1 parent 9d86edb
commit 556c9a7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/components/lib/menubar/Menubar.js b/components/lib/menubar/Menubar.js
@@ -491,7 +491,7 @@ export const Menubar = React.memo(
             }
         };
 
-        const createProcessedItems = React.useCallback((items, level = 0, parent = {}, parentKey = '') => {
+        const createProcessedItems = (items, level = 0, parent = {}, parentKey = '') => {
             const _processedItems = [];
 
             items &&
@@ -511,7 +511,7 @@ export const Menubar = React.memo(
                 });
 
             return _processedItems;
-        }, []);
+        };
 
         useMountEffect(() => {
             if (!idState) {
@@ -536,7 +536,8 @@ export const Menubar = React.memo(
             const processed = createProcessedItems(itemsToProcess, 0, null, '');
 
             setProcessedItems(processed);
-        }, [props.model, createProcessedItems]);
+            // eslint-disable-next-line react-hooks/exhaustive-deps
+        }, [props.model]);
 
         useUpdateEffect(() => {
             const processedItem = activeItemPath.find((p) => p.key === focusedItemInfo.parentKey);

diff --git a/components/lib/menubar/MenubarSub.js b/components/lib/menubar/MenubarSub.js
@@ -239,7 +239,6 @@ export const MenubarSub = React.memo(
             const menuitemProps = mergeProps(
                 {
                     id,
-                    key: dataId,
                     'data-id': dataId,
                     role: 'menuitem',
                     'aria-label': item.label,
@@ -259,7 +258,7 @@ export const MenubarSub = React.memo(
             );
 
             return (
-                <li {...menuitemProps}>
+                <li {...menuitemProps} key={dataId}>
                     <div {...contentProps}>{content}</div>
                     {submenu}
                 </li>