@patternfly/react-core 6.0.0-alpha.83 → 6.0.0-alpha.85

package/helpers/package.json

@@ -1,8 +1 @@
-{
-  "name": "@patternfly/react-core-helpers",
-  "main": "../dist/js/helpers/index.js",
-  "module": "../dist/esm/helpers/index.js",
-  "typings": "../dist/esm/helpers/index.d.ts",
-  "version": "6.0.0-alpha.82",
-  "private": true
-}
+{"name":"@patternfly/react-core-helpers","main":"../dist/js/helpers/index.js","module":"../dist/esm/helpers/index.js","typings":"../dist/esm/helpers/index.d.ts","version":"6.0.0-alpha.84","private":true}

package/layouts/package.json

@@ -1,8 +1 @@
-{
-  "name": "@patternfly/react-core-layouts",
-  "main": "../dist/js/layouts/index.js",
-  "module": "../dist/esm/layouts/index.js",
-  "typings": "../dist/esm/layouts/index.d.ts",
-  "version": "6.0.0-alpha.82",
-  "private": true
-}
+{"name":"@patternfly/react-core-layouts","main":"../dist/js/layouts/index.js","module":"../dist/esm/layouts/index.js","typings":"../dist/esm/layouts/index.d.ts","version":"6.0.0-alpha.84","private":true}

package/next/package.json

@@ -1,8 +1 @@
-{
-  "name": "@patternfly/react-core-next",
-  "main": "../dist/js/next/index.js",
-  "module": "../dist/esm/next/index.js",
-  "typings": "../dist/esm/next/index.d.ts",
-  "version": "6.0.0-alpha.82",
-  "private": true
-}
+{"name":"@patternfly/react-core-next","main":"../dist/js/next/index.js","module":"../dist/esm/next/index.js","typings":"../dist/esm/next/index.d.ts","version":"6.0.0-alpha.84","private":true}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/react-core",
-  "version": "6.0.0-alpha.83",
+  "version": "6.0.0-alpha.85",
   "description": "This library provides a set of common React components for use with the PatternFly reference implementation.",
   "main": "dist/js/index.js",
   "module": "dist/esm/index.js",
@@ -64,5 +64,5 @@
     "react": "^17 || ^18",
     "react-dom": "^17 || ^18"
   },
-  "gitHead": "640f3adbba7919fd6ab3f7d8617d9ddcf62ca939"
+  "gitHead": "c3878e74a655cae5c081b3f2b799f060ccd47fed"
 }

package/src/components/Accordion/AccordionContent.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Accordion/accordion';
 import { AccordionContext, AccordionItemContext } from './AccordionContext';
-import { AccordionExpandableContentBody } from './AccordionExpandableContentBody';
+import { AccordionExpandableContentBody, AccordionExpandableContentBodyProps } from './AccordionExpandableContentBody';
 
 export interface AccordionContentProps extends React.HTMLProps<HTMLDivElement> {
   /** Content rendered inside the Accordion  */
@@ -21,6 +21,8 @@ export interface AccordionContentProps extends React.HTMLProps<HTMLDivElement> {
   component?: React.ElementType;
   /** Flag indicating content is custom. Expanded content Body wrapper will be removed from children.  This allows multiple bodies to be rendered as content. */
   isCustomContent?: React.ReactNode;
+  /** Props passed to the AccordionExpandableContentBody **/
+  contentBodyProps?: AccordionExpandableContentBodyProps;
 }
 
 export const AccordionContent: React.FunctionComponent<AccordionContentProps> = ({
@@ -32,6 +34,7 @@ export const AccordionContent: React.FunctionComponent<AccordionContentProps> =
   'aria-label': ariaLabel = '',
   'aria-labelledby': ariaLabelledby,
   component,
+  contentBodyProps,
   ...props
 }: AccordionContentProps) => {
   const [hasScrollbar, setHasScrollbar] = React.useState(false);
@@ -64,7 +67,11 @@ export const AccordionContent: React.FunctionComponent<AccordionContentProps> =
             {...(hasScrollbar && Container === 'div' && { role: 'region' })}
             {...props}
           >
-            {isCustomContent ? children : <AccordionExpandableContentBody>{children}</AccordionExpandableContentBody>}
+            {isCustomContent ? (
+              children
+            ) : (
+              <AccordionExpandableContentBody {...contentBodyProps}>{children}</AccordionExpandableContentBody>
+            )}
           </Container>
         );
       }}

