@ansible/ansible-ui-framework 0.0.374 → 0.0.375

package/cjs/{PageForm.d.ts → PageForm/PageForm.d.ts}

@@ -2,7 +2,7 @@ import { JSONSchema6 } from 'json-schema';
 import { CSSProperties, ReactNode } from 'react';
 import { DeepPartial, ErrorOption, FieldPath, FieldValues, SubmitHandler, UseFormReturn } from 'react-hook-form';
 import { PartialDeep } from 'type-fest';
-import { PageHeaderProps } from './PageHeader';
+import { PageHeaderProps } from '../PageHeader';
 export type FormPageProps<T extends object> = PageHeaderProps & {
     children?: ReactNode;
     defaultValues?: PartialDeep<T>;

package/cjs/{PageForm.js → PageForm/PageForm.js}

@@ -38,10 +38,11 @@ var react_icons_1 = require("@patternfly/react-icons");
 var fast_deep_equal_1 = __importDefault(require("fast-deep-equal"));
 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 PageHeader_1 = require("./PageHeader");
-var Settings_1 = require("./Settings");
+var Scrollable_1 = require("../components/Scrollable");
+var useBreakPoint_1 = require("../components/useBreakPoint");
+var PageHeader_1 = require("../PageHeader");
+var Settings_1 = require("../Settings");
+var PageFormSelectOption_1 = require("./PageFormSelectOption");
 function FormPage(props) {
     // const methods = useForm<PartialDeep<T>>({
     //     defaultValues: props.defaultValues,
@@ -110,9 +111,7 @@ function FormTextInput(props) {
     var _c = __read((0, react_1.useState)(false), 2), showSecret = _c[0], setShowSecret = _c[1];
     return ((0, jsx_runtime_1.jsx)(react_core_1.FormGroup, __assign({ id: "".concat(id, "-form-group"), fieldId: id, label: props.label, helperText: props.helperText, isRequired: props.required, validated: (error === null || error === void 0 ? void 0 : error.message) ? 'error' : undefined, helperTextInvalid: error === null || error === void 0 ? void 0 : error.message }, { children: (0, jsx_runtime_1.jsxs)(react_core_1.InputGroup, { children: [(0, jsx_runtime_1.jsx)(react_core_1.TextInput, __assign({ id: id, type: props.secret && !showSecret ? 'password' : 'text', "aria-describedby": "".concat(id, "-form-group"), isRequired: props.required, validated: (error === null || error === void 0 ? void 0 : error.message) ? 'error' : undefined, autoFocus: props.autoFocus, placeholder: props.placeholder }, registration, { onChange: function (v, e) {
                         void registration.onChange(e);
-                    }, 
-                    // innerRef={registration.ref}
-                    isReadOnly: isSubmitting })), props.secret && ((0, jsx_runtime_1.jsx)(react_core_1.Button, __assign({ variant: "control", onClick: function () { return setShowSecret(!showSecret); }, "aria-label": "Options menu", isDisabled: isSubmitting }, { children: showSecret ? (0, jsx_runtime_1.jsx)(react_icons_1.EyeIcon, {}) : (0, jsx_runtime_1.jsx)(react_icons_1.EyeSlashIcon, {}) })))] }) })));
+                    }, isReadOnly: isSubmitting })), props.secret && ((0, jsx_runtime_1.jsx)(react_core_1.Button, __assign({ variant: "control", onClick: function () { return setShowSecret(!showSecret); }, "aria-label": "Options menu", isDisabled: isSubmitting }, { children: showSecret ? (0, jsx_runtime_1.jsx)(react_icons_1.EyeIcon, {}) : (0, jsx_runtime_1.jsx)(react_icons_1.EyeSlashIcon, {}) })))] }) })));
 }
 exports.FormTextInput = FormTextInput;
 function FormTextArea(props) {
@@ -204,7 +203,7 @@ function FormSelect(props) {
         setOpen(false);
     }, [field, options]);
     var index = 0;
