From 70cad1cba171418f1709a66c224f8b23b2b6872c Mon Sep 17 00:00:00 2001
From: gitdallas <dallas.nicol@gmail.com>
Date: Tue, 14 Mar 2023 12:37:24 -0500
Subject: [PATCH 1/2] chore(ApplicationLauncher): deprecate

converting demos

add import in md

remove applauncher from pagestickysectionbreadcrumb example

update examples after deprecating app launcher

 import

missing semi colon

address pr feedback

remove applauncher from page/dashboard demos

use composablemenu applauncher demo in masthead demo

rebase markers

rebase fix

rebase fix

fix test snap after rebase

fixing dropdown imports after rebase

fix applauncher search
---
 packages/react-core/src/components/index.ts   |   1 -
 .../ComposableApplicationLauncher.tsx         |   2 +-
 packages/react-core/src/demos/Masthead.md     |   3 +
 packages/react-core/src/demos/Page.md         |   7 -
 .../src/demos/examples/DashboardHeader.js     |  37 +--
 ...stheadWithUtilitiesAndUserDropdownMenu.tsx | 287 ++++++++++++++++--
 .../Page/PageStickySectionBreadcrumb.tsx      |  31 +-
 .../examples/Page/PageStickySectionGroup.tsx  |  29 --
 .../Page/PageStickySectionGroupAlternate.tsx  |  29 --
 .../PageStickySectionGroupUsingPageHeader.tsx |  29 --
 .../ApplicationLauncher.tsx                   |   8 +-
 .../ApplicationLauncherContent.tsx            |   0
 .../ApplicationLauncherContext.ts             |   0
 .../ApplicationLauncherGroup.tsx              |   2 +-
 .../ApplicationLauncherIcon.tsx               |   0
 .../ApplicationLauncherItem.tsx               |   4 +-
 .../ApplicationLauncherItemContext.ts         |   0
 .../ApplicationLauncherSeparator.tsx          |   2 +-
 .../ApplicationLauncherText.tsx               |   0
 .../__tests__/ApplicationLauncher.test.tsx    |   3 +-
 .../ApplicationLauncherContent.test.tsx       |   0
 .../ApplicationLauncherGroup.test.tsx         |   0
 .../ApplicationLauncherIcon.test.tsx          |   0
 .../ApplicationLauncherSeparator.test.tsx     |   2 +-
 .../ApplicationLauncherText.test.tsx          |   0
 .../ApplicationLauncherContent.test.tsx.snap  |   0
 .../ApplicationLauncherGroup.test.tsx.snap    |   0
 .../ApplicationLauncherIcon.test.tsx.snap     |   0
 ...ApplicationLauncherSeparator.test.tsx.snap |   0
 .../ApplicationLauncherText.test.tsx.snap     |   0
 .../ApplicationLauncher.test.tsx.snap         |   0
 .../examples/ApplicationLauncher.md           |   0
 .../ApplicationLauncherAlignRight.tsx         |   4 +-
 .../examples/ApplicationLauncherAlignTop.tsx  |   3 +-
 .../examples/ApplicationLauncherBasic.tsx     |   2 +-
 .../ApplicationLauncherCustomIcon.tsx         |   2 +-
 .../examples/ApplicationLauncherDisabled.tsx  |   2 +-
 .../ApplicationLauncherDocumentBody.tsx       |   2 +-
 .../ApplicationLauncherFavoritesAndSearch.tsx |   2 +-
 .../ApplicationLauncherRouterLink.tsx         |   2 +-
 .../ApplicationLauncherSectionsAndIcons.tsx   |   2 +-
 .../examples/ApplicationLauncherTooltip.tsx   |   2 +-
 .../examples/pf-logo-small.svg                |   0
 .../components/ApplicationLauncher/index.ts   |   0
 .../src/deprecated/components/index.ts        |   3 +-
 packages/react-core/src/helpers/favorites.ts  |   2 +-
 .../ApplicationLauncherFavoritesDemo.tsx      |   2 +-
 47 files changed, 294 insertions(+), 212 deletions(-)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/ApplicationLauncher.tsx (97%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/ApplicationLauncherContent.tsx (100%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/ApplicationLauncherContext.ts (100%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/ApplicationLauncherGroup.tsx (76%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/ApplicationLauncherIcon.tsx (100%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/ApplicationLauncherItem.tsx (96%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/ApplicationLauncherItemContext.ts (100%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/ApplicationLauncherSeparator.tsx (75%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/ApplicationLauncherText.tsx (100%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/__tests__/ApplicationLauncher.test.tsx (95%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/__tests__/Generated/ApplicationLauncherContent.test.tsx (100%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/__tests__/Generated/ApplicationLauncherGroup.test.tsx (100%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/__tests__/Generated/ApplicationLauncherIcon.test.tsx (100%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/__tests__/Generated/ApplicationLauncherSeparator.test.tsx (83%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/__tests__/Generated/ApplicationLauncherText.test.tsx (100%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/__tests__/Generated/__snapshots__/ApplicationLauncherContent.test.tsx.snap (100%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/__tests__/Generated/__snapshots__/ApplicationLauncherGroup.test.tsx.snap (100%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/__tests__/Generated/__snapshots__/ApplicationLauncherIcon.test.tsx.snap (100%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/__tests__/Generated/__snapshots__/ApplicationLauncherSeparator.test.tsx.snap (100%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/__tests__/Generated/__snapshots__/ApplicationLauncherText.test.tsx.snap (100%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap (100%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/examples/ApplicationLauncher.md (100%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/examples/ApplicationLauncherAlignRight.tsx (96%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/examples/ApplicationLauncherAlignTop.tsx (86%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/examples/ApplicationLauncherBasic.tsx (96%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/examples/ApplicationLauncherCustomIcon.tsx (97%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/examples/ApplicationLauncherDisabled.tsx (96%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/examples/ApplicationLauncherDocumentBody.tsx (96%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/examples/ApplicationLauncherFavoritesAndSearch.tsx (98%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/examples/ApplicationLauncherRouterLink.tsx (96%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/examples/ApplicationLauncherSectionsAndIcons.tsx (97%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/examples/ApplicationLauncherTooltip.tsx (97%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/examples/pf-logo-small.svg (100%)
 rename packages/react-core/src/{ => deprecated}/components/ApplicationLauncher/index.ts (100%)

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/Page.md b/packages/react-core/src/demos/Page.md
index 00c890d826f..3f8183e2f4d 100644
--- a/packages/react-core/src/demos/Page.md
+++ b/packages/react-core/src/demos/Page.md
@@ -12,13 +12,6 @@ import imgAvatar from '@patternfly/react-core/src/components/Avatar/examples/ava
 import BarsIcon from '@patternfly/react-icons/dist/esm/icons/bars-icon';
 import AttentionBellIcon from '@patternfly/react-icons/dist/esm/icons/attention-bell-icon';
 import LightbulbIcon from '@patternfly/react-icons/dist/esm/icons/lightbulb-icon';
-import {
-Dropdown as DropdownDeprecated,
-DropdownGroup as DropdownGroupDeprecated,
-DropdownItem as DropdownItemDeprecated,
-DropdownToggle,
-KebabToggle
-} from '@patternfly/react-core/deprecated';
 
 - All examples set the `isManagedSidebar` prop on the Page component to have the sidebar automatically close for smaller screen widths. You can also manually control this behavior by not adding the `isManagedSidebar` prop and instead:
 
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 {
       </DropdownGroupDeprecated>
     ];
 
-    const appLauncherItems = [
-      <ApplicationLauncherItem key="application_1a" href="#">
-        Application 1 (anchor link)
-      </ApplicationLauncherItem>,
-      <ApplicationLauncherItem key="application_2a" component="button" onClick={() => alert('Clicked item 2')}>
-        Application 2 (button with onClick)
-      </ApplicationLauncherItem>
-    ];
-
     const headerToolbar = (
       <Toolbar id="toolbar" isFullHeight isStatic>
         <ToolbarContent>
@@ -163,15 +139,6 @@ export default class DashboardHeader extends React.Component {
               </ToolbarItem>
             )}
             <ToolbarGroup variant="icon-button-group" visibility={{ default: 'hidden', lg: 'visible' }}>
-              <ToolbarItem>
-                <ApplicationLauncher
-                  onSelect={this.onAppLauncherSelect}
-                  onToggle={this.onAppLauncherToggle}
-                  isOpen={isAppLauncherOpen}
-                  items={appLauncherItems}
-                  toggleId="dashboard-header-app-launcher"
-                />
-              </ToolbarItem>
               <ToolbarItem>
                 <Button aria-label="Settings" variant={ButtonVariant.plain} icon={<CogIcon />} />
               </ToolbarItem>
diff --git a/packages/react-core/src/demos/examples/Masthead/MastheadWithUtilitiesAndUserDropdownMenu.tsx b/packages/react-core/src/demos/examples/Masthead/MastheadWithUtilitiesAndUserDropdownMenu.tsx
index 81b1748bae5..e7d027723d0 100644
--- a/packages/react-core/src/demos/examples/Masthead/MastheadWithUtilitiesAndUserDropdownMenu.tsx
+++ b/packages/react-core/src/demos/examples/Masthead/MastheadWithUtilitiesAndUserDropdownMenu.tsx
@@ -1,7 +1,5 @@
 import React from 'react';
 import {
-  ApplicationLauncher,
-  ApplicationLauncherItem,
   Avatar,
   Brand,
   Breadcrumb,
@@ -18,6 +16,11 @@ import {
   MastheadContent,
   MastheadMain,
   MastheadToggle,
+  Menu,
+  MenuContent,
+  MenuList,
+  MenuItem,
+  MenuToggle,
   Nav,
   NavItem,
   NavList,
@@ -26,13 +29,18 @@ import {
   PageSectionVariants,
   PageSidebar,
   PageToggleButton,
+  Popper,
   SkipToContent,
   Text,
   TextContent,
   Toolbar,
   ToolbarContent,
   ToolbarGroup,
-  ToolbarItem
+  ToolbarItem,
+  MenuGroup,
+  MenuInput,
+  SearchInput,
+  Tooltip
 } from '@patternfly/react-core';
 import {
   Dropdown as DropdownDeprecated,
@@ -41,12 +49,15 @@ import {
   DropdownToggle,
   KebabToggle
 } from '@patternfly/react-core/deprecated';
+import { Link } from '@reach/router';
 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 pfIcon from './pf-logo-small.svg';
 
 interface NavOnSelectProps {
   groupId: number | string;
@@ -59,9 +70,15 @@ export const MastheadWithUtilitiesAndUserDropdownMenu: React.FunctionComponent =
   const [isDropdownOpen, setIsDropdownOpen] = React.useState(false);
   const [isKebabDropdownOpen, setIsKebabDropdownOpen] = React.useState(false);
   const [isFullKebabDropdownOpen, setIsFullKebabDropdownOpen] = React.useState(false);
-  const [isAppLauncherOpen, setIsAppLauncherOpen] = React.useState(false);
   const [activeItem, setActiveItem] = React.useState(1);
 
+  const [isOpen, setIsOpen] = React.useState<boolean>(false);
+  const [refFullOptions, setRefFullOptions] = React.useState<Element[]>();
+  const [favorites, setFavorites] = React.useState<string[]>([]);
+  const [filteredIds, setFilteredIds] = React.useState<string[]>(['*']);
+  const menuRef = React.useRef<HTMLDivElement>(null);
+  const toggleRef = React.useRef<HTMLButtonElement>(null);
+
   const onNavSelect = (selectedItem: NavOnSelectProps) => {
     typeof selectedItem.itemId === 'number' && setActiveItem(selectedItem.itemId);
   };
@@ -90,14 +107,249 @@ export const MastheadWithUtilitiesAndUserDropdownMenu: React.FunctionComponent =
     setIsFullKebabDropdownOpen(!isFullKebabDropdownOpen);
   };
 
-  const onAppLauncherToggle = (_event: any, isOpen: boolean) => {
-    setIsAppLauncherOpen(isOpen);
+  const handleMenuKeys = (event: KeyboardEvent) => {
+    if (!isOpen) {
+      return;
+    }
+    if (menuRef.current?.contains(event.target as Node) || toggleRef.current?.contains(event.target as Node)) {
+      if (event.key === 'Escape') {
+        setIsOpen(!isOpen);
+        toggleRef.current?.focus();
+      }
+    }
+  };
+
+  const handleClickOutside = (event: MouseEvent) => {
+    if (isOpen && !menuRef.current?.contains(event.target as Node)) {
+      setIsOpen(false);
+    }
+  };
+
+  const onToggleClick = (ev: React.MouseEvent) => {
+    ev.stopPropagation(); // Stop handleClickOutside from handling
+    setTimeout(() => {
+      if (menuRef.current) {
+        const firstElement = menuRef.current.querySelector(
+          '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])>*:first-child')));
+      }
+    }, 0);
+    setIsOpen(!isOpen);
+  };
+
+  React.useEffect(() => {
+    window.addEventListener('keydown', handleMenuKeys);
+    window.addEventListener('click', handleClickOutside);
+
+    return () => {
+      window.removeEventListener('keydown', handleMenuKeys);
+      window.removeEventListener('click', handleClickOutside);
+    };
+  }, [isOpen, menuRef]);
+
+
+  const toggle = (
+    <MenuToggle
+      aria-label="Toggle"
+      ref={toggleRef}
+      variant="plain"
+      onClick={onToggleClick}
+      isExpanded={isOpen}
+      style={{ width: 'auto' }}
+    >
+      <ThIcon />
+    </MenuToggle>
+  );
+
+  const menuItems = [
+    <MenuGroup key="group1" label="Group 1">
+      <MenuList>
+        <MenuItem itemId="0" id="0" isFavorited={favorites.includes('0')}>
+          Application 1
+        </MenuItem>
+        <MenuItem
+          itemId="1"
+          id="1"
+          isFavorited={favorites.includes('1')}
+          to="#default-link2"
+          onClick={(ev) => ev.preventDefault()}
+        >
+          Application 2
+        </MenuItem>
+      </MenuList>
+    </MenuGroup>,
+    <Divider key="group1-divider" />,
+    <MenuGroup key="group2" label="Group 2">
+      <MenuList>
+        <MenuItem
+          itemId="2"
+          id="2"
+          isFavorited={favorites.includes('2')}
+          component={(props) => <Link {...props} to="#router-link" />}
+        >
+          @reach/router Link
+        </MenuItem>
+        <MenuItem
+          itemId="3"
+          id="3"
+          isFavorited={favorites.includes('3')}
+          isExternalLink
+          icon={<img src={pfIcon} />}
+          component={(props) => <Link {...props} to="#router-link2" />}
+        >
+          @reach/router Link with icon
+        </MenuItem>
+      </MenuList>
+    </MenuGroup>,
+    <Divider key="group2-divider" />,
+    <MenuList key="other-items">
+      <MenuItem key="tooltip-app" isFavorited={favorites.includes('4')} itemId="4" id="4">
+        <Tooltip content={<div>Launch Application 3</div>} position="right">
+          <span>Application 3 with tooltip</span>
+        </Tooltip>
+      </MenuItem>
+      <MenuItem key="disabled-app" itemId="5" id="5" isDisabled>
+        Unavailable Application
+      </MenuItem>
+    </MenuList>
+  ];
+
+  const createFavorites = (favIds: string[]) => {
+    const favorites: unknown[] = [];
+
+    menuItems.forEach((item) => {
+      if (item.type === MenuList) {
+        item.props.children.filter((child) => {
+          if (favIds.includes(child.props.itemId)) {
+            favorites.push(child);
+          }
+        });
+      } else if (item.type === MenuGroup) {
+        item.props.children.props.children.filter((child) => {
+          if (favIds.includes(child.props.itemId)) {
+            favorites.push(child);
+          }
+        });
+      } else {
+        if (favIds.includes(item.props.itemId)) {
+          favorites.push(item);
+        }
+      }
+    });
+
+    return favorites;
+  };
+
+  const filterItems = (items: any[], filteredIds: string[]) => {
+    if (filteredIds.length === 1 && filteredIds[0] === '*') {
+      return items;
+    }
+    let keepDivider = false;
+    const filteredCopy = items
+      .map((group) => {
+        if (group.type === MenuGroup) {
+          const filteredGroup = React.cloneElement(group, {
+            children: React.cloneElement(group.props.children, {
+              children: group.props.children.props.children.filter((child) => {
+                if (filteredIds.includes(child.props.itemId)) {
+                  return child;
+                }
+              })
+            })
+          });
+          const filteredList = filteredGroup.props.children;
+          if (filteredList.props.children.length > 0) {
+            keepDivider = true;
+            return filteredGroup;
+          } else {
+            keepDivider = false;
+          }
+        } else if (group.type === MenuList) {
+          const filteredGroup = React.cloneElement(group, {
+            children: group.props.children.filter((child) => {
+              if (filteredIds.includes(child.props.itemId)) {
+                return child;
+              }
+            })
+          });
+          if (filteredGroup.props.children.length > 0) {
+            keepDivider = true;
+            return filteredGroup;
+          } else {
+            keepDivider = false;
+          }
+        } else {
+          if ((keepDivider && group.type === Divider) || filteredIds.includes(group.props.itemId)) {
+            return group;
+          }
+        }
+      })
+      .filter((newGroup) => newGroup);
+
+    if (filteredCopy.length > 0) {
+      const lastGroup = filteredCopy.pop();
+      if (lastGroup.type !== Divider) {
+        filteredCopy.push(lastGroup);
+      }
+    }
+
+    return filteredCopy;
   };
 
-  const onAppLauncherSelect = () => {
-    setIsAppLauncherOpen(!isAppLauncherOpen);
+  const onTextChange = (textValue: string) => {
+    if (textValue === '') {
+      setFilteredIds(['*']);
+      return;
+    }
+
+    const filteredIds =
+      refFullOptions
+        ?.filter((item) => (item as HTMLElement).innerText.toLowerCase().includes(textValue.toString().toLowerCase()))
+        .map((item) => item.id) || [];
+    setFilteredIds(filteredIds);
   };
 
+  const onFavorite = (event: any, itemId: string, actionId: string) => {
+    event.stopPropagation();
+    if (actionId === 'fav') {
+      const isFavorite = favorites.includes(itemId);
+      if (isFavorite) {
+        setFavorites(favorites.filter((fav) => fav !== itemId));
+      } else {
+        setFavorites([...favorites, itemId]);
+      }
+    }
+  };
+
+  const filteredFavorites = filterItems(createFavorites(favorites), filteredIds);
+  const filteredItems = filterItems(menuItems, filteredIds);
+  if (filteredItems.length === 0) {
+    filteredItems.push(<MenuItem key="no-items">No results found</MenuItem>);
+  }
+
+  const menu = (
+    // eslint-disable-next-line no-console
+    <Menu ref={menuRef} onActionClick={onFavorite} onSelect={(_ev, itemId) => console.log('selected', itemId)}>
+      <MenuInput>
+        <SearchInput aria-label="Filter menu items" type="search" onChange={(_event, value) => onTextChange(value)} />
+      </MenuInput>
+      <Divider />
+      <MenuContent>
+        {filteredFavorites.length > 0 && (
+          <React.Fragment>
+            <MenuGroup key="favorites-group" label="Favorites">
+              <MenuList>{filteredFavorites}</MenuList>
+            </MenuGroup>
+            <Divider key="favorites-divider" />
+          </React.Fragment>
+        )}
+        {filteredItems}
+      </MenuContent>
+    </Menu>
+  );
+
   const dashboardBreadcrumb = (
     <Breadcrumb>
       <BreadcrumbItem>Section home</BreadcrumbItem>
@@ -144,16 +396,7 @@ export const MastheadWithUtilitiesAndUserDropdownMenu: React.FunctionComponent =
       <DropdownItemDeprecated key="group 2 logout">Logout</DropdownItemDeprecated>
     </DropdownGroupDeprecated>
   ];
-
-  const appLauncherItems = [
-    <ApplicationLauncherItem key="application_1a" href="#">
-      Application 1 (anchor link)
-    </ApplicationLauncherItem>,
-    <ApplicationLauncherItem key="application_2a" component="button" onClick={() => alert('Clicked item 2')}>
-      Application 2 (button with onClick)
-    </ApplicationLauncherItem>
-  ];
-
+  
   const headerToolbar = (
     <Toolbar id="toolbar" isFullHeight isStatic>
       <ToolbarContent>
@@ -167,13 +410,7 @@ export const MastheadWithUtilitiesAndUserDropdownMenu: React.FunctionComponent =
           </ToolbarItem>
           <ToolbarGroup variant="icon-button-group" visibility={{ default: 'hidden', lg: 'visible' }}>
             <ToolbarItem visibility={{ default: 'hidden', md: 'hidden', lg: 'visible' }}>
-              <ApplicationLauncher
-                onSelect={onAppLauncherSelect}
-                onToggle={onAppLauncherToggle}
-                isOpen={isAppLauncherOpen}
-                items={appLauncherItems}
-                toggleId="dashboard-header-app-launcher"
-              />
+            <Popper trigger={toggle} triggerRef={toggleRef} popper={menu} popperRef={menuRef} isVisible={isOpen} />
             </ToolbarItem>
             <ToolbarItem>
               <Button aria-label="Settings" variant={ButtonVariant.plain} icon={<CogIcon />} />
diff --git a/packages/react-core/src/demos/examples/Page/PageStickySectionBreadcrumb.tsx b/packages/react-core/src/demos/examples/Page/PageStickySectionBreadcrumb.tsx
index e340f0ef342..99bc02b7706 100644
--- a/packages/react-core/src/demos/examples/Page/PageStickySectionBreadcrumb.tsx
+++ b/packages/react-core/src/demos/examples/Page/PageStickySectionBreadcrumb.tsx
@@ -1,7 +1,5 @@
 import React from 'react';
 import {
-  ApplicationLauncher,
-  ApplicationLauncherItem,
   Avatar,
   Brand,
   Breadcrumb,
@@ -32,7 +30,7 @@ import {
   Toolbar,
   ToolbarContent,
   ToolbarGroup,
-  ToolbarItem
+  ToolbarItem,
 } from '@patternfly/react-core';
 import {
   Dropdown as DropdownDeprecated,
@@ -59,7 +57,6 @@ export const PageStickySectionBreadcrumb: React.FunctionComponent = () => {
   const [isDropdownOpen, setIsDropdownOpen] = React.useState(false);
   const [isKebabDropdownOpen, setIsKebabDropdownOpen] = React.useState(false);
   const [isFullKebabDropdownOpen, setIsFullKebabDropdownOpen] = React.useState(false);
-  const [isAppLauncherOpen, setIsAppLauncherOpen] = React.useState(false);
   const [activeItem, setActiveItem] = React.useState(1);
 
   const onNavSelect = (selectedItem: NavOnSelectProps) => {
@@ -90,14 +87,6 @@ export const PageStickySectionBreadcrumb: React.FunctionComponent = () => {
     setIsFullKebabDropdownOpen(!isFullKebabDropdownOpen);
   };
 
-  const onAppLauncherToggle = (_event: any, isOpen: boolean) => {
-    setIsAppLauncherOpen(isOpen);
-  };
-
-  const onAppLauncherSelect = () => {
-    setIsAppLauncherOpen(!isAppLauncherOpen);
-  };
-
   const dashboardBreadcrumb = (
     <Breadcrumb>
       <BreadcrumbItem>Section home</BreadcrumbItem>
@@ -145,15 +134,6 @@ export const PageStickySectionBreadcrumb: React.FunctionComponent = () => {
     </DropdownGroupDeprecated>
   ];
 
-  const appLauncherItems = [
-    <ApplicationLauncherItem key="application_1a" href="#">
-      Application 1 (anchor link)
-    </ApplicationLauncherItem>,
-    <ApplicationLauncherItem key="application_2a" component="button" onClick={() => alert('Clicked item 2')}>
-      Application 2 (button with onClick)
-    </ApplicationLauncherItem>
-  ];
-
   const headerToolbar = (
     <Toolbar id="toolbar" isFullHeight isStatic>
       <ToolbarContent>
@@ -166,15 +146,6 @@ export const PageStickySectionBreadcrumb: React.FunctionComponent = () => {
             <Button aria-label="Notifications" variant={ButtonVariant.plain} icon={<BellIcon />} />
           </ToolbarItem>
           <ToolbarGroup variant="icon-button-group" visibility={{ default: 'hidden', lg: 'visible' }}>
-            <ToolbarItem visibility={{ default: 'hidden', md: 'hidden', lg: 'visible' }}>
-              <ApplicationLauncher
-                onSelect={onAppLauncherSelect}
-                onToggle={onAppLauncherToggle}
-                isOpen={isAppLauncherOpen}
-                items={appLauncherItems}
-                toggleId="dashboard-header-app-launcher"
-              />
-            </ToolbarItem>
             <ToolbarItem>
               <Button aria-label="Settings" variant={ButtonVariant.plain} icon={<CogIcon />} />
             </ToolbarItem>
diff --git a/packages/react-core/src/demos/examples/Page/PageStickySectionGroup.tsx b/packages/react-core/src/demos/examples/Page/PageStickySectionGroup.tsx
index 7b46030dd24..5cbfc6b632e 100644
--- a/packages/react-core/src/demos/examples/Page/PageStickySectionGroup.tsx
+++ b/packages/react-core/src/demos/examples/Page/PageStickySectionGroup.tsx
@@ -1,7 +1,5 @@
 import React from 'react';
 import {
-  ApplicationLauncher,
-  ApplicationLauncherItem,
   Avatar,
   Brand,
   Breadcrumb,
@@ -59,7 +57,6 @@ export const PageStickySectionGroup: React.FunctionComponent = () => {
   const [isDropdownOpen, setIsDropdownOpen] = React.useState(false);
   const [isKebabDropdownOpen, setIsKebabDropdownOpen] = React.useState(false);
   const [isFullKebabDropdownOpen, setIsFullKebabDropdownOpen] = React.useState(false);
-  const [isAppLauncherOpen, setIsAppLauncherOpen] = React.useState(false);
   const [activeItem, setActiveItem] = React.useState(1);
 
   const onNavSelect = (selectedItem: NavOnSelectProps) => {
@@ -90,14 +87,6 @@ export const PageStickySectionGroup: React.FunctionComponent = () => {
     setIsFullKebabDropdownOpen(!isFullKebabDropdownOpen);
   };
 
-  const onAppLauncherToggle = (_event: any, isOpen: boolean) => {
-    setIsAppLauncherOpen(isOpen);
-  };
-
-  const onAppLauncherSelect = () => {
-    setIsAppLauncherOpen(!isAppLauncherOpen);
-  };
-
   const dashboardBreadcrumb = (
     <Breadcrumb>
       <BreadcrumbItem>Section home</BreadcrumbItem>
@@ -145,15 +134,6 @@ export const PageStickySectionGroup: React.FunctionComponent = () => {
     </DropdownGroupDeprecated>
   ];
 
-  const appLauncherItems = [
-    <ApplicationLauncherItem key="application_1a" href="#">
-      Application 1 (anchor link)
-    </ApplicationLauncherItem>,
-    <ApplicationLauncherItem key="application_2a" component="button" onClick={() => alert('Clicked item 2')}>
-      Application 2 (button with onClick)
-    </ApplicationLauncherItem>
-  ];
-
   const headerToolbar = (
     <Toolbar id="toolbar" isFullHeight isStatic>
       <ToolbarContent>
@@ -166,15 +146,6 @@ export const PageStickySectionGroup: React.FunctionComponent = () => {
             <Button aria-label="Notifications" variant={ButtonVariant.plain} icon={<BellIcon />} />
           </ToolbarItem>
           <ToolbarGroup variant="icon-button-group" visibility={{ default: 'hidden', lg: 'visible' }}>
-            <ToolbarItem visibility={{ default: 'hidden', md: 'hidden', lg: 'visible' }}>
-              <ApplicationLauncher
-                onSelect={onAppLauncherSelect}
-                onToggle={onAppLauncherToggle}
-                isOpen={isAppLauncherOpen}
-                items={appLauncherItems}
-                toggleId="dashboard-header-app-launcher"
-              />
-            </ToolbarItem>
             <ToolbarItem>
               <Button aria-label="Settings" variant={ButtonVariant.plain} icon={<CogIcon />} />
             </ToolbarItem>
diff --git a/packages/react-core/src/demos/examples/Page/PageStickySectionGroupAlternate.tsx b/packages/react-core/src/demos/examples/Page/PageStickySectionGroupAlternate.tsx
index e3b06f5ab1f..4010f60897a 100644
--- a/packages/react-core/src/demos/examples/Page/PageStickySectionGroupAlternate.tsx
+++ b/packages/react-core/src/demos/examples/Page/PageStickySectionGroupAlternate.tsx
@@ -1,7 +1,5 @@
 import React from 'react';
 import {
-  ApplicationLauncher,
-  ApplicationLauncherItem,
   Avatar,
   Brand,
   Breadcrumb,
@@ -61,7 +59,6 @@ export const PageStickySectionGroupAlternate: React.FunctionComponent = () => {
   const [isDropdownOpen, setIsDropdownOpen] = React.useState(false);
   const [isKebabDropdownOpen, setIsKebabDropdownOpen] = React.useState(false);
   const [isFullKebabDropdownOpen, setIsFullKebabDropdownOpen] = React.useState(false);
-  const [isAppLauncherOpen, setIsAppLauncherOpen] = React.useState(false);
   const [activeItem, setActiveItem] = React.useState(1);
 
   const onNavSelect = (selectedItem: NavOnSelectProps) => {
@@ -92,14 +89,6 @@ export const PageStickySectionGroupAlternate: React.FunctionComponent = () => {
     setIsFullKebabDropdownOpen(!isFullKebabDropdownOpen);
   };
 
-  const onAppLauncherToggle = (_event: any, isOpen: boolean) => {
-    setIsAppLauncherOpen(isOpen);
-  };
-
-  const onAppLauncherSelect = () => {
-    setIsAppLauncherOpen(!isAppLauncherOpen);
-  };
-
   const kebabDropdownItems = [
     <DropdownItemDeprecated key="settings">
       <CogIcon /> Settings
@@ -136,15 +125,6 @@ export const PageStickySectionGroupAlternate: React.FunctionComponent = () => {
     </DropdownItemDeprecated>
   ];
 
-  const appLauncherItems = [
-    <ApplicationLauncherItem key="application_1a" href="#">
-      Application 1 (anchor link)
-    </ApplicationLauncherItem>,
-    <ApplicationLauncherItem key="application_2a" component="button" onClick={() => alert('Clicked item 2')}>
-      Application 2 (button with onClick)
-    </ApplicationLauncherItem>
-  ];
-
   const headerToolbar = (
     <Toolbar id="toolbar" isFullHeight isStatic>
       <ToolbarContent>
@@ -157,15 +137,6 @@ export const PageStickySectionGroupAlternate: React.FunctionComponent = () => {
             <Button aria-label="Notifications" variant={ButtonVariant.plain} icon={<BellIcon />} />
           </ToolbarItem>
           <ToolbarGroup variant="icon-button-group" visibility={{ default: 'hidden', lg: 'visible' }}>
-            <ToolbarItem visibility={{ default: 'hidden', md: 'hidden', lg: 'visible' }}>
-              <ApplicationLauncher
-                onSelect={onAppLauncherSelect}
-                onToggle={onAppLauncherToggle}
-                isOpen={isAppLauncherOpen}
-                items={appLauncherItems}
-                toggleId="dashboard-header-app-launcher"
-              />
-            </ToolbarItem>
             <ToolbarItem>
               <Button aria-label="Settings" variant={ButtonVariant.plain} icon={<CogIcon />} />
             </ToolbarItem>
diff --git a/packages/react-core/src/demos/examples/Page/PageStickySectionGroupUsingPageHeader.tsx b/packages/react-core/src/demos/examples/Page/PageStickySectionGroupUsingPageHeader.tsx
index 1db39ca902b..1e597a0c168 100644
--- a/packages/react-core/src/demos/examples/Page/PageStickySectionGroupUsingPageHeader.tsx
+++ b/packages/react-core/src/demos/examples/Page/PageStickySectionGroupUsingPageHeader.tsx
@@ -1,7 +1,5 @@
 import React from 'react';
 import {
-  ApplicationLauncher,
-  ApplicationLauncherItem,
   Avatar,
   Brand,
   Breadcrumb,
@@ -52,7 +50,6 @@ export const PageStickySectionGroupUsingPageHeader: React.FunctionComponent = ()
   const [isDropdownOpen, setIsDropdownOpen] = React.useState(false);
   const [isKebabDropdownOpen, setIsKebabDropdownOpen] = React.useState(false);
   const [isFullKebabDropdownOpen, setIsFullKebabDropdownOpen] = React.useState(false);
-  const [isAppLauncherOpen, setIsAppLauncherOpen] = React.useState(false);
   const [activeItem, setActiveItem] = React.useState(1);
 
   const onNavSelect = (selectedItem: NavOnSelectProps) => {
@@ -83,14 +80,6 @@ export const PageStickySectionGroupUsingPageHeader: React.FunctionComponent = ()
     setIsFullKebabDropdownOpen(!isFullKebabDropdownOpen);
   };
 
-  const onAppLauncherToggle = (_event: any, isOpen: boolean) => {
-    setIsAppLauncherOpen(isOpen);
-  };
-
-  const onAppLauncherSelect = () => {
-    setIsAppLauncherOpen(!isAppLauncherOpen);
-  };
-
   const dashboardBreadcrumb = (
     <Breadcrumb>
       <BreadcrumbItem>Section home</BreadcrumbItem>
@@ -138,15 +127,6 @@ export const PageStickySectionGroupUsingPageHeader: React.FunctionComponent = ()
     </DropdownGroupDeprecated>
   ];
 
-  const appLauncherItems = [
-    <ApplicationLauncherItem key="application_1a" href="#">
-      Application 1 (anchor link)
-    </ApplicationLauncherItem>,
-    <ApplicationLauncherItem key="application_2a" component="button" onClick={() => alert('Clicked item 2')}>
-      Application 2 (button with onClick)
-    </ApplicationLauncherItem>
-  ];
-
   const pageNav = (
     <Nav onSelect={onNavSelect}>
       <NavList>
@@ -182,15 +162,6 @@ export const PageStickySectionGroupUsingPageHeader: React.FunctionComponent = ()
           <Button aria-label="Notifications" variant={ButtonVariant.plain} icon={<BellIcon />} />
         </PageHeaderToolsItem>
         <PageHeaderToolsGroup visibility={{ default: 'hidden', lg: 'visible' }}>
-          <PageHeaderToolsItem visibility={{ default: 'hidden', md: 'hidden', lg: 'visible' }}>
-            <ApplicationLauncher
-              onSelect={onAppLauncherSelect}
-              onToggle={onAppLauncherToggle}
-              isOpen={isAppLauncherOpen}
-              items={appLauncherItems}
-              toggleId="dashboard-header-app-launcher"
-            />
-          </PageHeaderToolsItem>
           <PageHeaderToolsItem>
             <Button aria-label="Settings" variant={ButtonVariant.plain} icon={<CogIcon />} />
           </PageHeaderToolsItem>
diff --git a/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncher.tsx b/packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncher.tsx
similarity index 97%
rename from packages/react-core/src/components/ApplicationLauncher/ApplicationLauncher.tsx
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncher.tsx
index 9437f82c0e0..6a2ad252fbc 100644
--- a/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncher.tsx
+++ b/packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncher.tsx
@@ -7,14 +7,14 @@ import {
   DropdownPosition,
   DropdownToggle,
   DropdownContext
-} from '../../deprecated/components/Dropdown';
-import { DropdownWithContext } from '../../deprecated/components/Dropdown/DropdownWithContext';
+} from '../Dropdown';
+import { DropdownWithContext } from '../Dropdown/DropdownWithContext';
 import { ApplicationLauncherGroup } from './ApplicationLauncherGroup';
 import { ApplicationLauncherSeparator } from './ApplicationLauncherSeparator';
 import { ApplicationLauncherItem } from './ApplicationLauncherItem';
 import { ApplicationLauncherContext } from './ApplicationLauncherContext';
-import { createRenderableFavorites, extendItemsWithFavorite } from '../../helpers/favorites';
-import { SearchInput } from '../SearchInput';
+import { createRenderableFavorites, extendItemsWithFavorite } from '../../../helpers/favorites';
+import { SearchInput } from '../../../components/SearchInput';
 
 export interface ApplicationLauncherProps extends React.HTMLProps<HTMLDivElement> {
   /** Additional element css classes */
diff --git a/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncherContent.tsx b/packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncherContent.tsx
similarity index 100%
rename from packages/react-core/src/components/ApplicationLauncher/ApplicationLauncherContent.tsx
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncherContent.tsx
diff --git a/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncherContext.ts b/packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncherContext.ts
similarity index 100%
rename from packages/react-core/src/components/ApplicationLauncher/ApplicationLauncherContext.ts
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncherContext.ts
diff --git a/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncherGroup.tsx b/packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncherGroup.tsx
similarity index 76%
rename from packages/react-core/src/components/ApplicationLauncher/ApplicationLauncherGroup.tsx
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncherGroup.tsx
index bf0754f2b19..7be51bf49d4 100644
--- a/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncherGroup.tsx
+++ b/packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncherGroup.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { DropdownGroup, DropdownGroupProps } from '../../deprecated/components/Dropdown';
+import { DropdownGroup, DropdownGroupProps } from '../Dropdown';
 
 export const ApplicationLauncherGroup: React.FunctionComponent<DropdownGroupProps> = ({
   children,
diff --git a/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncherIcon.tsx b/packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncherIcon.tsx
similarity index 100%
rename from packages/react-core/src/components/ApplicationLauncher/ApplicationLauncherIcon.tsx
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncherIcon.tsx
diff --git a/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncherItem.tsx b/packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncherItem.tsx
similarity index 96%
rename from packages/react-core/src/components/ApplicationLauncher/ApplicationLauncherItem.tsx
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncherItem.tsx
index 67a99a31626..259fd9dfcd7 100644
--- a/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncherItem.tsx
+++ b/packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncherItem.tsx
@@ -1,12 +1,12 @@
 import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/AppLauncher/app-launcher';
-import { DropdownItem, DropdownItemProps } from '../../deprecated/components/Dropdown';
+import { DropdownItem, DropdownItemProps } from '../Dropdown';
 import { ApplicationLauncherContent } from './ApplicationLauncherContent';
 import { ApplicationLauncherContext } from './ApplicationLauncherContext';
 import { ApplicationLauncherItemContext } from './ApplicationLauncherItemContext';
 import StarIcon from '@patternfly/react-icons/dist/esm/icons/star-icon';
-import { getUniqueId } from '../../helpers/util';
+import { getUniqueId } from '../../../helpers/util';
 
 export interface ApplicationLauncherItemProps {
   /** Icon rendered before the text */
diff --git a/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncherItemContext.ts b/packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncherItemContext.ts
similarity index 100%
rename from packages/react-core/src/components/ApplicationLauncher/ApplicationLauncherItemContext.ts
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncherItemContext.ts
diff --git a/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncherSeparator.tsx b/packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncherSeparator.tsx
similarity index 75%
rename from packages/react-core/src/components/ApplicationLauncher/ApplicationLauncherSeparator.tsx
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncherSeparator.tsx
index 82d63ca61db..59ca4ac3aba 100644
--- a/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncherSeparator.tsx
+++ b/packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncherSeparator.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { DropdownSeparator, SeparatorProps } from '../../deprecated/components/Dropdown/DropdownSeparator';
+import { DropdownSeparator, SeparatorProps } from '../Dropdown/DropdownSeparator';
 
 export const ApplicationLauncherSeparator: React.FunctionComponent<SeparatorProps> = ({
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
diff --git a/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncherText.tsx b/packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncherText.tsx
similarity index 100%
rename from packages/react-core/src/components/ApplicationLauncher/ApplicationLauncherText.tsx
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/ApplicationLauncherText.tsx
diff --git a/packages/react-core/src/components/ApplicationLauncher/__tests__/ApplicationLauncher.test.tsx b/packages/react-core/src/deprecated/components/ApplicationLauncher/__tests__/ApplicationLauncher.test.tsx
similarity index 95%
rename from packages/react-core/src/components/ApplicationLauncher/__tests__/ApplicationLauncher.test.tsx
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/__tests__/ApplicationLauncher.test.tsx
index 387fbda9579..91af3313128 100644
--- a/packages/react-core/src/components/ApplicationLauncher/__tests__/ApplicationLauncher.test.tsx
+++ b/packages/react-core/src/deprecated/components/ApplicationLauncher/__tests__/ApplicationLauncher.test.tsx
@@ -3,8 +3,7 @@ import { render } from '@testing-library/react';
 import HelpIcon from '@patternfly/react-icons/dist/esm/icons/help-icon';
 import { ApplicationLauncher } from '../ApplicationLauncher';
 import { ApplicationLauncherItem } from '../ApplicationLauncherItem';
-
-import { DropdownPosition, DropdownDirection } from '../../../deprecated/components/Dropdown/dropdownConstants';
+import { DropdownPosition, DropdownDirection } from '../../Dropdown/dropdownConstants';
 import { ApplicationLauncherSeparator } from '../ApplicationLauncherSeparator';
 
 const dropdownItems = [
diff --git a/packages/react-core/src/components/ApplicationLauncher/__tests__/Generated/ApplicationLauncherContent.test.tsx b/packages/react-core/src/deprecated/components/ApplicationLauncher/__tests__/Generated/ApplicationLauncherContent.test.tsx
similarity index 100%
rename from packages/react-core/src/components/ApplicationLauncher/__tests__/Generated/ApplicationLauncherContent.test.tsx
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/__tests__/Generated/ApplicationLauncherContent.test.tsx
diff --git a/packages/react-core/src/components/ApplicationLauncher/__tests__/Generated/ApplicationLauncherGroup.test.tsx b/packages/react-core/src/deprecated/components/ApplicationLauncher/__tests__/Generated/ApplicationLauncherGroup.test.tsx
similarity index 100%
rename from packages/react-core/src/components/ApplicationLauncher/__tests__/Generated/ApplicationLauncherGroup.test.tsx
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/__tests__/Generated/ApplicationLauncherGroup.test.tsx
diff --git a/packages/react-core/src/components/ApplicationLauncher/__tests__/Generated/ApplicationLauncherIcon.test.tsx b/packages/react-core/src/deprecated/components/ApplicationLauncher/__tests__/Generated/ApplicationLauncherIcon.test.tsx
similarity index 100%
rename from packages/react-core/src/components/ApplicationLauncher/__tests__/Generated/ApplicationLauncherIcon.test.tsx
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/__tests__/Generated/ApplicationLauncherIcon.test.tsx
diff --git a/packages/react-core/src/components/ApplicationLauncher/__tests__/Generated/ApplicationLauncherSeparator.test.tsx b/packages/react-core/src/deprecated/components/ApplicationLauncher/__tests__/Generated/ApplicationLauncherSeparator.test.tsx
similarity index 83%
rename from packages/react-core/src/components/ApplicationLauncher/__tests__/Generated/ApplicationLauncherSeparator.test.tsx
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/__tests__/Generated/ApplicationLauncherSeparator.test.tsx
index 1dfd81edec5..fbba4de4795 100644
--- a/packages/react-core/src/components/ApplicationLauncher/__tests__/Generated/ApplicationLauncherSeparator.test.tsx
+++ b/packages/react-core/src/deprecated/components/ApplicationLauncher/__tests__/Generated/ApplicationLauncherSeparator.test.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { render } from '@testing-library/react';
 
 import { ApplicationLauncherSeparator } from '../../ApplicationLauncherSeparator';
-import { DropdownArrowContext } from '../../../../deprecated/components/Dropdown/dropdownConstants';
+import { DropdownArrowContext } from '../../../Dropdown/dropdownConstants';
 
 describe('ApplicationLauncherSeparator', () => {
   it('should match snapshot', () => {
diff --git a/packages/react-core/src/components/ApplicationLauncher/__tests__/Generated/ApplicationLauncherText.test.tsx b/packages/react-core/src/deprecated/components/ApplicationLauncher/__tests__/Generated/ApplicationLauncherText.test.tsx
similarity index 100%
rename from packages/react-core/src/components/ApplicationLauncher/__tests__/Generated/ApplicationLauncherText.test.tsx
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/__tests__/Generated/ApplicationLauncherText.test.tsx
diff --git a/packages/react-core/src/components/ApplicationLauncher/__tests__/Generated/__snapshots__/ApplicationLauncherContent.test.tsx.snap b/packages/react-core/src/deprecated/components/ApplicationLauncher/__tests__/Generated/__snapshots__/ApplicationLauncherContent.test.tsx.snap
similarity index 100%
rename from packages/react-core/src/components/ApplicationLauncher/__tests__/Generated/__snapshots__/ApplicationLauncherContent.test.tsx.snap
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/__tests__/Generated/__snapshots__/ApplicationLauncherContent.test.tsx.snap
diff --git a/packages/react-core/src/components/ApplicationLauncher/__tests__/Generated/__snapshots__/ApplicationLauncherGroup.test.tsx.snap b/packages/react-core/src/deprecated/components/ApplicationLauncher/__tests__/Generated/__snapshots__/ApplicationLauncherGroup.test.tsx.snap
similarity index 100%
rename from packages/react-core/src/components/ApplicationLauncher/__tests__/Generated/__snapshots__/ApplicationLauncherGroup.test.tsx.snap
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/__tests__/Generated/__snapshots__/ApplicationLauncherGroup.test.tsx.snap
diff --git a/packages/react-core/src/components/ApplicationLauncher/__tests__/Generated/__snapshots__/ApplicationLauncherIcon.test.tsx.snap b/packages/react-core/src/deprecated/components/ApplicationLauncher/__tests__/Generated/__snapshots__/ApplicationLauncherIcon.test.tsx.snap
similarity index 100%
rename from packages/react-core/src/components/ApplicationLauncher/__tests__/Generated/__snapshots__/ApplicationLauncherIcon.test.tsx.snap
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/__tests__/Generated/__snapshots__/ApplicationLauncherIcon.test.tsx.snap
diff --git a/packages/react-core/src/components/ApplicationLauncher/__tests__/Generated/__snapshots__/ApplicationLauncherSeparator.test.tsx.snap b/packages/react-core/src/deprecated/components/ApplicationLauncher/__tests__/Generated/__snapshots__/ApplicationLauncherSeparator.test.tsx.snap
similarity index 100%
rename from packages/react-core/src/components/ApplicationLauncher/__tests__/Generated/__snapshots__/ApplicationLauncherSeparator.test.tsx.snap
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/__tests__/Generated/__snapshots__/ApplicationLauncherSeparator.test.tsx.snap
diff --git a/packages/react-core/src/components/ApplicationLauncher/__tests__/Generated/__snapshots__/ApplicationLauncherText.test.tsx.snap b/packages/react-core/src/deprecated/components/ApplicationLauncher/__tests__/Generated/__snapshots__/ApplicationLauncherText.test.tsx.snap
similarity index 100%
rename from packages/react-core/src/components/ApplicationLauncher/__tests__/Generated/__snapshots__/ApplicationLauncherText.test.tsx.snap
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/__tests__/Generated/__snapshots__/ApplicationLauncherText.test.tsx.snap
diff --git a/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap b/packages/react-core/src/deprecated/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap
similarity index 100%
rename from packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap
diff --git a/packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncher.md b/packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncher.md
similarity index 100%
rename from packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncher.md
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncher.md
diff --git a/packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherAlignRight.tsx b/packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherAlignRight.tsx
similarity index 96%
rename from packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherAlignRight.tsx
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherAlignRight.tsx
index 72fd38819b9..b0fc39e6418 100644
--- a/packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherAlignRight.tsx
+++ b/packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherAlignRight.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import { ApplicationLauncher, ApplicationLauncherItem } from '@patternfly/react-core';
-import { DropdownPosition } from '@patternfly/react-core/deprecated';
+import { DropdownPosition } from '@patternfly/react-core/deprecated'
+import { ApplicationLauncher, ApplicationLauncherItem } from '@patternfly/react-core/deprecated';
 
 const appLauncherItems: React.ReactElement[] = [
   <ApplicationLauncherItem key="application_1a" href="#">
diff --git a/packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherAlignTop.tsx b/packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherAlignTop.tsx
similarity index 86%
rename from packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherAlignTop.tsx
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherAlignTop.tsx
index 6b7b768776f..51c712d42d0 100644
--- a/packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherAlignTop.tsx
+++ b/packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherAlignTop.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
-import { ApplicationLauncher, ApplicationLauncherItem } from '@patternfly/react-core';
-import { DropdownDirection } from '@patternfly/react-core/deprecated';
+import { ApplicationLauncher, ApplicationLauncherItem, DropdownDirection } from '@patternfly/react-core/deprecated';
 
 const appLauncherItems: React.ReactElement[] = [
   <ApplicationLauncherItem key="application_1a" href="#">
diff --git a/packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherBasic.tsx b/packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherBasic.tsx
similarity index 96%
rename from packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherBasic.tsx
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherBasic.tsx
index fcc2179a31c..14458448758 100644
--- a/packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherBasic.tsx
+++ b/packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherBasic.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { ApplicationLauncher, ApplicationLauncherItem } from '@patternfly/react-core';
+import { ApplicationLauncher, ApplicationLauncherItem } from '@patternfly/react-core/deprecated';
 
 const appLauncherItems: React.ReactElement[] = [
   <ApplicationLauncherItem key="application_1a" href="#">
diff --git a/packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherCustomIcon.tsx b/packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherCustomIcon.tsx
similarity index 97%
rename from packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherCustomIcon.tsx
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherCustomIcon.tsx
index f2970e2ac14..ea5185afb6f 100644
--- a/packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherCustomIcon.tsx
+++ b/packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherCustomIcon.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { ApplicationLauncher, ApplicationLauncherItem } from '@patternfly/react-core';
+import { ApplicationLauncher, ApplicationLauncherItem } from '@patternfly/react-core/deprecated';
 import HelpIcon from '@patternfly/react-icons/dist/esm/icons/help-icon';
 
 const appLauncherItems: React.ReactElement[] = [
diff --git a/packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherDisabled.tsx b/packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherDisabled.tsx
similarity index 96%
rename from packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherDisabled.tsx
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherDisabled.tsx
index bd3a13bdef3..ace925381b3 100644
--- a/packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherDisabled.tsx
+++ b/packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherDisabled.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { ApplicationLauncher, ApplicationLauncherItem } from '@patternfly/react-core';
+import { ApplicationLauncher, ApplicationLauncherItem } from '@patternfly/react-core/deprecated';
 
 const appLauncherItems: React.ReactElement[] = [
   <ApplicationLauncherItem key="application_1a" href="#">
diff --git a/packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherDocumentBody.tsx b/packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherDocumentBody.tsx
similarity index 96%
rename from packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherDocumentBody.tsx
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherDocumentBody.tsx
index 1089cd54cd9..9fffff4669d 100644
--- a/packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherDocumentBody.tsx
+++ b/packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherDocumentBody.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { ApplicationLauncher, ApplicationLauncherItem } from '@patternfly/react-core';
+import { ApplicationLauncher, ApplicationLauncherItem } from '@patternfly/react-core/deprecated';
 
 const appLauncherItems: React.ReactElement[] = [
   <ApplicationLauncherItem key="application_1a" href="#">
diff --git a/packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherFavoritesAndSearch.tsx b/packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherFavoritesAndSearch.tsx
similarity index 98%
rename from packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherFavoritesAndSearch.tsx
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherFavoritesAndSearch.tsx
index e234c6f7713..9f6e67f65cc 100644
--- a/packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherFavoritesAndSearch.tsx
+++ b/packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherFavoritesAndSearch.tsx
@@ -4,7 +4,7 @@ import {
   ApplicationLauncherItem,
   ApplicationLauncherGroup,
   ApplicationLauncherSeparator
-} from '@patternfly/react-core';
+} from '@patternfly/react-core/deprecated';
 import pfLogoSm from './pf-logo-small.svg';
 
 const icon: JSX.Element = <img src={pfLogoSm} />;
diff --git a/packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherRouterLink.tsx b/packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherRouterLink.tsx
similarity index 96%
rename from packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherRouterLink.tsx
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherRouterLink.tsx
index 7ed6c4543e5..c053879ed4e 100644
--- a/packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherRouterLink.tsx
+++ b/packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherRouterLink.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Link } from '@reach/router';
-import { ApplicationLauncher, ApplicationLauncherItem, ApplicationLauncherContent } from '@patternfly/react-core';
+import { ApplicationLauncher, ApplicationLauncherItem, ApplicationLauncherContent } from '@patternfly/react-core/deprecated';
 import pfLogoSm from './pf-logo-small.svg';
 
 const icon: JSX.Element = <img src={pfLogoSm} />;
diff --git a/packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherSectionsAndIcons.tsx b/packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherSectionsAndIcons.tsx
similarity index 97%
rename from packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherSectionsAndIcons.tsx
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherSectionsAndIcons.tsx
index f48f7ca43e0..17bbec0550d 100644
--- a/packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherSectionsAndIcons.tsx
+++ b/packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherSectionsAndIcons.tsx
@@ -4,7 +4,7 @@ import {
   ApplicationLauncherItem,
   ApplicationLauncherGroup,
   ApplicationLauncherSeparator
-} from '@patternfly/react-core';
+} from '@patternfly/react-core/deprecated';
 import pfLogoSm from './pf-logo-small.svg';
 
 const icon = <img src={pfLogoSm} />;
diff --git a/packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherTooltip.tsx b/packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherTooltip.tsx
similarity index 97%
rename from packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherTooltip.tsx
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherTooltip.tsx
index 7c6b295afe6..9dc3f3cc8db 100644
--- a/packages/react-core/src/components/ApplicationLauncher/examples/ApplicationLauncherTooltip.tsx
+++ b/packages/react-core/src/deprecated/components/ApplicationLauncher/examples/ApplicationLauncherTooltip.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { ApplicationLauncher, ApplicationLauncherItem } from '@patternfly/react-core';
+import { ApplicationLauncher, ApplicationLauncherItem } from '@patternfly/react-core/deprecated';
 
 const appLauncherItems: React.ReactElement[] = [
   <ApplicationLauncherItem key="application_1b" href="#" tooltip={<div>Launch Application 1</div>}>
diff --git a/packages/react-core/src/components/ApplicationLauncher/examples/pf-logo-small.svg b/packages/react-core/src/deprecated/components/ApplicationLauncher/examples/pf-logo-small.svg
similarity index 100%
rename from packages/react-core/src/components/ApplicationLauncher/examples/pf-logo-small.svg
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/examples/pf-logo-small.svg
diff --git a/packages/react-core/src/components/ApplicationLauncher/index.ts b/packages/react-core/src/deprecated/components/ApplicationLauncher/index.ts
similarity index 100%
rename from packages/react-core/src/components/ApplicationLauncher/index.ts
rename to packages/react-core/src/deprecated/components/ApplicationLauncher/index.ts
diff --git a/packages/react-core/src/deprecated/components/index.ts b/packages/react-core/src/deprecated/components/index.ts
index 4219c035bee..de4b79aec07 100644
--- a/packages/react-core/src/deprecated/components/index.ts
+++ b/packages/react-core/src/deprecated/components/index.ts
@@ -1,3 +1,4 @@
+export * from './ApplicationLauncher';
+export * from './ContextSelector';
 export * from './Dropdown';
 export * from './OptionsMenu';
-export * from './ContextSelector';
\ No newline at end of file
diff --git a/packages/react-core/src/helpers/favorites.ts b/packages/react-core/src/helpers/favorites.ts
index 85725dd20ab..d2f4928257d 100644
--- a/packages/react-core/src/helpers/favorites.ts
+++ b/packages/react-core/src/helpers/favorites.ts
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { ApplicationLauncherSeparator } from '../components/ApplicationLauncher/ApplicationLauncherSeparator';
+import { ApplicationLauncherSeparator } from '../deprecated/components/ApplicationLauncher/ApplicationLauncherSeparator';
 import { Divider } from '../components/Divider/Divider';
 
 /**
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/ApplicationLauncherDemo/ApplicationLauncherFavoritesDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/ApplicationLauncherDemo/ApplicationLauncherFavoritesDemo.tsx
index db73c9b9822..670af3ac076 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/ApplicationLauncherDemo/ApplicationLauncherFavoritesDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/ApplicationLauncherDemo/ApplicationLauncherFavoritesDemo.tsx
@@ -4,7 +4,7 @@ import {
   ApplicationLauncherItem,
   ApplicationLauncherGroup,
   ApplicationLauncherSeparator
-} from '@patternfly/react-core';
+} from '@patternfly/react-core/deprecated';
 
 interface ApplicationLauncherFavoritesDemoState {
   isOpen: boolean;

From 3a81be163a072b77155e24312b29ea1d7bff5fed Mon Sep 17 00:00:00 2001
From: gitdallas <dallas.nicol@gmail.com>
Date: Mon, 27 Mar 2023 11:17:48 -0500
Subject: [PATCH 2/2] these musta got nixed in my rebasing, putting back

---
 packages/react-core/src/demos/Page.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/react-core/src/demos/Page.md b/packages/react-core/src/demos/Page.md
index 3f8183e2f4d..00c890d826f 100644
--- a/packages/react-core/src/demos/Page.md
+++ b/packages/react-core/src/demos/Page.md
@@ -12,6 +12,13 @@ import imgAvatar from '@patternfly/react-core/src/components/Avatar/examples/ava
 import BarsIcon from '@patternfly/react-icons/dist/esm/icons/bars-icon';
 import AttentionBellIcon from '@patternfly/react-icons/dist/esm/icons/attention-bell-icon';
 import LightbulbIcon from '@patternfly/react-icons/dist/esm/icons/lightbulb-icon';
+import {
+Dropdown as DropdownDeprecated,
+DropdownGroup as DropdownGroupDeprecated,
+DropdownItem as DropdownItemDeprecated,
+DropdownToggle,
+KebabToggle
+} from '@patternfly/react-core/deprecated';
 
 - All examples set the `isManagedSidebar` prop on the Page component to have the sidebar automatically close for smaller screen widths. You can also manually control this behavior by not adding the `isManagedSidebar` prop and instead: