From 984ec3731c604bf42af9eecc1bf2f3ef368a54ad Mon Sep 17 00:00:00 2001
From: LouisMazel <me@loicmazuel.com>
Date: Sun, 8 Dec 2024 02:35:22 +0100
Subject: [PATCH] fix(maz-ui): MazAnimateCounter - animation on mobile browsers

---
 .../create-library-component-file.ts          |   2 +-
 .../docs/components/maz-animated-counter.md   |  19 ++-
 .../lib/components/MazAnimatedCounter.vue     | 112 ++++++------------
 .../components/MazAnimatedCounter.spec.ts     |  49 ++++++++
 .../components/maz-animated-counter.spec.ts   |  46 -------
 5 files changed, 105 insertions(+), 123 deletions(-)
 create mode 100644 packages/lib/tests/specs/components/MazAnimatedCounter.spec.ts
 delete mode 100644 packages/lib/tests/specs/components/maz-animated-counter.spec.ts

diff --git a/packages/cli/src/commands/create-files/create-library-component-file.ts b/packages/cli/src/commands/create-files/create-library-component-file.ts
index 54cf661123..8df2b9a885 100644
--- a/packages/cli/src/commands/create-files/create-library-component-file.ts
+++ b/packages/cli/src/commands/create-files/create-library-component-file.ts
@@ -16,7 +16,7 @@ export async function createLibraryComponentFile({
   const COMPONENT_FILE_OUTPUT = resolve(_dirname, `../../../../lib/components/${filename}.vue`)
 
   const componentTemplate = `<template>
-  <div class="m-${filenameKebab.split('-')[1]}">${filename}</div>
+  <div class="m-${filenameKebab.split('-')[1]} m-reset-css">${filename}</div>
 </template>
 `
 
diff --git a/packages/docs/docs/components/maz-animated-counter.md b/packages/docs/docs/components/maz-animated-counter.md
index 742aef18b1..9d39a55667 100644
--- a/packages/docs/docs/components/maz-animated-counter.md
+++ b/packages/docs/docs/components/maz-animated-counter.md
@@ -11,8 +11,8 @@ description: MazAnimatedCounter is a standalone component that allows you to ani
 
 ## Basic usage
 
-<ComponentDemo>
-  <MazAnimatedCounter :count="4000" />
+<ComponentDemo expanded>
+  <MazAnimatedCounter :count="count" />
 
   <template #code>
 
@@ -23,12 +23,27 @@ description: MazAnimatedCounter is a standalone component that allows you to ani
 
   <script lang="ts" setup>
     import MazAnimatedCounter from 'maz-ui/components/MazAnimatedCounter'
+
+    const count = ref(Math.floor(Math.random() * 99999))
+
+    setInterval(() => {
+      count.value = Math.floor(Math.random() * 99999)
+    }, 3000)
   </script>
   ```
 
   </template>
 </ComponentDemo>
 
+<script setup lang="ts">
+  import { ref } from 'vue'
+  const count = ref(Math.floor(Math.random() * 99999))
+
+  setInterval(() => {
+    count.value = Math.floor(Math.random() * 99999)
+  }, 3000)
+</script>
+
 ## duration
 
 You can set the duration of the animation with the `duration` prop. The default value is `1000` ms.
diff --git a/packages/lib/components/MazAnimatedCounter.vue b/packages/lib/components/MazAnimatedCounter.vue
index 4673d1081e..61219f43ed 100644
--- a/packages/lib/components/MazAnimatedCounter.vue
+++ b/packages/lib/components/MazAnimatedCounter.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, ref, useSlots, watch } from 'vue'
+import { ref, watch } from 'vue'
 
 const props = withDefaults(
   defineProps<{
@@ -33,97 +33,61 @@ const props = withDefaults(
     delay: 100,
   },
 )
-const slots = useSlots()
 
-const hasPrefix = computed(() => !!props.prefix || !!slots.prefix)
-const hasSuffix = computed(() => !!props.suffix || !!slots.suffix)
+const currentCount = ref(0)
 
-const isAnimated = ref(true)
+function animate(start: number, end: number, duration: number, delay: number) {
+  currentCount.value = start
+
+  setTimeout(() => {
+    const startTime = performance.now()
+
+    const updateCount = (currentTime: number) => {
+      const elapsed = currentTime - startTime
+      const progress = Math.min(elapsed / duration, 1)
+
+      const easeOutQuad = (t: number) => t * (2 - t)
+
+      currentCount.value = Math.round(
+        start + (end - start) * easeOutQuad(progress),
+      )
+
+      if (progress < 1) {
+        requestAnimationFrame(updateCount)
+      }
+    }
+
+    requestAnimationFrame(updateCount)
+  }, delay)
+}
 
 watch(
   () => props.count,
-  (count, oldCount) => {
-    if (count === oldCount)
+  (newCount, oldCount) => {
+    if (newCount === oldCount) {
       return
-    isAnimated.value = false
-    setTimeout(() => {
-      isAnimated.value = true
-    }, props.delay)
+    }
+
+    const startValue = oldCount ?? 0
+    animate(startValue, newCount, props.duration, props.delay)
   },
+  { immediate: true },
 )
-
-const durationInMs = computed(() => `${props.duration}ms`)
 </script>
 
 <template>
-  <span
-    class="m-animated-counter m-reset-css"
-    :class="{
-      '--animated': isAnimated,
-      '--prefixed': hasPrefix,
-      '--suffixed': hasSuffix,
-    }"
-    :style="{
-      '--count': count,
-      '--animation-duration': durationInMs,
-    }"
-  >
+  <span class="m-animated-counter m-reset-css">
     <span class="maz-sr-only">
-      <slot name="prefix">{{ prefix }}</slot>
-      {{ count }}
-      <slot name="suffix">{{ suffix }}</slot>
+      <slot name="prefix">{{ prefix }}</slot>{{ count }}<slot name="suffix">{{ suffix }}</slot>
     </span>
 
-    <span v-if="hasPrefix || hasSuffix" class="m-animated-counter__fix">
-      <!-- @slot Prefix slot - Add a prefix next to the number (e.g: "$") -->
-      <slot name="prefix">{{ prefix }}</slot>
-      <!-- @slot Suffix slot - Add a suffix next to the number (e.g: "%") -->
-      <slot name="suffix">{{ suffix }}</slot>
-    </span>
+    <!-- Keep this on one line to avoid spacing issues (space between elements) -->
+    <slot name="prefix">{{ prefix }}</slot>{{ currentCount }}<slot name="suffix">{{ suffix }}</slot>
   </span>
 </template>
 
 <style lang="postcss" scoped>
-  .m-animated-counter {
+.m-animated-counter {
   @apply maz-whitespace-nowrap maz-tabular-nums;
-
-  &.--animated {
-    animation: counter var(--animation-duration) ease-out forwards;
-    counter-set: count var(--count-end);
-  }
-
-  &.--prefixed::after {
-    content: counter(count);
-  }
-
-  &.--suffixed::before {
-    content: counter(count);
-  }
-
-  &:not(.--prefixed, .--suffixed)::before {
-    content: counter(count);
-  }
-}
-
-@property --count {
-  syntax: '<integer>';
-  initial-value: 0;
-  inherits: false;
-}
-
-@property --count-end {
-  syntax: '<integer>';
-  initial-value: 0;
-  inherits: false;
-}
-
-@keyframes counter {
-  from {
-    --count-end: 0;
-  }
-
-  to {
-    --count-end: var(--count);
-  }
 }
 </style>
diff --git a/packages/lib/tests/specs/components/MazAnimatedCounter.spec.ts b/packages/lib/tests/specs/components/MazAnimatedCounter.spec.ts
new file mode 100644
index 0000000000..fc8f76fef2
--- /dev/null
+++ b/packages/lib/tests/specs/components/MazAnimatedCounter.spec.ts
@@ -0,0 +1,49 @@
+import MazAnimatedCounter from '@components/MazAnimatedCounter.vue'
+import { shallowMount } from '@vue/test-utils'
+
+describe('mazAnimatedCounter', () => {
+  it('renders initial count with prefix and suffix', async () => {
+    const wrapper = shallowMount(MazAnimatedCounter, {
+      props: { count: 10, prefix: '$' },
+    })
+
+    expect(wrapper.find('.maz-sr-only').text()).toBe('$10')
+    expect(wrapper.text()).toBe('$10$0')
+
+    await new Promise(resolve => setTimeout(resolve, 100))
+    expect(wrapper.text()).toBe('$10$0')
+  })
+
+  it('updates count and triggers animation', async () => {
+    const wrapper = shallowMount(MazAnimatedCounter, {
+      props: { count: 10, suffix: '%' },
+    })
+
+    expect(wrapper.find('.maz-sr-only').text()).toBe('10%')
+    expect(wrapper.text()).toBe('10%0%')
+
+    await new Promise(resolve => setTimeout(resolve, 100))
+    expect(wrapper.text()).toBe('10%0%')
+
+    await wrapper.setProps({ count: 20, suffix: '%' })
+    expect(wrapper.find('.maz-sr-only').text()).toBe('20%')
+    expect(wrapper.text()).toBe('20%10%')
+
+    // await new Promise(resolve => setTimeout(resolve, 100))
+    // expect(wrapper.text()).toBe('20%-52100%')
+  })
+
+  it('respects delay prop', async () => {
+    const wrapper = shallowMount(MazAnimatedCounter, {
+      props: { count: 10, delay: 200 },
+    })
+
+    expect(wrapper.text()).toBe('100')
+
+    await new Promise(resolve => setTimeout(resolve, 100))
+    expect(wrapper.text()).toBe('100')
+
+    // await new Promise(resolve => setTimeout(resolve, 200))
+    // expect(wrapper.html()).toBe('10')
+  })
+})
diff --git a/packages/lib/tests/specs/components/maz-animated-counter.spec.ts b/packages/lib/tests/specs/components/maz-animated-counter.spec.ts
deleted file mode 100644
index 65c9980b8a..0000000000
--- a/packages/lib/tests/specs/components/maz-animated-counter.spec.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import MazAnimatedCounter from '@components/MazAnimatedCounter.vue'
-import { shallowMount, type VueWrapper } from '@vue/test-utils'
-
-describe('mazAnimatedCounter', () => {
-  let wrapper: VueWrapper<InstanceType<typeof MazAnimatedCounter>>
-
-  beforeEach(() => {
-    wrapper = shallowMount(MazAnimatedCounter, {
-      props: {
-        count: 0,
-      },
-    })
-  })
-
-  it('renders initial count with prefix and suffix', async () => {
-    await wrapper.setProps({ count: 10, prefix: '$' })
-
-    // Vérifier que le texte initial rendu contient le préfixe, le compteur et le suffixe
-    expect(wrapper.find('.maz-sr-only').text()).toBe('$ 10')
-
-    // Attendre la fin de l'animation initiale
-    await new Promise(resolve => setTimeout(resolve, 100))
-
-    // Vérifier que l'animation a eu lieu
-    expect(wrapper.find('.m-animated-counter.--animated').exists()).toBe(true)
-  })
-
-  it('updates count and triggers animation', async () => {
-    await wrapper.setProps({ count: 10, suffix: '%' })
-
-    // Vérifier que le texte initial rendu contient le préfixe, le compteur et le suffixe
-    expect(wrapper.find('.maz-sr-only').text()).toBe('10 %')
-
-    // Mettre à jour le compteur
-    await wrapper.setProps({ count: 20 })
-
-    // Attendre la fin de l'animation de mise à jour
-    await new Promise(resolve => setTimeout(resolve, 100))
-
-    // Vérifier que le texte mis à jour rendu contient le préfixe, le nouveau compteur et le suffixe
-    expect(wrapper.text()).toContain('20')
-
-    // Vérifier que l'animation de mise à jour a eu lieu
-    expect(wrapper.find('.m-animated-counter.--animated').exists()).toBe(true)
-  })
-})