@ansible/ansible-ui-framework 0.0.428 → 0.0.448

package/README.md

@@ -2,4 +2,4 @@
 
 A framework for building applications using [PatternFly](https://www.patternfly.org), developed by the Ansible UI developers.
 
-[Documentation](https://laughing-spoon-f689339f.pages.github.io/)
+[Documentation](https://github.com/ansible/ansible-ui/wiki/Ansible-UI-Framework)

package/cjs/PageActions/PageAction.d.ts

@@ -26,7 +26,7 @@ export type IPageSingleAction<T extends object> = IPageActionCommon & {
     type: PageActionType.single;
     variant?: ButtonVariant;
     onClick: (item: T) => void;
-    isDisabled?: (item: T) => string;
+    isDisabled?: (item: T) => string | undefined;
     isHidden?: (item: T) => boolean;
 };
 export type IPageDropdownAction<T extends object> = IPageActionCommon & {

package/cjs/PageActions/PageSingleAction.js

@@ -30,6 +30,6 @@ function PageSingleAction(props) {
     if (props.iconOnly) {
         variant = react_core_1.ButtonVariant.plain;
     }
-    return ((0, jsx_runtime_1.jsx)(Wrapper, { children: (0, jsx_runtime_1.jsx)(react_core_1.Tooltip, __assign({ content: tooltip, trigger: tooltip ? undefined : 'manual' }, { children: (0, jsx_runtime_1.jsx)(react_core_1.Button, __assign({ variant: variant, icon: Icon ? ((0, jsx_runtime_1.jsx)("span", __assign({ style: { marginLeft: -4, paddingRight: 4 } }, { children: (0, jsx_runtime_1.jsx)(Icon, {}) }))) : undefined, isAriaDisabled: Boolean(isDisabled), onClick: function () { return selectedItem && action.onClick(selectedItem); }, isDanger: action.isDanger }, { children: props.iconOnly && Icon ? (0, jsx_runtime_1.jsx)(Icon, {}) : action.shortLabel ? action.shortLabel : action.label })) })) }));
+    return ((0, jsx_runtime_1.jsx)(Wrapper, { children: (0, jsx_runtime_1.jsx)(react_core_1.Tooltip, __assign({ content: tooltip, trigger: tooltip ? undefined : 'manual' }, { children: (0, jsx_runtime_1.jsx)(react_core_1.Button, __assign({ id: props.action.label.toLowerCase().split(' ').join('-'), variant: variant, icon: Icon ? ((0, jsx_runtime_1.jsx)("span", __assign({ style: { marginLeft: -4, paddingRight: 4 } }, { children: (0, jsx_runtime_1.jsx)(Icon, {}) }))) : undefined, isAriaDisabled: Boolean(isDisabled), onClick: function () { return selectedItem && action.onClick(selectedItem); }, isDanger: action.isDanger }, { children: props.iconOnly && Icon ? (0, jsx_runtime_1.jsx)(Icon, {}) : action.shortLabel ? action.shortLabel : action.label })) })) }));
 }
 exports.PageSingleAction = PageSingleAction;

package/cjs/PageCells/TextCell.d.ts

@@ -3,7 +3,7 @@ import { PFColor } from '../components/pfcolors';
 export interface TextCellProps {
     icon?: ReactNode;
     iconSize?: 'sm' | 'md' | 'lg';
-    text?: string;
+    text?: string | null;
     to?: string;
     onClick?: () => void;
     color?: PFColor;

package/cjs/PageDetails/PageDetail.d.ts

@@ -0,0 +1,6 @@
+import { ReactNode } from 'react';
+export declare function PageDetail(props: {
+    label?: string;
+    children?: ReactNode;
+    isEmpty?: boolean;
+}): JSX.Element;

package/cjs/PageDetails/PageDetail.js

@@ -0,0 +1,27 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PageDetail = void 0;
+var jsx_runtime_1 = require("react/jsx-runtime");
+var react_core_1 = require("@patternfly/react-core");
+function PageDetail(props) {
+    var _a;
+    if (props.children === null || typeof props.children === 'undefined' || props.children === '') {
+        return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {});
+    }
+    if (props.isEmpty) {
+        return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {});
+    }
+    return ((0, jsx_runtime_1.jsxs)(react_core_1.DescriptionListGroup, { children: [props.label && (0, jsx_runtime_1.jsx)(react_core_1.DescriptionListTerm, { children: props.label }), (0, jsx_runtime_1.jsx)(react_core_1.DescriptionListDescription, __assign({ id: (_a = props.label) === null || _a === void 0 ? void 0 : _a.toLowerCase().split(' ').join('-') }, { children: props.children }))] }));
+}
+exports.PageDetail = PageDetail;

package/cjs/PageDetails/PageDetails.d.ts

@@ -0,0 +1,5 @@
+import { ReactNode } from 'react';
+export declare function PageDetails(props: {
+    children?: ReactNode;
+    disablePadding?: boolean;
+}): JSX.Element;

package/cjs/PageDetails/PageDetails.js

@@ -0,0 +1,45 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PageDetails = void 0;
+var jsx_runtime_1 = require("react/jsx-runtime");
+var react_core_1 = require("@patternfly/react-core");
+var Settings_1 = require("../Settings");
+function PageDetails(props) {
+    var disablePadding = props.disablePadding;
+    var settings = (0, Settings_1.useSettings)();
+    var orientation = settings.formLayout;
+    var columns = settings.formColumns;
+    var isCompact = false;
+    return ((0, jsx_runtime_1.jsx)(react_core_1.PageSection, __assign({ padding: { default: 'noPadding' }, style: {
+            backgroundColor: settings.theme === 'dark'
+                ? 'var(--pf-global--BackgroundColor--300)'
+                : 'var(--pf-global--BackgroundColor--100)',
+        } }, { children: (0, jsx_runtime_1.jsx)(react_core_1.DescriptionList, __assign({ orientation: {
+                sm: orientation,
+                md: orientation,
+                lg: orientation,
+                xl: orientation,
+                '2xl': orientation,
+            }, columnModifier: columns === 'multiple'
+                ? {
+                    default: '1Col',
+                    sm: '1Col',
+                    md: '2Col',
+                    lg: '2Col',
+                    xl: '3Col',
+                    '2xl': '3Col',
+                }
+                : undefined, style: { maxWidth: 1200, padding: disablePadding ? undefined : 24 }, isCompact: isCompact }, { children: props.children })) })));
+}
+exports.PageDetails = PageDetails;

package/cjs/PageDetails/PageDetailsFromColumns.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+import { ITableColumn } from '../PageTable/PageTable';
+export declare function PageDetailsFromColumns<T extends object>(props: {
+    item: T | undefined;
+    columns: ITableColumn<T>[];
+}): JSX.Element;

package/cjs/{PageTable/PageTableDetails.js → PageDetails/PageDetailsFromColumns.js}

@@ -11,16 +11,17 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TableDetails = void 0;
+exports.PageDetailsFromColumns = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 /* eslint-disable @typescript-eslint/no-empty-function */
-var Details_1 = require("../components/Details");
-var PageTable_1 = require("./PageTable");
-function TableDetails(props) {
+var PageTable_1 = require("../PageTable/PageTable");
+var PageDetail_1 = require("./PageDetail");
+var PageDetails_1 = require("./PageDetails");
+function PageDetailsFromColumns(props) {
     var item = props.item, columns = props.columns;
     if (!item)
         return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {});
-    return ((0, jsx_runtime_1.jsx)(Details_1.DetailsList, { children: columns.map(function (column) { return ((0, jsx_runtime_1.jsx)(Details_1.Detail, __assign({ label: column.header }, { children: (0, jsx_runtime_1.jsx)(PageTable_1.TableColumnCell, { column: column, item: item }) }), column.id)); }) }));
+    return ((0, jsx_runtime_1.jsx)(PageDetails_1.PageDetails, { children: columns.map(function (column) { return ((0, jsx_runtime_1.jsx)(PageDetail_1.PageDetail, __assign({ label: column.header }, { children: (0, jsx_runtime_1.jsx)(PageTable_1.TableColumnCell, { column: column, item: item }) }), column.id)); }) }));
 }
-exports.TableDetails = TableDetails;
+exports.PageDetailsFromColumns = PageDetailsFromColumns;

package/cjs/PageForm/Inputs/PageFormCheckbox.d.ts

@@ -1,9 +1,10 @@
-import { ReactNode } from 'react';
-export declare function PageFormCheckbox(props: {
-    label: string;
+/// <reference types="react" />
+import { CheckboxProps } from '@patternfly/react-core';
+import { Validate } from 'react-hook-form';
+export type PageFormCheckboxProps = {
+    id?: string;
     name: string;
-    helperText?: string;
-    required?: boolean;
-    description?: ReactNode;
-    body?: ReactNode;
-}): JSX.Element;
+    validate?: Validate<string> | Record<string, Validate<string>>;
+} & Omit<CheckboxProps, 'id' | 'onChange' | 'value'>;
+/** PatternFly Checkbox wrapper for use with react-hook-form */
+export declare function PageFormCheckbox(props: PageFormCheckboxProps): JSX.Element;

package/cjs/PageForm/Inputs/PageFormCheckbox.js

@@ -15,10 +15,14 @@ exports.PageFormCheckbox = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_core_1 = require("@patternfly/react-core");
 var react_hook_form_1 = require("react-hook-form");
+/** PatternFly Checkbox wrapper for use with react-hook-form */
 function PageFormCheckbox(props) {
-    var control = (0, react_hook_form_1.useFormContext)().control;
-    var field = (0, react_hook_form_1.useController)({ control: control, name: props.name }).field;
-    var id = props.name;
-    return ((0, jsx_runtime_1.jsx)(react_core_1.Checkbox, __assign({ label: props.label, id: id, "aria-describedby": "".concat(id, "-helper"), description: props.description, body: field.value ? props.body : undefined }, field, { isChecked: !!field.value })));
+    var name = props.name, readOnly = props.readOnly, validate = props.validate;
+    var _a = (0, react_hook_form_1.useFormContext)(), control = _a.control, isSubmitting = _a.formState.isSubmitting;
+    return ((0, jsx_runtime_1.jsx)(react_hook_form_1.Controller, { name: name, control: control, shouldUnregister: true, render: function (_a) {
+            var _b;
+            var _c = _a.field, onChange = _c.onChange, value = _c.value;
+            return ((0, jsx_runtime_1.jsx)(react_core_1.Checkbox, __assign({}, props, { id: (_b = props.id) !== null && _b !== void 0 ? _b : name.split('.').join('-'), isChecked: !!value, onChange: onChange, readOnly: readOnly || isSubmitting, minLength: undefined, maxLength: undefined, ref: undefined })));
+        }, rules: { validate: validate } }));
 }
 exports.PageFormCheckbox = PageFormCheckbox;

package/cjs/PageForm/Inputs/PageFormFileUpload.js

@@ -42,7 +42,7 @@ function PageFormFileUpload(props) {
     var handleFileReadStarted = function (_fileHandle) {
         setIsLoading(true);
     };
-    return ((0, jsx_runtime_1.jsx)(react_hook_form_1.Controller, { name: props.name, control: control, render: function (_a) {
+    return ((0, jsx_runtime_1.jsx)(react_hook_form_1.Controller, { name: props.name, control: control, shouldUnregister: true, render: function (_a) {
             var _b = _a.field, onChange = _b.onChange, value = _b.value, error = _a.fieldState.error;
             var handleClear = function (_event) {
                 setFilename('');

package/cjs/PageForm/Inputs/PageFormSelect.js

@@ -18,7 +18,7 @@ var FormGroupSelect_1 = require("./FormGroupSelect");
 /** PatternFly Select wrapper for use with react-hook-form */
 function PageFormSelect(props) {
     var _a = (0, react_hook_form_1.useFormContext)(), control = _a.control, isSubmitting = _a.formState.isSubmitting;
-    return ((0, jsx_runtime_1.jsx)(react_hook_form_1.Controller, { name: props.name, control: control, render: function (_a) {
+    return ((0, jsx_runtime_1.jsx)(react_hook_form_1.Controller, { name: props.name, control: control, shouldUnregister: true, render: function (_a) {
             var _b = _a.field, onChange = _b.onChange, value = _b.value, error = _a.fieldState.error;
             return ((0, jsx_runtime_1.jsx)(FormGroupSelect_1.FormGroupSelect, __assign({}, props, { value: value, onSelect: function (_, value) { return onChange(value); }, helperTextInvalid: error === null || error === void 0 ? void 0 : error.message, isReadOnly: props.isReadOnly || isSubmitting })));
         } }));

package/cjs/PageForm/Inputs/PageFormSelectOption.d.ts

@@ -1,7 +1,9 @@
 /// <reference types="react" />
+import { Validate } from 'react-hook-form';
 import { FormGroupSelectOptionProps } from './FormGroupSelectOption';
 export type PageFormSelectOptionProps<T> = {
     name: string;
+    validate?: Validate<string> | Record<string, Validate<string>>;
 } & Omit<FormGroupSelectOptionProps<T>, 'onSelect' | 'value'>;
 /**  Select wrapper for use with react-hook-form */
 export declare function PageFormSelectOption<T>(props: PageFormSelectOptionProps<T>): JSX.Element;

package/cjs/PageForm/Inputs/PageFormSelectOption.js

@@ -14,14 +14,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PageFormSelectOption = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_hook_form_1 = require("react-hook-form");
+var capitalize_1 = require("../../utils/capitalize");
 var FormGroupSelectOption_1 = require("./FormGroupSelectOption");
 /**  Select wrapper for use with react-hook-form */
 function PageFormSelectOption(props) {
+    var label = props.label, isRequired = props.isRequired, validate = props.validate;
     var _a = (0, react_hook_form_1.useFormContext)(), control = _a.control, isSubmitting = _a.formState.isSubmitting;
-    return ((0, jsx_runtime_1.jsx)(react_hook_form_1.Controller, { name: props.name, control: control, render: function (_a) {
+    return ((0, jsx_runtime_1.jsx)(react_hook_form_1.Controller, { name: props.name, control: control, shouldUnregister: true, render: function (_a) {
             var _b;
             var _c = _a.field, onChange = _c.onChange, value = _c.value, error = _a.fieldState.error;
             return ((0, jsx_runtime_1.jsx)(FormGroupSelectOption_1.FormGroupSelectOption, __assign({}, props, { id: (_b = props.id) !== null && _b !== void 0 ? _b : props.name, value: value, onSelect: function (_, value) { return onChange(value); }, helperTextInvalid: error === null || error === void 0 ? void 0 : error.message, isReadOnly: props.isReadOnly || isSubmitting })));
+        }, rules: {
+            required: typeof label === 'string' && typeof isRequired === 'boolean'
+                ? {
+                    value: true,
+                    message: "".concat((0, capitalize_1.capitalizeFirstLetter)(label.toLocaleLowerCase()), " is required."),
+                }
+                : isRequired,
+            validate: validate,
         } }));
 }
 exports.PageFormSelectOption = PageFormSelectOption;

package/cjs/PageForm/Inputs/PageFormTextArea.js

@@ -20,7 +20,7 @@ var FormGroupTextArea_1 = require("./FormGroupTextArea");
 function PageFormTextArea(props) {
     var name = props.name, label = props.label, isReadOnly = props.isReadOnly, isRequired = props.isRequired, minLength = props.minLength, maxLength = props.maxLength, pattern = props.pattern, validate = props.validate;
     var _a = (0, react_hook_form_1.useFormContext)(), control = _a.control, isSubmitting = _a.formState.isSubmitting;
-    return ((0, jsx_runtime_1.jsx)(react_hook_form_1.Controller, { name: name, control: control, render: function (_a) {
+    return ((0, jsx_runtime_1.jsx)(react_hook_form_1.Controller, { name: name, control: control, shouldUnregister: true, render: function (_a) {
             var _b;
             var _c = _a.field, onChange = _c.onChange, value = _c.value, error = _a.fieldState.error;
             return ((0, jsx_runtime_1.jsx)(FormGroupTextArea_1.FormGroupTextArea, __assign({}, props, { id: (_b = props.id) !== null && _b !== void 0 ? _b : name, value: value, onChange: onChange, helperTextInvalid: error === null || error === void 0 ? void 0 : error.message, isReadOnly: isReadOnly || isSubmitting, minLength: undefined, maxLength: undefined })));

package/cjs/PageForm/Inputs/PageFormTextInput.js

@@ -22,7 +22,7 @@ var FormGroupTextInput_1 = require("./FormGroupTextInput");
 function PageFormTextInput(props) {
     var label = props.label, name = props.name, isReadOnly = props.isReadOnly, isRequired = props.isRequired, minLength = props.minLength, maxLength = props.maxLength, pattern = props.pattern, validate = props.validate, selectTitle = props.selectTitle;
     var _a = (0, react_hook_form_1.useFormContext)(), control = _a.control, setValue = _a.setValue, _b = _a.formState, isSubmitting = _b.isSubmitting, isValidating = _b.isValidating;
-    return ((0, jsx_runtime_1.jsx)(react_hook_form_1.Controller, { name: name, control: control, render: function (_a) {
+    return ((0, jsx_runtime_1.jsx)(react_hook_form_1.Controller, { name: name, control: control, shouldUnregister: true, render: function (_a) {
             var _b;
             var _c = _a.field, onChange = _c.onChange, value = _c.value, error = _a.fieldState.error;
             return ((0, jsx_runtime_1.jsx)(FormGroupTextInput_1.FormGroupTextInput, __assign({}, props, { id: (_b = props.id) !== null && _b !== void 0 ? _b : name.split('.').join('-'), value: value, onChange: onChange, helperTextInvalid: !(validate && isValidating) && (error === null || error === void 0 ? void 0 : error.message), isReadOnly: isReadOnly || isSubmitting, minLength: undefined, maxLength: undefined }, { children: selectTitle && ((0, jsx_runtime_1.jsx)(react_core_1.Button, __assign({ variant: "control", onClick: function () {

package/cjs/PageForm/PageForm.d.ts

@@ -12,6 +12,8 @@ export declare function PageForm<T extends object>(props: {
     isVertical?: boolean;
     singleColumn?: boolean;
     disableScrolling?: boolean;
+    disableBody?: boolean;
+    disablePadding?: boolean;
 }): JSX.Element;
 export type PageFormSubmitHandler<T extends FieldValues> = (data: T, setError: (error: string) => void, setFieldError: (fieldName: FieldPath<T>, error: ErrorOption) => void) => Promise<unknown>;
 export declare function PageFormSubmitButton(props: {

package/cjs/PageForm/PageForm.js

@@ -71,12 +71,13 @@ var react_1 = require("react");
 var react_hook_form_1 = require("react-hook-form");
 var Scrollable_1 = require("../components/Scrollable");
 var useBreakPoint_1 = require("../components/useBreakPoint");
+var PageBody_1 = require("../PageBody");
 var Settings_1 = require("../Settings");
 var useFrameworkTranslations_1 = require("../useFrameworkTranslations");
 function PageForm(props) {
     var _this = this;
     var _a;
-    var schema = props.schema, defaultValue = props.defaultValue;
+    var schema = props.schema, defaultValue = props.defaultValue, disableBody = props.disableBody, disablePadding = props.disablePadding;
     var form = (0, react_hook_form_1.useForm)({
         defaultValues: defaultValue !== null && defaultValue !== void 0 ? defaultValue : {},
         resolver: schema
@@ -96,9 +97,7 @@ function PageForm(props) {
     var xl = multipleColumns ? (isHorizontal ? 6 : 6) : 12;
     var xl2 = multipleColumns ? (isHorizontal ? 4 : 4) : 12;
     var maxWidth = multipleColumns ? undefined : isHorizontal ? 960 : 800;
-    return (
-    // <PageBody>
-    (0, jsx_runtime_1.jsx)(react_hook_form_1.FormProvider, __assign({}, form, { children: (0, jsx_runtime_1.jsxs)(react_core_1.Form
+    var Component = ((0, jsx_runtime_1.jsx)(react_hook_form_1.FormProvider, __assign({}, form, { children: (0, jsx_runtime_1.jsxs)(react_core_1.Form
         // eslint-disable-next-line @typescript-eslint/no-misused-promises
         , __assign({ 
             // eslint-disable-next-line @typescript-eslint/no-misused-promises
@@ -128,12 +127,14 @@ function PageForm(props) {
                 flexGrow: 1,
                 overflow: props.disableScrolling ? undefined : 'hidden',
                 gap: 0,
-            } }, { children: [props.disableScrolling ? ((0, jsx_runtime_1.jsx)("div", __assign({ style: { maxWidth: maxWidth, padding: 24 } }, { children: (0, jsx_runtime_1.jsx)(react_core_1.Grid, __assign({ hasGutter: true, span: 12, sm: sm, md: md, lg: lg, xl: xl, xl2: xl2 }, { children: props.children })) }))) : ((0, jsx_runtime_1.jsx)(Scrollable_1.Scrollable, __assign({ style: { height: '100%', flexGrow: 1 } }, { children: (0, jsx_runtime_1.jsx)("div", __assign({ style: { maxWidth: maxWidth, padding: 24 } }, { children: (0, jsx_runtime_1.jsx)(react_core_1.Grid, __assign({ hasGutter: true, span: 12, sm: sm, md: md, lg: lg, xl: xl, xl2: xl2 }, { children: props.children })) })) }))), error && ((0, jsx_runtime_1.jsx)(react_core_1.Alert, { variant: "danger", title: error !== null && error !== void 0 ? error : '', isInline: true, style: { paddingLeft: isMd && props.onCancel ? 190 : undefined } })), props.onCancel ? ((0, jsx_runtime_1.jsx)("div", __assign({ style: {
+            } }, { children: [props.disableScrolling ? ((0, jsx_runtime_1.jsx)("div", __assign({ style: { maxWidth: maxWidth, padding: disablePadding ? undefined : 24 } }, { children: (0, jsx_runtime_1.jsx)(react_core_1.Grid, __assign({ hasGutter: true, span: 12, sm: sm, md: md, lg: lg, xl: xl, xl2: xl2 }, { children: props.children })) }))) : ((0, jsx_runtime_1.jsx)(Scrollable_1.Scrollable, __assign({ style: { height: '100%', flexGrow: 1 } }, { children: (0, jsx_runtime_1.jsx)("div", __assign({ style: { maxWidth: maxWidth, padding: disablePadding ? undefined : 24 } }, { children: (0, jsx_runtime_1.jsx)(react_core_1.Grid, __assign({ hasGutter: true, span: 12, sm: sm, md: md, lg: lg, xl: xl, xl2: xl2 }, { children: props.children })) })) }))), error && ((0, jsx_runtime_1.jsx)(react_core_1.Alert, { variant: "danger", title: error !== null && error !== void 0 ? error : '', isInline: true, style: { paddingLeft: isMd && props.onCancel ? 190 : undefined } })), props.onCancel ? ((0, jsx_runtime_1.jsx)("div", __assign({ style: {
                         backgroundColor: settings.theme === 'dark' ? 'var(--pf-global--BackgroundColor--400)' : undefined,
-                        padding: 24,
-                    } }, { children: (0, jsx_runtime_1.jsxs)(react_core_1.ActionGroup, __assign({ style: { marginTop: 0 } }, { children: [(0, jsx_runtime_1.jsx)(PageFormSubmitButton, { children: props.submitText }), props.onCancel && ((0, jsx_runtime_1.jsx)(PageFormCancelButton, __assign({ onCancel: props.onCancel }, { children: (_a = props.cancelText) !== null && _a !== void 0 ? _a : frameworkTranslations.cancelText })))] })) }))) : ((0, jsx_runtime_1.jsx)(PageFormSubmitButton, __assign({ style: { marginTop: 48 } }, { children: props.submitText })))] })) }))
-    // </PageBody>
-    );
+                        padding: disablePadding ? undefined : 24,
+                    } }, { children: (0, jsx_runtime_1.jsxs)(react_core_1.ActionGroup, __assign({ style: { marginTop: 0 } }, { children: [(0, jsx_runtime_1.jsx)(PageFormSubmitButton, { children: props.submitText }), props.onCancel && ((0, jsx_runtime_1.jsx)(PageFormCancelButton, __assign({ onCancel: props.onCancel }, { children: (_a = props.cancelText) !== null && _a !== void 0 ? _a : frameworkTranslations.cancelText })))] })) }))) : ((0, jsx_runtime_1.jsx)(PageFormSubmitButton, __assign({ style: { marginTop: 48 } }, { children: props.submitText })))] })) })));
+    if (!disableBody) {
+        Component = (0, jsx_runtime_1.jsx)(PageBody_1.PageBody, { children: Component });
+    }
+    return Component;
 }
 exports.PageForm = PageForm;
 function PageFormSubmitButton(props) {

package/cjs/PageForm/Utils/PageFormHidden.d.ts

@@ -0,0 +1,6 @@
+import { ReactNode } from 'react';
+export declare function PageFormHidden<T>(props: {
+    watch: string;
+    hidden: (value: T) => boolean;
+    children: ReactNode;
+}): JSX.Element;

package/cjs/PageForm/Utils/PageFormHidden.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PageFormHidden = void 0;
+var jsx_runtime_1 = require("react/jsx-runtime");
+var react_hook_form_1 = require("react-hook-form");
+function PageFormHidden(props) {
+    var value = (0, react_hook_form_1.useWatch)({ name: props.watch });
+    var hidden = props.hidden(value);
+    if (hidden)
+        return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {});
+    return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: props.children });
+}
+exports.PageFormHidden = PageFormHidden;

package/cjs/PageForm/Utils/PageFormSection.d.ts

@@ -0,0 +1,5 @@
+import { ReactNode } from 'react';
+export declare function PageFormSection(props: {
+    title: string;
+    children: ReactNode;
+}): JSX.Element;

package/cjs/PageForm/Utils/PageFormSection.js

@@ -0,0 +1,20 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PageFormSection = void 0;
+var jsx_runtime_1 = require("react/jsx-runtime");
+var react_core_1 = require("@patternfly/react-core");
+function PageFormSection(props) {
+    return ((0, jsx_runtime_1.jsx)(react_core_1.FormSection, __assign({ title: props.title, style: { marginTop: 16 } }, { children: props.children })));
+}
+exports.PageFormSection = PageFormSection;

package/cjs/PageForm/{Inputs → Utils}/PageFormWatch.js

@@ -4,8 +4,7 @@ exports.PageFormWatch = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_hook_form_1 = require("react-hook-form");
 function PageFormWatch(props) {
-    var control = (0, react_hook_form_1.useFormContext)().control;
-    var value = (0, react_hook_form_1.useWatch)({ control: control, name: props.watch });
+    var value = (0, react_hook_form_1.useWatch)({ name: props.watch });
     return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: props.children(value) });
 }
 exports.PageFormWatch = PageFormWatch;

package/cjs/PageHeader.d.ts

@@ -31,16 +31,14 @@ export interface PageHeaderProps {
  * @param {ReactNode} headerActions - The actions for the page.
  *
  * @example
- * <Page>
- *   <PageLayout>
- *     <PageHeader
- *       breadcrumbs={[{ label: 'Home', to: '/home' }, { label: 'Page title' }]}
- *       title='Page title'
- *       description='Page description'
- *       headerActions={<TypedActions actions={actions} />}
- *     />
- *     <PageBody />...</PageBody>
- *   </PageLayout>
- * <Page>
+ * <PageLayout>
+ *   <PageHeader
+ *     breadcrumbs={[{ label: 'Home', to: '/home' }, { label: 'Page title' }]}
+ *     title='Page title'
+ *     description='Page description'
+ *     headerActions={<TypedActions actions={actions} />}
+ *   />
+ *   ...
+ * </PageLayout>
  */
 export declare function PageHeader(props: PageHeaderProps): JSX.Element;

package/cjs/PageHeader.js

@@ -45,17 +45,15 @@ function Breadcrumbs(props) {
  * @param {ReactNode} headerActions - The actions for the page.
  *
  * @example
- * <Page>
- *   <PageLayout>
- *     <PageHeader
- *       breadcrumbs={[{ label: 'Home', to: '/home' }, { label: 'Page title' }]}
- *       title='Page title'
- *       description='Page description'
- *       headerActions={<TypedActions actions={actions} />}
- *     />
- *     <PageBody />...</PageBody>
- *   </PageLayout>
- * <Page>
+ * <PageLayout>
+ *   <PageHeader
+ *     breadcrumbs={[{ label: 'Home', to: '/home' }, { label: 'Page title' }]}
+ *     title='Page title'
+ *     description='Page description'
+ *     headerActions={<TypedActions actions={actions} />}
+ *   />
+ *   ...
+ * </PageLayout>
  */
 function PageHeader(props) {
     var navigation = props.navigation, breadcrumbs = props.breadcrumbs, title = props.title, description = props.description, controls = props.controls, headerActions = props.headerActions;

package/cjs/PageTable/PageTable.d.ts

@@ -1,12 +1,7 @@
 import { Dispatch, ReactNode, SetStateAction } from 'react';
 import { IPageAction } from '../PageActions/PageAction';
-import { PageHeaderProps } from '../PageHeader';
 import { PageTableViewType } from './PageTableViewType';
 import { IToolbarFilter } from './PageToolbar';
-export type TablePageProps<T extends object> = PageHeaderProps & PageTableProps<T> & {
-    error?: Error;
-};
-export declare function TablePage<T extends object>(props: TablePageProps<T>): JSX.Element;
 export type PageTableProps<T extends object> = {
     keyFn: (item: T) => string | number;
     itemCount?: number;
@@ -111,11 +106,11 @@ export interface ITableColumnTypeDateTime<T extends object> extends ITableColumn
 }
 export interface ITableColumnTypeDescription<T extends object> extends ITableColumnCommon<T> {
     type: 'description';
-    value: CellFn<T, string | undefined>;
+    value: CellFn<T, string | undefined | null>;
 }
 export interface ITableColumnTypeText<T extends object> extends ITableColumnCommon<T> {
     type: 'text';
-    value: CellFn<T, string | undefined>;
+    value: CellFn<T, string | null | undefined>;
 }
 export type ITableColumn<T extends object> = ITableColumnTypeReactNode<T> | ITableColumnTypeDateTime<T> | ITableColumnTypeLabels<T> | ITableColumnTypeCount<T> | ITableColumnTypeText<T> | ITableColumnTypeDescription<T>;
 export declare function TableColumnCell<T extends object>(props: {

package/cjs/PageTable/PageTable.js

@@ -30,7 +30,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TableColumnCell = exports.TableColumnCardType = exports.TableColumnSomething = exports.PageTable = exports.TablePage = void 0;
+exports.TableColumnCell = exports.TableColumnCardType = exports.TableColumnSomething = exports.PageTable = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_core_1 = require("@patternfly/react-core");
 var react_icons_1 = require("@patternfly/react-icons");
@@ -46,18 +46,12 @@ var DateTimeCell_1 = require("../PageCells/DateTimeCell");
 var LabelsCell_1 = require("../PageCells/LabelsCell");
 var TextCell_1 = require("../PageCells/TextCell");
 var PageColumnModal_1 = require("../PageColumnModal");
-var PageHeader_1 = require("../PageHeader");
-var PageLayout_1 = require("../PageLayout");
 var Settings_1 = require("../Settings");
 var PagePagination_1 = require("./PagePagination");
 var PageTableCards_1 = require("./PageTableCards");
 var PageTableList_1 = require("./PageTableList");
 var PageTableViewType_1 = require("./PageTableViewType");
 var PageToolbar_1 = require("./PageToolbar");
-function TablePage(props) {
-    return ((0, jsx_runtime_1.jsxs)(PageLayout_1.PageLayout, { children: [(0, jsx_runtime_1.jsx)(PageHeader_1.PageHeader, __assign({}, props)), (0, jsx_runtime_1.jsx)(PageTable, __assign({}, props))] }));
-}
-exports.TablePage = TablePage;
 /**
  * The PageTable component is used for adding a table to a page.
  *

package/cjs/PageTable/PageTableCard.js

@@ -28,9 +28,9 @@ var jsx_runtime_1 = require("react/jsx-runtime");
 /* eslint-disable @typescript-eslint/no-empty-function */
 var react_core_1 = require("@patternfly/react-core");
 var react_1 = require("react");
-var Details_1 = require("../components/Details");
 var IconWrapper_1 = require("../components/IconWrapper");
 var PageActions_1 = require("../PageActions/PageActions");
+var PageDetail_1 = require("../PageDetails/PageDetail");
 var PageTable_1 = require("./PageTable");
 function PageTableCard(props) {
     var _a;
@@ -144,9 +144,9 @@ function useColumnsToTableCardFn(columns, keyFn) {
                 icon: (_a = nameColumn === null || nameColumn === void 0 ? void 0 : nameColumn.icon) === null || _a === void 0 ? void 0 : _a.call(nameColumn, item),
                 title: (0, jsx_runtime_1.jsx)(PageTable_1.TableColumnCell, { column: nameColumn, item: item }),
                 subtitle: subtitleColumn && (!subtitleColumn.value || subtitleColumn.value(item)) && ((0, jsx_runtime_1.jsx)(PageTable_1.TableColumnCell, { column: subtitleColumn, item: item })),
-                cardBody: ((0, jsx_runtime_1.jsx)(react_core_1.CardBody, { children: (0, jsx_runtime_1.jsxs)(react_core_1.DescriptionList, __assign({ isCompact: true }, { children: [hasDescription && ((0, jsx_runtime_1.jsx)(Details_1.Detail, { children: descriptionColumn.type === 'description' ? ((0, jsx_runtime_1.jsx)("div", { children: descriptionColumn.value(item) })) : ((0, jsx_runtime_1.jsx)(PageTable_1.TableColumnCell, { column: descriptionColumn, item: item })) }, descriptionColumn.id)), cardColumns
+                cardBody: ((0, jsx_runtime_1.jsx)(react_core_1.CardBody, { children: (0, jsx_runtime_1.jsxs)(react_core_1.DescriptionList, __assign({ isCompact: true }, { children: [hasDescription && ((0, jsx_runtime_1.jsx)(PageDetail_1.PageDetail, { children: descriptionColumn.type === 'description' ? ((0, jsx_runtime_1.jsx)("div", { children: descriptionColumn.value(item) })) : ((0, jsx_runtime_1.jsx)(PageTable_1.TableColumnCell, { column: descriptionColumn, item: item })) }, descriptionColumn.id)), cardColumns
                                 .filter(function (column) { return !column.value || column.value(item); })
-                                .map(function (column) { return ((0, jsx_runtime_1.jsx)(Details_1.Detail, __assign({ label: column.header }, { children: (0, jsx_runtime_1.jsx)(PageTable_1.TableColumnCell, { column: column, item: item }) }), column.id)); }), countColumns.length > 0 && ((0, jsx_runtime_1.jsx)(Details_1.Detail, { children: (0, jsx_runtime_1.jsx)("div", __assign({ style: { display: 'flex', gap: 16, marginTop: 8, flexWrap: 'wrap' } }, { children: countColumns.map(function (column, i) { return ((0, jsx_runtime_1.jsxs)("div", __assign({ style: { display: 'flex', gap: 6, alignItems: 'baseline' } }, { children: [(0, jsx_runtime_1.jsx)(PageTable_1.TableColumnCell, { column: column, item: item }), (0, jsx_runtime_1.jsx)("small", __assign({ style: { opacity: 0.7 } }, { children: column.header }))] }), i)); }) })) }))] })) })),
+                                .map(function (column) { return ((0, jsx_runtime_1.jsx)(PageDetail_1.PageDetail, __assign({ label: column.header }, { children: (0, jsx_runtime_1.jsx)(PageTable_1.TableColumnCell, { column: column, item: item }) }), column.id)); }), countColumns.length > 0 && ((0, jsx_runtime_1.jsx)(PageDetail_1.PageDetail, { children: (0, jsx_runtime_1.jsx)("div", __assign({ style: { display: 'flex', gap: 16, marginTop: 8, flexWrap: 'wrap' } }, { children: countColumns.map(function (column, i) { return ((0, jsx_runtime_1.jsxs)("div", __assign({ style: { display: 'flex', gap: 6, alignItems: 'baseline' } }, { children: [(0, jsx_runtime_1.jsx)(PageTable_1.TableColumnCell, { column: column, item: item }), (0, jsx_runtime_1.jsx)("small", __assign({ style: { opacity: 0.7 } }, { children: column.header }))] }), i)); }) })) }))] })) })),
                 labels: labelColumn && ((_b = labelColumn.value(item)) === null || _b === void 0 ? void 0 : _b.map(function (label) { return ({ label: label }); })),
             };
             if (!hasDescription && cardColumns.length === 0 && countColumns.length === 0) {

package/cjs/PageTabs.d.ts

@@ -3,9 +3,10 @@ export declare function PageTabs(props: {
     children: ReactNode;
     preComponents?: ReactNode;
     postComponents?: ReactNode;
+    loading?: boolean;
 }): JSX.Element;
 export declare function PageTab(props: {
-    title?: string;
+    label?: string;
     children: ReactNode;
 }): JSX.Element;
 export declare function PageTabsOld(props: {

package/cjs/PageTabs.js

@@ -33,19 +33,23 @@ var react_core_1 = require("@patternfly/react-core");
 var react_1 = require("react");
 function PageTabs(props) {
     var _a;
+    var loading = props.loading;
     var _b = __read((0, react_1.useState)(0), 2), activeKey = _b[0], setActiveKey = _b[1];
     var onSelect = (0, react_1.useCallback)(function (_, key) { return setActiveKey(key); }, [setActiveKey]);
     var children = react_1.Children.toArray(props.children);
     var tabs = children.map(function (child, index) {
         if ((0, react_1.isValidElement)(child)) {
             if (child.type === PageTab) {
-                var title = child.props.title;
-                return ((0, jsx_runtime_1.jsx)(react_core_1.Tab, { title: title ? title : (0, jsx_runtime_1.jsx)(react_core_1.Skeleton, { width: "60px" }), eventKey: index }, title !== null && title !== void 0 ? title : index));
+                var label = child.props.label;
+                return ((0, jsx_runtime_1.jsx)(react_core_1.Tab, { title: label ? label : (0, jsx_runtime_1.jsx)(react_core_1.Skeleton, { width: "60px" }), eventKey: index }, label !== null && label !== void 0 ? label : index));
             }
         }
         return child;
     });
     var content = children[activeKey];
+    if (loading) {
+        return ((0, jsx_runtime_1.jsx)(PageTabs, { children: (0, jsx_runtime_1.jsx)(PageTab, { children: (0, jsx_runtime_1.jsx)(react_core_1.PageSection, __assign({ variant: "light" }, { children: (0, jsx_runtime_1.jsx)(react_core_1.Skeleton, {}) })) }) }));
+    }
     return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(react_core_1.PageSection, __assign({ type: react_core_1.PageSectionTypes.tabs }, { children: (0, jsx_runtime_1.jsxs)(react_core_1.Flex, __assign({ spaceItems: { default: 'spaceItemsNone' } }, { children: [props.preComponents && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(react_core_1.FlexItem
                                 // style={{ paddingLeft: 16 }}
                                 , { children: props.preComponents }), (0, jsx_runtime_1.jsx)(react_core_1.Divider, { orientation: { default: 'vertical' }, component: "div" })] })), (0, jsx_runtime_1.jsx)(react_core_1.FlexItem, __assign({ grow: { default: 'grow' } }, { children: (0, jsx_runtime_1.jsx)(react_core_1.Tabs, __assign({ activeKey: activeKey, onSelect: onSelect, inset: props.preComponents

package/cjs/index.d.ts

@@ -2,7 +2,6 @@ export * from './BulkActionDialog';
 export * from './BulkConfirmationDialog';
 export * from './components/BulkSelector';
 export * from './components/Collapse';
-export * from './components/Details';
 export * from './components/Help';
 export * from './components/icons/RunningIcon';
 export * from './components/pfcolors';
@@ -20,7 +19,9 @@ export * from './PageCells/DateTimeCell';
 export * from './PageCells/ElapsedTimeCell';
 export * from './PageCells/LabelsCell';
 export * from './PageCells/TextCell';
-export * from './PageDataList';
+export * from './PageDetails/PageDetail';
+export * from './PageDetails/PageDetails';
+export * from './PageDetails/PageDetailsFromColumns';
 export * from './PageDialog';
 export * from './PageForm/Inputs/FormGroupSelect';
 export * from './PageForm/Inputs/FormGroupSelectOption';
@@ -31,7 +32,6 @@ export * from './PageHeader';
 export * from './PageLayout';
 export * from './PageTable/PageTable';
 export * from './PageTable/PageTableCards';
-export * from './PageTable/PageTableDetails';
 export * from './PageTable/PageToolbar';
 export * from './PageTable/useTableItems';
 export * from './PageTabs';