@patternfly/react-table 4.61.11 → 4.61.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/react-table",
-  "version": "4.61.11",
+  "version": "4.61.15",
   "description": "This library provides a set of React table components for use with the PatternFly 4",
   "main": "dist/js/index.js",
   "module": "dist/esm/index.js",
@@ -31,10 +31,10 @@
     "clean": "rimraf dist"
   },
   "dependencies": {
-    "@patternfly/react-core": "^4.192.11",
-    "@patternfly/react-icons": "^4.43.11",
-    "@patternfly/react-styles": "^4.42.11",
-    "@patternfly/react-tokens": "^4.44.11",
+    "@patternfly/react-core": "^4.192.15",
+    "@patternfly/react-icons": "^4.43.15",
+    "@patternfly/react-styles": "^4.42.15",
+    "@patternfly/react-tokens": "^4.44.15",
     "lodash": "^4.17.19",
     "tslib": "^2.0.0"
   },
@@ -46,5 +46,5 @@
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },
-  "gitHead": "02911bcfeae9b049ecf0cdd863053d4dd1aa4e1a"
+  "gitHead": "43f728710c72197a3f6a093ec406de40cf12ce30"
 }

package/src/components/Table/ActionsColumn.tsx

@@ -10,14 +10,7 @@ import {
   DropdownPosition
 } from '@patternfly/react-core/dist/esm/components/Dropdown/dropdownConstants';
 
-import {
-  IAction,
-  IActionDropdownItem,
-  IActionOutsideItemButton,
-  IActionOutsideItemCustom,
-  IExtraData,
-  IRowData
-} from './TableTypes';
+import { IAction, IExtraData, IRowData } from './TableTypes';
 
 export interface CustomActionsToggleProps {
   onToggle: (isOpen: boolean) => void;
@@ -89,16 +82,10 @@ export class ActionsColumn extends React.Component<ActionsColumnProps, ActionsCo
       <KebabToggle isDisabled={isDisabled} onToggle={this.onToggle} />
     );
 
-    const outsideDropdownItems = items.filter(a => a.isOutsideDropdown) as (
-      | IActionOutsideItemButton
-      | IActionOutsideItemCustom
-    )[];
-
-    const dropdownItems = items.filter(a => !a.isOutsideDropdown) as IActionDropdownItem[];
-
     return (
       <React.Fragment>
-        {outsideDropdownItems
+        {items
+          .filter(item => item.isOutsideDropdown)
           // eslint-disable-next-line @typescript-eslint/no-unused-vars
           .map(({ title, itemKey, onClick, isOutsideDropdown, ...props }, key) =>
             typeof title === 'string' ? (
@@ -120,24 +107,26 @@ export class ActionsColumn extends React.Component<ActionsColumnProps, ActionsCo
           position={dropdownPosition}
           direction={dropdownDirection}
           isOpen={isOpen}
-          dropdownItems={dropdownItems.map(({ title, itemKey, onClick, isSeparator, ...props }, key) =>
-            isSeparator ? (
-              <DropdownSeparator {...props} key={itemKey || key} data-key={itemKey || key} />
-            ) : (
-              <DropdownItem
-                component="button"
-                onClick={event => {
-                  this.onClick(event, onClick);
-                  this.onToggle(!isOpen);
-                }}
-                {...props}
-                key={itemKey || key}
-                data-key={itemKey || key}
-              >
-                {title}
-              </DropdownItem>
-            )
-          )}
+          dropdownItems={items
+            .filter(item => !item.isOutsideDropdown)
+            .map(({ title, itemKey, onClick, isSeparator, ...props }, key) =>
+              isSeparator ? (
+                <DropdownSeparator {...props} key={itemKey || key} data-key={itemKey || key} />
+              ) : (
+                <DropdownItem
+                  component="button"
+                  onClick={event => {
+                    this.onClick(event, onClick);
+                    this.onToggle(!isOpen);
+                  }}
+                  {...props}
+                  key={itemKey || key}
+                  data-key={itemKey || key}
+                >
+                  {title}
+                </DropdownItem>
+              )
+            )}
           isPlain
           {...(rowData && rowData.actionProps)}
         />

package/src/components/Table/TableTypes.tsx

@@ -146,54 +146,22 @@ export interface ISortBy {
   defaultDirection?: 'asc' | 'desc';
 }
 
-export interface ISeparator {
+export interface IAction extends Omit<DropdownItemProps, 'title' | 'onClick'>, Pick<ButtonProps, 'variant'> {
   /** Flag indicating an item on actions menu is a separator, rather than an action */
-  isSeparator: true;
-}
-
-export interface IActionSeparator extends ISeparator {
-  isOutsideDropdown?: false;
-}
-
-interface IActionClickable {
+  isSeparator?: boolean;
+  /** Key of actions menu item */
+  itemKey?: string;
+  /** Content to display in the actions menu item */
+  title?: string | React.ReactNode;
   /** Click handler for the actions menu item */
   onClick?: (event: React.MouseEvent, rowIndex: number, rowData: IRowData, extraData: IExtraData) => void;
-}
-
-export type IActionOutsideItemBase = IActionClickable & {
   /** Flag indicating this action should be placed outside the actions menu, beside the toggle */
-  isOutsideDropdown: true;
-  /** Flag indicating an item on actions menu is not a separator, added to make it easy to distinguish */
-  isSeparator?: false;
-  /** Key of actions menu item */
-  itemKey?: undefined;
-};
-
-export type IActionOutsideItemButton = IActionOutsideItemBase &
-  Omit<ButtonProps, 'onClick'> & {
-    title: string;
-    /** Key of actions menu item */
-    itemKey?: string;
-  };
-
-export type IActionOutsideItemCustom = IActionOutsideItemBase & {
-  title: Exclude<React.ReactNode, string>;
-  [key: string]: any;
-};
-
-export type IActionDropdownItem = Omit<DropdownItemProps, 'title' | 'onClick'> &
-  IActionClickable & {
-    /** Flag indicating an item on actions menu is not a separator, added to make it easy to distinguish */
-    isSeparator?: false;
-    /** Flag indicating this action should be placed outside the actions menu, beside the toggle */
-    isOutsideDropdown?: false;
-    /** Key of actions menu item */
-    itemKey?: string;
-    /** Content to display in the actions menu item */
-    title: React.ReactNode;
-  };
+  isOutsideDropdown?: boolean;
+}
 
-export type IAction = IActionSeparator | IActionDropdownItem | IActionOutsideItemButton | IActionOutsideItemCustom;
+export interface ISeparator extends IAction {
+  isSeparator: boolean;
+}
 
 export type IActions = (IAction | ISeparator)[];
 export type IActionsResolver = (rowData: IRowData, extraData: IExtraData) => (IAction | ISeparator)[];

package/src/components/TableComposable/examples/ComposableTable.md

@@ -163,9 +163,6 @@ This example demonstrates adding actions as the last column. The header's last c
 
 To make a cell an action cell, render an `ActionsColumn` component inside a row's last `Td` and pass an array of `IAction` objects via the `items` prop of `ActionsColumn`.
 
-Look [here](https://github.com/patternfly/patternfly-react/blob/main/packages/react-table/src/components/Table/TableTypes.tsx)
-for the `IAction` type to see what it looks like.
-
 ```ts file="ComposableTableActions.tsx"
 ```