@patternfly/react-core 5.0.0-alpha.37 → 5.0.0-alpha.39

package/src/components/OverflowMenu/examples/OverflowMenuBreakpointOnContainer.tsx

@@ -6,18 +6,19 @@ import {
   OverflowMenuGroup,
   OverflowMenuItem,
   OverflowMenuDropdownItem,
-  Dropdown,
-  KebabToggle,
+  MenuToggle,
   Slider
 } from '@patternfly/react-core';
+import { Dropdown as DropdownNext, DropdownList } from '@patternfly/react-core/next';
+import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon';
 
 export const OverflowMenuBreakpointOnContainer: React.FunctionComponent = () => {
   const [isOpen, setIsOpen] = React.useState(false);
   const [containerWidth, setContainerWidth] = React.useState(100);
   const containerRef = React.useRef<HTMLDivElement>(null);
 
-  const onToggle = (_event: any, isOpen: boolean) => {
-    setIsOpen(isOpen);
+  const onToggle = () => {
+    setIsOpen(!isOpen);
   };
 
   const onSelect = () => {
@@ -36,19 +37,19 @@ export const OverflowMenuBreakpointOnContainer: React.FunctionComponent = () =>
   };
 
   const dropdownItems = [
-    <OverflowMenuDropdownItem key="item1" isShared>
+    <OverflowMenuDropdownItem itemId={0} key="item1" isShared>
       Item 1
     </OverflowMenuDropdownItem>,
-    <OverflowMenuDropdownItem key="item2" isShared>
+    <OverflowMenuDropdownItem itemId={1} key="item2" isShared>
       Item 2
     </OverflowMenuDropdownItem>,
-    <OverflowMenuDropdownItem key="item3" isShared>
+    <OverflowMenuDropdownItem itemId={2} key="item3" isShared>
       Item 3
     </OverflowMenuDropdownItem>,
-    <OverflowMenuDropdownItem key="item4" isShared>
+    <OverflowMenuDropdownItem itemId={3} key="item4" isShared>
       Item 4
     </OverflowMenuDropdownItem>,
-    <OverflowMenuDropdownItem key="item5" isShared>
+    <OverflowMenuDropdownItem itemId={4} key="item5" isShared>
       Item 5
     </OverflowMenuDropdownItem>
   ];
@@ -83,15 +84,24 @@ export const OverflowMenuBreakpointOnContainer: React.FunctionComponent = () =>
             </OverflowMenuGroup>
           </OverflowMenuContent>
           <OverflowMenuControl>
-            <Dropdown
+            <DropdownNext
               onSelect={onSelect}
-              toggle={<KebabToggle onToggle={onToggle} />}
+              toggle={toggleRef => (
+                <MenuToggle
+                  ref={toggleRef}
+                  aria-label="Breakpoint on container example overflow menu"
+                  variant="plain"
+                  onClick={onToggle}
+                  isExpanded={isOpen}
+                >
+                  <EllipsisVIcon />
+                </MenuToggle>
+              )}
               isOpen={isOpen}
-              isPlain
-              dropdownItems={dropdownItems}
-              isFlipEnabled
-              menuAppendTo="parent"
-            />
+              onOpenChange={isOpen => setIsOpen(isOpen)}
+            >
+              <DropdownList>{dropdownItems}</DropdownList>
+            </DropdownNext>
           </OverflowMenuControl>
         </OverflowMenu>
       </div>

package/src/components/Toolbar/examples/Toolbar.md

@@ -10,6 +10,8 @@ import CloneIcon from '@patternfly/react-icons/dist/esm/icons/clone-icon';
 import SyncIcon from '@patternfly/react-icons/dist/esm/icons/sync-icon';
 import FilterIcon from '@patternfly/react-icons/dist/esm/icons/filter-icon';
 import SearchIcon from '@patternfly/react-icons/dist/esm/icons/search-icon';
+import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon';
+import { Dropdown as DropdownNext, DropdownItem as DropdownItemNext, DropdownList } from '@patternfly/react-core/next';
 
 ## Examples
 

package/src/components/Toolbar/examples/ToolbarStacked.tsx

@@ -2,19 +2,17 @@ import React from 'react';
 import {
   Button,
   ButtonVariant,
-  KebabToggle,
   Select,
   SelectOption,
   SelectOptionObject,
   SelectVariant,
   Pagination,
   Dropdown,
-  DropdownSeparator,
   DropdownToggle,
   DropdownToggleCheckbox,
   DropdownItem,
-  DropdownPosition,
   Divider,
+  MenuToggle,
   OverflowMenu,
   OverflowMenuContent,
   OverflowMenuControl,
@@ -25,7 +23,9 @@ import {
   ToolbarToggleGroup,
   ToolbarItem
 } from '@patternfly/react-core';
+import { Dropdown as DropdownNext, DropdownItem as DropdownItemNext, DropdownList } from '@patternfly/react-core/next';
 import FilterIcon from '@patternfly/react-icons/dist/esm/icons/filter-icon';
+import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon';
 
 export const ToolbarStacked: React.FunctionComponent = () => {
   // toggle group - three option menus with labels, two icon buttons, Kebab menu - right aligned
@@ -52,8 +52,8 @@ export const ToolbarStacked: React.FunctionComponent = () => {
   const [page, setPage] = React.useState(1);
   const [perPage, setPerPage] = React.useState(20);
 
-  const onKebabToggle = (_event: any, isOpen: boolean) => {
-    setKebabIsOpen(isOpen);
+  const onKebabToggle = () => {
+    setKebabIsOpen(!kebabIsOpen);
   };
 
   const onResourceToggle = (_event: any, isExpanded: boolean) => {
@@ -65,7 +65,7 @@ export const ToolbarStacked: React.FunctionComponent = () => {
     setResourceIsExpanded(false);
   };
 
-  const onResourceSelectDropdown = (event: React.SyntheticEvent<HTMLDivElement, Event> | undefined) => {
+  const onResourceSelectDropdown = (event: React.MouseEvent<Element, MouseEvent>| undefined) => {
     setResourceSelected(event?.target);
     setResourceIsExpanded(false);
   };
@@ -101,21 +101,21 @@ export const ToolbarStacked: React.FunctionComponent = () => {
   };
 
   const dropdownItems = [
-    <DropdownItem key="link">Link</DropdownItem>,
-    <DropdownItem key="action" component="button">
+    <DropdownItemNext key="link">Link</DropdownItemNext>,
+    <DropdownItemNext key="action" component="button">
       Action
-    </DropdownItem>,
-    <DropdownItem key="disabled link" isDisabled>
+    </DropdownItemNext>,
+    <DropdownItemNext key="disabled link" isDisabled>
       Disabled Link
-    </DropdownItem>,
-    <DropdownItem key="disabled action" isDisabled component="button">
+    </DropdownItemNext>,
+    <DropdownItemNext key="disabled action" isDisabled component="button">
       Disabled Action
-    </DropdownItem>,
-    <DropdownSeparator key="separator" />,
-    <DropdownItem key="separated link">Separated Link</DropdownItem>,
-    <DropdownItem key="separated action" component="button">
+    </DropdownItemNext>,
+    <Divider key="separator" />,
+    <DropdownItemNext key="separated link">Separated Link</DropdownItemNext>,
+    <DropdownItemNext key="separated action" component="button">
       Separated Action
-    </DropdownItem>
+    </DropdownItemNext>
   ];
 
   const splitButtonDropdownItems = [
@@ -192,14 +192,23 @@ export const ToolbarStacked: React.FunctionComponent = () => {
                 </OverflowMenuGroup>
               </OverflowMenuContent>
               <OverflowMenuControl hasAdditionalOptions>
-                <Dropdown
-                  onSelect={onResourceSelectDropdown}
-                  toggle={<KebabToggle onToggle={onKebabToggle} />}
-                  isOpen={kebabIsOpen}
-                  isPlain
-                  dropdownItems={dropdownItems}
-                  position={DropdownPosition.right}
-                />
+              <DropdownNext
+                   onSelect={onResourceSelectDropdown}
+                   toggle={toggleRef => (
+                     <MenuToggle
+                       ref={toggleRef}
+                       aria-label="Kebab overflow menu"
+                       variant="plain"
+                       onClick={onKebabToggle}
+                       isExpanded={kebabIsOpen}
+                     >
+                       <EllipsisVIcon />
+                     </MenuToggle>
+                   )}
+                   isOpen={kebabIsOpen}
+                 >
+                   <DropdownList>{dropdownItems}</DropdownList>
+                 </DropdownNext>
               </OverflowMenuControl>
             </OverflowMenu>
           </ToolbarItem>

package/src/components/index.ts

@@ -51,7 +51,6 @@ export * from './MultipleFileUpload';
 export * from './Nav';
 export * from './NotificationBadge';
 export * from './NotificationDrawer';
-export * from './OptionsMenu';
 export * from './OverflowMenu';
 export * from './Page';
 export * from './Pagination';

package/src/demos/Card/Card.md

@@ -18,6 +18,9 @@ import sparkIcon from './camel-spark_200x150.png';
 import swaggerIcon from './camel-swagger-java_200x150.png';
 import azureIcon from './FuseConnector_Icons_AzureServices.png';
 import restIcon from './FuseConnector_Icons_REST.png';
+import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon';
+
+import { Dropdown as DropdownNext, DropdownList } from '@patternfly/react-core/next';
 
 ## Demos
 
@@ -49,6 +52,7 @@ import {
   EmptyStateActions,
   Gallery,
   KebabToggle,
+  MenuToggle,
   OverflowMenu,
   OverflowMenuControl,
   OverflowMenuDropdownItem,
@@ -67,6 +71,8 @@ import {
   ToolbarFilter,
   ToolbarContent
 } from '@patternfly/react-core';
+import { Dropdown as DropdownNext, DropdownList } from '@patternfly/react-core/next';
+import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon';
 import DashboardWrapper from '@patternfly/react-core/src/demos/examples/DashboardWrapper';
 
 import FilterIcon from '@patternfly/react-icons/dist/esm/icons/filter-icon';
@@ -120,9 +126,9 @@ class CardViewBasic extends React.Component {
       }));
     };
 
-    this.onToolbarKebabDropdownToggle = (_event, isLowerToolbarKebabDropdownOpen) => {
+    this.onToolbarKebabDropdownToggle = () => {
       this.setState({
-        isLowerToolbarKebabDropdownOpen
+        isOpen: !this.state.isLowerToolbarKebabDropdownOpen
       });
     };
 
@@ -495,19 +501,19 @@ class CardViewBasic extends React.Component {
     } = this.state;
 
     const toolbarKebabDropdownItems = [
-      <OverflowMenuDropdownItem key="link">Link</OverflowMenuDropdownItem>,
-      <OverflowMenuDropdownItem key="action" component="button">
+      <OverflowMenuDropdownItem itemId={0} key="link">Link</OverflowMenuDropdownItem>,
+      <OverflowMenuDropdownItem itemId={1} key="action" component="button">
         Action
       </OverflowMenuDropdownItem>,
-      <OverflowMenuDropdownItem key="disabled link" isDisabled>
+      <OverflowMenuDropdownItem itemId={2} key="disabled link" isDisabled>
         Disabled Link
       </OverflowMenuDropdownItem>,
-      <OverflowMenuDropdownItem key="disabled action" isDisabled component="button">
+      <OverflowMenuDropdownItem itemId={3} key="disabled action" isDisabled component="button">
         Disabled Action
       </OverflowMenuDropdownItem>,
-      <DropdownSeparator key="separator" />,
-      <OverflowMenuDropdownItem key="separated link">Separated Link</OverflowMenuDropdownItem>,
-      <OverflowMenuDropdownItem key="separated action" component="button">
+      <DropdownSeparator itemId={4} key="separator" />,
+      <OverflowMenuDropdownItem itemId={5} key="separated link">Separated Link</OverflowMenuDropdownItem>,
+      <OverflowMenuDropdownItem itemId={6} key="separated action" component="button">
         Separated Action
       </OverflowMenuDropdownItem>
     ];
@@ -522,15 +528,23 @@ class CardViewBasic extends React.Component {
               <Button variant="primary">Create a project</Button>
             </OverflowMenuItem>
             <OverflowMenuControl hasAdditionalOptions>
-              <Dropdown
+              <DropdownNext
                 onSelect={this.onToolbarKebabDropdownSelect}
-                toggle={<KebabToggle onToggle={this.onToolbarKebabDropdownToggle} id="toggle-id-6" />}
+                toggle={toggleRef => (
+                  <MenuToggle
+                    ref={toggleRef}
+                    aria-label="Toolbar kebab overflow menu"
+                    variant="plain"
+                    onClick={this.onToolbarKebabDropdownToggle}
+                    isExpanded={isLowerToolbarKebabDropdownOpen}
+                  >
+                    <EllipsisVIcon />
+                  </MenuToggle>
+                )}
                 isOpen={isLowerToolbarKebabDropdownOpen}
-                isPlain
-                dropdownItems={toolbarKebabDropdownItems}
-                isFlipEnabled
-                menuAppendTo="parent"
-              />
+              >
+                <DropdownList>{toolbarKebabDropdownItems}</DropdownList>
+              </DropdownNext>
             </OverflowMenuControl>
           </OverflowMenu>
         </ToolbarItem>

package/src/demos/Tabs.md

@@ -11,6 +11,9 @@ import CodeBranchIcon from '@patternfly/react-icons/dist/esm/icons/code-branch-i
 import CubeIcon from '@patternfly/react-icons/dist/esm/icons/cube-icon';
 import FilterIcon from '@patternfly/react-icons/dist/esm/icons/filter-icon';
 import SortAmountDownIcon from '@patternfly/react-icons/dist/esm/icons/sort-amount-down-icon';
+import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon';
+import { Dropdown as DropdownNext, DropdownList } from '@patternfly/react-core/next';
+
 
 ## Demos
 

package/src/demos/examples/Tabs/TabsAndTable.tsx

@@ -11,14 +11,12 @@ import {
   DrawerActions,
   DrawerCloseButton,
   DrawerPanelBody,
-  Dropdown,
   Flex,
   FlexItem,
   KebabToggle,
   Label,
   LabelGroup,
-  OptionsMenu,
-  OptionsMenuToggle,
+  MenuToggle,
   OverflowMenu,
   OverflowMenuContent,
   OverflowMenuControl,
@@ -39,7 +37,7 @@ import {
   Toolbar,
   ToolbarItem,
   ToolbarContent,
-  ToolbarToggleGroup
+  ToolbarToggleGroup,
 } from '@patternfly/react-core';
 import {
   TableComposable,
@@ -52,12 +50,13 @@ import {
   ActionsColumn,
   CustomActionsToggleProps
 } from '@patternfly/react-table';
+import { Dropdown as DropdownNext, DropdownList } from '@patternfly/react-core/next';
+import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon';
 import DashboardWrapper from '@patternfly/react-core/src/demos/examples/DashboardWrapper';
 import CodeIcon from '@patternfly/react-icons/dist/esm/icons/code-icon';
 import CodeBranchIcon from '@patternfly/react-icons/dist/esm/icons/code-branch-icon';
 import CubeIcon from '@patternfly/react-icons/dist/esm/icons/cube-icon';
 import FilterIcon from '@patternfly/react-icons/dist/esm/icons/filter-icon';
-import SortAmountDownIcon from '@patternfly/react-icons/dist/esm/icons/sort-amount-down-icon';
 
 interface Repository {
   name: string;
@@ -140,8 +139,8 @@ export const TablesAndTabs = () => {
   const customActionsToggle = (props: CustomActionsToggleProps) => (
     <KebabToggle
       isDisabled={props.isDisabled}
-      onToggle={(event: any, value: boolean) => {
-        props.onToggle(value);
+      onToggle={(event: any) => {
+        props.onToggle(event);
         event.stopPropagation();
       }}
     />
@@ -160,7 +159,7 @@ export const TablesAndTabs = () => {
             />
           </ToolbarItem>
         </ToolbarToggleGroup>
-        <ToolbarItem>
+        {/* <ToolbarItem> TODO: replace with select after #8073 goes in
           <OptionsMenu
             id="page-layout-table-column-management-action-toolbar-top-options-menu-toggle"
             isPlain
@@ -173,7 +172,7 @@ export const TablesAndTabs = () => {
               />
             }
           />
-        </ToolbarItem>
+        </ToolbarItem> */}
         <OverflowMenu breakpoint="md">
           <OverflowMenuContent className="pf-u-display-none pf-u-display-block-on-lg">
             <OverflowMenuGroup groupType="button" isPersistent>
@@ -186,13 +185,23 @@ export const TablesAndTabs = () => {
             </OverflowMenuGroup>
           </OverflowMenuContent>
           <OverflowMenuControl hasAdditionalOptions>
-            <Dropdown
+            <DropdownNext
               onSelect={() => {}}
-              toggle={<KebabToggle onToggle={() => {}} />}
+              toggle={toggleRef => (
+                <MenuToggle
+                  ref={toggleRef}
+                  aria-label="overflow menu"
+                  variant="plain"
+                  onClick={() => {}}
+                  isExpanded={false}
+                >
+                  <EllipsisVIcon />
+                </MenuToggle>
+              )}
               isOpen={false}
-              isPlain
-              dropdownItems={[]}
-            />
+            >
+              <DropdownList>{[]}</DropdownList>
+            </DropdownNext>
           </OverflowMenuControl>
         </OverflowMenu>
       </ToolbarContent>

package/src/{components → deprecated/components}/OptionsMenu/OptionsMenu.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/OptionsMenu/options-menu';
-import { DropdownContext } from '../Dropdown';
-import { DropdownWithContext } from '../Dropdown/DropdownWithContext';
-import { OUIAProps, useOUIAId } from '../../helpers';
+import { DropdownContext } from '../../../components/Dropdown';
+import { DropdownWithContext } from '../../../components/Dropdown/DropdownWithContext';
+import { OUIAProps, useOUIAId } from '../../../helpers';
 
 export enum OptionsMenuPosition {
   right = 'right',

package/src/{components → deprecated/components}/OptionsMenu/OptionsMenuItem.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/OptionsMenu/options-menu';
-import { DropdownItem } from '../Dropdown';
+import { DropdownItem } from '../../../components/Dropdown';
 import CheckIcon from '@patternfly/react-icons/dist/esm/icons/check-icon';
 
 export interface OptionsMenuItemProps

package/src/{components → deprecated/components}/OptionsMenu/OptionsMenuItemGroup.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/OptionsMenu/options-menu';
 import { css } from '@patternfly/react-styles';
-import { Divider } from '../Divider';
+import { Divider } from '../../../components/Divider';
 
 export interface OptionsMenuItemGroupProps extends React.HTMLProps<HTMLElement> {
   /** Content to be rendered in the options menu items component */

package/src/{components → deprecated/components}/OptionsMenu/OptionsMenuSeparator.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Divider, DividerProps } from '../Divider';
+import { Divider, DividerProps } from '../../../components/Divider';
 
 export const OptionsMenuSeparator: React.FunctionComponent<DividerProps> = ({
   component = 'li',

package/src/{components → deprecated/components}/OptionsMenu/OptionsMenuToggle.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { DropdownToggle, DropdownContext } from '../Dropdown';
+import { DropdownToggle, DropdownContext } from '../../../components/Dropdown';
 
 export interface OptionsMenuToggleProps extends React.HTMLProps<HTMLButtonElement> {
   /** Id of the parent options menu component */

package/src/{components → deprecated/components}/OptionsMenu/OptionsMenuToggleWithText.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { css } from '@patternfly/react-styles';
-import { KeyTypes } from '../../helpers/constants';
+import { KeyTypes } from '../../../helpers/constants';
 import styles from '@patternfly/react-styles/css/components/OptionsMenu/options-menu';
-import { DropdownContext } from '../Dropdown';
+import { DropdownContext } from '../../../components/Dropdown';
 
 export interface OptionsMenuToggleWithTextProps extends React.HTMLProps<HTMLDivElement> {
   /** Id of the parent options menu component */

package/src/{components → deprecated/components}/OptionsMenu/__tests__/Generated/OptionsMenuItem.test.tsx

@@ -3,7 +3,7 @@ import React from 'react';
 import { render } from '@testing-library/react';
 
 import { OptionsMenuItem } from '../../OptionsMenuItem';
-import { DropdownArrowContext } from '../../../Dropdown';
+import { DropdownArrowContext } from '../../../../../../components/Dropdown';
 
 describe('OptionsMenuItem', () => {
   it('should match snapshot', () => {

package/src/{components → deprecated/components}/OptionsMenu/examples/OptionsMenu.md

@@ -12,7 +12,7 @@ import SortAmountDownIcon from '@patternfly/react-icons/dist/esm/icons/sort-amou
 ### Single option
 ```js
 import React from 'react';
-import { OptionsMenu, OptionsMenuItem, OptionsMenuToggle } from '@patternfly/react-core';
+import { OptionsMenu, OptionsMenuItem, OptionsMenuToggle } from '@patternfly/react-core/deprecated';
 
 class SingleOption extends React.Component {
   constructor(props) {
@@ -61,7 +61,7 @@ class SingleOption extends React.Component {
 ### Disabled
 ```js
 import React from 'react';
-import { OptionsMenu, OptionsMenuItem, OptionsMenuToggle } from '@patternfly/react-core';
+import { OptionsMenu, OptionsMenuItem, OptionsMenuToggle } from '@patternfly/react-core/deprecated';
 
 class DisabledOptionsMenu extends React.Component {
   constructor(props) {
@@ -97,7 +97,7 @@ class DisabledOptionsMenu extends React.Component {
 ### Multiple options
 ```js
 import React from 'react';
-import { OptionsMenu, OptionsMenuItem, OptionsMenuSeparator, OptionsMenuItemGroup, OptionsMenuToggle} from '@patternfly/react-core';
+import { OptionsMenu, OptionsMenuItem, OptionsMenuSeparator, OptionsMenuItemGroup, OptionsMenuToggle} from '@patternfly/react-core/deprecated';
 
 class MultipleOptions extends React.Component {
   constructor(props) {
@@ -162,7 +162,7 @@ class MultipleOptions extends React.Component {
 ### Plain
 ```js
 import React from 'react';
-import { OptionsMenu, OptionsMenuItem, OptionsMenuToggle } from '@patternfly/react-core';
+import { OptionsMenu, OptionsMenuItem, OptionsMenuToggle } from '@patternfly/react-core/deprecated';
 import SortAmountDownIcon from '@patternfly/react-icons/dist/esm/icons/sort-amount-down-icon';
 
 class Plain extends React.Component {
@@ -239,7 +239,7 @@ class Plain extends React.Component {
 ### Align top
 ```js
 import React from 'react';
-import { OptionsMenu, OptionsMenuItem, OptionsMenuDirection, OptionsMenuToggle } from '@patternfly/react-core';
+import { OptionsMenu, OptionsMenuItem, OptionsMenuDirection, OptionsMenuToggle } from '@patternfly/react-core/deprecated';
 
 class Top extends React.Component {
   constructor(props) {
@@ -290,7 +290,7 @@ class Top extends React.Component {
 ### Align right
 ```js
 import React from 'react';
-import { OptionsMenu, OptionsMenuItem, OptionsMenuPosition, OptionsMenuToggle } from '@patternfly/react-core';
+import { OptionsMenu, OptionsMenuItem, OptionsMenuPosition, OptionsMenuToggle } from '@patternfly/react-core/deprecated';
 
 class AlignRight extends React.Component {
   constructor(props) {
@@ -341,7 +341,7 @@ class AlignRight extends React.Component {
 ### Plain with text
 ```js
 import React from 'react';
-import { OptionsMenu, OptionsMenuItem, OptionsMenuToggleWithText } from '@patternfly/react-core';
+import { OptionsMenu, OptionsMenuItem, OptionsMenuToggleWithText } from '@patternfly/react-core/deprecated';
 import CaretDownIcon from '@patternfly/react-icons/dist/esm/icons/caret-down-icon';
 
 class PlainWithText extends React.Component {
@@ -401,7 +401,7 @@ class PlainWithText extends React.Component {
 ### Plain with text disabled
 ```js
 import React from 'react';
-import { OptionsMenu, OptionsMenuItem, OptionsMenuToggleWithText } from '@patternfly/react-core';
+import { OptionsMenu, OptionsMenuItem, OptionsMenuToggleWithText } from '@patternfly/react-core/deprecated';
 import CaretDownIcon from '@patternfly/react-icons/dist/esm/icons/caret-down-icon';
 
 class PlainWithText extends React.Component {
@@ -461,7 +461,7 @@ class PlainWithText extends React.Component {
 ### Grouped items with titles
 ```js
 import React from 'react';
-import { OptionsMenu, OptionsMenuItem, OptionsMenuToggle, OptionsMenuItemGroup } from '@patternfly/react-core';
+import { OptionsMenu, OptionsMenuItem, OptionsMenuToggle, OptionsMenuItemGroup } from '@patternfly/react-core/deprecated';
 
 class GroupedItems extends React.Component {
   constructor(props) {
@@ -522,7 +522,7 @@ class GroupedItems extends React.Component {
 ### Single option with menu on document body
 ```js
 import React from 'react';
-import { OptionsMenu, OptionsMenuItem, OptionsMenuToggle } from '@patternfly/react-core';
+import { OptionsMenu, OptionsMenuItem, OptionsMenuToggle } from '@patternfly/react-core/deprecated';
 
 class SingleOption extends React.Component {
   constructor(props) {

package/src/deprecated/components/index.ts

@@ -1 +1 @@
-export * from './';
+export * from './OptionsMenu';

package/components/OptionsMenu/OptionsMenu.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"OptionsMenu.d.ts","sourceRoot":"","sources":["../../../../src/components/OptionsMenu/OptionsMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,EAAE,SAAS,EAAa,MAAM,eAAe,CAAC;AAErD,oBAAY,mBAAmB;IAC7B,KAAK,UAAU;IACf,IAAI,SAAS;CACd;AAED,oBAAY,oBAAoB;IAC9B,EAAE,OAAO;IACT,IAAI,SAAS;CACd;AAED,MAAM,WAAW,gBAAiB,SAAQ,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,SAAS;IAClF,0DAA0D;IAC1D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iDAAiD;IACjD,EAAE,EAAE,MAAM,CAAC;IACX,2GAA2G;IAC3G,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC;IAC7B,oGAAoG;IACpG,MAAM,EAAE,KAAK,CAAC,YAAY,CAAC;IAC3B,8DAA8D;IAC9D,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,uCAAuC;IACvC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,mDAAmD;IACnD,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,2CAA2C;IAC3C,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,wDAAwD;IACxD,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC5B,kEAAkE;IAClE,SAAS,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC;IAC1B;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,WAAW,GAAG,CAAC,MAAM,WAAW,CAAC,GAAG,QAAQ,GAAG,QAAQ,CAAC;IACvE,mEAAmE;IACnE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uEAAuE;IACvE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,iLAAiL;IACjL,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,iBAAiB,CAAC,gBAAgB,CA4CjE,CAAC"}

package/components/OptionsMenu/OptionsMenu.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"OptionsMenu.js","sourceRoot":"","sources":["../../../../src/components/OptionsMenu/OptionsMenu.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,MAAM,MAAM,kEAAkE,CAAC;AACtF,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAa,SAAS,EAAE,MAAM,eAAe,CAAC;AAErD,MAAM,CAAN,IAAY,mBAGX;AAHD,WAAY,mBAAmB;IAC7B,sCAAe,CAAA;IACf,oCAAa,CAAA;AACf,CAAC,EAHW,mBAAmB,KAAnB,mBAAmB,QAG9B;AAED,MAAM,CAAN,IAAY,oBAGX;AAHD,WAAY,oBAAoB;IAC9B,iCAAS,CAAA;IACT,qCAAa,CAAA;AACf,CAAC,EAHW,oBAAoB,KAApB,oBAAoB,QAG/B;AAuCD,MAAM,CAAC,MAAM,WAAW,GAA8C,CAAC,EAcpD,EAAE,EAAE;QAdgD,EACrE,SAAS,GAAG,EAAE,EACd,SAAS,EACT,MAAM,EACN,MAAM,GAAG,KAAK,EACd,SAAS,GAAG,KAAK,EACjB,EAAE;IACF,6DAA6D;IAC7D,GAAG,EACH,YAAY,GAAG,QAAQ,EACvB,MAAM,EACN,QAAQ,GAAG,IAAI,EACf,MAAM,GAAG,IAAI,OAEI,EADd,KAAK,cAb6D,wHActE,CADS;IACc,OAAA,CACtB,oBAAC,eAAe,CAAC,QAAQ,IACvB,KAAK,EAAE;YACL,EAAE;YACF,QAAQ,EAAE,GAAG,EAAE,CAAC,SAAS;YACzB,oBAAoB,EAAE,MAAM,CAAC,qBAAqB;YAClD,eAAe,EAAE,MAAM,CAAC,qBAAqB;YAC7C,SAAS,EAAE,MAAM,CAAC,eAAe;YACjC,SAAS,EAAE,MAAM,CAAC,mBAAmB;YACrC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC,CAAC,MAAM,CAAC,iBAAiB;YAC/E,SAAS,EAAE,MAAM,CAAC,WAAW;YAC7B,aAAa,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ;YACxC,aAAa,EAAE,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;YACvC,aAAa,EAAE,KAAK;YACpB,MAAM,EAAE,SAAS,CAAC,WAAW,CAAC,WAAW,EAAE,MAAM,CAAC;YAClD,QAAQ;YACR,iBAAiB,EAAE,WAAW,CAAC,WAAW;SAC3C;QAED,oBAAC,mBAAmB,kBAClB,EAAE,EAAE,EAAE,EACN,aAAa,EAAE,SAAS,EACxB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,IACV,KAAK,EACT,CACuB,CAC5B,CAAA;CAAA,CAAC;AACF,WAAW,CAAC,WAAW,GAAG,aAAa,CAAC"}

package/components/OptionsMenu/OptionsMenuItem.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"OptionsMenuItem.d.ts","sourceRoot":"","sources":["../../../../src/components/OptionsMenu/OptionsMenuItem.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAM/B,MAAM,WAAW,oBACf,SAAQ,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,iBAAiB,CAAC,EAAE,UAAU,GAAG,SAAS,GAAG,WAAW,GAAG,MAAM,CAAC;IAC/F,6DAA6D;IAC7D,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,8DAA8D;IAC9D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2CAA2C;IAC3C,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,kDAAkD;IAClD,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,2DAA2D;IAC3D,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,iBAAiB,CAAC,GAAG,KAAK,CAAC,aAAa,KAAK,IAAI,CAAC;IACvF,0CAA0C;IAC1C,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAED,eAAO,MAAM,eAAe,EAAE,KAAK,CAAC,iBAAiB,CAAC,oBAAoB,CAuBzE,CAAC"}

package/components/OptionsMenu/OptionsMenuItem.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"OptionsMenuItem.js","sourceRoot":"","sources":["../../../../src/components/OptionsMenu/OptionsMenuItem.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC/C,OAAO,MAAM,MAAM,kEAAkE,CAAC;AACtF,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,SAAS,MAAM,mDAAmD,CAAC;AAkB1E,MAAM,CAAC,MAAM,eAAe,GAAkD,CAAC,EAOxD,EAAE,EAAE;QAPoD,EAC7E,QAAQ,GAAG,IAAuB,EAClC,UAAU,GAAG,KAAK,EAClB,QAAQ,GAAG,GAAG,EAAE,CAAC,IAAW,EAC5B,EAAE,GAAG,EAAE,EACP,UAAU,OAEW,EADlB,KAAK,cANqE,0DAO9E,CADS;IACkB,OAAA,CAC1B,oBAAC,YAAY,kBACX,EAAE,EAAE,EAAE,EACN,SAAS,EAAC,QAAQ,EAClB,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,CAAC,KAAU,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IACpC,CAAC,UAAU,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,EACzC,KAAK;QAER,QAAQ;QACR,UAAU,IAAI,CACb,8BAAM,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,uBAAuB,CAAC;YAClD,oBAAC,SAAS,mBAAc,UAAU,GAAI,CACjC,CACR,CACY,CAChB,CAAA;CAAA,CAAC;AACF,eAAe,CAAC,WAAW,GAAG,iBAAiB,CAAC"}

package/components/OptionsMenu/OptionsMenuItemGroup.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"OptionsMenuItemGroup.d.ts","sourceRoot":"","sources":["../../../../src/components/OptionsMenu/OptionsMenuItemGroup.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAK/B,MAAM,WAAW,yBAA0B,SAAQ,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC;IAC7E,iEAAiE;IACjE,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,sEAAsE;IACtE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,mEAAmE;IACnE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,sDAAsD;IACtD,UAAU,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC;IACtC,+FAA+F;IAC/F,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,iBAAiB,CAAC,yBAAyB,CAenF,CAAC"}

package/components/OptionsMenu/OptionsMenuItemGroup.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"OptionsMenuItemGroup.js","sourceRoot":"","sources":["../../../../src/components/OptionsMenu/OptionsMenuItemGroup.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,MAAM,MAAM,kEAAkE,CAAC;AACtF,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAerC,MAAM,CAAC,MAAM,oBAAoB,GAAuD,CAAC,EAO7D,EAAE,EAAE;QAPyD,EACvF,SAAS,GAAG,EAAE,EACd,YAAY,EAAE,SAAS,GAAG,EAAE,EAC5B,UAAU,GAAG,EAAE,EACf,QAAQ,GAAG,IAAI,EACf,YAAY,GAAG,KAAK,OAEM,EADvB,KAAK,cAN+E,qEAOxF,CADS;IACuB,OAAA,CAC/B,iDAAa,KAAK,IAAE,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAC,MAAM;QACrE,UAAU,IAAI,4BAAI,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,qBAAqB,CAAC,IAAG,UAAU,CAAM;QAClF,4BAAI,SAAS,EAAE,SAAS,gBAAc,SAAS,EAAE,IAAI,EAAC,OAAO;YAC1D,QAAQ;YACR,YAAY,IAAI,oBAAC,OAAO,IAAC,SAAS,EAAC,IAAI,EAAC,IAAI,EAAC,WAAW,GAAG,CACzD,CACG,CACX,CAAA;CAAA,CAAC;AACF,oBAAoB,CAAC,WAAW,GAAG,sBAAsB,CAAC"}

package/components/OptionsMenu/OptionsMenuSeparator.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"OptionsMenuSeparator.d.ts","sourceRoot":"","sources":["../../../../src/components/OptionsMenu/OptionsMenuSeparator.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAW,YAAY,EAAE,MAAM,YAAY,CAAC;AAEnD,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,iBAAiB,CAAC,YAAY,CAGP,CAAC"}

package/components/OptionsMenu/OptionsMenuSeparator.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"OptionsMenuSeparator.js","sourceRoot":"","sources":["../../../../src/components/OptionsMenu/OptionsMenuSeparator.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,OAAO,EAAgB,MAAM,YAAY,CAAC;AAEnD,MAAM,CAAC,MAAM,oBAAoB,GAA0C,CAAC,EAG7D,EAAE,EAAE;QAHyD,EAC1E,SAAS,GAAG,IAAI,OAEH,EADV,KAAK,cAFkE,aAG3E,CADS;IACU,OAAA,oBAAC,OAAO,kBAAC,SAAS,EAAE,SAAS,IAAM,KAAK,EAAI,CAAA;CAAA,CAAC;AACjE,oBAAoB,CAAC,WAAW,GAAG,sBAAsB,CAAC"}

package/components/OptionsMenu/OptionsMenuToggle.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"OptionsMenuToggle.d.ts","sourceRoot":"","sources":["../../../../src/components/OptionsMenu/OptionsMenuToggle.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,MAAM,WAAW,sBAAuB,SAAQ,KAAK,CAAC,SAAS,CAAC,iBAAiB,CAAC;IAChF,8CAA8C;IAC9C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,qDAAqD;IACrD,QAAQ,CAAC,EAAE,CACT,KAAK,EAAE,UAAU,GAAG,UAAU,GAAG,aAAa,GAAG,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAC/G,MAAM,EAAE,OAAO,KACZ,IAAI,CAAC;IACV,uCAAuC;IACvC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,8CAA8C;IAC9C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,6DAA6D;IAC7D,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,uCAAuC;IACvC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,4BAA4B;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,sFAAsF;IACtF,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,uDAAuD;IACvD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,iBAAiB,CAAC,KAAK,IAAI,CAAC;IAC/D,sCAAsC;IACtC,SAAS,CAAC,EAAE,WAAW,CAAC;IACxB,+DAA+D;IAC/D,cAAc,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAClC;AAED,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,iBAAiB,CAAC,sBAAsB,CAiC7E,CAAC"}

package/components/OptionsMenu/OptionsMenuToggle.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"OptionsMenuToggle.js","sourceRoot":"","sources":["../../../../src/components/OptionsMenu/OptionsMenuToggle.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AA+B9D,MAAM,CAAC,MAAM,iBAAiB,GAAoD,CAAC,EAe1D,EAAE,EAAE;QAfsD,EACjF,OAAO,GAAG,KAAK,EACf,UAAU,GAAG,KAAK,EAClB,MAAM,GAAG,KAAK,EACd,QAAQ,GAAG,EAAE,EACb,cAAc,GAAG,oBAAC,KAAK,CAAC,QAAQ,OAAG,EACnC,SAAS,GAAG,KAAK;IACjB,6DAA6D;IAC7D,QAAQ,GAAG,KAAK;IAChB,6DAA6D;IAC7D,aAAa,GAAG,KAAK;IACrB,6DAA6D;IAC7D,IAAI,EACJ,YAAY,EAAE,SAAS,GAAG,cAAc,OAEjB,EADpB,KAAK,cAdyE,iIAelF,CADS;IACoB,OAAA,CAC5B,oBAAC,eAAe,CAAC,QAAQ,QACtB,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CACtB,oBAAC,cAAc,oBACT,CAAC,CAAC,OAAO,IAAI,SAAS,CAAC,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,EACrD,KAAK,IACT,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,QAAQ,EAClB,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,SAAS,mBAC7C,SAAS,gBACX,SAAS,mBACN,MAAM,IACjB,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EACxD,CACH,CACwB,CAC5B,CAAA;CAAA,CAAC;AACF,iBAAiB,CAAC,WAAW,GAAG,mBAAmB,CAAC"}

package/components/OptionsMenu/OptionsMenuToggleWithText.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"OptionsMenuToggleWithText.d.ts","sourceRoot":"","sources":["../../../../src/components/OptionsMenu/OptionsMenuToggleWithText.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAM/B,MAAM,WAAW,8BAA+B,SAAQ,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC;IACrF,8CAA8C;IAC9C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,uGAAuG;IACvG,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC;IAC5B,0DAA0D;IAC1D,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mEAAmE;IACnE,oBAAoB,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACvC,4DAA4D;IAC5D,6BAA6B,CAAC,EAAE,MAAM,CAAC;IACvC,qDAAqD;IACrD,QAAQ,CAAC,EAAE,CACT,KAAK,EAAE,UAAU,GAAG,UAAU,GAAG,aAAa,GAAG,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAC/G,MAAM,EAAE,OAAO,KACZ,IAAI,CAAC;IACV,+CAA+C;IAC/C,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,iBAAiB,CAAC,GAAG,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC;IAC9F,uCAAuC;IACvC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,8CAA8C;IAC9C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,oEAAoE;IACpE,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,uCAAuC;IACvC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,sCAAsC;IACtC,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACzC,4EAA4E;IAC5E,eAAe,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,MAAM,CAAC;IAC5E,sFAAsF;IACtF,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kDAAkD;IAClD,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,6BAA6B;IAC7B,UAAU,CAAC,EAAE,MAAM,WAAW,CAAC;CAChC;AAED,eAAO,MAAM,yBAAyB,EAAE,KAAK,CAAC,iBAAiB,CAAC,8BAA8B,CAoG7F,CAAC"}