@snack-uikit/stepper 0.5.10-preview-e59b2871.0 → 0.5.10-preview-96ca8003.0

package/dist/components/Stepper/Stepper.js

@@ -13,7 +13,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import cn from 'classnames';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { extractSupportProps } from '@snack-uikit/utils';
-import { STEP_STATE, STEP_VALIDATION_RESULT } from '../../constants';
+import { STEP_STATE } from '../../constants';
 import { Step } from '../../helperComponents';
 import { StepperContext } from '../../StepperContext';
 import styles from './styles.module.css';
@@ -43,34 +43,26 @@ export function Stepper(_a) {
         const currentStep = steps[currentStepIndex];
         setCurrentStepState(STEP_STATE.Loading);
         Promise.all([
-            (_b = (_a = currentStep.validation) === null || _a === void 0 ? void 0 : _a.call(currentStep)) !== null && _b !== void 0 ? _b : Promise.resolve(STEP_STATE.Completed),
-            (_c = stepsValidator === null || stepsValidator === void 0 ? void 0 : stepsValidator(currentStepIndex)) !== null && _c !== void 0 ? _c : Promise.resolve(STEP_STATE.Completed),
+            (_b = (_a = currentStep.validation) === null || _a === void 0 ? void 0 : _a.call(currentStep)) !== null && _b !== void 0 ? _b : Promise.resolve(true),
+            (_c = stepsValidator === null || stepsValidator === void 0 ? void 0 : stepsValidator.value(currentStepIndex)) !== null && _c !== void 0 ? _c : Promise.resolve(true),
         ])
-            .then(results => results.every(result => result === STEP_VALIDATION_RESULT.Completed)
-            ? STEP_VALIDATION_RESULT.Completed
-            : STEP_VALIDATION_RESULT.Rejected)
-            .catch(() => STEP_VALIDATION_RESULT.Rejected)
-            .then(validationResult => {
-            switch (validationResult) {
-                case STEP_VALIDATION_RESULT.Completed:
-                    if (currentStepIndex === steps.length - 1) {
-                        // завершился последний шаг
-                        setCurrentStepState(STEP_STATE.Completed);
-                        setIsCompleted(true);
-                    }
-                    else {
-                        setCurrentStepIndex(currentStepIndex + 1);
-                        setCurrentStepState(STEP_STATE.Current);
-                    }
-                    return;
-                case STEP_VALIDATION_RESULT.Rejected:
-                    setCurrentStepState(STEP_STATE.Rejected);
-                    return;
-                default:
-                    setCurrentStepState(STEP_STATE.Current);
+            .then(results => results.every(isValid => isValid))
+            .catch(() => false)
+            .then(isValid => {
+            if (!isValid) {
+                setCurrentStepState(STEP_STATE.Rejected);
+                return;
             }
-        })
-            .catch(() => setCurrentStepState(STEP_STATE.Rejected));
+            if (currentStepIndex === steps.length - 1) {
+                // завершился последний шаг
+                setCurrentStepState(STEP_STATE.Completed);
+                setIsCompleted(true);
+            }
+            else {
+                setCurrentStepIndex(currentStepIndex + 1);
+                setCurrentStepState(STEP_STATE.Current);
+            }
+        });
     }, [currentStepIndex, isCompleted, setCurrentStepIndex, steps, stepsValidator]);
     const goPrev = useCallback((index = currentStepIndex - 1) => {
         if (currentStepIndex === 0 || index < 0 || index > currentStepIndex) {
@@ -103,6 +95,9 @@ export function Stepper(_a) {
             setCurrentStepState(STEP_STATE.Current);
         }
     }, [currentStepState]);
+    const setValidator = useCallback((validator) => {
+        setStepsValidator({ value: validator });
+    }, []);
     const stepper = (_jsx("div", Object.assign({ className: cn(styles.stepper, className) }, extractSupportProps(props), { children: stepsView.map((step, index) => (_jsx(Step, { step: step, "data-test-id": props['data-test-id'], hideTailLine: index === steps.length - 1 }, step.title + index))) })));
     const stepperApi = {
         goNext,
@@ -112,7 +107,7 @@ export function Stepper(_a) {
         resetValidation,
         stepCount: steps.length,
         stepper,
-        setValidator: setStepsValidator,
+        setValidator,
     };
     return _jsx(StepperContext.Provider, { value: stepperApi, children: children(stepperApi) });
 }

package/dist/constants.d.ts

@@ -5,7 +5,3 @@ export declare const STEP_STATE: {
     readonly Waiting: "waiting";
     readonly Rejected: "rejected";
 };
-export declare const STEP_VALIDATION_RESULT: {
-    readonly Completed: "completed";
-    readonly Rejected: "rejected";
-};

package/dist/constants.js

@@ -5,7 +5,3 @@ export const STEP_STATE = {
     Waiting: 'waiting',
     Rejected: 'rejected',
 };
-export const STEP_VALIDATION_RESULT = {
-    Completed: 'completed',
-    Rejected: 'rejected',
-};

package/dist/types.d.ts

@@ -1,13 +1,12 @@
 import { JSX } from 'react';
 import { ValueOf } from '@snack-uikit/utils';
-import { STEP_STATE, STEP_VALIDATION_RESULT } from './constants';
+import { STEP_STATE } from './constants';
 export type StepState = ValueOf<typeof STEP_STATE>;
-export type StepValidationResult = ValueOf<typeof STEP_VALIDATION_RESULT>;
-export type StepsValidator = (stepIndex: number) => Promise<StepValidationResult>;
+export type StepsValidator = (stepIndex: number) => Promise<boolean>;
 export type StepData = {
     title: string;
     description?: string;
-    validation?(): Promise<StepValidationResult>;
+    validation?(): Promise<boolean>;
 };
 export type StepViewData = StepData & {
     onClick?(): void;

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "title": "Stepper",
-  "version": "0.5.10-preview-e59b2871.0",
+  "version": "0.5.10-preview-96ca8003.0",
   "sideEffects": [
     "*.css",
     "*.woff",
@@ -39,5 +39,5 @@
     "@snack-uikit/utils": "3.2.0",
     "classnames": "2.3.2"
   },
-  "gitHead": "1f6f70cea8ded89a952f288fefe362231ea3404b"
+  "gitHead": "f34f4124d15e2215a4eca379bb530b21cf63b87b"
 }

package/src/components/Stepper/Stepper.tsx

@@ -3,7 +3,7 @@ import { ReactElement, useCallback, useEffect, useMemo, useState } from 'react';
 
 import { extractSupportProps, WithSupportProps } from '@snack-uikit/utils';
 
-import { STEP_STATE, STEP_VALIDATION_RESULT } from '../../constants';
+import { STEP_STATE } from '../../constants';
 import { Step } from '../../helperComponents';
 import { StepperContext } from '../../StepperContext';
 import { StepData, StepperApi, StepState, StepsValidator, StepViewData } from '../../types';
@@ -47,7 +47,7 @@ export function Stepper({
   );
   const [currentStepIndex, setCurrentStepIndexValue] = useState(defaultCurrentStepIndex);
   const [isCompleted, setIsCompleted] = useState(isCompletedByDefault);
-  const [stepsValidator, setStepsValidator] = useState<StepsValidator>();
+  const [stepsValidator, setStepsValidator] = useState<{ value: StepsValidator }>();
 
   useEffect(() => {
     onCompleteChange?.(isCompleted);
@@ -75,35 +75,26 @@ export function Stepper({
     setCurrentStepState(STEP_STATE.Loading);
 
     Promise.all([
-      currentStep.validation?.() ?? Promise.resolve(STEP_STATE.Completed),
-      stepsValidator?.(currentStepIndex) ?? Promise.resolve(STEP_STATE.Completed),
+      currentStep.validation?.() ?? Promise.resolve(true),
+      stepsValidator?.value(currentStepIndex) ?? Promise.resolve(true),
     ])
-      .then(results =>
-        results.every(result => result === STEP_VALIDATION_RESULT.Completed)
-          ? STEP_VALIDATION_RESULT.Completed
-          : STEP_VALIDATION_RESULT.Rejected,
-      )
-      .catch(() => STEP_VALIDATION_RESULT.Rejected)
-      .then(validationResult => {
-        switch (validationResult) {
-          case STEP_VALIDATION_RESULT.Completed:
-            if (currentStepIndex === steps.length - 1) {
-              // завершился последний шаг
-              setCurrentStepState(STEP_STATE.Completed);
-              setIsCompleted(true);
-            } else {
-              setCurrentStepIndex(currentStepIndex + 1);
-              setCurrentStepState(STEP_STATE.Current);
-            }
-            return;
-          case STEP_VALIDATION_RESULT.Rejected:
-            setCurrentStepState(STEP_STATE.Rejected);
-            return;
-          default:
-            setCurrentStepState(STEP_STATE.Current);
+      .then(results => results.every(isValid => isValid))
+      .catch(() => false)
+      .then(isValid => {
+        if (!isValid) {
+          setCurrentStepState(STEP_STATE.Rejected);
+          return;
         }
-      })
-      .catch(() => setCurrentStepState(STEP_STATE.Rejected));
+
+        if (currentStepIndex === steps.length - 1) {
+          // завершился последний шаг
+          setCurrentStepState(STEP_STATE.Completed);
+          setIsCompleted(true);
+        } else {
+          setCurrentStepIndex(currentStepIndex + 1);
+          setCurrentStepState(STEP_STATE.Current);
+        }
+      });
   }, [currentStepIndex, isCompleted, setCurrentStepIndex, steps, stepsValidator]);
 
   const goPrev = useCallback(
@@ -154,6 +145,10 @@ export function Stepper({
     }
   }, [currentStepState]);
 
+  const setValidator = useCallback((validator: StepsValidator) => {
+    setStepsValidator({ value: validator });
+  }, []);
+
   const stepper = (
     <div className={cn(styles.stepper, className)} {...extractSupportProps(props)}>
       {stepsView.map((step, index) => (
@@ -175,7 +170,7 @@ export function Stepper({
     resetValidation,
     stepCount: steps.length,
     stepper,
-    setValidator: setStepsValidator,
+    setValidator,
   };
 
   return <StepperContext.Provider value={stepperApi}>{children(stepperApi)}</StepperContext.Provider>;

package/src/constants.ts

@@ -5,8 +5,3 @@ export const STEP_STATE = {
   Waiting: 'waiting',
   Rejected: 'rejected',
 } as const;
-
-export const STEP_VALIDATION_RESULT = {
-  Completed: 'completed',
-  Rejected: 'rejected',
-} as const;

package/src/types.ts

@@ -2,18 +2,16 @@ import { JSX } from 'react';
 
 import { ValueOf } from '@snack-uikit/utils';
 
-import { STEP_STATE, STEP_VALIDATION_RESULT } from './constants';
+import { STEP_STATE } from './constants';
 
 export type StepState = ValueOf<typeof STEP_STATE>;
 
-export type StepValidationResult = ValueOf<typeof STEP_VALIDATION_RESULT>;
-
-export type StepsValidator = (stepIndex: number) => Promise<StepValidationResult>;
+export type StepsValidator = (stepIndex: number) => Promise<boolean>;
 
 export type StepData = {
   title: string;
   description?: string;
-  validation?(): Promise<StepValidationResult>;
+  validation?(): Promise<boolean>;
 };
 
 export type StepViewData = StepData & {