fix: forward move and swap array control actions to children in form …

…group reducer
MrWolfZ · Mar 13, 2021 · f682561 · f682561
1 parent f743b8b
commit f682561
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/group/reducer.spec.ts b/src/group/reducer.spec.ts
@@ -11,6 +11,7 @@ import {
   MarkAsTouchedAction,
   MarkAsUnsubmittedAction,
   MarkAsUntouchedAction,
+  MoveArrayControlAction,
   RemoveArrayControlAction,
   RemoveGroupControlAction,
   ResetAction,
@@ -19,6 +20,7 @@ import {
   SetUserDefinedPropertyAction,
   SetValueAction,
   StartAsyncValidationAction,
+  SwapArrayControlAction,
   UnfocusAction,
 } from '../actions';
 import { createFormGroupState } from '../state';
@@ -76,6 +78,22 @@ describe('form group reducer', () => {
     expect(resultState.controls.inner5!.controls[0]).toBeUndefined();
   });
 
+  it(`should forward add ${MoveArrayControlAction.name}s to children`, () => {
+    const value: FormGroupValue = { inner: '', inner2: '', inner3: { inner4: '' }, inner5: ['a', 'b', 'c'] };
+    const state = createFormGroupState(FORM_CONTROL_ID, value);
+    const resultState = formGroupReducer<FormGroupValue>(state, new MoveArrayControlAction(FORM_CONTROL_INNER5_ID, 0, 1));
+    expect(resultState.controls.inner5!.controls[0].value).toBe('b');
+    expect(resultState.controls.inner5!.controls[1].value).toBe('a');
+  });
+
+  it(`should forward remove ${SwapArrayControlAction.name}s to children`, () => {
+    const value: FormGroupValue = { inner: '', inner2: '', inner3: { inner4: '' }, inner5: ['a', 'b', 'c'] };
+    const state = createFormGroupState(FORM_CONTROL_ID, value);
+    const resultState = formGroupReducer(state, new SwapArrayControlAction(FORM_CONTROL_INNER5_ID, 0, 1));
+    expect(resultState.controls.inner5!.controls[0].value).toBe('b');
+    expect(resultState.controls.inner5!.controls[1].value).toBe('a');
+  });
+
   it('should not update state if no child was updated', () => {
     const resultState = formGroupReducer(INITIAL_STATE, new SetValueAction(FORM_CONTROL_INNER_ID, '') as any);
     expect(resultState).toBe(INITIAL_STATE);

diff --git a/src/group/reducer.ts b/src/group/reducer.ts
@@ -5,7 +5,9 @@ import {
   AddArrayControlAction,
   FocusAction,
   isNgrxFormsAction,
+  MoveArrayControlAction,
   RemoveArrayControlAction,
+  SwapArrayControlAction,
   UnfocusAction,
 } from '../actions';
 import { FormGroupState, isGroupState, KeyValue } from '../state';
@@ -46,6 +48,8 @@ export function formGroupReducerInternal<TValue extends KeyValue>(state: FormGro
     case UnfocusAction.TYPE:
     case AddArrayControlAction.TYPE:
     case RemoveArrayControlAction.TYPE:
+    case MoveArrayControlAction.TYPE:
+    case SwapArrayControlAction.TYPE:
       return childReducer(state, action);
 
     default: