fix: allow new preparation row reorder and delete

Author: jjoonleo

lib/presentation/schedule_create/schedule_spare_and_preparing_time/preparation_form/bloc/preparation_form_bloc.dart

@@ -57,7 +57,7 @@ class PreparationFormBloc
       state.copyWith(
         status: PreparationFormStatus.initial,
         preparationStepList: preparationFormState.preparationStepList,
-        draftStep: null,
+        clearAddingStepId: true,
         showValidationErrors: false,
         isValid: isValid,
       ),
@@ -83,7 +83,7 @@ class PreparationFormBloc
         state.copyWith(
           preparationStepList: preparationStepList,
           status: PreparationFormStatus.initial,
-          draftStep: null,
+          clearAddingStepId: true,
           isValid: isValid,
         ),
       );
@@ -103,11 +103,16 @@ class PreparationFormBloc
     );
     removedList.removeWhere((element) => element.id == event.preparationStepId);
 
-    final isValid = _validate([
-      ...removedList,
-      if (state.draftStep != null) state.draftStep!,
-    ]);
-    emit(state.copyWith(preparationStepList: removedList, isValid: isValid));
+    final isValid = _validate(removedList);
+    final removedAddingStep = state.addingStepId == event.preparationStepId;
+    emit(
+      state.copyWith(
+        preparationStepList: removedList,
+        status: removedAddingStep ? PreparationFormStatus.initial : null,
+        clearAddingStepId: removedAddingStep,
+        isValid: isValid,
+      ),
+    );
   }
 
   void _onPreparationFormPreparationStepNameChanged(
@@ -123,11 +128,18 @@ class PreparationFormBloc
       ),
     );
 
-    final isValid = _validate([
-      ...changedList,
-      if (state.draftStep != null) state.draftStep!,
-    ]);
-    emit(state.copyWith(preparationStepList: changedList, isValid: isValid));
+    final isValid = _validate(changedList);
+    final shouldCommitAddingStep = _shouldCommitAddingStep(
+      changedList[event.index],
+    );
+    emit(
+      state.copyWith(
+        preparationStepList: changedList,
+        status: shouldCommitAddingStep ? PreparationFormStatus.initial : null,
+        clearAddingStepId: shouldCommitAddingStep,
+        isValid: isValid,
+      ),
+    );
   }
 
   void _onPreparationFormPreparationStepTimeChanged(
@@ -142,39 +154,62 @@ class PreparationFormBloc
         event.preparationStepTime,
       ),
     );
