chore: V4 cherry pick

packages/react-core/src/components/TimePicker/TimePicker.tsx

@@ -373,9 +373,22 @@ export class TimePicker extends React.Component<TimePickerProps, TimePickerState
   onToggle = (isOpen: boolean) => {
     // on close, parse and validate input
     this.setState(prevState => {
-      const { timeRegex, isInvalid } = prevState;
-      const { delimiter, is24Hour, includeSeconds } = this.props;
-      const time = parseTime(prevState.timeState, timeRegex, delimiter, !is24Hour, includeSeconds);
+      const { timeRegex, isInvalid, timeState } = prevState;
+      const { delimiter, is24Hour, includeSeconds, onChange } = this.props;
+      const time = parseTime(timeState, timeRegex, delimiter, !is24Hour, includeSeconds);
+
+      // Call onChange when Enter is pressed in input and timeoption does not exist in menu
+      if (onChange && !isOpen && time !== timeState) {
+        onChange(
+          null,
+          time,
+          getHours(time, timeRegex),
+          getMinutes(time, timeRegex),
+          getSeconds(time, timeRegex),
+          this.isValid(time)
+        );
+      }
+
       return {
         isTimeOptionsOpen: isOpen,
         timeState: time,
@@ -414,7 +427,6 @@ export class TimePicker extends React.Component<TimePickerProps, TimePickerState
   onInputChange = (newTime: string, event: React.FormEvent<HTMLInputElement>) => {
     const { onChange } = this.props;
     const { timeRegex } = this.state;
-
     if (onChange) {
       onChange(
         event,

packages/react-core/src/components/TimePicker/__tests__/TimePicker.test.tsx

@@ -86,6 +86,28 @@ describe('TimePicker', () => {
         expects: { hour: 23, minutes: 59, seconds: null }
       });
     });
+
+    // Disabling because this test does not work on CI
+    xtest('should call onChange when pressing Enter', async () => {
+      const onChange = jest.fn();
+      const user = userEvent.setup();
+
+      render(<TimePicker onChange={onChange} aria-label="time picker" />);
+
+      // Take into account timezones when tests are ran
+      const isPM = new Date().getHours() > 12;
+
+      await user.type(screen.getByLabelText('time picker'), `11:11`);
+      await user.keyboard('[Enter]');
+      expect(onChange).toHaveBeenLastCalledWith(
+        expect.any(Object),
+        `11:11 ${isPM ? 'PM' : 'AM'}`,
+        isPM ? 23 : 11,
+        11,
+        null,
+        true
+      );
+    });
   });
 
   describe('test isInvalid', () => {

packages/react-core/src/demos/DatePicker/DatePicker.md

@@ -18,34 +18,35 @@ DateRangePicker = () => {
   const [from, setFrom] = React.useState();
   const [to, setTo] = React.useState();
 
-  const toValidator = date => isValidDate(from) && date >= from ? '' : 'To date must be less than from date';
-  const onFromChange = (_str, date) => {
+  const toValidator = (date) =>
+    isValidDate(from) && date >= from ? '' : 'The "to" date must be after the "from" date';
+
+  const onFromChange = (_event, _value, date) => {
     setFrom(new Date(date));
     if (isValidDate(date)) {
       date.setDate(date.getDate() + 1);
       setTo(yyyyMMddFormat(date));
-    }
-    else {
+    } else {
       setTo('');
     }
   };
 
+  const onToChange = (_event, _value, date) => {
+    if (isValidDate(date)) {
+      setTo(yyyyMMddFormat(date));
+    }
+  };
+
   return (
     <Split>
       <SplitItem>
-        <DatePicker
-          onChange={onFromChange}
-          aria-label="Start date"
-          placeholder="YYYY-MM-DD"
-        />
-      </SplitItem>
-      <SplitItem style={{ padding: '6px 12px 0 12px' }}>
-        to
+        <DatePicker onChange={onFromChange} aria-label="Start date" placeholder="YYYY-MM-DD" />
       </SplitItem>
+      <SplitItem style={{ padding: '6px 12px 0 12px' }}>to</SplitItem>
       <SplitItem>
         <DatePicker
           value={to}
-          onChange={date => setTo(date)}
+          onChange={onToChange}
           isDisabled={!isValidDate(from)}
           rangeStart={from}
           validators={[toValidator]}
@@ -55,23 +56,34 @@ DateRangePicker = () => {
       </SplitItem>
     </Split>
   );
-}
+};
 ```
 
 ### Date and time range picker
 
 ```js
-import { Flex, FlexItem, InputGroup, DatePicker, isValidDate, TimePicker, yyyyMMddFormat, updateDateTime } from '@patternfly/react-core';
+import {
+  Flex,
+  FlexItem,
+  InputGroup,
+  DatePicker,
+  isValidDate,
+  TimePicker,
+  yyyyMMddFormat,
+  updateDateTime
+} from '@patternfly/react-core';
 
 DateTimeRangePicker = () => {
   const [from, setFrom] = React.useState();
   const [to, setTo] = React.useState();
 
-  const toValidator = date => {
-    return isValidDate(from) && yyyyMMddFormat(date) >= yyyyMMddFormat(from) ? '' : 'To date must after from date';
+  const toValidator = (date) => {
+    return isValidDate(from) && yyyyMMddFormat(date) >= yyyyMMddFormat(from)
+      ? ''
+      : 'The "to" date must be after the "from" date';
   };
-  
-  const onFromDateChange = (inputDate, newFromDate) => {
+
+  const onFromDateChange = (_event, inputDate, newFromDate) => {
     if (isValidDate(from) && isValidDate(newFromDate) && inputDate === yyyyMMddFormat(newFromDate)) {
       newFromDate.setHours(from.getHours());
       newFromDate.setMinutes(from.getMinutes());
@@ -80,7 +92,7 @@ DateTimeRangePicker = () => {
       setFrom(new Date(newFromDate));
     }
   };
-  
+
   const onFromTimeChange = (_event, time, hour, minute) => {
     if (isValidDate(from)) {
       const updatedFromDate = new Date(from);
@@ -90,16 +102,16 @@ DateTimeRangePicker = () => {
     }
   };
 
-  const onToDateChange = (inputDate, newToDate) => {
+  const onToDateChange = (_event, inputDate, newToDate) => {
     if (isValidDate(to) && isValidDate(newToDate) && inputDate === yyyyMMddFormat(newToDate)) {
       newToDate.setHours(to.getHours());
       newToDate.setMinutes(to.getMinutes());
     }
-    if (isValidDate(newToDate) && inputDate === yyyyMMddFormat(newToDate)){
+    if (isValidDate(newToDate) && inputDate === yyyyMMddFormat(newToDate)) {
       setTo(newToDate);
     }
   };
-  
+
   const onToTimeChange = (_event, time, hour, minute) => {
     if (isValidDate(to)) {
       const updatedToDate = new Date(to);
@@ -110,24 +122,14 @@ DateTimeRangePicker = () => {
   };
 
   return (
-    <Flex direction={{default: 'column', lg: 'row'}}>
+    <Flex direction={{ default: 'column', lg: 'row' }}>
       <FlexItem>
         <InputGroup>
-          <DatePicker
-            onChange={onFromDateChange}
-            aria-label="Start date"
-            placeholder="YYYY-MM-DD"
-          />
-          <TimePicker 
-            aria-label="Start time"
-            style={{width: '150px'}} 
-            onChange={onFromTimeChange} 
-          />
+          <DatePicker onChange={onFromDateChange} aria-label="Start date" placeholder="YYYY-MM-DD" />
+          <TimePicker aria-label="Start time" style={{ width: '150px' }} onChange={onFromTimeChange} />
         </InputGroup>
       </FlexItem>
-      <FlexItem>
-        to
-      </FlexItem>
+      <FlexItem>to</FlexItem>
       <FlexItem>
         <InputGroup>
           <DatePicker
@@ -139,19 +141,22 @@ DateTimeRangePicker = () => {
             aria-label="End date"
             placeholder="YYYY-MM-DD"
           />
-          <TimePicker style={{width: '150px'}} onChange={onToTimeChange} isDisabled={!isValidDate(from)}/>
+          <TimePicker style={{ width: '150px' }} onChange={onToTimeChange} isDisabled={!isValidDate(from)} />
         </InputGroup>
       </FlexItem>
     </Flex>
   );
-}
+};
 ```
 
-
 ### Date and time pickers in modal
+
 Modals trap focus and watch a few document level events. In order to place a date picker in a modal:
+
 - To avoid the modal's escape press event handler from overruling the date picker's escape press handlers, use the `DatePickerRef` to close the calendar when it is open and the escape key is pressed.
 - Append the calendar to the modal to keep it as close to the date picker in the DOM while maintaining correct layouts visually
   In order to place a time picker in the modal, its menu must be appended to the time picker's parent.
+
 ```ts file="./examples/DateTimePickerInModal.tsx"
+
 ```

packages/react-table/src/components/Table/ActionsColumn.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Dropdown, DropdownItem, DropdownList } from '@patternfly/react-core';
+import { Dropdown, DropdownItem, DropdownList } from '@patternfly/react-core/dist/esm/components/Dropdown';
 import { Button } from '@patternfly/react-core/dist/esm/components/Button';
 import { Divider } from '@patternfly/react-core/dist/esm/components/Divider';
 import { MenuToggle } from '@patternfly/react-core/dist/esm/components/MenuToggle';
@@ -70,7 +70,7 @@ const ActionsColumnBase: React.FunctionComponent<ActionsColumnProps> = ({
         .map(({ title, itemKey, onClick, isOutsideDropdown, ...props }, key) =>
           typeof title === 'string' ? (
             <Button
-              onClick={(event) => onActionClick(event, onClick)}
+              onClick={(event: MouseEvent | React.MouseEvent<any, MouseEvent> | React.KeyboardEvent<Element>) => onActionClick(event, onClick)}
               {...(props as any)}
               isDisabled={isDisabled}
               key={itemKey || `outside_dropdown_${key}`}
@@ -85,8 +85,8 @@ const ActionsColumnBase: React.FunctionComponent<ActionsColumnProps> = ({
 
       <Dropdown
         isOpen={isOpen}
-        onOpenChange={(isOpen) => setIsOpen(isOpen)}
-        toggle={(toggleRef) =>
+        onOpenChange={(isOpen: boolean) => setIsOpen(isOpen)}
+        toggle={(toggleRef: any) =>
           actionsToggle ? (
             actionsToggle({ onToggle, isOpen, isDisabled, toggleRef })
           ) : (

packages/react-table/src/components/Table/BodyCell.tsx

@@ -1,6 +1,8 @@
 import * as React from 'react';
-import { Tooltip } from '@patternfly/react-core/dist/esm/components/Tooltip/Tooltip';
-import { Bullseye, EmptyState, SelectProps } from '@patternfly/react-core';
+import { Tooltip } from '@patternfly/react-core/dist/esm/components/Tooltip';
+import { Bullseye } from '@patternfly/react-core/dist/esm/layouts/Bullseye';
+import { EmptyState } from '@patternfly/react-core/dist/esm/components/EmptyState';
+import { SelectProps } from '@patternfly/react-core/dist/esm/components/Select';
 import { Td } from '../TableComposable/Td';
 
 export interface BodyCellProps {

packages/react-table/src/components/Table/CollapseColumn.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import AngleDownIcon from '@patternfly/react-icons/dist/esm/icons/angle-down-icon';
 import { css } from '@patternfly/react-styles';
-import { Button } from '@patternfly/react-core/dist/esm/components/Button/Button';
+import { Button } from '@patternfly/react-core/dist/esm/components/Button';
 import styles from '@patternfly/react-styles/css/components/Table/table';
 
 export interface CollapseColumnProps {

packages/react-table/src/components/Table/DraggableCell.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import GripVerticalIcon from '@patternfly/react-icons/dist/esm/icons/grip-vertical-icon';
-import { Button } from '@patternfly/react-core/dist/esm/components/Button/Button';
+import { Button } from '@patternfly/react-core/dist/esm/components/Button';
 
 export interface DraggableCellProps {
   id: string;

packages/react-table/src/components/Table/EditableSelectInputCell.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { css } from '@patternfly/react-styles';
-import { Select, SelectOptionObject } from '@patternfly/react-core';
+import { Select, SelectOptionObject } from '@patternfly/react-core/dist/esm/components/Select';
 import inlineStyles from '@patternfly/react-styles/css/components/InlineEdit/inline-edit';
 import formStyles from '@patternfly/react-styles/css/components/Form/form';
 import { EditableSelectInputProps } from './base';

packages/react-table/src/components/Table/FavoritesCell.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import StarIcon from '@patternfly/react-icons/dist/esm/icons/star-icon';
-import { Button } from '@patternfly/react-core/dist/esm/components/Button/Button';
+import { Button } from '@patternfly/react-core/dist/esm/components/Button';
 
 export interface FavoritesCellProps {
   id?: string;

packages/react-table/src/components/Table/HeaderCellInfoWrapper.tsx

@@ -2,7 +2,9 @@ import * as React from 'react';
 import HelpIcon from '@patternfly/react-icons/dist/esm/icons/help-icon';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Table/table';
-import { Button, Tooltip, Popover, TooltipProps, PopoverProps } from '@patternfly/react-core';
+import { Tooltip, TooltipProps } from '@patternfly/react-core/dist/esm/components/Tooltip';
+import { Popover, PopoverProps } from '@patternfly/react-core/dist/esm/components/Popover';
+import { Button } from '@patternfly/react-core/dist/esm/components/Button';
 import { TableText } from './TableText';
 
 export interface ColumnHelpWrapperProps {

packages/react-table/src/components/Table/Table.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { OUIAProps, getDefaultOUIAId } from '@patternfly/react-core';
-import { DropdownDirection, DropdownPosition } from '@patternfly/react-core/dist/esm/deprecated/components';
+import { OUIAProps, getDefaultOUIAId } from '@patternfly/react-core/dist/esm/helpers';
+import { DropdownDirection, DropdownPosition } from '@patternfly/react-core/dist/esm/deprecated/components/Dropdown';
 import inlineStyles from '@patternfly/react-styles/css/components/InlineEdit/inline-edit';
 import { css } from '@patternfly/react-styles';
 import { Provider } from './base';

packages/react-table/src/components/Table/TableText.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Table/table';
 import { css } from '@patternfly/react-styles';
-import { Tooltip, TooltipProps } from '@patternfly/react-core/dist/esm/components/Tooltip/Tooltip';
+import { Tooltip, TooltipProps } from '@patternfly/react-core/dist/esm/components/Tooltip';
 
 export enum TableTextVariant {
   div = 'div',

packages/react-table/src/components/Table/TableTypes.tsx

@@ -1,10 +1,10 @@
-import { DropdownItemProps } from '@patternfly/react-core';
+import { ButtonProps } from '@patternfly/react-core/dist/esm/components/Button';
 import { formatterValueType, ColumnType, RowType, RowKeyType, HeaderType } from './base';
 import { SortByDirection } from './SortColumn';
-import { DropdownDirection, DropdownPosition } from '@patternfly/react-core/dist/esm/deprecated/components';
+import { DropdownItemProps } from '@patternfly/react-core/dist/esm/components/Dropdown';
+import { DropdownDirection, DropdownPosition } from '@patternfly/react-core/dist/esm/deprecated/components/Dropdown';
 import * as React from 'react';
 import { CustomActionsToggleProps } from './ActionsColumn';
-import { ButtonProps } from '@patternfly/react-core';
 
 export enum TableGridBreakpoint {
   none = '',

packages/react-table/src/components/Table/base/types.tsx

@@ -6,8 +6,10 @@
  */
 
 import * as React from 'react';
-import { TooltipProps, PopoverProps, SelectOptionObject, SelectProps } from '@patternfly/react-core';
-import { DropdownPosition, DropdownDirection } from '@patternfly/react-core/dist/esm/deprecated/components';
+import { TooltipProps } from '@patternfly/react-core/dist/esm/components/Tooltip';
+import { PopoverProps } from '@patternfly/react-core/dist/esm/components/Popover';
+import { DropdownPosition, DropdownDirection } from '@patternfly/react-core/dist/esm/deprecated/components/Dropdown';
+import { SelectProps, SelectOptionObject } from '@patternfly/react-core/dist/esm/components/Select';
 import { TableComposable } from '../../TableComposable/TableComposable';
 import { Thead } from '../../TableComposable/Thead';
 import { Tbody } from '../../TableComposable/Tbody';

packages/react-table/src/components/Table/utils/decorators/treeRow.tsx

@@ -3,7 +3,8 @@ import { IExtra, IFormatterValueType, OnCheckChange, OnTreeRowCollapse, OnToggle
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Table/table';
 import stylesTreeView from '@patternfly/react-styles/css/components/Table/table-tree-view';
-import { Button, Checkbox } from '@patternfly/react-core';
+import { Button } from '@patternfly/react-core/dist/esm/components/Button';
+import { Checkbox } from '@patternfly/react-core/dist/esm/components/Checkbox';
 import AngleDownIcon from '@patternfly/react-icons/dist/esm/icons/angle-down-icon';
 import EllipsisHIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-h-icon';
 

packages/react-table/src/components/Table/utils/transformers.test.tsx

@@ -18,7 +18,7 @@ import {
   textCenter,
   cellActions
 } from './';
-import { DropdownPosition, DropdownDirection } from '@patternfly/react-core/deprecated';
+import { DropdownPosition, DropdownDirection } from '@patternfly/react-core/dist/esm/deprecated/components/Dropdown';
 import {
   IAction,
   IActions,

packages/react-table/src/components/TableComposable/TableComposable.tsx

@@ -5,7 +5,7 @@ import stylesTreeView from '@patternfly/react-styles/css/components/Table/table-
 import { css } from '@patternfly/react-styles';
 import { toCamel } from '../Table/utils/utils';
 import { IVisibility } from '../Table/utils/decorators/classNames';
-import { useOUIAProps, OUIAProps, handleArrows, setTabIndex } from '@patternfly/react-core';
+import { useOUIAProps, OUIAProps, handleArrows, setTabIndex } from '@patternfly/react-core/dist/esm/helpers';
 import { TableGridBreakpoint, TableVariant } from '../Table/TableTypes';
 
 export interface BaseCellProps {