@patternfly/react-core 5.0.0-alpha.111 → 5.0.0-alpha.113

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/react-core",
-  "version": "5.0.0-alpha.111",
+  "version": "5.0.0-alpha.113",
   "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",
@@ -46,15 +46,15 @@
     "subpaths": "node scripts/createSubpaths.js"
   },
   "dependencies": {
-    "@patternfly/react-icons": "^5.0.0-alpha.17",
-    "@patternfly/react-styles": "^5.0.0-alpha.13",
-    "@patternfly/react-tokens": "^5.0.0-alpha.12",
+    "@patternfly/react-icons": "^5.0.0-alpha.18",
+    "@patternfly/react-styles": "^5.0.0-alpha.14",
+    "@patternfly/react-tokens": "^5.0.0-alpha.13",
     "focus-trap": "7.4.1",
     "react-dropzone": "^14.2.3",
     "tslib": "^2.5.0"
   },
   "devDependencies": {
-    "@patternfly/patternfly": "5.0.0-alpha.55",
+    "@patternfly/patternfly": "5.0.0-alpha.59",
     "@rollup/plugin-commonjs": "^25.0.0",
     "@rollup/plugin-node-resolve": "^15.0.2",
     "@rollup/plugin-replace": "^5.0.2",
@@ -71,5 +71,5 @@
     "react": "^17 || ^18",
     "react-dom": "^17 || ^18"
   },
-  "gitHead": "5ca3b66fb6082856f2ab3758f7c1181be80cac79"
+  "gitHead": "eac4934781b7f38e76d19d862f442a868ec594d2"
 }

package/src/components/InputGroup/InputGroupText.tsx

@@ -2,11 +2,6 @@ import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/InputGroup/input-group';
 import { css } from '@patternfly/react-styles';
 
-export enum InputGroupTextVariant {
-  default = 'default',
-  plain = 'plain'
-}
-
 export interface InputGroupTextProps extends React.HTMLProps<HTMLSpanElement | HTMLLabelElement> {
   /** Additional classes added to the input group text. */
   className?: string;
@@ -14,15 +9,12 @@ export interface InputGroupTextProps extends React.HTMLProps<HTMLSpanElement | H
   children: React.ReactNode;
   /** Component that wraps the input group text. */
   component?: React.ReactNode;
-  /** Input group text variant */
-  variant?: InputGroupTextVariant | 'default' | 'plain';
 }
 
 export const InputGroupText: React.FunctionComponent<InputGroupTextProps> = ({
   className = '',
   component = 'span',
   children,
-  variant = InputGroupTextVariant.default,
   ...props
 }: InputGroupTextProps) => {
   const Component = component as any;
@@ -30,7 +22,6 @@ export const InputGroupText: React.FunctionComponent<InputGroupTextProps> = ({
     <Component
       className={css(
         styles.inputGroupText,
-        variant === InputGroupTextVariant.plain && styles.modifiers.plain,
         className
       )}
       {...props}

package/src/components/InputGroup/__tests__/InputGroupText.test.tsx

@@ -2,12 +2,12 @@ import React from 'react';
 
 import { render, screen } from '@testing-library/react';
 
-import { InputGroupText, InputGroupTextVariant } from '../InputGroupText';
+import { InputGroupText } from '../InputGroupText';
 
 describe('InputGroupText', () => {
   test('renders', () => {
     render(
-      <InputGroupText className="inpt-grp-text" variant={InputGroupTextVariant.plain} id="email-npt-grp">
+      <InputGroupText className="inpt-grp-text" id="email-npt-grp">
         @
       </InputGroupText>
     );

package/src/components/InputGroup/examples/InputGroupBasic.tsx

@@ -4,7 +4,6 @@ import {
   InputGroup,
   InputGroupText,
   InputGroupItem,
-  InputGroupTextVariant,
   TextInput,
   ValidatedOptions
 } from '@patternfly/react-core';
@@ -41,7 +40,7 @@ export const InputGroupBasic: React.FunctionComponent = () => (
         <TextInput name="textInput-basic-3" id="textInput-basic-3" type="text" aria-label="percentage" />
       </InputGroupItem>
       <InputGroupItem isPlain isBox>
-        <InputGroupText id="plain-example" variant={InputGroupTextVariant.plain}>
+        <InputGroupText id="plain-example">
           %
         </InputGroupText>
       </InputGroupItem>

package/src/layouts/Flex/Flex.tsx

@@ -138,16 +138,17 @@ export interface FlexProps extends React.HTMLProps<HTMLDivElement> {
   };
   /** Gap between items at various breakpoints. This will override spacers for the main axis. */
   gap?: {
-    default?: 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap2xl' | 'gap3xl' | 'gap4xl';
-    sm?: 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap2xl' | 'gap3xl' | 'gap4xl';
-    md?: 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap2xl' | 'gap3xl' | 'gap4xl';
-    lg?: 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap2xl' | 'gap3xl' | 'gap4xl';
-    xl?: 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap2xl' | 'gap3xl' | 'gap4xl';
-    '2xl'?: 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap2xl' | 'gap3xl' | 'gap4xl';
+    default?: 'gap' | 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap2xl' | 'gap3xl' | 'gap4xl';
+    sm?: 'gap' | 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap2xl' | 'gap3xl' | 'gap4xl';
+    md?: 'gap' | 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap2xl' | 'gap3xl' | 'gap4xl';
+    lg?: 'gap' | 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap2xl' | 'gap3xl' | 'gap4xl';
+    xl?: 'gap' | 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap2xl' | 'gap3xl' | 'gap4xl';
+    '2xl'?: 'gap' | 'gapNone' | 'gapXs' | 'gapSm' | 'gapMd' | 'gapLg' | 'gapXl' | 'gap2xl' | 'gap3xl' | 'gap4xl';
   };
   /** Gap between rows at various breakpoints. This will override spacers for the main axis. */
   rowGap?: {
     default?:
+      | 'rowGap'
       | 'rowGapNone'
       | 'rowGapXs'
       | 'rowGapSm'
@@ -158,6 +159,7 @@ export interface FlexProps extends React.HTMLProps<HTMLDivElement> {
       | 'rowGap3xl'
       | 'rowGap4xl';
     sm?:
+      | 'rowGap'
       | 'rowGapNone'
       | 'rowGapXs'
       | 'rowGapSm'
@@ -168,6 +170,7 @@ export interface FlexProps extends React.HTMLProps<HTMLDivElement> {
       | 'rowGap3xl'
       | 'rowGap4xl';
     md?:
+      | 'rowGap'
       | 'rowGapNone'
       | 'rowGapXs'
       | 'rowGapSm'
@@ -178,6 +181,7 @@ export interface FlexProps extends React.HTMLProps<HTMLDivElement> {
       | 'rowGap3xl'
       | 'rowGap4xl';
     lg?:
+      | 'rowGap'
       | 'rowGapNone'
       | 'rowGapXs'
       | 'rowGapSm'
@@ -188,6 +192,7 @@ export interface FlexProps extends React.HTMLProps<HTMLDivElement> {
       | 'rowGap3xl'
       | 'rowGap4xl';
     xl?:
+      | 'rowGap'
       | 'rowGapNone'
       | 'rowGapXs'
       | 'rowGapSm'
@@ -198,6 +203,7 @@ export interface FlexProps extends React.HTMLProps<HTMLDivElement> {
       | 'rowGap3xl'
       | 'rowGap4xl';
     '2xl'?:
+      | 'rowGap'
       | 'rowGapNone'
       | 'rowGapXs'
       | 'rowGapSm'
@@ -211,6 +217,7 @@ export interface FlexProps extends React.HTMLProps<HTMLDivElement> {
   /** Gap beween columns at various breakpoints. This will override spacers for the main axis. */
   columnGap?: {
     default?:
+      | 'columnGap'
       | 'columnGapNone'
       | 'columnGapXs'
       | 'columnGapSm'
@@ -221,6 +228,7 @@ export interface FlexProps extends React.HTMLProps<HTMLDivElement> {
       | 'columnGap3xl'
       | 'columnGap4xl';
     sm?:
+      | 'columnGap'
       | 'columnGapNone'
       | 'columnGapXs'
       | 'columnGapSm'
@@ -231,6 +239,7 @@ export interface FlexProps extends React.HTMLProps<HTMLDivElement> {
       | 'columnGap3xl'
       | 'columnGap4xl';
     md?:
+      | 'columnGap'
       | 'columnGapNone'
       | 'columnGapXs'
       | 'columnGapSm'
@@ -241,6 +250,7 @@ export interface FlexProps extends React.HTMLProps<HTMLDivElement> {
       | 'columnGap3xl'
       | 'columnGap4xl';
     lg?:
+      | 'columnGap'
       | 'columnGapNone'
       | 'columnGapXs'
       | 'columnGapSm'
@@ -251,6 +261,7 @@ export interface FlexProps extends React.HTMLProps<HTMLDivElement> {
       | 'columnGap3xl'
       | 'columnGap4xl';
     xl?:
+      | 'columnGap'
       | 'columnGapNone'
       | 'columnGapXs'
       | 'columnGapSm'
@@ -261,6 +272,7 @@ export interface FlexProps extends React.HTMLProps<HTMLDivElement> {
       | 'columnGap3xl'
       | 'columnGap4xl';
     '2xl'?:
+      | 'columnGap'
       | 'columnGapNone'
       | 'columnGapXs'
       | 'columnGapSm'