@patternfly/react-core 4.224.11 → 4.224.14

package/dist/umd/react-core.js

@@ -1507,10 +1507,8 @@
      * @param {string} variant Optional variant to add to the generated ID
      */
     const useOUIAId = (componentType, id, variant) => {
-        if (id !== undefined) {
-            return id;
-        }
-        return React.useMemo(() => getDefaultOUIAId(componentType, variant), [componentType, variant]);
+        const defaultOUIAId = React.useMemo(() => getDefaultOUIAId(componentType, variant), [componentType, variant]);
+        return id !== null && id !== void 0 ? id : defaultOUIAId;
     };
     /**
      * Returns a generated id based on the URL location
@@ -21017,7 +21015,16 @@
                     return onClose();
                 }
                 else {
-                    const newStep = currentStep + 1;
+                    let newStep = currentStep;
+                    for (let nextStep = currentStep; nextStep <= maxSteps; nextStep++) {
+                        if (!flattenedSteps[nextStep]) {
+                            return;
+                        }
+                        if (!flattenedSteps[nextStep].isDisabled) {
+                            newStep = nextStep + 1;
+                            break;
+                        }
+                    }
                     this.setState({
                         currentStep: newStep
                     });
@@ -21038,7 +21045,16 @@
                     });
                 }
                 else {
-                    const newStep = currentStep - 1 <= 0 ? 0 : currentStep - 1;
+                    let newStep = currentStep;
+                    for (let prevStep = currentStep; prevStep >= 0; prevStep--) {
+                        if (!flattenedSteps[prevStep - 2]) {
+                            return;
+                        }
+                        if (!flattenedSteps[prevStep - 2].isDisabled) {
+                            newStep = prevStep - 1 <= 1 ? 1 : prevStep - 1;
+                            break;
+                        }
+                    }
                     this.setState({
                         currentStep: newStep
                     });
@@ -21048,9 +21064,12 @@
                 }
             };
             this.goToStep = (step) => {
+                const flattenedSteps = this.getFlattenedSteps();
+                if (flattenedSteps[step - 1].isDisabled) {
+                    return;
+                }
                 const { onGoToStep } = this.props;
                 const { currentStep } = this.state;
-                const flattenedSteps = this.getFlattenedSteps();
                 const maxSteps = flattenedSteps.length;
                 if (step < 1) {
                     step = 1;
@@ -21197,12 +21216,12 @@
                                     return;
                                 }
                                 navItemStep = this.getFlattenedStepsIndex(flattenedSteps, childStep.name);
-                                enabled = childStep.canJumpTo;
+                                enabled = childStep.canJumpTo && !childStep.isDisabled;
                                 return (React__namespace.createElement(WizardNavItem, { key: `child_${indexChild}`, id: childStep.id, content: childStep.name, isCurrent: activeStep.name === childStep.name, isDisabled: !enabled, step: navItemStep, onNavItemClick: this.goToStep }));
                             }))));
                     }
                     navItemStep = this.getFlattenedStepsIndex(flattenedSteps, step.name);
-                    enabled = step.canJumpTo;
+                    enabled = step.canJumpTo && !step.isDisabled;
                     return (React__namespace.createElement(WizardNavItem, Object.assign({}, step.stepNavItemProps, { key: index, id: step.id, content: step.name, isCurrent: activeStep.name === step.name, isDisabled: !enabled, step: navItemStep, onNavItemClick: this.goToStep })));
                 })));
             };