fix(timepicker): formatValue

ovh · Jul 29, 2024 · b8353ca · b8353ca
1 parent fb5246c
commit b8353ca
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/packages/ods/src/components/timepicker/src/components/ods-timepicker/ods-timepicker.tsx b/packages/ods/src/components/timepicker/src/components/ods-timepicker/ods-timepicker.tsx
@@ -70,8 +70,7 @@ export class OdsTimepicker {
   }
 
   @Watch('withSeconds')
-  @Watch('value')
-  onValueChange(): void {
+  formatValue(): void {
     const value = formatValue(this.odsInput?.value as string, this.withSeconds);
 
     if (value) {
@@ -85,8 +84,8 @@ export class OdsTimepicker {
       this.value = this.defaultValue ?? null;
     }
     this.initTimezones();
+    this.formatValue();
     this.defaultCurrentTimezone = this.currentTimezone;
-    setFormValue(this.internals, this.value);
   }
 
   async formResetCallback(): Promise<void> {

diff --git a/packages/ods/src/components/timepicker/src/controller/ods-timepicker.ts b/packages/ods/src/components/timepicker/src/controller/ods-timepicker.ts
@@ -2,16 +2,22 @@ import { ODS_TIMEZONES_PRESET } from '../constant/timezone-preset';
 import { type ODS_TIMEZONE, ODS_TIMEZONES, type OdsTimezone } from '../constant/timezones';
 
 function formatValue(value?: string, withSeconds?: boolean): string {
-  if (!withSeconds && value?.match(/:/g)?.length === 2) {
-    const inputValue = value.split(':');
-    return `${ inputValue[0] }:${ inputValue[1] }`;
+  const numberOfTwoPoint = value?.match(/:/g)?.length;
+  if (!withSeconds && numberOfTwoPoint) {
+    if (numberOfTwoPoint === 1) {
+      return value;
+    }
+    if (numberOfTwoPoint === 2) {
+      const inputValue = value.split(':');
+      return `${ inputValue[0] }:${ inputValue[1] }`;
+    }
   }
 
-  if (withSeconds) {
-    if (value?.match(/:/g)?.length === 1) {
+  if (withSeconds && numberOfTwoPoint) {
+    if (numberOfTwoPoint === 1) {
       return `${ value }:00`;
     }
-    if (value?.match(/:/g)?.length === 2) {
+    if (numberOfTwoPoint === 2) {
       return value;
     }
   }

diff --git a/packages/ods/src/components/timepicker/tests/controller/ods-timepicker.spec.ts b/packages/ods/src/components/timepicker/tests/controller/ods-timepicker.spec.ts
@@ -7,6 +7,10 @@ describe('ods-timepicker controller', () => {
       expect(formatValue('12:34:56', false)).toBe('12:34');
     });
 
+    it('should format value without seconds correctly', () => {
+      expect(formatValue('12:34', false)).toBe('12:34');
+    });
+
     it('should format value with seconds correctly', () => {
       expect(formatValue('12:34', true)).toBe('12:34:00');
     });