package/src/components/Accordion/AccordionExpandableContentBody.tsx

@@ -2,12 +2,17 @@ import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Accordion/accordion';
 
-export interface AccordionExpandableContentBodyProps {
+export interface AccordionExpandableContentBodyProps extends React.HTMLProps<HTMLDivElement> {
   /** Content rendered inside the accordion content body  */
   children?: React.ReactNode;
 }
 
 export const AccordionExpandableContentBody: React.FunctionComponent<AccordionExpandableContentBodyProps> = ({
-  children = null
-}: AccordionExpandableContentBodyProps) => <div className={css(styles.accordionExpandableContentBody)}>{children}</div>;
+  children = null,
+  ...props
+}: AccordionExpandableContentBodyProps) => (
+  <div className={css(styles.accordionExpandableContentBody)} {...props}>
+    {children}
+  </div>
+);
 AccordionExpandableContentBody.displayName = 'AccordionExpandableContentBody';

package/src/components/Accordion/AccordionItem.tsx

@@ -3,7 +3,7 @@ import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Accordion/accordion';
 import { AccordionItemContext } from './AccordionContext';
 
-export interface AccordionItemProps {
+export interface AccordionItemProps extends React.HTMLProps<HTMLDivElement> {
   /** Content rendered inside the accordion item. */
   children?: React.ReactNode;
   /** Additional classes added to the accordion item. */
@@ -15,14 +15,17 @@ export interface AccordionItemProps {
 export const AccordionItem: React.FunctionComponent<AccordionItemProps> = ({
   children = null,
   className,
-  isExpanded: isExpandedProp = false
+  isExpanded: isExpandedProp = false,
+  ...props
 }: AccordionItemProps) => (
   <AccordionItemContext.Provider
     value={{
       isExpanded: isExpandedProp
     }}
   >
-    <div className={css(styles.accordionItem, isExpandedProp && styles.modifiers.expanded, className)}>{children}</div>
+    <div className={css(styles.accordionItem, isExpandedProp && styles.modifiers.expanded, className)} {...props}>
+      {children}
+    </div>
   </AccordionItemContext.Provider>
 );
 AccordionItem.displayName = 'AccordionItem';

package/src/components/Accordion/__tests__/AccordionItem.test.tsx

@@ -28,6 +28,12 @@ test(`Renders with additional classes when className is passed`, () => {
   expect(screen.getByText('Test')).toHaveClass('custom-class');
 });
 
+test(`Spreads props if others are passed`, () => {
+  render(<AccordionItem data-testId="testId">Test</AccordionItem>);
+
+  expect(screen.getByTestId('testId')).toBeInTheDocument();
+});
+
 test('Matches the snapshot', () => {
   const { asFragment } = render(<AccordionItem>Test</AccordionItem>);
   expect(asFragment()).toMatchSnapshot();

package/src/components/Pagination/Pagination.tsx

@@ -169,6 +169,8 @@ export interface PaginationProps extends React.HTMLProps<HTMLDivElement>, OUIAPr
   ouiaId?: number | string;
   /** Set the value of data-ouia-safe. Only set to true when the component is in a static state, i.e. no animations are occurring. At all other times, this value must be false. */
   ouiaSafe?: boolean;
+  /** @beta The container to append the pagination options menu to. */
+  menuAppendTo?: HTMLElement | (() => HTMLElement) | 'inline';
 }
 
 const handleInputWidth = (lastPage: number, node: HTMLDivElement) => {
@@ -229,6 +231,7 @@ export const Pagination: React.FunctionComponent<PaginationProps> = ({
   ouiaSafe = true,
   usePageInsets,
   inset,
+  menuAppendTo,
   ...props
 }: PaginationProps) => {
   const paginationRef = React.useRef<HTMLDivElement>(null);
@@ -336,6 +339,7 @@ export const Pagination: React.FunctionComponent<PaginationProps> = ({
           toggleTemplate={toggleTemplate}
           isDisabled={isDisabled}
           containerRef={containerRef}
+          appendTo={menuAppendTo}
         />
       )}
       <Navigation

package/src/components/Pagination/PaginationOptionsMenu.tsx

@@ -1,5 +1,6 @@
 import * as React from 'react';
 import { css } from '@patternfly/react-styles';
+import styles from '@patternfly/react-styles/css/components/Pagination/pagination';
 import { Menu, MenuContent, MenuList, MenuItem } from '../Menu';
 import { MenuToggle } from '../MenuToggle';
 import { Popper } from '../../helpers/Popper/Popper';
@@ -52,7 +53,10 @@ export interface PaginationOptionsMenuProps extends React.HTMLProps<HTMLDivEleme
   onPerPageSelect?: OnPerPageSelect;
   /** Label for the English word "of". */
   ofWord?: string;
+  /** React ref for the container to append the options menu to. This is a static ref provided by the main pagination component. */
   containerRef?: React.RefObject<HTMLDivElement>;
+  /** @beta The container to append the pagination options menu to. Overrides the containerRef prop. */
+  appendTo?: HTMLElement | (() => HTMLElement) | 'inline';
 }
 
 export const PaginationOptionsMenu: React.FunctionComponent<PaginationOptionsMenuProps> = ({
@@ -76,7 +80,8 @@ export const PaginationOptionsMenu: React.FunctionComponent<PaginationOptionsMen
   itemsTitle = '',
   toggleTemplate,
   onPerPageSelect = () => null as any,
-  containerRef
+  containerRef,
+  appendTo
 }: PaginationOptionsMenuProps) => {
   const [isOpen, setIsOpen] = React.useState(false);
   const toggleRef = React.useRef<HTMLButtonElement>(null);
@@ -166,38 +171,40 @@ export const PaginationOptionsMenu: React.FunctionComponent<PaginationOptionsMen
     ));
 
   const toggle = (
-    <MenuToggle
-      ref={toggleRef}
-      onClick={onToggle}
-      {...(optionsToggleAriaLabel && { 'aria-label': optionsToggleAriaLabel })}
-      isDisabled={isDisabled || (itemCount && itemCount <= 0)}
-      isExpanded={isOpen}
-      {...(widgetId && { id: `${widgetId}-toggle` })}
-      variant="plainText"
-      aria-haspopup="listbox"
-    >
-      {toggleTemplate &&
-        typeof toggleTemplate === 'string' &&
-        fillTemplate(toggleTemplate, { firstIndex, lastIndex, ofWord, itemCount, itemsTitle })}
-      {toggleTemplate &&
-        typeof toggleTemplate !== 'string' &&
-        (toggleTemplate as (props: PaginationToggleTemplateProps) => React.ReactElement)({
-          firstIndex,
-          lastIndex,
-          ofWord,
-          itemCount,
-          itemsTitle
-        })}
-      {!toggleTemplate && (
-        <ToggleTemplate
-          firstIndex={firstIndex}
-          lastIndex={lastIndex}
-          ofWord={ofWord}
-          itemCount={itemCount}
-          itemsTitle={itemsTitle}
-        />
-      )}
-    </MenuToggle>
+    <div className={css(styles.paginationPageMenu)}>
+      <MenuToggle
+        ref={toggleRef}
+        onClick={onToggle}
+        {...(optionsToggleAriaLabel && { 'aria-label': optionsToggleAriaLabel })}
+        isDisabled={isDisabled || (itemCount && itemCount <= 0)}
+        isExpanded={isOpen}
+        {...(widgetId && { id: `${widgetId}-toggle` })}
+        variant="plainText"
+        aria-haspopup="listbox"
+      >
+        {toggleTemplate &&
+          typeof toggleTemplate === 'string' &&
+          fillTemplate(toggleTemplate, { firstIndex, lastIndex, ofWord, itemCount, itemsTitle })}
+        {toggleTemplate &&
+          typeof toggleTemplate !== 'string' &&
+          (toggleTemplate as (props: PaginationToggleTemplateProps) => React.ReactElement)({
+            firstIndex,
+            lastIndex,
+            ofWord,
+            itemCount,
+            itemsTitle
+          })}
+        {!toggleTemplate && (
+          <ToggleTemplate
+            firstIndex={firstIndex}
+            lastIndex={lastIndex}
+            ofWord={ofWord}
+            itemCount={itemCount}
+            itemsTitle={itemsTitle}
+          />
+        )}
+      </MenuToggle>
+    </div>
   );
 
   const menu = (
@@ -208,6 +215,7 @@ export const PaginationOptionsMenu: React.FunctionComponent<PaginationOptionsMen
     </Menu>
   );
 
+  const containerToAppendTo = appendTo ?? (containerRef?.current || undefined);
   return (
     <Popper
       trigger={toggle}
@@ -216,7 +224,7 @@ export const PaginationOptionsMenu: React.FunctionComponent<PaginationOptionsMen
       popperRef={menuRef}
       isVisible={isOpen}
       direction={dropDirection}
-      appendTo={containerRef?.current || undefined}
+      appendTo={containerToAppendTo}
       minWidth={minWidth !== undefined ? minWidth : 'revert'}
     />
   );

package/src/components/Pagination/__tests__/Generated/__snapshots__/PaginationOptionsMenu.test.tsx.snap

@@ -2,49 +2,53 @@
 
 exports[`PaginationOptionsMenu should match snapshot (auto-generated) 1`] = `
 <DocumentFragment>
-  <button
-    aria-expanded="false"
-    aria-haspopup="listbox"
-    class="pf-v6-c-menu-toggle pf-m-plain pf-m-text"
-    data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-1"
-    data-ouia-component-type="PF6/MenuToggle"
-    data-ouia-safe="true"
-    id="''-toggle"
-    type="button"
+  <div
+    class="pf-v6-c-pagination__page-menu"
   >
-    <span
-      class="pf-v6-c-menu-toggle__text"
-    >
-      <b>
-        0 - 0
-      </b>
-      Custom toggle template of
-      <b>
-        0
-      </b>
-       'items'
-    </span>
-    <span
-      class="pf-v6-c-menu-toggle__controls"
+    <button
+      aria-expanded="false"
+      aria-haspopup="listbox"
+      class="pf-v6-c-menu-toggle pf-m-plain pf-m-text"
+      data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-1"
+      data-ouia-component-type="PF6/MenuToggle"
+      data-ouia-safe="true"
+      id="''-toggle"
+      type="button"
     >
       <span
-        class="pf-v6-c-menu-toggle__toggle-icon"
+        class="pf-v6-c-menu-toggle__text"
+      >
+        <b>
+          0 - 0
+        </b>
+        Custom toggle template of
+        <b>
+          0
+        </b>
+         'items'
+      </span>
+      <span
+        class="pf-v6-c-menu-toggle__controls"
       >
-        <svg
-          aria-hidden="true"
-          class="pf-v6-svg"
-          fill="currentColor"
-          height="1em"
-          role="img"
-          viewBox="0 0 320 512"
-          width="1em"
+        <span
+          class="pf-v6-c-menu-toggle__toggle-icon"
         >
-          <path
-            d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
-          />
-        </svg>
+          <svg
+            aria-hidden="true"
+            class="pf-v6-svg"
+            fill="currentColor"
+            height="1em"
+            role="img"
+            viewBox="0 0 320 512"
+            width="1em"
+          >
+            <path
+              d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
+            />
+          </svg>
+        </span>
       </span>
-    </span>
-  </button>
+    </button>
+  </div>
 </DocumentFragment>
 `;