From 3f59b7f7059a6d07130e49cc2478fed9cb1ef8b0 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Fri, 7 Oct 2022 13:32:44 +0200
Subject: [PATCH 1/2] client: refactor marquee component to composition API

---
 packages/client/src/components/marquee.vue | 143 ++++++++-------------
 1 file changed, 57 insertions(+), 86 deletions(-)

diff --git a/packages/client/src/components/marquee.vue b/packages/client/src/components/marquee.vue
index 276c78d05..9721e2e87 100644
--- a/packages/client/src/components/marquee.vue
+++ b/packages/client/src/components/marquee.vue
@@ -1,104 +1,75 @@
-<script lang="ts">
-import { h, onMounted, onUnmounted, ref, watch } from 'vue';
+<template>
+<div class="marquee">
+	<span ref="contentEl" :class="{ content: true, paused, reverse }">
+		<span v-for="i in repeat" :key="i" class="text">
+			<slot></slot>
+		</span>
+	</span>
+</div>
+</template>
 
-export default {
-	name: 'MarqueeText',
-	props: {
-		duration: {
-			type: Number,
-			default: 15,
-		},
-		repeat: {
-			type: Number,
-			default: 2,
-		},
-		paused: {
-			type: Boolean,
-			default: false,
-		},
-		reverse: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	setup(props) {
-		const contentEl = ref();
+<script lang="ts" setup>
+import { watch, onMounted } from 'vue';
 
-		function calc() {
-			const eachLength = contentEl.value.offsetWidth / props.repeat;
-			const factor = 3000;
-			const duration = props.duration / ((1 / eachLength) * factor);
+const props = withDefaults(defineProps<{
+	duration?: number;
+	repeat?: number;
+	paused?: boolean;
+	reverse?: boolean;
+}>(), {
+	duration: 15,
+	repeat: 2,
+	paused: false,
+	reverse: false,
+});
 
-			contentEl.value.style.animationDuration = `${duration}s`;
-		}
+let contentEl = $ref();
 
-		watch(() => props.duration, calc);
+function calc() {
+	const eachLength = contentEl.offsetWidth / props.repeat;
+	const factor = 3000;
+	const duration = props.duration / ((1 / eachLength) * factor);
 
-		onMounted(() => {
-			calc();
-		});
+	contentEl.style.animationDuration = `${duration}s`;
+}
 
-		onUnmounted(() => {
-		});
-
-		return {
-			contentEl,
-		};
-	},
-	render({
-		$slots, $style, $props: {
-			repeat, paused, reverse,
-		},
-	}) {
-		return h('div', { class: [$style.wrap] }, [
-			h('span', {
-				ref: 'contentEl',
-				class: [
-					paused
-						? $style.paused
-						: undefined,
-					$style.content,
-				],
-			}, Array(repeat).fill(
-				h('span', {
-					class: $style.text,
-					style: {
-						animationDirection: reverse
-							? 'reverse'
-							: undefined,
-					},
-				}, $slots.default()),
-			)),
-		]);
-	},
-};
+watch(() => props.duration, calc);
+onMounted(calc);
 </script>
 
-<style lang="scss" module>
-.wrap {
+<style lang="scss" scoped>
+.marquee {
 	overflow: clip;
 	animation-play-state: running;
 
 	&:hover {
 		animation-play-state: paused;
 	}
+
+	> .content {
+		display: inline-block;
+		white-space: nowrap;
+		animation-play-state: inherit;
+
+		&.paused {
+			animation-play-state: paused;
+		}
+
+		&.reverse {
+			animation-direction: reverse;
+		}
+
+		> .text {
+			display: inline-block;
+			animation-name: marquee;
+			animation-timing-function: linear;
+			animation-iteration-count: infinite;
+			animation-duration: inherit;
+			animation-play-state: inherit;
+		}
+	}
 }
-.content {
-	display: inline-block;
-	white-space: nowrap;
-	animation-play-state: inherit;
-}
-.text {
-	display: inline-block;
-	animation-name: marquee;
-	animation-timing-function: linear;
-	animation-iteration-count: infinite;
-	animation-duration: inherit;
-	animation-play-state: inherit;
-}
-.paused .text {
-	animation-play-state: paused;
-}
+
 @keyframes marquee {
 	0% { transform:translateX(0); }
 	100% { transform:translateX(-100%); }

From 60e49a4196414d6fb894dadcf50d1066e80ab3ac Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Sat, 8 Oct 2022 20:59:21 +0200
Subject: [PATCH 2/2] add type annotations

---
 packages/client/src/components/marquee.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/marquee.vue b/packages/client/src/components/marquee.vue
index 9721e2e87..2088c5ed8 100644
--- a/packages/client/src/components/marquee.vue
+++ b/packages/client/src/components/marquee.vue
@@ -23,9 +23,9 @@ const props = withDefaults(defineProps<{
 	reverse: false,
 });
 
-let contentEl = $ref();
+let contentEl: HTMLElement = $ref();
 
-function calc() {
+function calc(): void {
 	const eachLength = contentEl.offsetWidth / props.repeat;
 	const factor = 3000;
 	const duration = props.duration / ((1 / eachLength) * factor);