fix(timepicker): when showMeridian changes value, time is rerendered

fixes #2476
valor-software · Aug 23, 2017 · e59172f · e59172f
1 parent 646e033
commit e59172f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/src/timepicker/reducer/timepicker.reducer.ts b/src/timepicker/reducer/timepicker.reducer.ts
@@ -17,7 +17,8 @@ export class TimepickerState {
   controls: TimepickerControls;
 }
 
-export const initialState = {
+export const initialState: TimepickerState = {
+  value: null,
   config: new TimepickerConfig(),
   controls: {
     canIncrementHours: true,
@@ -28,7 +29,7 @@ export const initialState = {
     canDecrementMinutes: true,
     canDecrementSeconds: true
   }
-} as TimepickerState;
+};
 
 export function timepickerReducer(state = initialState, action: Action) {
   switch (action.type) {
@@ -81,11 +82,17 @@ export function timepickerReducer(state = initialState, action: Action) {
 
     case (TimepickerActions.UPDATE_CONTROLS): {
       const _newControlsState = timepickerControls(state.value, action.payload);
-
-      return Object.assign({}, state, {
+      const _newState: TimepickerState = {
+        value: state.value,
         config: action.payload,
         controls: _newControlsState
-      });
+      };
+
+      if (state.config.showMeridian !== _newState.config.showMeridian) {
+        _newState.value = new Date(state.value);
+      }
+
+      return Object.assign({}, state, _newState);
     }
 
     default:

diff --git a/src/timepicker/timepicker.component.ts b/src/timepicker/timepicker.component.ts
@@ -35,18 +35,16 @@ export const TIMEPICKER_CONTROL_VALUE_ACCESSOR: any = {
         <!-- increment hours button-->
         <td>
           <a class="btn btn-link" [class.disabled]="!canIncrementHours"
-             (click)="changeHours(hourStep)">
-            <span class="glyphicon glyphicon-chevron-up"></span>
-          </a>
+             (click)="changeHours(hourStep)"
+          ><span class="glyphicon glyphicon-chevron-up"></span></a>
         </td>
         <!-- divider -->
         <td>&nbsp;&nbsp;&nbsp;</td>
         <!-- increment minutes button -->
         <td>
           <a class="btn btn-link" [class.disabled]="!canIncrementMinutes"
-             (click)="changeMinutes(minuteStep)">
-            <span class="glyphicon glyphicon-chevron-up"></span>
-          </a>
+             (click)="changeMinutes(minuteStep)"
+          ><span class="glyphicon glyphicon-chevron-up"></span></a>
         </td>
         <!-- divider -->
         <td *ngIf="showSeconds">&nbsp;</td>
@@ -112,8 +110,8 @@ export const TIMEPICKER_CONTROL_VALUE_ACCESSOR: any = {
           <button type="button" class="btn btn-default text-center"
                   [disabled]="readonlyInput"
                   [class.disabled]="readonlyInput"
-                  (click)="toggleMeridian()">
-            {{meridian}}
+                  (click)="toggleMeridian()"
+          >{{ meridian }}
           </button>
         </td>
       </tr>