Skip to content

Commit 8ae2a2d

Browse files
authored
Merge pull request #9 from selemondev/fix/custom-gap-speed
fix: custom gap and speed
2 parents c036b2b + dc9f53b commit 8ae2a2d

File tree

6 files changed

+15
-10
lines changed

6 files changed

+15
-10
lines changed

examples/vue3-marquee/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"type-check": "vue-tsc --build --force"
1212
},
1313
"dependencies": {
14-
"@selemondev/vue3-marquee": "0.0.2",
14+
"@selemondev/vue3-marquee": "0.0.7",
1515
"@wdns/vue-code-block": "^2.3.1",
1616
"vue": "^3.4.15"
1717
},

examples/vue3-marquee/src/App.vue

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ const verticalCodeSnippet = ref(`<Marquee class="h-[400px]" direction="up" :fade
8484
</Marquee>`
8585
);
8686
87-
const customGapAndSpeedSnippet = ref(`<Marquee class="gap-[3rem] [--duration:5s]" innerClassName="gap-[3rem] [--gap:3rem]" :fade="true">
87+
const customGapAndSpeedSnippet = ref(`<Marquee class="gap-[3rem] [--duration:5s] [--gap:3rem]" innerClassName="gap-[3rem]" :fade="true">
8888
<div>Content 1</div>
8989
<div>Content 2</div>
9090
<div>Content 3</div>
@@ -243,7 +243,7 @@ export default defineNuxtPlugin((nuxtApp) => {
243243
<hr class="border-stone-200" />
244244
<div class="space-y-1 ">
245245
<h3 class="font-semibold">Custom gap and speed</h3>
246-
<Marquee class="gap-[3rem] [--duration:10s] py-4" innerClassName="gap-[3rem] [--gap:3rem]" :fade="true">
246+
<Marquee class="gap-[3rem] [--duration:5s] [--gap:3rem]" innerClassName="gap-[3rem]" :fade="true">
247247
<div v-for="testimonial in testimonials" :key="testimonial.name">
248248
<Card :avatar="testimonial.avatar" :name="testimonial.name" :title="testimonial.title"
249249
:content="testimonial.content" />
@@ -258,8 +258,7 @@ export default defineNuxtPlugin((nuxtApp) => {
258258
<div class="space-y-1">
259259
<h3 class="font-semibold">Reduced motion</h3>
260260
<div>Disable animation when user device prefers reduced motion.</div>
261-
<Marquee class="py-4 motion-reduce:overflow-auto"
262-
innerclass="motion-reduce:animate-none motion-reduce:first:hidden">
261+
<Marquee class="py-4 motion-reduce:overflow-auto" innerClassName="motion-reduce:animate-none motion-reduce:first:hidden">
263262
<div v-for="testimonial in testimonials" :key="testimonial.name">
264263
<Card :avatar="testimonial.avatar" :name="testimonial.name" :title="testimonial.title"
265264
:content="testimonial.content" />

packages/vue3-marquee/src/components/Marquee.vue

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,17 @@ const props = withDefaults(defineProps<{
1919
const attrs = useAttrs();
2020
</script>
2121

22+
<script lang="ts">
23+
export default {
24+
name: 'Marquee',
25+
inheritAttrs: false
26+
}
27+
</script>
2228
<template>
23-
<div v-bind="attrs" :class="cn('group flex gap-[1rem] overflow-hidden', {
29+
<div :class="cn('group flex gap-[1rem] overflow-hidden', {
2430
'flex-row': props.direction === 'left',
2531
'flex-col': props.direction !== 'left',
26-
})" :style="{
32+
}, attrs && attrs.class )" :style="{
2733
maskImage: props.fade
2834
? `linear-gradient(${props.direction === 'left' ? 'to right' : 'to bottom'
2935
}, transparent 0%, rgba(0, 0, 0, 1.0) 10%, rgba(0, 0, 0, 1.0) 90%, transparent 100%)`
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { clsx, type ClassValue } from "clsx";
22
import { twMerge } from "tailwind-merge";
33

4-
export function cn(...inputs: ClassValue[]) {
4+
export function cn(...inputs: ClassValue[] | any) {
55
return twMerge(clsx(inputs));
66
}

pnpm-lock.yaml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pnpm-workspace.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
packages:
22
- examples/*
3-
- 'packages/*'
3+
- packages/*

0 commit comments

Comments
 (0)