-    return ((0, jsx_runtime_1.jsx)(react_core_1.FormGroup, __assign({ id: "".concat(id, "-form-group"), fieldId: id, label: props.label, helperTextInvalid: error, helperText: props.help, isRequired: props.required, validated: error ? 'error' : undefined }, { children: (0, jsx_runtime_1.jsx)(react_core_1.Select, __assign({ id: id, variant: react_core_1.SelectVariant.single, "aria-describedby": "".concat(id, "-helper"), validated: error ? 'error' : undefined }, field, { isOpen: open, onToggle: function () { return setOpen(!open); }, selections: selectedIndex === -1 ? '' : selectedIndex.toString(), onSelect: onSelect, isCreatable: props.create, isInputFilterPersisted: props.create, placeholderText: props.placeholder, isGrouped: isGrouped, footer: ((_b = props.footer) === null || _b === void 0 ? void 0 : _b.label) && ((0, jsx_runtime_1.jsx)(react_core_1.Button, __assign({ variant: "link", isInline: true, onClick: function () {
+    return ((0, jsx_runtime_1.jsx)(react_core_1.FormGroup, __assign({ id: "".concat(id, "-form-group"), fieldId: id, label: props.label, helperTextInvalid: error, helperText: props.help, isRequired: props.required, validated: error ? 'error' : undefined }, { children: (0, jsx_runtime_1.jsx)(react_core_1.Select, __assign({ id: id, variant: react_core_1.SelectVariant.single, "aria-describedby": "".concat(id, "-helper"), validated: error ? 'error' : undefined }, field, { isOpen: open, onToggle: function () { return setOpen(!open); }, selections: selectedIndex === -1 ? '' : selectedIndex.toString(), onSelect: onSelect, isCreatable: props.create, isInputFilterPersisted: props.create, placeholderText: props.placeholder, isGrouped: isGrouped, ref: field.ref, footer: ((_b = props.footer) === null || _b === void 0 ? void 0 : _b.label) && ((0, jsx_runtime_1.jsx)(react_core_1.Button, __assign({ variant: "link", isInline: true, onClick: function () {
                     var _a, _b;
                     setOpen(false);
                     (_b = (_a = props.footer) === null || _a === void 0 ? void 0 : _a.click) === null || _b === void 0 ? void 0 : _b.call(_a);
@@ -282,7 +281,7 @@ function FormSchema(props) {
                     case 'select': {
                         if ('options' in property) {
                             var formSelectProps = property;
-                            p.push((0, jsx_runtime_1.jsx)(FormSelect, { name: base + propertyName, label: title, placeholder: placeholder, required: required, options: formSelectProps.options, footer: formSelectProps.footer }, base + propertyName));
+                            p.push((0, jsx_runtime_1.jsx)(PageFormSelectOption_1.PageFormSelectOption, { name: base + propertyName, label: title, placeholder: placeholder, isRequired: required, options: formSelectProps.options, footer: formSelectProps.footer }, base + propertyName));
                         }
                         else {
                             p.push((0, jsx_runtime_1.jsx)(FormTextSelect, { name: base + propertyName, label: title, placeholder: placeholder, required: required, selectTitle: property.selectTitle, selectValue: property.selectValue, selectOpen: property.selectOpen }, base + propertyName));
@@ -353,14 +352,10 @@ function PageForm(props) {
                 flexGrow: 1,
                 overflow: props.disableScrolling ? undefined : 'hidden',
                 gap: 0,
-            } }, { children: [props.disableScrolling ? ((0, jsx_runtime_1.jsx)(react_core_1.PageSection, __assign({ isFilled: true, 
-                    // padding={{ default: props.onCancel ? 'padding' : 'noPadding' }}
-                    variant: "light", style: { maxWidth: maxWidth } }, { children: (0, jsx_runtime_1.jsxs)(react_core_1.Grid, __assign({ hasGutter: true, span: 12, sm: sm, md: md, lg: lg, xl: xl, xl2: xl2 }, { children: [props.schema && (0, jsx_runtime_1.jsx)(FormSchema, { schema: props.schema }), props.children] })) }))) : ((0, jsx_runtime_1.jsx)(Scrollable_1.Scrollable, __assign({ style: { height: '100%', flexGrow: 1 } }, { children: (0, jsx_runtime_1.jsx)(react_core_1.PageSection, __assign({ isFilled: true, 
-                        // padding={{ default: props.onCancel ? 'padding' : 'noPadding' }}
-                        variant: "light", style: { maxWidth: maxWidth } }, { children: (0, jsx_runtime_1.jsxs)(react_core_1.Grid, __assign({ hasGutter: true, span: 12, sm: sm, md: md, lg: lg, xl: xl, xl2: xl2 }, { children: [props.schema && (0, jsx_runtime_1.jsx)(FormSchema, { schema: props.schema }), 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)(react_core_1.PageSection, __assign({ isFilled: false, style: {
-                        borderTop: 'thin solid var(--pf-global--BorderColor--100)',
+            } }, { children: [props.disableScrolling ? ((0, jsx_runtime_1.jsx)("div", __assign({ style: { maxWidth: maxWidth, padding: 24 } }, { children: (0, jsx_runtime_1.jsxs)(react_core_1.Grid, __assign({ hasGutter: true, span: 12, sm: sm, md: md, lg: lg, xl: xl, xl2: xl2 }, { children: [props.schema && (0, jsx_runtime_1.jsx)(FormSchema, { schema: props.schema }), 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.jsxs)(react_core_1.Grid, __assign({ hasGutter: true, span: 12, sm: sm, md: md, lg: lg, xl: xl, xl2: xl2 }, { children: [props.schema && (0, jsx_runtime_1.jsx)(FormSchema, { schema: props.schema }), 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,
-                    }, variant: "light" }, { 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: props.cancelText })))] })) }))) : ((0, jsx_runtime_1.jsx)(PageFormSubmitButton, __assign({ style: { marginTop: 48 } }, { children: props.submitText })))] })) }))
+                        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: props.cancelText })))] })) }))) : ((0, jsx_runtime_1.jsx)(PageFormSubmitButton, __assign({ style: { marginTop: 48 } }, { children: props.submitText })))] })) }))
     // </PageBody>
     );
 }

package/cjs/PageForm/PageFormSelectOption.d.ts

@@ -0,0 +1,9 @@
+/// <reference types="react" />
+import { PageSelectOptionProps } from '../components/PageSelectOption';
+export type PageFormSelectOption<T> = {
+    name: string;
+} & Omit<PageSelectOptionProps<T>, 'onSelect' | 'value'>;
+/**
+ * A PageSelectOption for use in PageForms
+ */
+export declare function PageFormSelectOption<T>(props: PageFormSelectOption<T>): JSX.Element;

package/cjs/PageForm/PageFormSelectOption.js

@@ -0,0 +1,29 @@
+"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.PageFormSelectOption = void 0;
+var jsx_runtime_1 = require("react/jsx-runtime");
+var react_hook_form_1 = require("react-hook-form");
+var PageSelectOption_1 = require("../components/PageSelectOption");
+/**
+ * A PageSelectOption for use in PageForms
+ */
+function PageFormSelectOption(props) {
+    var _a = (0, react_hook_form_1.useFormContext)(), control = _a.control, isSubmitting = _a.formState.isSubmitting;
+    var name = props.name;
+    return ((0, jsx_runtime_1.jsx)(react_hook_form_1.Controller, { name: name, control: control, render: function (_a) {
+            var _b = _a.field, onChange = _b.onChange, value = _b.value, error = _a.fieldState.error;
+            return ((0, jsx_runtime_1.jsx)(PageSelectOption_1.PageSelectOption, __assign({}, props, { value: value, onSelect: onChange, helperTextInvalid: error === null || error === void 0 ? void 0 : error.message, readOnly: isSubmitting })));
+        } }));
+}
+exports.PageFormSelectOption = PageFormSelectOption;

package/cjs/PageToolbar.js

@@ -44,7 +44,7 @@ var react_core_1 = require("@patternfly/react-core");
 var react_icons_1 = require("@patternfly/react-icons");
 var react_1 = require("react");
 var BulkSelector_1 = require("./components/BulkSelector");
-var SingleSelect_1 = require("./components/SingleSelect");
+var PageSelect_1 = require("./components/PageSelect");
 var useBreakPoint_1 = require("./components/useBreakPoint");
 var PageActions_1 = require("./PageActions/PageActions");
 var PageActionType_1 = require("./PageActions/PageActionType");
@@ -112,7 +112,7 @@ function PageTableToolbar(props) {
             paddingBottom: sm ? undefined : 8,
             paddingTop: sm ? undefined : 8,
             backgroundColor: settings.theme === 'dark' ? 'var(--pf-global--BackgroundColor--300)' : undefined,
-        } }, { children: (0, jsx_runtime_1.jsxs)(react_core_1.ToolbarContent, { children: [showSelect && ((0, jsx_runtime_1.jsx)(react_core_1.ToolbarGroup, { children: (0, jsx_runtime_1.jsx)(react_core_1.ToolbarItem, __assign({ variant: "bulk-select" }, { children: (0, jsx_runtime_1.jsx)(BulkSelector_1.BulkSelector, __assign({}, props)) })) })), toolbarFilters && toolbarFilters.length > 0 && ((0, jsx_runtime_1.jsx)(react_core_1.ToolbarToggleGroup, __assign({ toggleIcon: (0, jsx_runtime_1.jsx)(react_icons_1.FilterIcon, {}), breakpoint: "md", style: { zIndex: 302 } }, { children: (0, jsx_runtime_1.jsxs)(react_core_1.ToolbarGroup, __assign({ variant: "filter-group" }, { children: [(0, jsx_runtime_1.jsx)(react_core_1.ToolbarItem, { children: (0, jsx_runtime_1.jsx)(SingleSelect_1.SingleSelect2, __assign({ onChange: setSeletedFilter, value: selectedFilter }, { children: toolbarFilters.map(function (filter) { return ((0, jsx_runtime_1.jsx)(react_core_1.SelectOption, __assign({ value: filter.key }, { children: (0, jsx_runtime_1.jsxs)(react_core_1.Flex, __assign({ spaceItems: { default: 'spaceItemsNone' }, alignItems: { default: 'alignItemsCenter' }, flexWrap: { default: 'nowrap' } }, { children: [(0, jsx_runtime_1.jsx)(react_core_1.FlexItem, __assign({ style: { paddingLeft: 4, paddingRight: 8 } }, { children: (0, jsx_runtime_1.jsx)(react_icons_1.FilterIcon, {}) })), (0, jsx_runtime_1.jsx)(react_core_1.FlexItem, { children: filter.label })] })) }), filter.key)); }) })) }), (0, jsx_runtime_1.jsx)(react_core_1.ToolbarItem, { children: (0, jsx_runtime_1.jsx)(ToolbarFilterInput, { filter: toolbarFilters.find(function (filter) { return filter.key === selectedFilter; }), addFilter: function (value) {
+        } }, { children: (0, jsx_runtime_1.jsxs)(react_core_1.ToolbarContent, { children: [showSelect && ((0, jsx_runtime_1.jsx)(react_core_1.ToolbarGroup, { children: (0, jsx_runtime_1.jsx)(react_core_1.ToolbarItem, __assign({ variant: "bulk-select" }, { children: (0, jsx_runtime_1.jsx)(BulkSelector_1.BulkSelector, __assign({}, props)) })) })), toolbarFilters && toolbarFilters.length > 0 && ((0, jsx_runtime_1.jsx)(react_core_1.ToolbarToggleGroup, __assign({ toggleIcon: (0, jsx_runtime_1.jsx)(react_icons_1.FilterIcon, {}), breakpoint: "md", style: { zIndex: 302 } }, { children: (0, jsx_runtime_1.jsxs)(react_core_1.ToolbarGroup, __assign({ variant: "filter-group" }, { children: [(0, jsx_runtime_1.jsx)(react_core_1.ToolbarItem, { children: (0, jsx_runtime_1.jsx)(PageSelect_1.PageSelect, __assign({ onSelect: setSeletedFilter, value: selectedFilter }, { children: toolbarFilters.map(function (filter) { return ((0, jsx_runtime_1.jsx)(react_core_1.SelectOption, __assign({ value: filter.key }, { children: (0, jsx_runtime_1.jsxs)(react_core_1.Flex, __assign({ spaceItems: { default: 'spaceItemsNone' }, alignItems: { default: 'alignItemsCenter' }, flexWrap: { default: 'nowrap' } }, { children: [(0, jsx_runtime_1.jsx)(react_core_1.FlexItem, __assign({ style: { paddingLeft: 4, paddingRight: 8 } }, { children: (0, jsx_runtime_1.jsx)(react_icons_1.FilterIcon, {}) })), (0, jsx_runtime_1.jsx)(react_core_1.FlexItem, { children: filter.label })] })) }), filter.key)); }) })) }), (0, jsx_runtime_1.jsx)(react_core_1.ToolbarItem, { children: (0, jsx_runtime_1.jsx)(ToolbarFilterInput, { filter: toolbarFilters.find(function (filter) { return filter.key === selectedFilter; }), addFilter: function (value) {
                                         var _a;
                                         var values = filters === null || filters === void 0 ? void 0 : filters[selectedFilter];
                                         if (!values)

package/cjs/Settings.js

@@ -31,7 +31,7 @@ exports.SettingsDialog = exports.useSettingsDialog = exports.SettingsProvider =
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_core_1 = require("@patternfly/react-core");
 var react_1 = require("react");
-var SingleSelect_1 = require("./components/SingleSelect");
+var PageSelect_1 = require("./components/PageSelect");
 var PageDialog_1 = require("./PageDialog");
 var useFrameworkTranslations_1 = require("./useFrameworkTranslations");
 exports.SettingsContext = (0, react_1.createContext)([
@@ -110,14 +110,14 @@ function SettingsDialog(props) {
     var _f = __read((0, useFrameworkTranslations_1.useFrameworkTranslations)(), 1), translations = _f[0];
     return ((0, jsx_runtime_1.jsx)(react_core_1.Modal, __assign({ title: "Settings", isOpen: props.open, onClose: onClose, variant: react_core_1.ModalVariant.medium, tabIndex: 0, actions: [
             (0, jsx_runtime_1.jsx)(react_core_1.Button, __assign({ variant: "primary", onClick: onClose }, { children: translations.closeText }), "close"),
-        ] }, { children: (0, jsx_runtime_1.jsxs)(react_core_1.Form, __assign({ isHorizontal: settings.formLayout === 'horizontal' }, { children: [(0, jsx_runtime_1.jsxs)(SingleSelect_1.SingleSelect, __assign({ label: "Theme", value: (_a = settings.theme) !== null && _a !== void 0 ? _a : 'system', onChange: function (theme) {
+        ] }, { children: (0, jsx_runtime_1.jsxs)(react_core_1.Form, __assign({ isHorizontal: settings.formLayout === 'horizontal' }, { children: [(0, jsx_runtime_1.jsxs)(PageSelect_1.PageSelect, __assign({ label: "Theme", value: (_a = settings.theme) !== null && _a !== void 0 ? _a : 'system', onSelect: function (theme) {
                         return setSettings(__assign(__assign({}, settings), { theme: theme }));
-                    } }, { children: [(0, jsx_runtime_1.jsx)(react_core_1.SelectOption, __assign({ value: "system" }, { children: 'System default' })), (0, jsx_runtime_1.jsx)(react_core_1.SelectOption, __assign({ value: "light" }, { children: 'Light' })), (0, jsx_runtime_1.jsx)(react_core_1.SelectOption, __assign({ value: "dark" }, { children: 'Dark' }))] })), (0, jsx_runtime_1.jsxs)(SingleSelect_1.SingleSelect, __assign({ label: "Table Layout", value: (_b = settings.tableLayout) !== null && _b !== void 0 ? _b : 'comfortable', onChange: function (tableLayout) {
+                    } }, { children: [(0, jsx_runtime_1.jsx)(react_core_1.SelectOption, __assign({ value: "system" }, { children: 'System default' })), (0, jsx_runtime_1.jsx)(react_core_1.SelectOption, __assign({ value: "light" }, { children: 'Light' })), (0, jsx_runtime_1.jsx)(react_core_1.SelectOption, __assign({ value: "dark" }, { children: 'Dark' }))] })), (0, jsx_runtime_1.jsxs)(PageSelect_1.PageSelect, __assign({ label: "Table Layout", value: (_b = settings.tableLayout) !== null && _b !== void 0 ? _b : 'comfortable', onSelect: function (tableLayout) {
                         return setSettings(__assign(__assign({}, settings), { tableLayout: tableLayout }));
-                    } }, { children: [(0, jsx_runtime_1.jsx)(react_core_1.SelectOption, __assign({ value: "comfortable" }, { children: 'Comfortable' })), (0, jsx_runtime_1.jsx)(react_core_1.SelectOption, __assign({ value: "compact" }, { children: 'Compact' }))] })), (0, jsx_runtime_1.jsxs)(SingleSelect_1.SingleSelect, __assign({ label: "Form Columns", value: (_c = settings.formColumns) !== null && _c !== void 0 ? _c : 'multiple', onChange: function (formColumns) {
+                    } }, { children: [(0, jsx_runtime_1.jsx)(react_core_1.SelectOption, __assign({ value: "comfortable" }, { children: 'Comfortable' })), (0, jsx_runtime_1.jsx)(react_core_1.SelectOption, __assign({ value: "compact" }, { children: 'Compact' }))] })), (0, jsx_runtime_1.jsxs)(PageSelect_1.PageSelect, __assign({ label: "Form Columns", value: (_c = settings.formColumns) !== null && _c !== void 0 ? _c : 'multiple', onSelect: function (formColumns) {
                         return setSettings(__assign(__assign({}, settings), { formColumns: formColumns }));
-                    } }, { children: [(0, jsx_runtime_1.jsx)(react_core_1.SelectOption, __assign({ value: "multiple" }, { children: 'Multiple columns' })), (0, jsx_runtime_1.jsx)(react_core_1.SelectOption, __assign({ value: "single" }, { children: 'Single column' }))] })), (0, jsx_runtime_1.jsxs)(SingleSelect_1.SingleSelect, __assign({ label: "Form Layout", value: (_d = settings.formLayout) !== null && _d !== void 0 ? _d : 'vertical', onChange: function (formLayout) {
+                    } }, { children: [(0, jsx_runtime_1.jsx)(react_core_1.SelectOption, __assign({ value: "multiple" }, { children: 'Multiple columns' })), (0, jsx_runtime_1.jsx)(react_core_1.SelectOption, __assign({ value: "single" }, { children: 'Single column' }))] })), (0, jsx_runtime_1.jsxs)(PageSelect_1.PageSelect, __assign({ label: "Form Layout", value: (_d = settings.formLayout) !== null && _d !== void 0 ? _d : 'vertical', onSelect: function (formLayout) {
                         return setSettings(__assign(__assign({}, settings), { formLayout: formLayout }));
-                    } }, { children: [(0, jsx_runtime_1.jsx)(react_core_1.SelectOption, __assign({ value: "vertical" }, { children: 'Vertical labels' })), (0, jsx_runtime_1.jsx)(react_core_1.SelectOption, __assign({ value: "horizontal" }, { children: 'Horizontal labels' }))] })), (0, jsx_runtime_1.jsxs)(SingleSelect_1.SingleSelect, __assign({ label: "Borders", value: settings.borders ? 'true' : 'false', onChange: function (value) { return setSettings(__assign(__assign({}, settings), { borders: value === 'true' })); }, style: { paddingBottom: 120 } }, { children: [(0, jsx_runtime_1.jsx)(react_core_1.SelectOption, __assign({ value: "true" }, { children: 'Yes' })), (0, jsx_runtime_1.jsx)(react_core_1.SelectOption, __assign({ value: "false" }, { children: 'No' }))] }))] })) })));
+                    } }, { children: [(0, jsx_runtime_1.jsx)(react_core_1.SelectOption, __assign({ value: "vertical" }, { children: 'Vertical labels' })), (0, jsx_runtime_1.jsx)(react_core_1.SelectOption, __assign({ value: "horizontal" }, { children: 'Horizontal labels' }))] })), (0, jsx_runtime_1.jsxs)(PageSelect_1.PageSelect, __assign({ label: "Borders", value: settings.borders ? 'true' : 'false', onSelect: function (value) { return setSettings(__assign(__assign({}, settings), { borders: value === 'true' })); } }, { children: [(0, jsx_runtime_1.jsx)(react_core_1.SelectOption, __assign({ value: "true" }, { children: 'Yes' })), (0, jsx_runtime_1.jsx)(react_core_1.SelectOption, __assign({ value: "false" }, { children: 'No' }))] }))] })) })));
 }
 exports.SettingsDialog = SettingsDialog;

package/cjs/components/PageFormGroup.d.ts

@@ -0,0 +1,11 @@
+import { ReactNode } from 'react';
+export type PageFormGroupProps = {
+    children: ReactNode;
+    helperText?: ReactNode | undefined;
+    helperTextInvalid?: ReactNode | undefined;
+    id?: string;
+    isRequired?: boolean;
+    label?: string;
+};
+/** Wrapper over the PatternFly FormGroup making it optional based on if label is given. */
+export declare function PageFormGroup(props: PageFormGroupProps): JSX.Element;

package/cjs/components/PageFormGroup.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.PageFormGroup = void 0;
+var jsx_runtime_1 = require("react/jsx-runtime");
+var react_core_1 = require("@patternfly/react-core");
+/** Wrapper over the PatternFly FormGroup making it optional based on if label is given. */
+function PageFormGroup(props) {
+    var _a;
+    var children = props.children, helperText = props.helperText, helperTextInvalid = props.helperTextInvalid, isRequired = props.isRequired, label = props.label;
+    if (!label) {
+        return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: props.children });
+    }
+    var id = (_a = props.id) !== null && _a !== void 0 ? _a : label === null || label === void 0 ? void 0 : label.toLocaleLowerCase().split(' ').join('-');
+    return ((0, jsx_runtime_1.jsx)(react_core_1.FormGroup, __assign({ fieldId: id, helperText: helperText, helperTextInvalid: helperTextInvalid, id: "".concat(id, "-form-group"), isRequired: isRequired, label: label, validated: helperTextInvalid ? 'error' : undefined }, { children: children })));
+}
+exports.PageFormGroup = PageFormGroup;

package/cjs/components/PageSelect.d.ts

@@ -0,0 +1,16 @@
+import React, { ChangeEvent, ReactNode } from 'react';
+import { PageFormGroupProps } from './PageFormGroup';
+export type PageSelectProps = {
+    footer?: ReactNode;
+    isCreatable?: boolean;
+    isGrouped?: boolean | undefined;
+    onSelect: (value: string, event: React.MouseEvent<Element, MouseEvent> | ChangeEvent<Element>) => void;
+    placeholder?: string;
+    value: string | undefined;
+    readOnly?: boolean;
+} & PageFormGroupProps;
+/** Wrapper over a PatternFly Select.
+ * Simplifies the PatternFly Select.
+ * Supports a PageFormGroup with label if label is specififed.
+ */
+export declare function PageSelect(props: PageSelectProps): JSX.Element;

package/cjs/components/PageSelect.js

@@ -0,0 +1,54 @@
+"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);
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PageSelect = void 0;
+var jsx_runtime_1 = require("react/jsx-runtime");
+var react_core_1 = require("@patternfly/react-core");
+var react_1 = require("react");
+var PageFormGroup_1 = require("./PageFormGroup");
+/** Wrapper over a PatternFly Select.
+ * Simplifies the PatternFly Select.
+ * Supports a PageFormGroup with label if label is specififed.
+ */
+function PageSelect(props) {
+    var _a;
+    var children = props.children, footer = props.footer, helperTextInvalid = props.helperTextInvalid, isCreatable = props.isCreatable, isGrouped = props.isGrouped, isReadonly = props.readOnly, label = props.label, onSelect = props.onSelect, placeholder = props.placeholder, value = props.value;
+    var _b = __read((0, react_1.useState)(false), 2), open = _b[0], setOpen = _b[1];
+    var onToggle = (0, react_1.useCallback)(function () { return setOpen(function (open) { return !open; }); }, []);
+    var onSelectHandler = (0, react_1.useCallback)(function (event, value) {
+        if (typeof value === 'string')
+            onSelect(value, event);
+        else
+            onSelect(value.toString(), event);
+        setOpen(false);
+    }, [onSelect]);
+    var id = (_a = props.id) !== null && _a !== void 0 ? _a : label === null || label === void 0 ? void 0 : label.toLocaleLowerCase().split(' ').join('-');
+    return ((0, jsx_runtime_1.jsx)(PageFormGroup_1.PageFormGroup, __assign({}, props, { children: (0, jsx_runtime_1.jsx)(react_core_1.Select, __assign({ "aria-describedby": id ? "".concat(id, "-form-group") : undefined, footer: footer, id: id, isCreatable: isCreatable, isGrouped: isGrouped, isInputFilterPersisted: isCreatable, isOpen: open, maxHeight: 280, onSelect: onSelectHandler, onToggle: onToggle, placeholderText: placeholder, selections: value, validated: helperTextInvalid ? 'error' : undefined, variant: react_core_1.SelectVariant.single, isDisabled: isReadonly }, { children: children })) })));
+}
+exports.PageSelect = PageSelect;

package/cjs/components/PageSelectOption.d.ts

@@ -0,0 +1,14 @@
+import { ChangeEvent } from 'react';
+import { PageSelectProps } from './PageSelect';
+export interface IPageSelectOption<T> {
+    group?: string;
+    label: string;
+    description?: string;
+    value: T;
+}
+export type PageSelectOptionProps<T> = {
+    options: IPageSelectOption<T>[];
+    onSelect: (value: T | undefined, event: React.MouseEvent<Element, MouseEvent> | ChangeEvent<Element>) => void;
+    value: T | undefined;
+} & Omit<PageSelectProps, 'onSelect' | 'value' | 'children'>;
+export declare function PageSelectOption<T>(props: PageSelectOptionProps<T>): JSX.Element;

package/cjs/components/PageSelectOption.js

@@ -0,0 +1,56 @@
+"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.PageSelectOption = void 0;
+var jsx_runtime_1 = require("react/jsx-runtime");
+var react_core_1 = require("@patternfly/react-core");
+var react_1 = require("react");
+var PageSelect_1 = require("./PageSelect");
+function PageSelectOption(props) {
+    var onSelect = props.onSelect, value = props.value;
+    var onSelectHandler = (0, react_1.useCallback)(function (label, event) {
+        var _a;
+        onSelect((_a = props.options.find(function (option) { return option.label === label; })) === null || _a === void 0 ? void 0 : _a.value, event);
+    }, [onSelect, props.options]);
+    var options = props.options;
+    options.sort(function (l, r) {
+        var _a, _b, _c, _d;
+        if (((_a = l.group) !== null && _a !== void 0 ? _a : '') < ((_b = r.group) !== null && _b !== void 0 ? _b : ''))
+            return -1;
+        if (((_c = l.group) !== null && _c !== void 0 ? _c : '') > ((_d = r.group) !== null && _d !== void 0 ? _d : ''))
+            return 1;
+        if (l.label < r.label)
+            return -1;
+        if (l.label > r.label)
+            return 1;
+        return 0;
+    });
+    var groups = options.reduce(function (groups, option) {
+        var _a;
+        var group = (_a = option.group) !== null && _a !== void 0 ? _a : '';
+        var optionsArray = groups[group];
+        if (!optionsArray) {
+            optionsArray = [];
+            groups[group] = optionsArray;
+        }
+        optionsArray.push(option);
+        return groups;
+    }, {});
+    var isGrouped = Object.keys(groups).length > 1 ||
+        (Object.keys(groups).length === 1 && Object.keys(groups)[0] !== '');
+    var selected = props.options.find(function (option) { return option.value === value; });
+    return ((0, jsx_runtime_1.jsx)(PageSelect_1.PageSelect, __assign({}, props, { value: selected === null || selected === void 0 ? void 0 : selected.label, onSelect: onSelectHandler, isGrouped: isGrouped }, { children: !isGrouped
+            ? options.map(function (option) { return ((0, jsx_runtime_1.jsx)(react_core_1.SelectOption, __assign({ value: option.label, label: option.label, description: option.description }, { children: option.label }), option.label)); })
+            : Object.keys(groups).map(function (group) { return ((0, jsx_runtime_1.jsx)(react_core_1.SelectGroup, __assign({ label: group }, { children: groups[group].map(function (option) { return ((0, jsx_runtime_1.jsx)(react_core_1.SelectOption, __assign({ value: option.label, label: option.label, description: option.description }, { children: option.label }), option.label)); }) }), group)); }) })));
+}
+exports.PageSelectOption = PageSelectOption;

package/cjs/components/useOpen.d.ts

@@ -1,4 +1,4 @@
-export declare function useOpen(props: {
+export declare function useOpen(props?: {
     open?: boolean;
     setOpen?: (open: boolean) => void;
 }): [boolean, (open: boolean) => void, () => void];

package/cjs/components/useOpen.js

@@ -19,14 +19,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useOpen = void 0;
 var react_1 = require("react");
 function useOpen(props) {
-    var _a = __read((0, react_1.useState)(function () { var _a; return (_a = props.open) !== null && _a !== void 0 ? _a : false; }), 2), open = _a[0], setOpenState = _a[1];
+    var _a = __read((0, react_1.useState)(function () { var _a; return (_a = props === null || props === void 0 ? void 0 : props.open) !== null && _a !== void 0 ? _a : false; }), 2), open = _a[0], setOpenState = _a[1];
     (0, react_1.useEffect)(function () {
-        if (props.open !== undefined) {
-            setOpenState(props.open);
+        if ((props === null || props === void 0 ? void 0 : props.open) !== undefined) {
+            setOpenState(props === null || props === void 0 ? void 0 : props.open);
         }
-    }, [props.open, setOpenState]);
+    }, [props === null || props === void 0 ? void 0 : props.open, setOpenState]);
     var setOpen = (0, react_1.useCallback)(function (open) {
-        props.setOpen ? props.setOpen(open) : setOpenState(open);
+        (props === null || props === void 0 ? void 0 : props.setOpen) ? props === null || props === void 0 ? void 0 : props.setOpen(open) : setOpenState(open);
     }, [props]);
     var onToggle = (0, react_1.useCallback)(function () {
         setOpen(!open);

package/cjs/index.d.ts

@@ -12,6 +12,8 @@ export * from './components/Collapse';
 export * from './components/Details';
 export * from './components/Help';
 export * from './components/icons/RunningIcon';
+export * from './components/PageSelect';
+export * from './components/PageSelectOption';
 export * from './components/pfcolors';
 export * from './components/Scrollable';
 export * from './components/useBreakPoint';
@@ -22,7 +24,8 @@ export * from './PageAlertToaster';
 export * from './PageBody';
 export * from './PageDataList';
 export * from './PageDialog';
-export * from './PageForm';
+export * from './PageForm/PageForm';
+export * from './PageForm/PageFormSelectOption';
 export * from './PageFramework';
 export * from './PageHeader';
 export * from './PageLayout';

package/cjs/index.js

@@ -28,6 +28,8 @@ __exportStar(require("./components/Collapse"), exports);
 __exportStar(require("./components/Details"), exports);
 __exportStar(require("./components/Help"), exports);
 __exportStar(require("./components/icons/RunningIcon"), exports);
+__exportStar(require("./components/PageSelect"), exports);
+__exportStar(require("./components/PageSelectOption"), exports);
 __exportStar(require("./components/pfcolors"), exports);
 __exportStar(require("./components/Scrollable"), exports);
 __exportStar(require("./components/useBreakPoint"), exports);
@@ -38,7 +40,8 @@ __exportStar(require("./PageAlertToaster"), exports);
 __exportStar(require("./PageBody"), exports);
 __exportStar(require("./PageDataList"), exports);
 __exportStar(require("./PageDialog"), exports);
-__exportStar(require("./PageForm"), exports);
+__exportStar(require("./PageForm/PageForm"), exports);
+__exportStar(require("./PageForm/PageFormSelectOption"), exports);
 __exportStar(require("./PageFramework"), exports);
 __exportStar(require("./PageHeader"), exports);
 __exportStar(require("./PageLayout"), exports);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ansible/ansible-ui-framework",
   "description": "A framework for building applications using PatternFly.",
-  "version": "0.0.374",
+  "version": "0.0.375",
   "author": "Red Hat",
   "license": "MIT",
   "repository": {

package/cjs/components/SingleSelect.d.ts

@@ -1,18 +0,0 @@
-import { CSSProperties, ReactNode } from 'react';
-export declare function SingleSelect(props: {
-    id?: string;
-    label: string;
-    value: string;
-    onChange: (value: string) => void;
-    children: ReactNode;
-    style?: CSSProperties;
-    open?: boolean;
-    setOpen?: (open: boolean) => void;
-}): JSX.Element;
-export declare function SingleSelect2(props: {
-    id?: string;
-    children: ReactNode;
-    value?: string;
-    onChange: (value: string) => void;
-    label?: string;
-}): JSX.Element;

package/cjs/components/SingleSelect.js

@@ -1,70 +0,0 @@
-"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);
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SingleSelect2 = exports.SingleSelect = void 0;
-var jsx_runtime_1 = require("react/jsx-runtime");
-var react_core_1 = require("@patternfly/react-core");
-var react_1 = require("react");
-var useOpen_1 = require("./useOpen");
-function SingleSelect(props) {
-    var _a;
-    var onChange = props.onChange;
-    var _b = __read((0, useOpen_1.useOpen)(props), 3), open = _b[0], setOpen = _b[1], onToggle = _b[2];
-    var onSelect = (0, react_1.useCallback)(function (_e, v) {
-        if (typeof v === 'string') {
-            onChange(v);
-        }
-        else {
-            onChange(v.toString());
-        }
-        setOpen(false);
-    }, [onChange, setOpen]);
-    var id = (_a = props.id) !== null && _a !== void 0 ? _a : props.label.toLocaleLowerCase().split(' ').join('-');
-    return ((0, jsx_runtime_1.jsx)(react_core_1.FormGroup, __assign({ label: props.label, fieldId: id, style: props.style }, { children: (0, jsx_runtime_1.jsx)(react_core_1.Select, __assign({ id: id, selections: props.value, isOpen: open, onToggle: onToggle, onSelect: onSelect }, { children: props.children })) })));
-}
-exports.SingleSelect = SingleSelect;
-function SingleSelect2(props) {
-    var onChange = props.onChange;
-    var id = props.id;
-    var _a = __read((0, react_1.useState)(false), 2), open = _a[0], setOpen = _a[1];
-    var onToggle = (0, react_1.useCallback)(function () {
-        setOpen(function (open) { return !open; });
-    }, []);
-    var onSelect = (0, react_1.useCallback)(function (_e, v) {
-        if (typeof v === 'string') {
-            onChange(v);
-        }
-        else {
-            onChange(v.toString());
-        }
-        setOpen(false);
-    }, [onChange]);
-    return ((0, jsx_runtime_1.jsx)(react_core_1.Select, __assign({ id: id, selections: props.value, isOpen: open, onToggle: onToggle, onSelect: onSelect }, { children: props.children })));
-}
-exports.SingleSelect2 = SingleSelect2;