Skip to content

Commit 4103c6a

Browse files
committed
feat: 优化 AM 播放器布局部分元素效果
1 parent 0b0b9da commit 4103c6a

5 files changed

Lines changed: 98 additions & 100 deletions

File tree

‎src/components/player/FullPlayer/layouts/apple/AppleControls.vue‎

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,8 @@ const { items: menuItems, handleSelect: onMenuSelect } = useTrackMenu(toRef(medi
105105
:max="duration"
106106
:step="100"
107107
:track-height="8"
108-
:thumb-size="20"
109-
:always-show-thumb="false"
110-
class="apple-slider"
108+
:hover-track-height="20"
109+
hide-thumb
111110
cover
112111
@drag-end="onSeekDragEnd"
113112
/>
@@ -242,10 +241,10 @@ const { items: menuItems, handleSelect: onMenuSelect } = useTrackMenu(toRef(medi
242241
:max="1"
243242
:step="0.01"
244243
:track-height="8"
245-
:thumb-size="20"
246-
:always-show-thumb="false"
244+
:hover-track-height="20"
245+
hide-thumb
247246
cover
248-
class="apple-slider flex-1"
247+
class="flex-1"
249248
@change="player.setVolume(volumePositionToGain($event))"
250249
/>
251250
<IconSpAmSpeakerMax class="shrink-0 w-[43px] h-10" />
@@ -255,22 +254,6 @@ const { items: menuItems, handleSelect: onMenuSelect } = useTrackMenu(toRef(medi
255254
</template>
256255

257256
<style scoped>
258-
.apple-slider {
259-
& :deep(.s-slider-thumb) {
260-
display: none;
261-
}
262-
263-
& :deep(:is(.s-slider-track, .s-slider-fill)) {
264-
transition:
265-
height 0.28s ease-out,
266-
box-shadow 0.4s ease;
267-
}
268-
269-
&:hover :deep(:is(.s-slider-track, .s-slider-fill)) {
270-
height: 100% !important;
271-
}
272-
}
273-
274257
.apple-transition-shine {
275258
color: transparent;
276259
background: linear-gradient(

‎src/components/player/FullPlayer/layouts/apple/AppleLayout.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ const toggleLyric = (): void => {
4949
:style="{ transform: infoCentered ? 'translateX(calc(50vw - 50%))' : undefined }"
5050
>
5151
<div class="w-[min(50vh,38vw)] flex flex-col gap-[4vh]">
52-
<PlayerCover class="w-full aspect-square rounded-xl shadow-[0_16px_40px_rgba(0,0,0,0.3)]" />
52+
<PlayerCover
53+
class="w-full aspect-square rounded-xl shadow-[0_16px_40px_rgba(0,0,0,0.3)] transition-shadow duration-500 ease-out"
54+
/>
5355
<AppleControls />
5456
</div>
5557
</div>

‎src/components/player/FullPlayer/layouts/standard/ClassicLayout.vue‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ const toggleLyric = (): void => {
6161
<Transition name="scale-switch" mode="out-in">
6262
<div :key="displayTrack?.id">
6363
<PlayerCover
64-
class="classic-cover w-full aspect-square rounded-[32px] shadow-[0_0_20px_10px_rgba(0,0,0,0.1)]"
64+
class="w-full aspect-square rounded-[32px] shadow-[0_0_20px_10px_rgba(0,0,0,0.1)] [transition:transform_500ms_cubic-bezier(0.34,1.56,0.64,1),box-shadow_500ms_ease-out]"
6565
:class="isPlaying ? 'scale-100' : 'scale-90'"
6666
/>
6767
<div class="absolute top-full left-0 w-full pt-6">
@@ -102,11 +102,3 @@ const toggleLyric = (): void => {
102102
</div>
103103
<PlayerBottomBar />
104104
</template>
105-
106-
<style scoped>
107-
.classic-cover {
108-
transition:
109-
transform 500ms cubic-bezier(0.34, 1.56, 0.64, 1),
110-
box-shadow 200ms ease-out;
111-
}
112-
</style>

‎src/components/ui/SSlider.vue‎

Lines changed: 88 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ export interface SSliderProps {
2222
trackHeight?: number;
2323
/** 拖拽点大小(px) */
2424
thumbSize?: number;
25+
/** 悬停或拖拽时展开到的轨道粗细(px) */
26+
hoverTrackHeight?: number;
27+
/** 完全隐藏拖拽点 */
28+
hideThumb?: boolean;
2529
/** 刻度标记:{ 值: 标签 } */
2630
marks?: Record<number, string>;
2731
/** 垂直方向 */
@@ -46,6 +50,8 @@ const props = withDefaults(defineProps<SSliderProps>(), {
4650
popoverOffset: 8,
4751
trackHeight: 4,
4852
thumbSize: 14,
53+
hoverTrackHeight: undefined,
54+
hideThumb: false,
4955
marks: undefined,
5056
vertical: false,
5157
centerFill: false,
@@ -152,9 +158,21 @@ const centerFillStyle = computed(() => {
152158

153159
/** 拖拽点是否可见(始终显示 / hover / 拖拽中) */
154160
const thumbVisible = computed(
155-
() => (props.alwaysShowThumb || isHovering.value || isDragging.value) && !props.glow,
161+
() =>
162+
!props.hideThumb &&
163+
(props.alwaysShowThumb || isHovering.value || isDragging.value) &&
164+
!props.glow,
156165
);
157166

167+
/** 当前轨道粗细,悬停或拖拽时展开 */
168+
const currentTrackSize = computed(() => {
169+
const expanded = props.hoverTrackHeight && (isHovering.value || isDragging.value);
170+
return `${expanded ? props.hoverTrackHeight : props.trackHeight}px`;
171+
});
172+
173+
/** 触摸区域粗细,需容纳拖拽点与展开后的轨道 */
174+
const hitboxSize = computed(() => `${Math.max(props.thumbSize, props.hoverTrackHeight ?? 0)}px`);
175+
158176
/** 将值转换为轨道上的百分比位置 */
159177
const toPercent = (value: number): number => ((value - props.min) / (props.max - props.min)) * 100;
160178

@@ -273,41 +291,44 @@ const onPointerUp = (): void => {
273291
v-if="!vertical"
274292
ref="trackRef"
275293
class="s-slider-hitbox relative flex items-center"
276-
:style="{ height: `${thumbSize}px` }"
294+
:style="{ height: hitboxSize }"
277295
@pointerdown="onPointerDown"
278296
@pointermove="onPointerMove"
279297
@pointerup="onPointerUp"
280298
@pointercancel="onPointerUp"
281299
>
282300
<div
283-
class="s-slider-track absolute left-0 right-0 rounded-full"
301+
class="s-slider-track absolute left-0 right-0 rounded-full transition-[height] duration-280 ease-out"
284302
:class="cover ? 'bg-cover/25' : 'bg-on-surface/12'"
285-
:style="{ height: `${trackHeight}px` }"
303+
:style="{ height: currentTrackSize }"
286304
/>
287305
<!-- 中心刻度线(仅 centerFill 模式) -->
288306
<div
289307
v-if="centerFill"
290308
class="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 w-0.5 rounded-full bg-on-surface/20"
291309
:style="{ height: `${trackHeight + 6}px` }"
292310
/>
293-
<!-- 填充:从左侧 / 中点 -->
294-
<div
295-
class="s-slider-fill absolute rounded-full"
296-
:class="cover ? 'bg-cover/100' : 'bg-primary'"
297-
:style="
298-
centerFill
299-
? {
300-
height: `${trackHeight}px`,
301-
left: centerFillStyle.start,
302-
width: centerFillStyle.length,
303-
}
304-
: {
305-
height: `${trackHeight}px`,
306-
left: '0',
307-
width: 'var(--s-slider-progress)',
308-
}
309-
"
310-
/>
311+
<!-- 填充 -->
312+
<div class="s-slider-fill-glow absolute inset-0 flex items-center pointer-events-none">
313+
<div
314+
class="s-slider-fill absolute rounded-full transition-[height] duration-280 ease-out"
315+
:class="cover ? 'bg-cover/100' : 'bg-primary'"
316+
:style="
317+
centerFill
318+
? {
319+
height: currentTrackSize,
320+
left: centerFillStyle.start,
321+
width: centerFillStyle.length,
322+
}
323+
: {
324+
height: currentTrackSize,
325+
left: '0',
326+
width: '100%',
327+
clipPath: 'inset(0 calc(100% - var(--s-slider-progress)) 0 0)',
328+
}
329+
"
330+
/>
331+
</div>
311332
<div
312333
class="s-slider-thumb absolute rounded-full shadow-sm transition-[transform,opacity] duration-150"
313334
:class="[
@@ -330,41 +351,44 @@ const onPointerUp = (): void => {
330351
v-else
331352
ref="trackRef"
332353
class="s-slider-hitbox relative flex justify-center h-full touch-none"
333-
:style="{ width: `${thumbSize}px` }"
354+
:style="{ width: hitboxSize }"
334355
@pointerdown="onPointerDown"
335356
@pointermove="onPointerMove"
336357
@pointerup="onPointerUp"
337358
@pointercancel="onPointerUp"
338359
>
339360
<div
340-
class="s-slider-track absolute top-0 bottom-0 rounded-full"
361+
class="s-slider-track absolute top-0 bottom-0 rounded-full transition-[width] duration-280 ease-out"
341362
:class="cover ? 'bg-cover/25' : 'bg-on-surface/12'"
342-
:style="{ width: `${trackHeight}px` }"
363+
:style="{ width: currentTrackSize }"
343364
/>
344365
<!-- 中心刻度线(仅 centerFill 模式) -->
345366
<div
346367
v-if="centerFill"
347368
class="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 h-0.5 rounded-full bg-on-surface/20"
348369
:style="{ width: `${trackHeight + 6}px` }"
349370
/>
350-
<!-- 填充:从底部 / 中点向上 -->
351-
<div
352-
class="s-slider-fill absolute rounded-full"
353-
:class="cover ? 'bg-cover/100' : 'bg-primary'"
354-
:style="
355-
centerFill
356-
? {
357-
width: `${trackHeight}px`,
358-
bottom: centerFillStyle.start,
359-
height: centerFillStyle.length,
360-
}
361-
: {
362-
width: `${trackHeight}px`,
363-
bottom: '0',
364-
height: 'var(--s-slider-progress)',
365-
}
366-
"
367-
/>
371+
<!-- 填充 -->
372+
<div class="s-slider-fill-glow absolute inset-0 flex justify-center pointer-events-none">
373+
<div
374+
class="s-slider-fill absolute rounded-full transition-[width] duration-280 ease-out"
375+
:class="cover ? 'bg-cover/100' : 'bg-primary'"
376+
:style="
377+
centerFill
378+
? {
379+
width: currentTrackSize,
380+
bottom: centerFillStyle.start,
381+
height: centerFillStyle.length,
382+
}
383+
: {
384+
width: currentTrackSize,
385+
bottom: '0',
386+
height: '100%',
387+
clipPath: 'inset(calc(100% - var(--s-slider-progress)) 0 0 0)',
388+
}
389+
"
390+
/>
391+
</div>
368392
<div
369393
class="s-slider-thumb absolute rounded-full shadow-sm transition-[transform,opacity] duration-150"
370394
:class="[
@@ -455,40 +479,36 @@ const onPointerUp = (): void => {
455479
</template>
456480

457481
<style scoped>
458-
.s-slider-fill {
482+
/* 发光放外层,避免被裁切 */
483+
.s-slider-fill-glow {
459484
--s-slider-glow: 0.4;
460485
--s-slider-glow-color: var(--s-primary);
461-
box-shadow: 0 0 0 0 transparent;
462-
transition: box-shadow 0.4s ease;
463-
}
486+
transition: filter 0.4s ease;
464487

465-
.dark .s-slider-fill {
466-
--s-slider-glow: 1;
467-
}
488+
.dark & {
489+
--s-slider-glow: 1;
490+
}
468491

469-
.s-slider--cover .s-slider-fill {
470-
--s-slider-glow: 1;
471-
--s-slider-glow-color: var(--s-cover);
472-
}
492+
.s-slider--cover & {
493+
--s-slider-glow: 1;
494+
--s-slider-glow-color: var(--s-cover);
495+
}
473496

474-
.s-slider--glow .s-slider-fill {
475-
box-shadow:
476-
0 0 3px 0.5px rgb(var(--s-slider-glow-color) / calc(0.8 * var(--s-slider-glow))),
477-
0 0 8px 1px rgb(var(--s-slider-glow-color) / calc(0.35 * var(--s-slider-glow)));
478-
animation: s-slider-breathe 1.4s ease-in-out infinite alternate;
479-
}
497+
.s-slider--glow & {
498+
filter: drop-shadow(0 0 3px rgb(var(--s-slider-glow-color) / calc(0.8 * var(--s-slider-glow))))
499+
drop-shadow(0 0 8px rgb(var(--s-slider-glow-color) / calc(0.35 * var(--s-slider-glow))));
500+
animation: s-slider-breathe 1.4s ease-in-out infinite alternate;
480501

481-
@keyframes s-slider-breathe {
482-
to {
483-
box-shadow:
484-
0 0 4px 1px rgb(var(--s-slider-glow-color) / calc(0.95 * var(--s-slider-glow))),
485-
0 0 12px 2px rgb(var(--s-slider-glow-color) / calc(0.5 * var(--s-slider-glow)));
502+
@media (prefers-reduced-motion: reduce) {
503+
animation: none;
504+
}
486505
}
487506
}
488507

489-
@media (prefers-reduced-motion: reduce) {
490-
.s-slider--glow .s-slider-fill {
491-
animation: none;
508+
@keyframes s-slider-breathe {
509+
to {
510+
filter: drop-shadow(0 0 4px rgb(var(--s-slider-glow-color) / calc(0.95 * var(--s-slider-glow))))
511+
drop-shadow(0 0 12px rgb(var(--s-slider-glow-color) / calc(0.5 * var(--s-slider-glow))));
492512
}
493513
}
494514
</style>

‎src/styles/view-transitions.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ html[data-player-layout-transition] {
7676
[data-player-cover="full"] {
7777
view-transition-name: player-layout-cover;
7878
view-transition-class: cover;
79+
box-shadow: none;
7980
}
8081

8182
[data-player-layout="lyric"] {

0 commit comments

Comments
 (0)