fix(UX-1241): Fixed inkwell on ZetaStepper (#190)

refactor: Optimized ZetaStepper to be made up of sub-components. test: Wrote tests for ZetaStepper
ZebraDevs · Oct 18, 2024 · 60a137f · 60a137f
1 parent 58fc7f5
commit 60a137f
Show file tree

Hide file tree

Showing 12 changed files with 929 additions and 314 deletions.
diff --git a/example/lib/pages/components/stepper_example.dart b/example/lib/pages/components/stepper_example.dart
@@ -12,19 +12,9 @@ class StepperExample extends StatefulWidget {
 }
 
 class _StepperExampleState extends State<StepperExample> {
-  int _sharpHorizontalStep = 0;
+  int _horistonalStep = 0;
   int _verticalStep = 0;
 
-  ZetaStepType _getForStepIndex({
-    required int currentStep,
-    required int stepIndex,
-  }) {
-    if (currentStep == stepIndex) return ZetaStepType.enabled;
-    if (currentStep > stepIndex) return ZetaStepType.complete;
-
-    return ZetaStepType.disabled;
-  }
-
   @override
   Widget build(BuildContext context) {
     return ExampleScaffold(
@@ -35,32 +25,17 @@ class _StepperExampleState extends State<StepperExample> {
             SizedBox(
               height: 150,
               child: ZetaStepper(
-                currentStep: _sharpHorizontalStep,
-                onStepTapped: (index) => setState(() => _sharpHorizontalStep = index),
+                currentStep: _horistonalStep,
+                onStepTapped: (index) => setState(() => _horistonalStep = index),
                 steps: [
                   ZetaStep(
-                    type: _getForStepIndex(
-                      currentStep: _sharpHorizontalStep,
-                      stepIndex: 0,
-                    ),
                     title: Text("Title"),
-                    content: Text("Content"),
                   ),
                   ZetaStep(
-                    type: _getForStepIndex(
-                      currentStep: _sharpHorizontalStep,
-                      stepIndex: 1,
-                    ),
                     title: Text("Title 2"),
-                    content: Text("Content 2"),
                   ),
                   ZetaStep(
-                    type: _getForStepIndex(
-                      currentStep: _sharpHorizontalStep,
-                      stepIndex: 2,
-                    ),
                     title: Text("Title 3"),
-                    content: Text("Content 3"),
                   ),
                 ],
               ),
@@ -73,31 +48,17 @@ class _StepperExampleState extends State<StepperExample> {
                 onStepTapped: (index) => setState(() => _verticalStep = index),
                 steps: [
                   ZetaStep(
-                    type: _getForStepIndex(
-                      currentStep: _verticalStep,
-                      stepIndex: 0,
-                    ),
                     title: Text("Title"),
                     subtitle: Text("Step Number"),
-                    content: Text("Content"),
                   ),
                   ZetaStep(
-                    type: _getForStepIndex(
-                      currentStep: _verticalStep,
-                      stepIndex: 1,
-                    ),
                     title: Text("Title 2"),
                     subtitle: Text("Step Number"),
-                    content: Text("Content 2"),
+                    disabled: true,
                   ),
                   ZetaStep(
-                    type: _getForStepIndex(
-                      currentStep: _verticalStep,
-                      stepIndex: 2,
-                    ),
                     title: Text("Title 3"),
                     subtitle: Text("Step Number"),
-                    content: Text("Content 3"),
                   ),
                 ],
               ),

diff --git a/example/widgetbook/pages/components/stepper_widgetbook.dart b/example/widgetbook/pages/components/stepper_widgetbook.dart
@@ -7,13 +7,6 @@ import '../../utils/scaffold.dart';
 Widget stepperUseCase(BuildContext context) {
   int currentStep = 0;
 
-  ZetaStepType getForStepIndex(int stepIndex) {
-    if (currentStep == stepIndex) return ZetaStepType.enabled;
-    if (currentStep > stepIndex) return ZetaStepType.complete;
-
-    return ZetaStepType.disabled;
-  }
-
   final type = context.knobs.list(
     label: "Type",
     options: [
@@ -24,8 +17,6 @@ Widget stepperUseCase(BuildContext context) {
     labelBuilder: (type) => type.name,
   );
 
-  final enabledContent = context.knobs.boolean(label: 'Enabled Content', initialValue: true);
-
   return WidgetbookScaffold(
     builder: (context, _) => StatefulBuilder(
       builder: (context, setState) {
@@ -40,19 +31,13 @@ Widget stepperUseCase(BuildContext context) {
             type: type,
             steps: [
               ZetaStep(
-                type: getForStepIndex(0),
                 title: Text("Title"),
-                content: enabledContent ? Text("Content") : null,
               ),
               ZetaStep(
-                type: getForStepIndex(1),
                 title: Text("Title 2"),
-                content: enabledContent ? Text("Content 2") : null,
               ),
               ZetaStep(
-                type: getForStepIndex(2),
                 title: Text("Title 3"),
-                content: enabledContent ? Text("Content 3") : null,
               ),
             ],
           ),

diff --git a/lib/src/components/components.dart b/lib/src/components/components.dart
@@ -45,7 +45,7 @@ export 'segmented_control/segmented_control.dart';
 export 'select_input/select_input.dart';
 export 'slider/slider.dart';
 export 'snack_bar/snack_bar.dart';
-export 'stepper/stepper.dart';
+export 'stepper/stepper.dart' hide HorizontalStep, StepDivider, StepIcon, VerticalStep;
 export 'stepper_input/stepper_input.dart' hide ZetaStepperInputState;
 export 'switch/zeta_switch.dart';
 export 'tabs/tab.dart';