Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #3169: MenuItem add visible property #3177

Merged
merged 1 commit into from
Aug 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions components/lib/breadcrumb/BreadCrumb.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ export const BreadCrumb = React.memo(
const home = props.home;

if (home) {
if (home.visible === false) {
return null;
}
const { icon: _icon, target, url, disabled, style, className: _className, template } = home;
const className = classNames('p-breadcrumb-home', { 'p-disabled': disabled }, _className);
const icon = IconUtils.getJSXIcon(_icon, { className: 'p-menuitem-icon' }, { props });
Expand Down Expand Up @@ -64,6 +67,9 @@ export const BreadCrumb = React.memo(
};

const createMenuitem = (item) => {
if (item.visible === false) {
return null;
}
const className = classNames(item.className, { 'p-disabled': item.disabled });
const label = item.label && <span className="p-menuitem-text">{item.label}</span>;
let content = (
Expand Down Expand Up @@ -94,6 +100,9 @@ export const BreadCrumb = React.memo(
const createMenuitems = () => {
if (props.model) {
const items = props.model.map((item, index) => {
if (item.visible === false) {
return null;
}
const menuitem = createMenuitem(item);
const separator = index === props.model.length - 1 ? null : createSeparator();
const key = item.label + '_' + index;
Expand Down
3 changes: 3 additions & 0 deletions components/lib/contextmenu/ContextMenuSub.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ export const ContextMenuSub = React.memo((props) => {
};

const createMenuItem = (item, index) => {
if (item.visible === false) {
return null;
}
const active = activeItemState === item;
const key = item.label + '_' + index;
const className = classNames('p-menuitem', { 'p-menuitem-active': active }, item.className);
Expand Down
3 changes: 3 additions & 0 deletions components/lib/dock/Dock.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ export const Dock = React.memo(
};

const createItem = (item, index) => {
if (item.visible === false) {
return null;
}
const { disabled, icon: _icon, label, template, url, target } = item;
const className = classNames('p-dock-item', {
'p-dock-item-second-prev': currentIndexState - 2 === index,
Expand Down
3 changes: 3 additions & 0 deletions components/lib/megamenu/MegaMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,9 @@ export const MegaMenu = React.memo(
};

const createSubmenuItem = (item, index) => {
if (item.visible === false) {
return null;
}
if (item.separator) {
return createSeparator(index);
} else {
Expand Down
3 changes: 3 additions & 0 deletions components/lib/menu/Menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,9 @@ export const Menu = React.memo(
};

const createMenuItem = (item, index) => {
if (item.visible === false) {
return null;
}
const className = classNames('p-menuitem', item.className);
const linkClassName = classNames('p-menuitem-link', { 'p-disabled': item.disabled });
const iconClassName = classNames('p-menuitem-icon', item.icon);
Expand Down
3 changes: 3 additions & 0 deletions components/lib/menubar/MenubarSub.js
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,9 @@ export const MenubarSub = React.memo(
};

const createMenuitem = (item, index) => {
if (item.visible === false) {
return null;
}
const key = item.label + '_' + index;
const className = classNames('p-menuitem', { 'p-menuitem-active': activeItemState === item }, item.className);
const linkClassName = classNames('p-menuitem-link', { 'p-disabled': item.disabled });
Expand Down
1 change: 1 addition & 0 deletions components/lib/menuitem/menuitem.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export interface MenuItem {
items?: MenuItem[] | MenuItem[][];
expanded?: boolean;
disabled?: boolean;
visible?: boolean;
target?: string;
separator?: boolean;
style?: object;
Expand Down
3 changes: 3 additions & 0 deletions components/lib/panelmenu/PanelMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ export const PanelMenu = React.memo(
};

const createPanel = (item, index) => {
if (item.visible === false) {
return null;
}
const key = item.label + '_' + index;
const active = isItemActive(item);
const className = classNames('p-panelmenu-panel', item.className);
Expand Down
3 changes: 3 additions & 0 deletions components/lib/panelmenu/PanelMenuSub.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ export const PanelMenuSub = React.memo((props) => {
};

const createMenuItem = (item, index) => {
if (item.visible === false) {
return null;
}
const key = item.label + '_' + index;
const active = isItemActive(item);
const className = classNames('p-menuitem', item.className);
Expand Down
3 changes: 3 additions & 0 deletions components/lib/slidemenu/SlideMenuSub.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ export const SlideMenuSub = React.memo((props) => {
};

const createMenuitem = (item, index) => {
if (item.visible === false) {
return null;
}
const key = createKey(item, index);
const active = activeItemState === item;
const className = classNames('p-menuitem', { 'p-menuitem-active': active, 'p-disabled': item.disabled }, item.className);
Expand Down
3 changes: 3 additions & 0 deletions components/lib/speeddial/SpeedDial.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,9 @@ export const SpeedDial = React.memo(
}));

const createItem = (item, index) => {
if (item.visible === false) {
return null;
}
const style = getItemStyle(index);
const { disabled, icon: _icon, label, template, url, target } = item;
const contentClassName = classNames('p-speeddial-action', { 'p-disabled': disabled });
Expand Down
3 changes: 3 additions & 0 deletions components/lib/splitbutton/SplitButtonItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ export const SplitButtonItem = React.memo((props) => {
};

const createMenuitem = () => {
if (item.visible === false) {
return null;
}
const { disabled, icon: _icon, label: _label, template, url, target } = props.menuitem;
const className = classNames('p-menuitem-link', { 'p-disabled': disabled });
const iconClassName = classNames('p-menuitem-icon', _icon);
Expand Down
3 changes: 3 additions & 0 deletions components/lib/steps/Steps.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ export const Steps = React.memo(
};

const createItem = (item, index) => {
if (item.visible === false) {
return null;
}
const key = item.label + '_' + index;
const active = index === props.activeIndex;
const disabled = item.disabled || (index !== props.activeIndex && props.readOnly);
Expand Down
6 changes: 5 additions & 1 deletion components/lib/tabmenu/TabMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ export const TabMenu = React.memo(
});

const createMenuItem = (item, index) => {
if (item.visible === false) {
return null;
}
const { className: _className, style, disabled, icon: _icon, label: _label, template, url, target } = item;
const key = _label + '_' + index;
const active = isSelected(index);
Expand Down Expand Up @@ -91,7 +94,8 @@ export const TabMenu = React.memo(
element: content,
props,
active,
index
index,
disabled
};

content = ObjectUtils.getJSXElement(template, item, defaultContentOptions);
Expand Down
6 changes: 5 additions & 1 deletion components/lib/tieredmenu/TieredMenuSub.js
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,9 @@ export const TieredMenuSub = React.memo((props) => {
};

const createMenuItem = (item, index) => {
if (item.visible === false) {
return null;
}
const { id, className: _className, style, disabled, icon: _icon, label: _label, items, target, url, template } = item;
const key = _label + '_' + index;
const active = activeItemState === item;
Expand Down Expand Up @@ -194,7 +197,8 @@ export const TieredMenuSub = React.memo((props) => {
submenuIconClassName,
element: content,
props,
active
active,
disabled
};

content = ObjectUtils.getJSXElement(template, item, defaultContentOptions);
Expand Down
8 changes: 7 additions & 1 deletion pages/menumodel/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Head from 'next/head';
import React, { memo } from 'react';
import { CodeHighlight } from '../../components/doc/common/codehighlight';
import Head from 'next/head';

const MenuModelDemo = () => {
return (
Expand Down Expand Up @@ -100,6 +100,12 @@ const items = [
<td>false</td>
<td>When set as true, disables the menuitem.</td>
</tr>
<tr>
<td>visible</td>
<td>boolean</td>
<td>true</td>
<td>When set as false, hides the menu item.</td>
</tr>
<tr>
<td>target</td>
<td>string</td>
Expand Down