lkt-step-process 2.0.13 → 2.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lkt-step-process",
-  "version": "2.0.13",
+  "version": "2.0.15",
   "description": "",
   "type": "module",
   "module": "./dist/build.js",

package/src/components/ButtonNav.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 
     import { ButtonNavProps } from '../config/ButtonNavProps';
-    import { ref, SetupContext, useSlots } from 'vue';
+    import { computed, ref, SetupContext, useSlots } from 'vue';
     import { DotConfig } from 'lkt-vue-kernel';
 
     const props = withDefaults(defineProps<ButtonNavProps>(), {});
@@ -22,10 +22,16 @@
             prevButtonRef.value.click();
         }
     });
+
+    const stepHasDotsInfo = computed(() => {
+        if (typeof props.currentStepConfig?.excludedFromTotalCount === 'function') return !props.currentStepConfig.excludedFromTotalCount();
+        if (typeof props.currentStepConfig?.excludedFromTotalCount === 'boolean') return !props.currentStepConfig.excludedFromTotalCount;
+        return true;
+    })
 </script>
 
 <template>
-    <div class="lkt-step-process--nav">
+    <div class="lkt-step-process--nav" v-if="prevButton || nextButton || (stepHasDotsInfo && (slots['nav-info'] || dots && amountOfSteps > 0))">
         <lkt-button
             ref="prevButtonRef"
             v-if="prevButton"
@@ -34,11 +40,12 @@
             class="is-prev-button"
         />
 
-        <div class="lkt-step-process--nav-info" v-if="slots['nav-info'] || dots && amountOfSteps > 0">
+        <div class="lkt-step-process--nav-info" v-if="stepHasDotsInfo && (slots['nav-info'] || dots && amountOfSteps > 0)">
             <template v-if="slots['nav-info']">
                 <slot
                     name="nav-info"
                     v-bind="{
+                        visibleStep: visibleStepIndex,
                         currentStep,
                         currentStepIndex,
                         amountOfSteps,
@@ -46,12 +53,12 @@
                 />
             </template>
 
-            <div class="lkt-step-process--dots" v-if="dots && amountOfSteps > 0">
+            <div class="lkt-step-process--dots" v-if="dots && amountOfSteps > 0 && stepHasDotsInfo">
                 <lkt-dot
                     v-for="n in amountOfSteps"
                     v-bind="<DotConfig>{
                         text: dotsNumbers ? n : '',
-                        class: n === (currentStepIndex + 1) ? 'is-active' : '',
+                        class: n === visibleStepIndex ? 'is-active' : '',
                     }"
                 />
             </div>

package/src/lib-components/LktStepProcess.vue

@@ -49,6 +49,20 @@
     const currentStepIndex = computed(() => {
             return stepsHaystack.value.findIndex((step: StepProcessStepConfig) => step.key === currentStep.value);
         }),
+        visibleStepIndex = computed(() => {
+            let baseIndex = stepsHaystack.value.findIndex((step: StepProcessStepConfig) => step.key === currentStep.value);
+            let r = baseIndex;
+            for (let i = 0; i < baseIndex; ++i) {
+                let excluded = false,
+                    excludedValue = stepsHaystack.value[i].excludedFromTotalCount;
+
+                if (typeof excludedValue === 'function') excluded = excludedValue() === true;
+                else if (typeof excludedValue === 'boolean') excluded = excludedValue === true;
+
+                if (excluded) --r;
+            }
+            return r + 1;
+        }),
         currentStepConfig = computed(() => {
             return stepsHaystack.value[currentStepIndex.value];
         }),
@@ -146,7 +160,15 @@
             return props.buttonNavPosition === ItemCrudButtonNavPosition.Bottom;
         }),
         computedAmountOfSteps = computed(() => {
-            return stepsHaystack.value.length;
+            let r = 0;
+            stepsHaystack.value.forEach(step => {
+                let excluded = false;
+                if (typeof step.excludedFromTotalCount === 'function') excluded = step.excludedFromTotalCount() === true;
+                else if (typeof step.excludedFromTotalCount === 'boolean') excluded = step.excludedFromTotalCount === true;
+
+                if (!excluded) ++r;
+            })
+            return r;
         }),
         computedButtonNavProps = computed(() => {
             return <ButtonNavProps>{
@@ -154,7 +176,9 @@
                 prevButton: computedPrevButton.value,
                 nextButton: computedNextButton.value,
                 currentStep: currentStep.value,
+                currentStepConfig: currentStepConfig.value,
                 currentStepIndex: currentStepIndex.value,
+                visibleStepIndex: visibleStepIndex.value,
                 amountOfSteps: computedAmountOfSteps.value,
                 dots: props.dots,
                 dotsNumbers: props.dotsNumbers,
@@ -216,6 +240,9 @@
 
                     case StepRenderType.RendersAndVisibleIfActive:
                         return stepKey === currentStep.value;
+
+                    case StepRenderType.RendersAfterFirstActiveVisibleIfActive:
+                        return firstRenderReached.value[stepKey] === true;
                 }
             }
             return stepKey === currentStep.value;
@@ -234,6 +261,7 @@
 
                     case StepRenderType.AlwaysRendersVisibleIfActive:
                     case StepRenderType.RendersAndVisibleIfActive:
+                    case StepRenderType.RendersAfterFirstActiveVisibleIfActive:
                         return stepKey === currentStep.value;
                 }
             }
@@ -269,10 +297,11 @@
             ref="navRef"
             v-bind="computedButtonNavProps"
         >
-            <template #nav-info="{currentStep, currentStepIndex, amountOfSteps}" v-if="slots['nav-info']">
+            <template #nav-info="{currentStep, currentStepIndex, amountOfSteps, visibleStep}" v-if="slots['nav-info']">
                 <slot
                     name="nav-info"
                       v-bind="{
+                        visibleStep,
                         currentStep,
                         currentStepIndex,
                         amountOfSteps: computedAmountOfSteps,
@@ -297,10 +326,11 @@
             ref="navRef"
             v-bind="computedButtonNavProps"
         >
-            <template #nav-info="{currentStep, currentStepIndex, amountOfSteps}" v-if="slots['nav-info']">
+            <template #nav-info="{currentStep, currentStepIndex, amountOfSteps, visibleStep}" v-if="slots['nav-info']">
                 <slot
                     name="nav-info"
                     v-bind="{
+                        visibleStep,
                         currentStep,
                         currentStepIndex,
                         amountOfSteps: computedAmountOfSteps,