From 281968a4e97f87c879bc2c61ff7ea53db53f2c5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=90=E6=82=A6=E5=AD=90?= Date: Wed, 28 Oct 2026 00:37:38 -0700 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=83=8C=E6=99=AF=E8=A7=86?= =?UTF-8?q?=E5=B7=AE=E4=B8=8E=E6=BB=9A=E5=8A=A8=E7=89=A9=E5=93=81=E6=BB=91?= =?UTF-8?q?=E5=85=A5=E5=8A=A8=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 2 + README.md | 2 + desktop/package.json | 2 +- package.json | 2 +- web/package.json | 2 +- .../features/items/ItemGalleryGrid.jsx | 10 +- .../renderer/features/items/scroll-reveal.css | 20 +++ .../renderer/features/items/scroll-reveal.js | 64 +++++++++ web/src/renderer/features/layout/AppShell.jsx | 2 + .../features/layout/PageBackground.jsx | 88 +++++++++++++ .../renderer/features/layout/page-motion.css | 25 ++++ web/tests/renderer/page-background.test.jsx | 124 ++++++++++++++++++ web/tests/renderer/scroll-reveal.test.jsx | 95 ++++++++++++++ 13 files changed, 434 insertions(+), 4 deletions(-) create mode 100644 web/src/renderer/features/items/scroll-reveal.css create mode 100644 web/src/renderer/features/items/scroll-reveal.js create mode 100644 web/src/renderer/features/layout/PageBackground.jsx create mode 100644 web/src/renderer/features/layout/page-motion.css create mode 100644 web/tests/renderer/page-background.test.jsx create mode 100644 web/tests/renderer/scroll-reveal.test.jsx diff --git a/README.en.md b/README.en.md index fec5973..fa7d42b 100644 --- a/README.en.md +++ b/README.en.md @@ -37,6 +37,8 @@ Uploads become WebP images with a maximum long edge of 1920 pixels, without enla Items are sorted by latest update by default. +The background moves subtly as you scroll, and item cards slide into view on their first entrance. The first screen appears immediately. Both effects respect the system's reduced-motion preference. + The first visit downloads the interface. If a module fails to load after login, the page reloads once to fetch the current application; if it fails again, use Reload to try again. Click the app name at the top-left to unlock the private area. Locking or refreshing hides it again. diff --git a/README.md b/README.md index 8be2d00..6595fcd 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,8 @@ docker compose up -d 物品默认按最近更新排列。 +滚动时背景轻微视差移动,物品卡片首次滚入视野时滑入显示。首屏内容直接显示,系统开启“减少动态效果”时关闭这两种动效。 + 首次打开会下载界面程序。若文件加载失败,登录后会自动重新加载最新页面一次;仍失败可点击“重新加载”重试。 点击左上角“物品管理”输入隐私区密码;解锁后可设置隐私物品、分类和位置;物品的隐私开关位于“标签”右侧。锁定或刷新后重新隐藏。 diff --git a/desktop/package.json b/desktop/package.json index f7246cb..c3df079 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -1,6 +1,6 @@ { "name": "@itemmanager/desktop", - "version": "26.7.1", + "version": "26.8.0", "private": true, "description": "物品管理桌面客户端", "author": "MCJ", diff --git a/package.json b/package.json index 98c3a6f..14fcb0f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "itemmanager-workspace", - "version": "26.7.1", + "version": "26.8.0", "private": true, "license": "MIT", "packageManager": "pnpm@11.7.0", diff --git a/web/package.json b/web/package.json index 28c984e..fa933a8 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "@itemmanager/web", - "version": "26.7.1", + "version": "26.8.0", "private": true, "license": "MIT", "packageManager": "pnpm@11.7.0", diff --git a/web/src/renderer/features/items/ItemGalleryGrid.jsx b/web/src/renderer/features/items/ItemGalleryGrid.jsx index 1a4ba0b..cdd5c8b 100644 --- a/web/src/renderer/features/items/ItemGalleryGrid.jsx +++ b/web/src/renderer/features/items/ItemGalleryGrid.jsx @@ -1,6 +1,14 @@ +import { useEffect, useRef } from 'react'; + import ItemGalleryCard from './ItemGalleryCard'; +import { observeScrollReveal } from './scroll-reveal'; +import './scroll-reveal.css'; export default function ItemGalleryGrid({ items, bulkMode = false, bulkSelectedIds = new Set(), onSelect }) { + const gridRef = useRef(null); + const seenRef = useRef(new WeakSet()); + useEffect(() => observeScrollReveal(gridRef.current, seenRef.current), [items]); + if (!items.length) { return (
@@ -11,7 +19,7 @@ export default function ItemGalleryGrid({ items, bulkMode = false, bulkSelectedI } return ( -
+
{items.map((item) => ( element.classList.remove('scroll-reveal-enter')); + } + + function configure() { + observer?.disconnect(); + observer = null; + clearMotion(); + if (preference?.matches || typeof IntersectionObserver !== 'function') return; + const waiting = new WeakSet(); + try { + const next = new IntersectionObserver(entries => { + if (!active || observer !== next || preference?.matches) return; + for (const { target, isIntersecting } of entries) { + if (!container.contains(target) || seen.has(target)) continue; + if (!isIntersecting) { + waiting.add(target); + continue; + } + seen.add(target); + next.unobserve(target); + // The initial visible cards never wait for an animation. + if (waiting.has(target)) target.classList.add('scroll-reveal-enter'); + } + }, { threshold: 0.05 }); + observer = next; + container.querySelectorAll('.item-gallery-card').forEach(element => { + if (!seen.has(element)) next.observe(element); + }); + } catch { + observer?.disconnect(); + observer = null; + } + } + + function finish(event) { + if (event.target.matches?.('.item-gallery-card')) event.target.classList.remove('scroll-reveal-enter'); + } + + configure(); + if (preference?.addEventListener) preference.addEventListener('change', configure); + else preference?.addListener?.(configure); + container.addEventListener('animationend', finish); + container.addEventListener('animationcancel', finish); + container.addEventListener('focusin', finish); + + return () => { + active = false; + observer?.disconnect(); + if (preference?.removeEventListener) preference.removeEventListener('change', configure); + else preference?.removeListener?.(configure); + container.removeEventListener('animationend', finish); + container.removeEventListener('animationcancel', finish); + container.removeEventListener('focusin', finish); + clearMotion(); + }; +} diff --git a/web/src/renderer/features/layout/AppShell.jsx b/web/src/renderer/features/layout/AppShell.jsx index 7d5be6a..5c74404 100644 --- a/web/src/renderer/features/layout/AppShell.jsx +++ b/web/src/renderer/features/layout/AppShell.jsx @@ -2,6 +2,7 @@ import CatalogWorkspace from '../catalog/CatalogWorkspace'; import ItemsGalleryPage from '../items/ItemsGalleryPage'; import TagManager from '../tags/TagManager'; import Toolbar from './Toolbar'; +import PageBackground from './PageBackground'; const CATALOG_CONTEXT_TITLES = { category: '分类管理', @@ -55,6 +56,7 @@ export default function AppShell({ return (
+ { + const layer = layerRef.current; + const shell = layer?.parentElement; + if (!shell || typeof window.requestAnimationFrame !== 'function') return; + + const preference = window.matchMedia?.('(prefers-reduced-motion: reduce)'); + let stopped = false; + let frame = null; + let pendingSource = null; + + function documentSource() { + return document.scrollingElement || document.documentElement; + } + + function defaultSource() { + const page = documentSource(); + if (page.scrollHeight > page.clientHeight) return page; + return [...shell.querySelectorAll(SCROLL_SURFACES)].find(surface => surface.scrollHeight > surface.clientHeight) || page; + } + + function draw() { + frame = null; + if (stopped || preference?.matches) return; + const source = pendingSource?.isConnected ? pendingSource : defaultSource(); + pendingSource = null; + const range = Math.max(0, source.scrollHeight - source.clientHeight); + const progress = range ? Math.min(1, Math.max(0, source.scrollTop / range)) : 0; + layer.style.setProperty('--page-parallax-y', `${Math.round(-56 * progress * 100) / 100}px`); + } + + function schedule(source) { + if (stopped || preference?.matches) return; + pendingSource = source; + if (frame === null) frame = window.requestAnimationFrame(draw); + } + + function onScroll(event) { + const target = event.target; + if (target === document || target === window) { + schedule(documentSource()); + } else if (target instanceof Element && shell.contains(target) && target.matches(SCROLL_SURFACES) + && !target.closest('[role="dialog"], .dialog-backdrop') && target.scrollHeight > target.clientHeight) { + schedule(target); + } + } + + function cancelPending() { + if (frame !== null) window.cancelAnimationFrame?.(frame); + frame = null; + pendingSource = null; + } + + function onPreferenceChange() { + cancelPending(); + if (preference?.matches) layer.style.setProperty('--page-parallax-y', '0px'); + else schedule(defaultSource()); + } + + function onResize() { + schedule(defaultSource()); + } + + window.addEventListener('scroll', onScroll, { capture: true, passive: true }); + window.addEventListener('resize', onResize, { passive: true }); + if (preference?.addEventListener) preference.addEventListener('change', onPreferenceChange); + else preference?.addListener?.(onPreferenceChange); + onPreferenceChange(); + + return () => { + stopped = true; + cancelPending(); + window.removeEventListener('scroll', onScroll, true); + window.removeEventListener('resize', onResize); + if (preference?.removeEventListener) preference.removeEventListener('change', onPreferenceChange); + else preference?.removeListener?.(onPreferenceChange); + }; + }, []); + + return