Skip to content

Commit 2760986

Browse files
authored
Merge pull request #1406 from florkbr/pf5-migration-cleanup
fix(pf4): clean up errors and functional issues noticed on pf demo page
2 parents a841574 + a69025e commit 2760986

File tree

6 files changed

+6
-11
lines changed

6 files changed

+6
-11
lines changed

packages/pf4-component-mapper/demo/index.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,6 @@ class App extends React.Component {
7777
}}
7878
componentMapper={{
7979
...componentMapper,
80-
'dual-list-select': {
81-
component: componentMapper['dual-list-select'],
82-
renderStatus: ({ selected, options }) => `selected ${selected} from ${options}`,
83-
},
8480
summary: Summary,
8581
}}
8682
FormTemplate={(props) => <FormTemplate {...props} showFormControls={this.state.additionalOptions.showFormControls} />}

packages/pf4-component-mapper/src/slider/slider.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const Slider = (props) => {
1919
id={id || input.name}
2020
FormGroupProps={FormGroupProps}
2121
>
22-
<PF4Slider onChange={input.onChange} onValueChange={input.onChange} currentValue={input.value} inputValue={input.value} {...rest} />
22+
<PF4Slider onChange={input.onChange} value={input.value} inputValue={input.value} isDisabled={isDisabled || isReadOnly} {...rest} />
2323
</FormGroup>
2424
);
2525
};

packages/pf4-component-mapper/src/text-field/text-field.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@ const TextField = (props) => {
2626
{...rest}
2727
id={id || input.name}
2828
isRequired={isRequired}
29-
isReadOnly={isReadOnly}
3029
isDisabled={isDisabled}
31-
readOnly={isReadOnly}
30+
readOnlyVariant={isReadOnly ? 'default' : undefined}
3231
/>
3332
</FormGroup>
3433
);

packages/pf4-component-mapper/src/textarea/textarea.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const Textarea = (props) => {
2323
<Pf4TextArea
2424
{...showError(meta, validateOnMount)}
2525
isRequired={isRequired}
26-
disabled={isDisabled || isReadOnly}
26+
isDisabled={isDisabled || isReadOnly}
2727
{...input}
2828
id={id || input.name}
2929
{...rest}

packages/pf4-component-mapper/src/time-picker/time-picker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const TimePicker = (props) => {
1919
id={id || input.name}
2020
FormGroupProps={FormGroupProps}
2121
>
22-
<PF4TimePicker {...input} defaultTime={input.value} {...rest} id={id || input.name} isDisabled={isDisabled || isReadOnly} />
22+
<PF4TimePicker {...input} time={input.value ? input.value : undefined} {...rest} id={id || input.name} isDisabled={isDisabled || isReadOnly} />
2323
</FormGroup>
2424
);
2525
};

packages/pf4-component-mapper/src/wizard/wizard.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ const WizardInternal = ({
117117
title={title}
118118
description={description}
119119
onClose={formOptions.onCancel}
120-
hideClose={hideClose}
120+
isCloseHidden={hideClose}
121121
titleId={titleId}
122122
descriptionId={descriptionId}
123123
closeButtonAriaLabel={closeButtonAriaLabel}
@@ -126,7 +126,7 @@ const WizardInternal = ({
126126
<WizardToggle activeStepIndex={activeStepIndex} currentStep={currentStep} navSchema={navSchema} isOpen={state.openNav} dispatch={dispatch} />
127127
<div className="pf-v5-c-wizard__outer-wrap">
128128
<div className="pf-v5-c-wizard__inner-wrap">
129-
<WizardNav aria-label={navAriaLabel} isOpen={state.openNav}>
129+
<WizardNav aria-label={navAriaLabel} isExpanded={state.openNav}>
130130
<FormSpy subscription={{ values: true, valid: true, validating: true }}>
131131
{({ values, valid, validating }) => (
132132
<WizardNavigation

0 commit comments

Comments
 (0)