@patternfly/react-core 5.0.0-alpha.104 → 5.0.0-alpha.106

package/src/components/Slider/Slider.tsx

@@ -3,7 +3,7 @@ import { useState } from 'react';
 import styles from '@patternfly/react-styles/css/components/Slider/slider';
 import { css } from '@patternfly/react-styles';
 import { SliderStep } from './SliderStep';
-import { InputGroup, InputGroupText } from '../InputGroup';
+import { InputGroup, InputGroupText, InputGroupItem } from '../InputGroup';
 import { TextInput } from '../TextInput';
 import { Tooltip } from '../Tooltip';
 
@@ -333,11 +333,14 @@ export const Slider: React.FunctionComponent<SliderProps> = ({
     if (inputLabel) {
       return (
         <InputGroup>
-          {textInput}
-          <InputGroupText {...(isDisabled && { className: css(styles.modifiers.disabled) })}>
-            {' '}
-            {inputLabel}
-          </InputGroupText>
+          <InputGroupItem isFill>{textInput}</InputGroupItem>
+          <InputGroupItem isBox>
+            <InputGroupText
+              {...(isDisabled && { className: css(styles.modifiers.disabled) })}
+            >
+              {inputLabel}
+            </InputGroupText>
+          </InputGroupItem>
         </InputGroup>
       );
     } else {

package/src/components/Slider/_tests_/__snapshots__/Slider.test.tsx.snap

@@ -413,21 +413,29 @@ exports[`slider renders slider with input 1`] = `
       <div
         class="pf-v5-c-input-group"
       >
-        <input
-          aria-invalid="false"
-          aria-label="Slider value input"
-          class="pf-v5-c-form-control pf-v5-c-form-control"
-          data-ouia-component-id="OUIA-Generated-TextInputBase-3"
-          data-ouia-component-type="PF4/TextInput"
-          data-ouia-safe="true"
-          type="number"
-          value="50"
-        />
-        <span
-          class="pf-v5-c-input-group__text"
+        <div
+          class="pf-v5-c-input-group__item pf-m-fill"
+        >
+          <input
+            aria-invalid="false"
+            aria-label="Slider value input"
+            class="pf-v5-c-form-control pf-v5-c-form-control"
+            data-ouia-component-id="OUIA-Generated-TextInputBase-3"
+            data-ouia-component-type="PF4/TextInput"
+            data-ouia-safe="true"
+            type="number"
+            value="50"
+          />
+        </div>
+        <div
+          class="pf-v5-c-input-group__item pf-m-box"
         >
-           %
-        </span>
+          <span
+            class="pf-v5-c-input-group__text"
+          >
+            %
+          </span>
+        </div>
       </div>
     </div>
   </div>
@@ -481,21 +489,29 @@ exports[`slider renders slider with input above thumb 1`] = `
         <div
           class="pf-v5-c-input-group"
         >
-          <input
-            aria-invalid="false"
-            aria-label="Slider value input"
-            class="pf-v5-c-form-control pf-v5-c-form-control"
-            data-ouia-component-id="OUIA-Generated-TextInputBase-4"
-            data-ouia-component-type="PF4/TextInput"
-            data-ouia-safe="true"
-            type="number"
-            value="50"
-          />
-          <span
-            class="pf-v5-c-input-group__text"
+          <div
+            class="pf-v5-c-input-group__item pf-m-fill"
           >
-             %
-          </span>
+            <input
+              aria-invalid="false"
+              aria-label="Slider value input"
+              class="pf-v5-c-form-control pf-v5-c-form-control"
+              data-ouia-component-id="OUIA-Generated-TextInputBase-4"
+              data-ouia-component-type="PF4/TextInput"
+              data-ouia-safe="true"
+              type="number"
+              value="50"
+            />
+          </div>
+          <div
+            class="pf-v5-c-input-group__item pf-m-box"
+          >
+            <span
+              class="pf-v5-c-input-group__text"
+            >
+              %
+            </span>
+          </div>
         </div>
       </div>
       <div

package/src/components/TimePicker/TimePicker.tsx

@@ -6,7 +6,7 @@ import menuStyles from '@patternfly/react-styles/css/components/Menu/menu';
 import { getUniqueId } from '../../helpers';
 import { Popper } from '../../helpers/Popper/Popper';
 import { Menu, MenuContent, MenuList, MenuItem } from '../Menu';
-import { InputGroup } from '../InputGroup';
+import { InputGroup, InputGroupItem } from '../InputGroup';
 import { TextInput, TextInputProps } from '../TextInput';
 import { KeyTypes } from '../../helpers/constants';
 import {
@@ -535,19 +535,21 @@ export class TimePicker extends React.Component<TimePickerProps, TimePickerState
       <div ref={this.baseComponentRef} className={css(datePickerStyles.datePicker, className)}>
         <div className={css(datePickerStyles.datePickerInput)} style={style} {...props}>
           <InputGroup>
-            <div id={randomId}>
-              <div ref={this.toggleRef} style={{ paddingLeft: '0' }}>
-                <Popper
-                  appendTo={calculatedAppendTo}
-                  trigger={textInput}
-                  triggerRef={this.inputRef}
-                  popper={menuContainer}
-                  popperRef={this.menuRef}
-                  isVisible={isTimeOptionsOpen}
-                  zIndex={zIndex}
-                />
+            <InputGroupItem>
+              <div id={randomId}>
+                <div ref={this.toggleRef} style={{ paddingLeft: '0' }}>
+                  <Popper
+                    appendTo={calculatedAppendTo}
+                    trigger={textInput}
+                    triggerRef={this.inputRef}
+                    popper={menuContainer}
+                    popperRef={this.menuRef}
+                    isVisible={isTimeOptionsOpen}
+                    zIndex={zIndex}
+                  />
+                </div>
               </div>
-            </div>
+            </InputGroupItem>
           </InputGroup>
           {isInvalid && (
             <div className={css(datePickerStyles.datePickerHelperText)}>

package/src/demos/Button.md

@@ -15,7 +15,7 @@ Please note that only the button can be interacted with in this example. The use
 
 ```ts
 import React from 'react';
-import { Form, FormGroup, ActionGroup, InputGroup, TextInput, Button } from '@patternfly/react-core';
+import { Form, FormGroup, ActionGroup, TextInput, Button } from '@patternfly/react-core';
 import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
 
 const ProgressButton: React.FunctionComponent = () => {

package/src/demos/Card/Card.md

@@ -19,6 +19,7 @@ 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 { data } from './CardData.jsx';
 
 ## Demos
 
@@ -84,6 +85,7 @@ 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 { data } from './CardData.jsx';
 
 class CardViewBasic extends React.Component {
   constructor(props) {
@@ -93,7 +95,7 @@ class CardViewBasic extends React.Component {
       filters: {
         products: []
       },
-      res: [],
+      cardData: data,
       isChecked: false,
       selectedItems: [],
       areAllSelected: false,
@@ -134,7 +136,8 @@ class CardViewBasic extends React.Component {
       });
     };
 
-    this.onCardKebabDropdownToggle = (key) => {
+    this.onCardKebabDropdownToggle = (key, event) => {
+      event?.stopPropagation();
       this.setState((prevState) => ({
         [key]: !prevState[key]
       }));
@@ -149,7 +152,7 @@ class CardViewBasic extends React.Component {
     this.deleteItem = (item) => (event) => {
       const filter = (getter) => (val) => getter(val) !== item.id;
       this.setState({
-        res: this.state.res.filter(filter(({ id }) => id)),
+        cardData: this.state.cardData.filter(filter(({ id }) => id)),
         selectedItems: this.state.selectedItems.filter(filter((id) => id))
       });
     };
@@ -162,7 +165,8 @@ class CardViewBasic extends React.Component {
 
     this.onPerPageSelect = (_event, perPage) => {
       this.setState({
-        perPage
+        perPage,
+        page: 1
       });
     };
 
@@ -264,7 +268,7 @@ class CardViewBasic extends React.Component {
 
   splitCheckboxSelectAll(e) {
     const { checked } = e.target;
-    const { isChecked, res } = this.state;
+    const { isChecked, cardData } = this.state;
     let collection = [];
 
     if (checked) {
@@ -329,9 +333,9 @@ class CardViewBasic extends React.Component {
   }
 
   getAllItems() {
-    const { res } = this.state;
+    const { cardData } = this.state;
     const collection = [];
-    for (const items of res) {
+    for (const items of cardData) {
       collection.push(items.id);
     }
 
@@ -339,31 +343,19 @@ class CardViewBasic extends React.Component {
   }
 
   updateSelected() {
-    const { res, selectedItems } = this.state;
-    let rows = res.map((post) => {
+    const { cardData, selectedItems } = this.state;
+    let rows = cardData.map((post) => {
       post.selected = selectedItems.includes(post.id);
       return post;
     });
 
     this.setState({
-      res: rows
+      cardData: rows
     });
   }
 
-  fetch(page, perPage) {
-    fetch(`https://my-json-server.typicode.com/jenny-s51/cardviewdata/posts?_page=${page}&_limit=${perPage}`)
-      .then((resp) => resp.json())
-      .then((resp) => this.setState({ res: resp, perPage, page }))
-      .then(() => this.updateSelected())
-      .catch((err) => this.setState({ error: err }));
-  }
-
-  componentDidMount() {
-    this.fetch(this.state.page, this.state.perPage);
-  }
-
   renderPagination() {
-    const { page, perPage, totalItemCount } = this.state;
+    const { page, perPage, totalItemCount, cardData } = this.state;
 
     const defaultPerPageOptions = [
       {
@@ -386,12 +378,8 @@ class CardViewBasic extends React.Component {
         page={page}
         perPage={perPage}
         perPageOptions={defaultPerPageOptions}
-        onSetPage={(_evt, value) => {
-          this.fetch(value, perPage);
-        }}
-        onPerPageSelect={(_evt, value) => {
-          this.fetch(1, value);
-        }}
+        onSetPage={this.onSetPage}
+        onPerPageSelect={this.onPerPageSelect}
         variant="top"
         isCompact
       />
@@ -399,7 +387,7 @@ class CardViewBasic extends React.Component {
   }
 
   buildSelectDropdown() {
-    const { splitButtonDropdownIsOpen, selectedItems, areAllSelected } = this.state;
+    const { splitButtonDropdownIsOpen, selectedItems, areAllSelected, filters, cardData } = this.state;
     const numSelected = selectedItems.length;
     const allSelected = areAllSelected;
     const anySelected = numSelected > 0;
@@ -508,7 +496,7 @@ class CardViewBasic extends React.Component {
       splitButtonDropdownIsOpen,
       activeItem,
       filters,
-      res,
+      cardData,
       checked,
       selectedItems,
       areAllSelected,
@@ -576,13 +564,6 @@ class CardViewBasic extends React.Component {
       </React.Fragment>
     );
 
-    const filtered =
-      filters.products.length > 0
-        ? res.filter((card) => {
-            return filters.products.length === 0 || filters.products.includes(card.name);
-          })
-        : res;
-
     const icons = {
       pfIcon,
       activeMQIcon,
@@ -595,6 +576,13 @@ class CardViewBasic extends React.Component {
       restIcon,
       swaggerIcon
     };
+    
+    const filtered =
+      filters.products.length > 0
+        ? data.filter((card) => {
+            return filters.products.length === 0 || filters.products.includes(card.name);
+          })
+        : cardData.slice((page - 1) * perPage, perPage === 1 ? page * perPage : page * perPage - 1);
 
     return (
       <React.Fragment>
@@ -630,6 +618,7 @@ class CardViewBasic extends React.Component {
                 <Card
                   hasSelectableInput
                   isCompact
+                  isSelectableRaised
                   key={product.name}
                   id={product.name.replace(/ /g, '-')}
                   onKeyDown={(e) => this.onKeyDown(e, product.id)}
@@ -642,14 +631,14 @@ class CardViewBasic extends React.Component {
                       actions: (
                         <>
                           <Dropdown
-                            isOpen={this.state[key]}
+                            isOpen={this.state[key] ?? false}
                             onOpenChange={(isOpen) => this.setState({ [key]: isOpen })}
-                            toggle={(toggleRef) => (
+                            toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
                               <MenuToggle
                                 ref={toggleRef}
                                 aria-label={`${product.name} actions`}
                                 variant="plain"
-                                onClick={() => this.onCardKebabDropdownToggle(key)}
+                                onClick={(e) => this.onCardKebabDropdownToggle(key, e)}
                                 isExpanded={this.state[key]}
                               >
                                 <EllipsisVIcon />

package/src/demos/Card/CardData.jsx

@@ -0,0 +1,62 @@
+export const data = [
+    {
+      "id": 0,
+      "name": "PatternFly",
+      "description": "PatternFly is a community project that promotes design commonality and improves user experience.",
+      "icon": "pfIcon"
+    },
+    {
+      "id": 1,
+      "name": "ActiveMQ",
+      "description": "The ActiveMQ component allows messages to be sent to a JMS Queue or Topic; or messages to be consumed from a JMS Queue or Topic using Apache ActiveMQ.",
+      "icon": "activeMQIcon"
+    },
+    {
+      "id": 2,
+      "name": "Apache Spark",
+      "description": "This documentation page covers the Apache Spark component for the Apache Camel.",
+      "icon": "sparkIcon"
+    },
+    {
+      "id": 3,
+      "name": "Avro",
+      "description": "This component provides a dataformat for avro, which allows serialization and deserialization of messages using Apache Avro’s binary dataformat. Moreover, it provides support for Apache Avro’s rpc, by providing producers and consumers endpoint for using avro over netty or http.",
+      "icon": "avroIcon"
+    },
+    {
+      "id": 4,
+      "name": "Azure Services",
+      "description": "The Camel Components for Windows Azure Services provide connectivity to Azure services from Camel.",
+      "icon": "azureIcon"
+    },
+    {
+      "id": 5,
+      "name": "Crypto",
+      "description": "For providing flexible endpoints to sign and verify exchanges using the Signature Service of the Java Cryptographic Extension.",
+      "icon": "saxonIcon"
+    },
+    {
+      "id": 6,
+      "name": "DropBox",
+      "description": "The dropbox component allows you to treat Dropbox remote folders as a producer or consumer of messages.",
+      "icon": "dropBoxIcon"
+    },
+    {
+      "id": 7,
+      "name": "JBoss Data Grid",
+      "description": "Read or write to a fully-supported distributed cache and data grid for faster integration services.",
+      "icon": "infinispanIcon"
+    },
+    {
+      "id": 8,
+      "name": "REST",
+      "description": "The rest component allows to define REST endpoints (consumer) using the Rest DSL and plugin to other Camel components as the REST transport. From Camel 2.18 onwards the rest component can also be used as a client (producer) to call REST services.",
+      "icon": "restIcon"
+    },
+    {
+      "id": 9,
+      "name": "SWAGGER",
+      "description": "Expose REST services and their APIs using Swagger specification.",
+      "icon": "swaggerIcon"
+    }
+  ]

package/src/demos/ComposableMenu/examples/ComposableContextSelector.tsx

@@ -11,6 +11,7 @@ import {
   Popper,
   Divider,
   InputGroup,
+  InputGroupItem,
   Button,
   ButtonVariant,
   SearchInput
@@ -151,21 +152,25 @@ export const ComposableContextSelector: React.FunctionComponent = () => {
       <MenuSearch>
         <MenuSearchInput>
           <InputGroup>
-            <SearchInput
-              value={searchInputValue}
-              placeholder="Search"
-              onChange={(_event, value) => onSearchInputChange(value)}
-              onKeyPress={onEnterPressed}
-              aria-labelledby="pf-context-selector-search-button-id-1"
-            />
-            <Button
-              variant={ButtonVariant.control}
-              aria-label="Search menu items"
-              id="pf-context-selector-search-button-id-1"
-              onClick={onSearchButtonClick}
-            >
-              <SearchIcon aria-hidden="true" />
-            </Button>
+            <InputGroupItem isFill>
+              <SearchInput
+                value={searchInputValue}
+                placeholder="Search"
+                onChange={(_event, value) => onSearchInputChange(value)}
+                onKeyPress={onEnterPressed}
+                aria-labelledby="pf-context-selector-search-button-id-1"
+              />
+            </InputGroupItem>
+            <InputGroupItem>
+              <Button
+                variant={ButtonVariant.control}
+                aria-label="Search menu items"
+                id="pf-context-selector-search-button-id-1"
+                onClick={onSearchButtonClick}
+              >
+                <SearchIcon aria-hidden="true" />
+              </Button>
+            </InputGroupItem>
           </InputGroup>
         </MenuSearchInput>
       </MenuSearch>

package/src/demos/DatePicker/examples/DateTimePickerInModal.tsx

@@ -1,5 +1,13 @@
 import React from 'react';
-import { DatePicker, Modal, ModalVariant, Button, TimePicker, InputGroup } from '@patternfly/react-core';
+import {
+  DatePicker,
+  Modal,
+  ModalVariant,
+  Button,
+  TimePicker,
+  InputGroup,
+  InputGroupItem
+} from '@patternfly/react-core';
 
 export const SimpleModal = () => {
   const [isModalOpen, setIsModalOpen] = React.useState(false);
@@ -42,8 +50,12 @@ export const SimpleModal = () => {
         ]}
       >
         <InputGroup>
-          <DatePicker ref={dateRef} appendTo={() => document.getElementById('date-time-picker-modal')} />
-          <TimePicker menuAppendTo="parent" isOpen={isTimePickerOpen} setIsOpen={setIsTimePickerOpen} />
+          <InputGroupItem>
+            <DatePicker ref={dateRef} appendTo={() => document.getElementById('date-time-picker-modal')} />
+          </InputGroupItem>
+          <InputGroupItem>
+            <TimePicker menuAppendTo="parent" isOpen={isTimePickerOpen} setIsOpen={setIsTimePickerOpen} />
+          </InputGroupItem>
         </InputGroup>
       </Modal>
     </React.Fragment>

package/src/demos/DateTimePicker.md

@@ -21,16 +21,7 @@ In this demo, learn how to use a [CalendarMonth](/components/calendar-month) com
 ### Date and time range picker
 
 ```js
-import {
-  Flex,
-  FlexItem,
-  InputGroup,
-  DatePicker,
-  isValidDate,
-  TimePicker,
-  yyyyMMddFormat,
-  updateDateTime
-} from '@patternfly/react-core';
+import { Flex, FlexItem, InputGroup, InputGroupItem, DatePicker, isValidDate, TimePicker, yyyyMMddFormat, updateDateTime } from '@patternfly/react-core';
 
 DateTimeRangePicker = () => {
   const [from, setFrom] = React.useState();
@@ -84,26 +75,34 @@ DateTimeRangePicker = () => {
     <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} />
+          <InputGroupItem>
+            <DatePicker onChange={onFromDateChange} aria-label="Start date" placeholder="YYYY-MM-DD" />
+          </InputGroupItem>
+          <InputGroupItem>
+            <TimePicker aria-label="Start time" style={{ width: '150px' }} onChange={onFromTimeChange} />
+          </InputGroupItem>
         </InputGroup>
       </FlexItem>
       <FlexItem>to</FlexItem>
       <FlexItem>
         <InputGroup>
-          <DatePicker
-            value={isValidDate(to) ? yyyyMMddFormat(to) : to}
-            onChange={onToDateChange}
-            isDisabled={!isValidDate(from)}
-            rangeStart={from}
-            validators={[toValidator]}
-            aria-label="End date"
-            placeholder="YYYY-MM-DD"
-          />
-          <TimePicker style={{ width: '150px' }} onChange={onToTimeChange} isDisabled={!isValidDate(from)} />
+          <InputGroupItem>
+            <DatePicker
+              value={isValidDate(to) ? yyyyMMddFormat(to) : to}
+              onChange={onToDateChange}
+              isDisabled={!isValidDate(from)}
+              rangeStart={from}
+              validators={[toValidator]}
+              aria-label="End date"
+              placeholder="YYYY-MM-DD"
+            />
+          </InputGroupItem>
+          <InputGroupItem>
+            <TimePicker style={{ width: '150px' }} onChange={onToTimeChange} isDisabled={!isValidDate(from)} />
+          </InputGroupItem>
         </InputGroup>
       </FlexItem>
     </Flex>
   );
-};
+}
 ```

package/src/demos/PasswordGenerator.md

@@ -15,6 +15,7 @@ import EyeSlashIcon from '@patternfly/react-icons/dist/esm/icons/eye-slash-icon'
 import React from 'react';
 import {
   InputGroup,
+  InputGroupItem,
   TextInput,
   Button,
   Popper,
@@ -119,23 +120,27 @@ const PasswordGenerator: React.FunctionComponent = () => {
   const textInput = (
     <div ref={searchInputRef} id="password-input">
       <InputGroup>
-        <TextInput
-          onFocus={() => {
-            setIsAutocompleteOpen(true);
-          }}
-          isRequired
-          type={passwordHidden ? 'password' : 'text'}
-          aria-label="Password input"
-          value={password}
-          onChange={onChange}
-        />
-        <Button
-          variant="control"
-          onClick={() => setPasswordHidden(!passwordHidden)}
-          aria-label={passwordHidden ? 'Show password' : 'Hide password'}
-        >
-          {passwordHidden ? <EyeIcon /> : <EyeSlashIcon />}
-        </Button>
+        <InputGroupItem isFill>
+          <TextInput
+            onFocus={() => {
+              setIsAutocompleteOpen(true);
+            }}
+            isRequired
+            type={passwordHidden ? 'password' : 'text'}
+            aria-label="Password input"
+            value={password}
+            onChange={onChange}
+          />
+        </InputGroupItem>
+        <InputGroupItem>
+          <Button
+            variant="control"
+            onClick={() => setPasswordHidden(!passwordHidden)}
+            aria-label={passwordHidden ? 'Show password' : 'Hide password'}
+          >
+            {passwordHidden ? <EyeIcon /> : <EyeSlashIcon />}
+          </Button>
+        </InputGroupItem>
       </InputGroup>
     </div>
   );