diff --git a/packages/react-core/src/components/index.ts b/packages/react-core/src/components/index.ts index 7b0707bfb48..bdd2f2166e6 100644 --- a/packages/react-core/src/components/index.ts +++ b/packages/react-core/src/components/index.ts @@ -4,7 +4,6 @@ export * from './Accordion'; export * from './ActionList'; export * from './Alert'; export * from './AlertGroup'; -export * from './ApplicationLauncher'; export * from './Avatar'; export * from './BackToTop'; export * from './Backdrop'; diff --git a/packages/react-core/src/demos/ComposableMenu/examples/ComposableApplicationLauncher.tsx b/packages/react-core/src/demos/ComposableMenu/examples/ComposableApplicationLauncher.tsx index 763a69a6b37..9003472d57e 100644 --- a/packages/react-core/src/demos/ComposableMenu/examples/ComposableApplicationLauncher.tsx +++ b/packages/react-core/src/demos/ComposableMenu/examples/ComposableApplicationLauncher.tsx @@ -50,7 +50,7 @@ export const ComposableApplicationLauncher: React.FunctionComponent = () => { 'li > button:not(:disabled), li > a:not(:disabled), input:not(:disabled)' ); firstElement && (firstElement as HTMLElement).focus(); - setRefFullOptions(Array.from(menuRef.current.querySelectorAll('li:not(li[role=separator])'))); + setRefFullOptions(Array.from(menuRef.current.querySelectorAll('li:not(li[role=separator])>*:first-child'))); } }, 0); setIsOpen(!isOpen); diff --git a/packages/react-core/src/demos/Masthead.md b/packages/react-core/src/demos/Masthead.md index 8e2e1dbe55c..2bf3adef33f 100644 --- a/packages/react-core/src/demos/Masthead.md +++ b/packages/react-core/src/demos/Masthead.md @@ -7,6 +7,7 @@ import BarsIcon from '@patternfly/react-icons/dist/esm/icons/bars-icon'; import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon'; import CogIcon from '@patternfly/react-icons/dist/esm/icons/cog-icon'; import HelpIcon from '@patternfly/react-icons/dist/esm/icons/help-icon'; +import ThIcon from '@patternfly/react-icons/dist/esm/icons/th-icon'; import QuestionCircleIcon from '@patternfly/react-icons/dist/esm/icons/question-circle-icon'; import imgAvatar from '@patternfly/react-core/src/components/Avatar/examples/avatarImg.svg'; import { @@ -16,6 +17,8 @@ DropdownItem as DropdownItemDeprecated, DropdownToggle, KebabToggle } from '@patternfly/react-core/deprecated'; +import pfIcon from './Card/pf-logo-small.svg'; +import { Link } from '@reach/router'; ## Demos diff --git a/packages/react-core/src/demos/examples/DashboardHeader.js b/packages/react-core/src/demos/examples/DashboardHeader.js index f6a878e47f3..cd9b8142487 100644 --- a/packages/react-core/src/demos/examples/DashboardHeader.js +++ b/packages/react-core/src/demos/examples/DashboardHeader.js @@ -1,7 +1,5 @@ import React from 'react'; import { - ApplicationLauncher, - ApplicationLauncherItem, Avatar, Brand, Button, @@ -16,7 +14,7 @@ import { ToolbarContent, ToolbarGroup, ToolbarItem, - PageToggleButton + PageToggleButton, } from '@patternfly/react-core'; import { Dropdown as DropdownDeprecated, @@ -40,7 +38,6 @@ export default class DashboardHeader extends React.Component { isDropdownOpen: false, isKebabDropdownOpen: false, isFullKebabDropdownOpen: false, - isAppLauncherOpen: false, activeItem: 0 }; @@ -79,22 +76,10 @@ export default class DashboardHeader extends React.Component { isFullKebabDropdownOpen: !this.state.isFullKebabDropdownOpen }); }; - - this.onAppLauncherToggle = (_event, isAppLauncherOpen) => { - this.setState({ - isAppLauncherOpen - }); - }; - - this.onAppLauncherSelect = () => { - this.setState({ - isAppLauncherOpen: !this.state.isAppLauncherOpen - }); - }; } render() { - const { isDropdownOpen, isKebabDropdownOpen, isFullKebabDropdownOpen, isAppLauncherOpen } = this.state; + const { isDropdownOpen, isKebabDropdownOpen, isFullKebabDropdownOpen } = this.state; const { notificationBadge } = this.props; const kebabDropdownItems = [ @@ -133,15 +118,6 @@ export default class DashboardHeader extends React.Component { ]; - const appLauncherItems = [ - - Application 1 (anchor link) - , - alert('Clicked item 2')}> - Application 2 (button with onClick) - - ]; - const headerToolbar = ( @@ -163,15 +139,6 @@ export default class DashboardHeader extends React.Component { )} - - -