-    final isValid = _validate([
-      ...changedList,
-      if (state.draftStep != null) state.draftStep!,
-    ]);
-    emit(state.copyWith(preparationStepList: changedList, isValid: isValid));
+    final isValid = _validate(changedList);
+    final shouldCommitAddingStep = _shouldCommitAddingStep(
+      changedList[event.index],
+    );
+    emit(
+      state.copyWith(
+        preparationStepList: changedList,
+        status: shouldCommitAddingStep ? PreparationFormStatus.initial : null,
+        clearAddingStepId: shouldCommitAddingStep,
+        isValid: isValid,
+      ),
+    );
+  }
+
+  bool _shouldCommitAddingStep(PreparationStepFormState step) {
+    return step.id == state.addingStepId &&
+        step.preparationName.isValid &&
+        step.preparationTime.isValid;
   }
 
   void _onPreparationFormDraftStepNameChanged(
     PreparationFormDraftStepNameChanged event,
     Emitter<PreparationFormState> emit,
   ) {
-    final draftStep = state.draftStep ?? PreparationStepFormState();
-    final changedDraft = draftStep.copyWith(
-      preparationName: PreparationNameInputModel.dirty(
-        event.preparationStepName,
+    final draftIndex = state.preparationStepList.indexWhere(
+      (step) => step.id == state.addingStepId,
+    );
+    if (draftIndex == -1) {
+      return;
+    }
+
+    add(
+      PreparationFormPreparationStepNameChanged(
+        index: draftIndex,
+        preparationStepName: event.preparationStepName,
       ),
     );
-    final isValid = _validate([...state.preparationStepList, changedDraft]);
-    emit(state.copyWith(draftStep: changedDraft, isValid: isValid));
   }
 
   void _onPreparationFormDraftStepTimeChanged(
     PreparationFormDraftStepTimeChanged event,
     Emitter<PreparationFormState> emit,
   ) {
-    final draftStep = state.draftStep ?? PreparationStepFormState();
-    final changedDraft = draftStep.copyWith(
-      preparationTime: PreparationTimeInputModel.dirty(
-        event.preparationStepTime,
+    final draftIndex = state.preparationStepList.indexWhere(
+      (step) => step.id == state.addingStepId,
+    );
+    if (draftIndex == -1) {
+      return;
+    }
+
+    add(
+      PreparationFormPreparationStepTimeChanged(
+        index: draftIndex,
+        preparationStepTime: event.preparationStepTime,
       ),
     );
-    final isValid = _validate([...state.preparationStepList, changedDraft]);
-    emit(state.copyWith(draftStep: changedDraft, isValid: isValid));
   }
 
   void _onPreparationFormPreparationStepOrderChanged(
@@ -193,10 +228,7 @@ class PreparationFormBloc
     final item = changedList.removeAt(oldIndex);
     changedList.insert(newIndex, item);
 
-    final isValid = _validate([
-      ...changedList,
-      if (state.draftStep != null) state.draftStep!,
-    ]);
+    final isValid = _validate(changedList);
     emit(state.copyWith(preparationStepList: changedList, isValid: isValid));
   }
 
@@ -221,12 +253,14 @@ class PreparationFormBloc
       return;
     }
 
-    final draftStep = PreparationStepFormState();
-    final isValid = _validate([...state.preparationStepList, draftStep]);
+    final addedStep = PreparationStepFormState();
+    final changedList = [...state.preparationStepList, addedStep];
+    final isValid = _validate(changedList);
     emit(
       state.copyWith(
         status: PreparationFormStatus.adding,
-        draftStep: draftStep,
+        preparationStepList: changedList,
+        addingStepId: addedStep.id,
         isValid: isValid,
       ),
     );

lib/presentation/schedule_create/schedule_spare_and_preparing_time/preparation_form/bloc/preparation_form_state.dart

@@ -4,13 +4,11 @@ enum PreparationFormStatus { initial, success, adding }
 
 enum PreparationFormInvalidField { name, time }
 
-const _draftStepNoChange = Object();
-
 final class PreparationFormState extends Equatable {
   const PreparationFormState({
     this.status = PreparationFormStatus.initial,
     this.preparationStepList = const [],
-    this.draftStep,
+    this.addingStepId,
     this.showValidationErrors = false,
     this.isValid = false,
   });
@@ -64,14 +62,12 @@ final class PreparationFormState extends Equatable {
 
   final PreparationFormStatus status;
   final List<PreparationStepFormState> preparationStepList;
-  final PreparationStepFormState? draftStep;
+  final String? addingStepId;
   final bool showValidationErrors;
   final bool isValid;
 
-  List<PreparationStepFormState> get visiblePreparationStepList => [
-    ...preparationStepList,
-    if (draftStep != null) draftStep!,
-  ];
+  List<PreparationStepFormState> get visiblePreparationStepList =>
+      preparationStepList;
 
   PreparationStepFormState? get firstInvalidStep => visiblePreparationStepList
       .firstWhereOrNull((step) => invalidFieldFor(step) != null);
@@ -89,16 +85,17 @@ final class PreparationFormState extends Equatable {
   PreparationFormState copyWith({
     PreparationFormStatus? status,
     List<PreparationStepFormState>? preparationStepList,
-    Object? draftStep = _draftStepNoChange,
+    String? addingStepId,
+    bool clearAddingStepId = false,
     bool? showValidationErrors,
     bool? isValid,
   }) {
     return PreparationFormState(
       status: status ?? this.status,
       preparationStepList: preparationStepList ?? this.preparationStepList,
-      draftStep: identical(draftStep, _draftStepNoChange)
-          ? this.draftStep
-          : draftStep as PreparationStepFormState?,
+      addingStepId: clearAddingStepId
+          ? null
+          : addingStepId ?? this.addingStepId,
       showValidationErrors: showValidationErrors ?? this.showValidationErrors,
       isValid: isValid ?? this.isValid,
     );
@@ -108,7 +105,7 @@ final class PreparationFormState extends Equatable {
   List<Object?> get props => [
     status,
     preparationStepList,
-    draftStep,
+    addingStepId,
     showValidationErrors,
     isValid,
   ];

lib/presentation/schedule_create/schedule_spare_and_preparing_time/preparation_form/components/preparation_form_create_list.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:on_time_front/presentation/onboarding/preparation_name_select/components/create_icon_button.dart';
 import 'package:on_time_front/presentation/schedule_create/schedule_spare_and_preparing_time/preparation_form/bloc/preparation_form_bloc.dart';
-import 'package:on_time_front/presentation/schedule_create/schedule_spare_and_preparing_time/preparation_form/components/preparation_form_list_field.dart';
 import 'package:on_time_front/presentation/schedule_create/schedule_spare_and_preparing_time/preparation_form/components/preparation_form_reorderable_list.dart';
 
 class PreparationFormCreateList extends StatelessWidget {
@@ -32,6 +31,7 @@ class PreparationFormCreateList extends StatelessWidget {
         children: [
           PreparationFormReorderableList(
             preparationStepList: preparationNameState.preparationStepList,
+            addingStepId: preparationNameState.addingStepId,
             showValidationErrors: preparationNameState.showValidationErrors,
             stepKeyFor: stepKeyFor,
             nameFocusNodeFor: nameFocusNodeFor,
@@ -53,53 +53,6 @@ class PreparationFormCreateList extends StatelessWidget {
                   ),
                 ),
           ),
-          preparationNameState.status == PreparationFormStatus.adding
-              ? PreparationFormListField(
-                  key:
-                      stepKeyFor?.call(preparationNameState.draftStep!.id) ??
-                      ValueKey<String>(
-                        'draft_${preparationNameState.draftStep!.id}',
-                      ),
-                  isAdding: true,
-                  showValidationErrors:
-                      preparationNameState.showValidationErrors,
-                  focusNode: nameFocusNodeFor?.call(
-                    preparationNameState.draftStep!.id,
-                  ),
-                  preparationStep: preparationNameState.draftStep!,
-                  onNameChanged: (value) {
-                    context.read<PreparationFormBloc>().add(
-                      PreparationFormDraftStepNameChanged(
-                        preparationStepName: value,
-                      ),
-                    );
-                  },
-                  onNameFocusLost: (value) {
-                    context.read<PreparationFormBloc>().add(
-                      PreparationFormDraftStepNameChanged(
-                        preparationStepName: value,
-                      ),
-                    );
-                  },
-                  onPreparationTimeTapped: () {
-                    context.read<PreparationFormBloc>().add(
-                      PreparationFormDraftStepTimeChanged(
-                        preparationStepTime: preparationNameState
-                            .draftStep!
-                            .preparationTime
-                            .value,
-                      ),
-                    );
-                  },
-                  onPreparationTimeChanged: (value) {
-                    context.read<PreparationFormBloc>().add(
-                      PreparationFormDraftStepTimeChanged(
-                        preparationStepTime: value,
-                      ),
-                    );
-                  },
-                )
-              : SizedBox.shrink(),
           SizedBox(height: 28.0),
           Center(
             child: SizedBox(

lib/presentation/schedule_create/schedule_spare_and_preparing_time/preparation_form/components/preparation_form_reorderable_list.dart

@@ -28,6 +28,7 @@ class PreparationFormReorderableList extends StatelessWidget {
   const PreparationFormReorderableList({
     super.key,
     required this.preparationStepList,
+    required this.addingStepId,
     required this.showValidationErrors,
     required this.stepKeyFor,
     required this.nameFocusNodeFor,
@@ -37,6 +38,7 @@ class PreparationFormReorderableList extends StatelessWidget {
   });
 
   final List<PreparationStepFormState> preparationStepList;
+  final String? addingStepId;
   final bool showValidationErrors;
   final Key Function(String stepId)? stepKeyFor;
   final FocusNode Function(String stepId)? nameFocusNodeFor;
@@ -97,6 +99,7 @@ class PreparationFormReorderableList extends StatelessWidget {
                   stepKeyFor?.call(step.id) ??
                   ValueKey<String>('field_${step.id}'),
               index: index,
+              isAdding: step.id == addingStepId,
               showValidationErrors: showValidationErrors,
               focusNode: nameFocusNodeFor?.call(step.id),
               preparationStep: step,