diff --git a/frontend/src/components/FloatingAddButton.vue b/frontend/src/components/FloatingAddButton.vue index fdb1f2a..f59b143 100644 --- a/frontend/src/components/FloatingAddButton.vue +++ b/frontend/src/components/FloatingAddButton.vue @@ -8,14 +8,21 @@ const dragging = ref(false) const snapping = ref(false) const edge = ref<'left' | 'right'>('right') const position = ref<{ x: number; y: number } | null>(null) -const pointer = ref<{ id: number; startX: number; startY: number; originX: number; originY: number } | null>(null) +const pupilOffset = ref({ x: 0, y: 0 }) +const pointer = ref<{ id: number; startX: number; startY: number; originX: number; originY: number; lastX: number; lastY: number } | null>(null) let suppressClick = false +let suppressClickTimer: number | undefined let snappingTimer: number | undefined -const buttonStyle = computed(() => position.value - ? { left: `${position.value.x}px`, top: `${position.value.y}px`, right: 'auto', bottom: 'auto' } - : {}) +const buttonStyle = computed(() => ({ + ...(position.value ? { left: `${position.value.x}px`, top: `${position.value.y}px`, right: 'auto', bottom: 'auto' } : {}), + '--pupil-x': `${pupilOffset.value.x}px`, + '--pupil-y': `${pupilOffset.value.y}px`, +})) +function prefersReducedMotion() { + return window.matchMedia('(prefers-reduced-motion: reduce)').matches +} function clearSnappingTimer() { if (snappingTimer) { window.clearTimeout(snappingTimer) @@ -24,11 +31,18 @@ function clearSnappingTimer() { } function startSnappingPulse() { clearSnappingTimer() - snapping.value = true + if (prefersReducedMotion()) { + pupilOffset.value = { x: 0, y: 0 } + return + } snappingTimer = window.setTimeout(() => { - snapping.value = false - snappingTimer = undefined - }, 220) + pupilOffset.value = { x: 0, y: 0 } + snapping.value = true + snappingTimer = window.setTimeout(() => { + snapping.value = false + snappingTimer = undefined + }, 460) + }, 200) } function updateEdge() { if (!position.value) return @@ -43,10 +57,11 @@ function startDrag(event: PointerEvent) { if (!event.isPrimary || (event.pointerType === 'mouse' && event.button !== 0)) return clearSnappingTimer() snapping.value = false + pupilOffset.value = { x: 0, y: 0 } const target = event.currentTarget as HTMLElement const rect = target.getBoundingClientRect() position.value = clampFabPosition(rect.left, rect.top, window.innerWidth, window.innerHeight, 56, 14, 84) - pointer.value = { id: event.pointerId, startX: event.clientX, startY: event.clientY, originX: rect.left, originY: rect.top } + pointer.value = { id: event.pointerId, startX: event.clientX, startY: event.clientY, originX: rect.left, originY: rect.top, lastX: event.clientX, lastY: event.clientY } try { target.setPointerCapture?.(event.pointerId) } catch { /* pointer capture unavailable in synthetic events */ } } function moveDrag(event: PointerEvent) { @@ -54,8 +69,14 @@ function moveDrag(event: PointerEvent) { if (!start || start.id !== event.pointerId) return const deltaX = event.clientX - start.startX const deltaY = event.clientY - start.startY + const vectorX = event.clientX - start.lastX + const vectorY = event.clientY - start.lastY + start.lastX = event.clientX + start.lastY = event.clientY if (!dragging.value && !isFabDrag(deltaX, deltaY)) return dragging.value = true + const length = Math.hypot(vectorX, vectorY) + if (!prefersReducedMotion() && length > 1) pupilOffset.value = { x: vectorX / length * 1.5, y: vectorY / length * 1.1 } position.value = clampFabPosition(start.originX + deltaX, start.originY + deltaY, window.innerWidth, window.innerHeight, 56, 14, 84) } function finishDrag(event: PointerEvent) { @@ -69,7 +90,13 @@ function finishDrag(event: PointerEvent) { updateEdge() startSnappingPulse() suppressClick = true - window.setTimeout(() => { suppressClick = false }, 180) + if (suppressClickTimer) window.clearTimeout(suppressClickTimer) + suppressClickTimer = window.setTimeout(() => { + suppressClick = false + suppressClickTimer = undefined + }, 180) + } else { + pupilOffset.value = { x: 0, y: 0 } } dragging.value = false } @@ -83,22 +110,32 @@ onMounted(() => window.addEventListener('resize', snapFabToCurrentViewport)) onUnmounted(() => { window.removeEventListener('resize', snapFabToCurrentViewport) clearSnappingTimer() + if (suppressClickTimer) window.clearTimeout(suppressClickTimer) }) diff --git a/frontend/src/style.css b/frontend/src/style.css index 8c7e981..e20d01b 100644 --- a/frontend/src/style.css +++ b/frontend/src/style.css @@ -35,13 +35,13 @@ main{container-type:inline-size;min-width:0;padding:27px 34px 50px;overflow:auto @media(max-width:930px){.task-row,.habit-row,.countdown-row{min-height:62px;background:#fff;border:1px solid var(--line);border-radius:13px;box-shadow:none}.task-list,.habit-list,.countdown-timeline{display:grid;gap:8px}.task-row{padding:4px 7px}.task-row:hover,.task-row.selected{background:#fffaf5}.habit-row{padding:4px 7px}.countdown-row,.countdown-row:first-of-type{border:1px solid var(--line)}.countdown-row{grid-template-columns:minmax(0,1fr) 72px;padding:8px 9px;gap:8px}.task-main strong,.habit-name,.countdown-main>b{font-size:14px;font-weight:650}.meta,.countdown-main>small,.countdown-state small{font-size:11px;color:var(--muted)}.habit-progress{font-size:16px}.task-check{width:44px;flex-basis:44px}.countdown-icon{width:36px;height:36px;border-radius:10px}.countdown-state strong{font-size:24px}.countdown-group{gap:8px}.countdown-group>h3{padding-left:3px}.habit-detail-mask{padding:0}.habit-detail-sheet{width:100%;border-radius:22px 22px 0 0;padding:18px 16px calc(18px + env(safe-area-inset-bottom))}} @media(max-width:800px){.settings-grid{grid-template-columns:1fr}.tool-card.wide{grid-column:auto}.habit-main{padding:10px 2px}.numeric-action input{width:62px}} @media(max-width:390px){.task-compose-sheet{width:100%;max-width:100%;overflow-x:hidden}.task-compose-sheet .app-sheet__header>button{min-width:44px;min-height:44px}.task-compose-sheet input,.task-compose-sheet select,.task-compose-sheet button{min-height:44px}.task-compose-date-clear,.task-compose-time-remove{min-width:44px;min-height:44px}.task-compose-sheet .app-sheet__footer>button{min-height:44px}.habit-detail-sheet,.habit-compose-sheet{width:100%;max-width:100%}.habit-detail-sheet .app-sheet__header>button,.habit-compose-sheet .app-sheet__header>button{min-width:44px;min-height:44px}.habit-detail-sheet .app-sheet__footer>button,.habit-detail-sheet .app-sheet__danger>button,.habit-compose-sheet .app-sheet__footer>button{min-height:44px}} -.unified-fab{display:grid;place-items:center;position:fixed;z-index:60;right:20px;bottom:22px;width:56px;height:56px;padding:0;border:1px solid #efb28f;border-radius:50%;background:#fff4e7;color:#bd4a25;box-shadow:inset 0 1px 0 #fff,0 8px 20px rgba(132,76,40,.2);transition:left .2s cubic-bezier(.2,.8,.3,1),top .2s cubic-bezier(.2,.8,.3,1),transform .16s ease,box-shadow .16s ease;touch-action:none;user-select:none;overflow:visible}.unified-fab .fab-cat{width:52px;height:52px;overflow:visible;fill:none;stroke:currentColor;stroke-width:1.8;stroke-linecap:round;stroke-linejoin:round;transition:transform .18s ease}.unified-fab .fab-cat-back,.unified-fab .fab-cat-head{fill:#ffd7b9}.unified-fab .fab-cat-head{fill:#ffe5cf}.unified-fab .fab-cat-eye--awake{opacity:0;fill:currentColor;stroke:none}.unified-fab .fab-cat-sleep{fill:currentColor;stroke:none;font:700 8px/1 ui-rounded,"SF Pro Rounded",sans-serif;opacity:.72}.unified-fab.edge-left .fab-cat{transform:scaleX(-1)}.unified-fab:hover{transform:translateY(-2px);box-shadow:inset 0 1px 0 #fff,0 10px 24px rgba(132,76,40,.24)}.unified-fab:active{transform:scale(.96)}.unified-fab.dragging{transform:scale(1.06);box-shadow:inset 0 1px 0 #fff,0 12px 28px rgba(132,76,40,.3);transition:transform .16s ease,box-shadow .16s ease}.unified-fab.snapping{box-shadow:inset 0 1px 0 #fff,0 10px 24px rgba(132,76,40,.24)}.unified-fab.sleeping .fab-cat-body{transform-origin:29px 40px;animation:fab-cat-breathe 2.8s ease-in-out infinite}.unified-fab.awake .fab-cat-eye--sleeping,.unified-fab.awake .fab-cat-sleep{opacity:0}.unified-fab.awake .fab-cat-eye--awake{opacity:1}.unified-fab.awake .fab-cat-head{transform:translateY(-1px)}@keyframes fab-cat-breathe{0%,100%{transform:scaleY(1)}50%{transform:scaleY(.965)}}.app-sheet-mask.app-sheet-mask{background:var(--sheet-scrim);overscroll-behavior:contain}.app-sheet{min-height:0;overflow:hidden;background:var(--paper)}.app-sheet__header{min-height:64px;flex:0 0 64px;position:sticky;z-index:3;top:0;background:var(--paper);border-bottom:1px solid var(--line);padding:0 18px}.app-sheet__header>div{min-width:0}.app-sheet__header h2,.app-sheet__header h3{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.app-sheet__header>button{width:44px;height:44px;flex:0 0 44px;display:grid;place-items:center;border:0;background:transparent;border-radius:10px}.app-sheet__body{min-height:0;overflow-y:auto;overscroll-behavior:contain;-webkit-overflow-scrolling:touch;display:grid;gap:14px;padding:16px 18px}.app-sheet__footer{position:sticky;bottom:0;z-index:3;margin:0;background:var(--paper);border-top:1px solid var(--line);padding:12px 18px;padding-bottom:calc(16px + env(safe-area-inset-bottom));display:flex;justify-content:flex-end;gap:8px}.app-sheet__danger{border-top:1px solid #f1d4cd;background:#fff8f6;padding:12px 18px;padding-bottom:calc(16px + env(safe-area-inset-bottom));display:flex;justify-content:flex-end}.app-sheet--actions .app-sheet__body{gap:6px;padding:8px 16px calc(16px + env(safe-area-inset-bottom))}.app-sheet--actions .app-sheet__body>button{min-height:50px;width:100%;display:flex;align-items:center;gap:12px;border:0;background:#fff;padding:13px;border-radius:12px;text-align:left} +.unified-fab{display:grid;place-items:center;position:fixed;z-index:60;right:20px;bottom:22px;width:56px;height:56px;padding:0;border:1px solid #e9b88f;border-radius:50%;background:#fff3df;box-shadow:inset 0 1px 0 rgba(255,255,255,.78),0 6px 16px rgba(112,65,35,.18);transition:left .2s cubic-bezier(.2,.8,.3,1),top .2s cubic-bezier(.2,.8,.3,1),transform .14s cubic-bezier(.2,.8,.3,1),box-shadow .16s ease;touch-action:none;user-select:none;overflow:visible}.unified-fab .fab-cat{width:52px;height:52px;overflow:visible}.fab-cat__character{transform-origin:28px 27px;transition:transform .14s cubic-bezier(.2,.8,.3,1)}.fab-cat__tail path{fill:none;stroke:#f28c52;stroke-width:4.5;stroke-linecap:round}.fab-cat__tail{transform-origin:40.5px 36.8px}.unified-fab.edge-left .fab-cat__tail{transform:translateX(56px) scaleX(-1)}.fab-cat__face-shape,.fab-cat__ear{fill:#f28c52;stroke:#98482c;stroke-width:1.5;stroke-linejoin:round}.fab-cat__inner-ear{fill:#f7b092;stroke:none}.fab-cat__ear{transform-box:fill-box;transition:transform .16s cubic-bezier(.2,.8,.3,1)}.fab-cat__ear--left{transform-origin:right bottom}.fab-cat__ear--right{transform-origin:left bottom}.fab-cat__eye{fill:#fff9f0;stroke:#98482c;stroke-width:1.15;transform-box:fill-box;transform-origin:center;animation:fab-cat-blink 8s 2.4s infinite cubic-bezier(.4,0,.2,1)}.fab-cat__pupils{fill:#71351f;stroke:none;transform:translate(var(--pupil-x),var(--pupil-y));transition:transform 70ms linear}.fab-cat__nose{fill:#71351f;stroke:none}.fab-cat__mouth{fill:none;stroke:#71351f;stroke-width:1.1;stroke-linecap:round}.fab-cat__plus{fill:none;stroke:#fff;stroke-width:2.4;stroke-linecap:round}.unified-fab:focus-visible{outline:3px solid #a84628;outline-offset:3px}.unified-fab:focus:not(:focus-visible){outline:none}.unified-fab:active:not(.dragging){transform:translateY(1px) scale(.97)}.unified-fab:active:not(.dragging) .fab-cat__character{transform:scale(.94)}.unified-fab.dragging{box-shadow:inset 0 1px 0 rgba(255,255,255,.78),0 9px 20px rgba(112,65,35,.24)}.unified-fab.dragging .fab-cat__eye,.unified-fab:active .fab-cat__eye{animation:none}.unified-fab.dragging .fab-cat__eye ellipse{ry:2.55}.unified-fab.snapping .fab-cat__tail{animation:fab-cat-tail-wag .46s cubic-bezier(.25,.8,.35,1) 1}@media(hover:hover) and (pointer:fine){.unified-fab:hover:not(.dragging){transform:translateY(-1px);box-shadow:inset 0 1px 0 rgba(255,255,255,.78),0 8px 18px rgba(112,65,35,.21)}.unified-fab:hover .fab-cat__eye{animation:none}.unified-fab:hover .fab-cat__ear--left{transform:translateY(-.8px) rotate(-4deg)}.unified-fab:hover .fab-cat__ear--right{transform:translateY(-1px) rotate(3deg)}}@keyframes fab-cat-blink{0%,5%,100%{transform:scaleY(1)}1.875%,2.875%{transform:scaleY(.12)}}@keyframes fab-cat-tail-wag{0%,100%{rotate:0deg}28%{rotate:12deg}62%{rotate:-8deg}}.app-sheet-mask.app-sheet-mask{background:var(--sheet-scrim);overscroll-behavior:contain}.app-sheet{min-height:0;overflow:hidden;background:var(--paper)}.app-sheet__header{min-height:64px;flex:0 0 64px;position:sticky;z-index:3;top:0;background:var(--paper);border-bottom:1px solid var(--line);padding:0 18px}.app-sheet__header>div{min-width:0}.app-sheet__header h2,.app-sheet__header h3{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.app-sheet__header>button{width:44px;height:44px;flex:0 0 44px;display:grid;place-items:center;border:0;background:transparent;border-radius:10px}.app-sheet__body{min-height:0;overflow-y:auto;overscroll-behavior:contain;-webkit-overflow-scrolling:touch;display:grid;gap:14px;padding:16px 18px}.app-sheet__footer{position:sticky;bottom:0;z-index:3;margin:0;background:var(--paper);border-top:1px solid var(--line);padding:12px 18px;padding-bottom:calc(16px + env(safe-area-inset-bottom));display:flex;justify-content:flex-end;gap:8px}.app-sheet__danger{border-top:1px solid #f1d4cd;background:#fff8f6;padding:12px 18px;padding-bottom:calc(16px + env(safe-area-inset-bottom));display:flex;justify-content:flex-end}.app-sheet--actions .app-sheet__body{gap:6px;padding:8px 16px calc(16px + env(safe-area-inset-bottom))}.app-sheet--actions .app-sheet__body>button{min-height:50px;width:100%;display:flex;align-items:center;gap:12px;border:0;background:#fff;padding:13px;border-radius:12px;text-align:left} @media(max-width:930px){.app-sheet{width:100%;max-height:min(88dvh,760px);display:flex!important;flex-direction:column!important;overflow:hidden!important;border-radius:var(--sheet-radius) var(--sheet-radius) 0 0!important;padding:0!important}.app-sheet--detail,.app-sheet--create{max-width:none!important}.app-sheet-mask{padding:0!important;place-items:end center!important;align-items:flex-end!important}.app-sheet__header{display:flex!important;align-items:center!important;justify-content:space-between!important;width:100%}.app-sheet__body{width:100%;flex:1 1 auto}.app-sheet__body label{display:grid;gap:6px}.app-sheet__footer{width:100%;flex:0 0 auto}.app-sheet__footer .primary-small{min-width:124px}.app-sheet__danger{width:100%;flex:0 0 auto}.app-sheet__danger .danger-text{width:100%;min-height:48px;justify-content:center}} .calendar-picker-layer{position:fixed;z-index:90;inset:0;pointer-events:none}.calendar-picker{position:fixed;width:328px;background:#fffdf8;border:1px solid #ded6ca;border-radius:18px;box-shadow:0 18px 46px rgba(56,40,24,.2);padding:14px;display:grid;gap:10px;pointer-events:auto;color:var(--text)}.calendar-picker__header{display:grid;grid-template-columns:40px 1fr 40px;align-items:center;gap:4px}.calendar-picker__header h3{margin:0;text-align:center;font-size:16px}.calendar-picker__header button,.calendar-picker__grid button{border:0;background:transparent;display:grid;place-items:center}.calendar-picker__header button{width:40px;height:40px;border-radius:10px}.calendar-picker__header svg{width:18px}.calendar-picker__close{display:none!important}.calendar-picker__weekdays,.calendar-picker__grid{display:grid;grid-template-columns:repeat(7,1fr);gap:3px}.calendar-picker__weekdays span{text-align:center;color:var(--muted);font-size:11px;padding:3px 0}.calendar-picker__grid button{height:34px;border-radius:10px;color:#4f483f;font-size:13px}.calendar-picker__grid button:hover,.calendar-picker__grid button:focus-visible{background:#f6ede2;outline:2px solid transparent}.calendar-picker__grid button.outside{color:#b9b0a5}.calendar-picker__grid button.today{box-shadow:inset 0 0 0 1px var(--accent);color:#b7421e}.calendar-picker__grid button.selected{background:var(--accent);color:#fff}.calendar-picker__grid button.selected.today{box-shadow:inset 0 0 0 1px #fff}.calendar-picker__footer{display:grid;grid-template-columns:auto auto 1fr auto auto;align-items:center;gap:4px;border-top:1px solid #e8e0d5;padding-top:10px}.calendar-picker__footer button{min-height:36px;border:0;background:transparent;border-radius:9px;padding:0 9px;color:#6d6459;font-weight:650}.calendar-picker__footer button:hover{background:#f6ede2}.calendar-picker__footer .calendar-picker__done{background:var(--accent);color:#fff}.calendar-picker__footer .calendar-picker__done:hover{background:#df4e22}@media(max-width:600px){.calendar-picker-layer{pointer-events:auto;background:rgba(45,38,31,.3);display:flex;align-items:flex-end}.calendar-picker{position:relative!important;left:auto!important;top:auto!important;width:100%;height:min(520px,72dvh);border-width:1px 0 0;border-radius:24px 24px 0 0;padding:18px 18px calc(16px + env(safe-area-inset-bottom));grid-template-rows:auto auto 1fr auto}.calendar-picker__header{grid-template-columns:44px 1fr 44px 44px}.calendar-picker__close{display:grid!important}.calendar-picker__grid{align-content:stretch}.calendar-picker__grid button{height:auto;min-height:42px}.calendar-picker__footer button{min-height:44px}} .task-compose-mask{position:fixed;z-index:70;inset:0;background:rgba(45,38,31,.34);display:flex;align-items:flex-end;padding:0}.task-compose-sheet{width:100%;max-height:min(88dvh,720px);overflow:auto;background:#fffdf8;border-radius:24px 24px 0 0;padding:18px 18px calc(20px + env(safe-area-inset-bottom));box-shadow:0 -16px 42px rgba(56,40,24,.2);display:grid;gap:14px;transform-origin:var(--fab-origin-x,calc(100% - 44px)) var(--fab-origin-y,100%)}.task-compose-sheet header{display:flex;align-items:center;justify-content:space-between}.task-compose-sheet header small{color:var(--accent);font-size:10px;font-weight:800;letter-spacing:.12em}.task-compose-sheet h2{margin:2px 0 0;font-size:22px}.task-compose-sheet label{display:grid;gap:6px;color:#675f54;font-size:12px;font-weight:650}.task-compose-sheet input,.task-compose-sheet select,.task-compose-sheet textarea{width:100%;border:1px solid var(--line);background:#fff;border-radius:11px;padding:12px;outline:none;resize:vertical}.task-compose-sheet input:focus,.task-compose-sheet select:focus,.task-compose-sheet textarea:focus{border-color:var(--accent);box-shadow:0 0 0 3px rgba(241,90,41,.1)}.task-compose-row{display:grid;grid-template-columns:minmax(0,1fr) 105px;gap:10px}.task-compose-date-actions{display:flex;flex-wrap:wrap;align-items:center;gap:8px}.task-compose-date-control{position:relative;display:flex;align-items:center;min-width:0}.task-compose-date-chip{position:relative;display:inline-flex!important;grid-template-columns:none!important;align-items:center;flex-direction:row!important;gap:7px!important;width:auto;min-height:44px;padding:0 12px;border:1px solid var(--line);border-radius:999px;background:#fffaf3;color:#776e62!important;font-size:13px!important;font-weight:700!important;overflow:hidden;cursor:pointer}.task-compose-date-chip.selected{border-color:#f3b18f;background:var(--accent-soft);color:#b7421e!important}.task-compose-date-chip svg{width:16px;height:16px;flex:none}.task-compose-date-clear{display:grid;place-items:center;width:34px;height:34px;margin-left:2px;border:0;border-radius:50%;background:transparent;color:var(--muted)}.task-compose-date-clear:hover{background:#f5eee5;color:var(--text)}.task-compose-date-clear svg{width:15px;height:15px}.task-compose-time-add{min-width:0;height:40px;padding:0 13px;border:1px dashed #e5b89d;border-radius:999px;background:transparent;color:var(--accent);font-weight:700}.task-compose-time-add:hover{border-color:var(--accent);background:#fff4e8}.task-compose-time-chip{display:inline-flex!important;grid-template-columns:none!important;align-items:center;flex-direction:row!important;gap:5px!important;width:auto;color:var(--muted)!important;font-size:12px!important}.task-compose-time-chip input{width:102px!important;min-width:0;padding:9px 8px!important;border-radius:999px!important}.task-compose-time-remove{display:grid;place-items:center;flex:0 0 34px;width:34px;height:34px;border:0;border-radius:50%;background:transparent;color:var(--muted)}.task-compose-time-remove:hover{background:#f5eee5;color:var(--text)}.task-compose-time-remove svg{width:15px;height:15px}.task-compose-sheet footer{display:flex;justify-content:flex-end;gap:9px;padding-top:4px}.task-compose-sheet button:disabled{opacity:.45}.task-compose-enter-active,.task-compose-leave-active{transition:background .22s ease}.task-compose-enter-active .task-compose-sheet,.task-compose-leave-active .task-compose-sheet{transition:transform .28s cubic-bezier(.2,.9,.25,1.08),opacity .2s ease}.task-compose-enter-from,.task-compose-leave-to{background:rgba(45,38,31,0)}.task-compose-enter-from .task-compose-sheet,.task-compose-leave-to .task-compose-sheet{transform:translateY(36px) scale(.86);opacity:0} -.countdown-compose-enter-active,.countdown-compose-leave-active{transition:background .24s ease}.countdown-compose-enter-active .countdown-modal,.countdown-compose-leave-active .countdown-modal{transition:transform .34s cubic-bezier(.18,.9,.28,1.16),opacity .22s ease,filter .22s ease;transform-origin:var(--fab-origin-x,calc(100% - 43px)) var(--fab-origin-y,calc(100% - 104px))}.countdown-compose-enter-from,.countdown-compose-leave-to{background:rgba(45,38,31,0)}.countdown-compose-enter-from .countdown-modal,.countdown-compose-leave-to .countdown-modal{transform:translate(20px,28px) scale(.18) rotate(8deg);opacity:0;filter:blur(5px)}@media(max-width:930px){.unified-fab{bottom:calc(82px + env(safe-area-inset-bottom))}}@media(max-width:930px){.today-filtered-empty-note{min-height:44px;padding:0 4px 0 12px}.today-filtered-empty-note>span{min-width:0;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}}@media(prefers-reduced-motion:reduce){.unified-fab.sleeping .fab-cat-body{animation:none}.unified-fab .fab-cat{transition:none}*,*:before,*:after{scroll-behavior:auto!important;animation-duration:.01ms!important;transition-duration:.01ms!important}} +.countdown-compose-enter-active,.countdown-compose-leave-active{transition:background .24s ease}.countdown-compose-enter-active .countdown-modal,.countdown-compose-leave-active .countdown-modal{transition:transform .34s cubic-bezier(.18,.9,.28,1.16),opacity .22s ease,filter .22s ease;transform-origin:var(--fab-origin-x,calc(100% - 43px)) var(--fab-origin-y,calc(100% - 104px))}.countdown-compose-enter-from,.countdown-compose-leave-to{background:rgba(45,38,31,0)}.countdown-compose-enter-from .countdown-modal,.countdown-compose-leave-to .countdown-modal{transform:translate(20px,28px) scale(.18) rotate(8deg);opacity:0;filter:blur(5px)}@media(max-width:930px){.unified-fab{bottom:calc(82px + env(safe-area-inset-bottom))}}@media(max-width:930px){.today-filtered-empty-note{min-height:44px;padding:0 4px 0 12px}.today-filtered-empty-note>span{min-width:0;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}}@media(prefers-reduced-motion:reduce){.unified-fab,.unified-fab *,.unified-fab:before,.unified-fab:after{animation:none!important;transition:none!important}.unified-fab:hover,.unified-fab:active,.unified-fab:hover .fab-cat__ear,.unified-fab:active .fab-cat__character{transform:none!important}.unified-fab.edge-left .fab-cat__tail{transform:translateX(56px) scaleX(-1)}*,*:before,*:after{scroll-behavior:auto!important;animation-duration:.01ms!important;transition-duration:.01ms!important}} .overdue-section{margin-top:18px}.overdue-heading{color:var(--danger);margin-bottom:6px}.overdue-heading span{min-width:22px;height:22px;padding:0 7px;display:inline-grid;place-items:center;border-radius:999px;background:#fde2dc;color:var(--danger);font-size:11px}.overdue-list{margin-bottom:18px}.overdue-task{background:#fff8f6}.task-tail{flex:0 1 auto;min-width:0;max-width:42%;display:flex;justify-content:flex-end;text-align:right;white-space:nowrap}.task-actions{display:flex;align-items:center;flex:0 0 auto}.task-row>.drag-handle,.task-row>.task-check,.task-actions>*{flex-shrink:0}.task-due{min-width:0;display:inline-flex;justify-content:flex-end;align-items:center}.task-due__text{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;text-align:right}.task-due--overdue{color:var(--danger)}.task-due--neutral,.task-due--completed{color:var(--muted)}.task-due--completed{opacity:.8}.pager{display:flex;align-items:center;justify-content:flex-end;gap:10px;margin:0 0 14px}.pager button:disabled{opacity:.4;cursor:not-allowed}.pager span{color:var(--muted);font-size:13px}.section-heading{display:flex;align-items:center;gap:7px;margin:16px 0 10px;font-size:16px;line-height:1.35;color:#514a40}.section-heading svg{width:17px;height:17px;color:var(--accent)}.sr-only{position:absolute!important;width:1px!important;height:1px!important;padding:0!important;margin:-1px!important;overflow:hidden!important;clip:rect(0,0,0,0)!important;white-space:nowrap!important;border:0!important}.more-settings{border:1px solid var(--line);border-radius:10px;background:#fff}.more-settings summary{cursor:pointer;padding:11px 13px;color:#756d61;font-size:12px;font-weight:700}.more-settings-body{display:grid;gap:12px;padding:0 13px 13px}.more-settings-body>label{display:grid;grid-template-columns:80px 1fr;align-items:center;gap:7px;color:#756d61;font-size:12px;font-weight:650}.modal-mask{position:fixed;inset:0;z-index:80;background:rgba(45,38,31,.4);display:grid;place-items:center;padding:24px}.modal-box{width:min(360px,92vw);background:#fffdf8;border:1px solid var(--line);border-radius:14px;box-shadow:var(--shadow);padding:22px;display:grid;gap:14px}.modal-box h3{margin:0;font-size:17px}.modal-box label{display:grid;gap:7px;font-size:12px;font-weight:650;color:#756d61}.modal-input{width:100%;border:1px solid var(--line);background:#fff;padding:11px;border-radius:9px;outline:none;font-size:16px}.modal-actions{display:flex;justify-content:flex-end;gap:8px}.purge-list-dialog{width:min(430px,92vw)}.purge-list-dialog p{margin:0;color:var(--muted);line-height:1.65}.purge-list-dialog button{min-height:44px;min-width:88px}.purge-list-dialog button:disabled{cursor:not-allowed;opacity:.62}.purge-list-error{padding:10px 12px;border-radius:10px;background:#fde7e2!important;color:var(--danger)!important;font-weight:650}.countdown-view{display:grid;gap:16px;padding-bottom:36px}.countdown-content{display:grid;gap:16px}.countdown-hero{display:flex;align-items:end;justify-content:space-between;border-bottom:1px solid var(--line);padding-bottom:10px}.countdown-hero small{display:block;color:var(--muted);font-size:12px}.countdown-layout{display:grid;gap:22px;align-items:start}.countdown-timeline{display:grid;gap:20px;max-width:820px;width:100%;margin:0 auto}.countdown-group{display:grid;gap:2px}.countdown-group>h3{margin:0 0 7px;padding-left:12px;color:#8a8175;font-size:11px;font-weight:750;letter-spacing:.08em}.countdown-row{--countdown-tone:#d9a17c;position:relative;width:100%;min-height:66px;display:grid;grid-template-columns:minmax(0,1fr) 86px;align-items:center;gap:14px;border:0;border-bottom:1px solid var(--line);border-radius:0;background:transparent;padding:9px 10px 9px 17px;text-align:left;color:inherit;transition:background .15s ease,transform .15s ease}.countdown-row:before{content:'';position:absolute;left:3px;top:50%;width:4px;height:4px;border-radius:50%;background:var(--countdown-tone);transform:translateY(-50%)}.countdown-row:first-of-type{border-top:1px solid var(--line)}.countdown-row:hover{background:#fffaf3}.countdown-row:active{transform:scale(.995)}.countdown-row.kind-anniversary{--countdown-tone:#b69b7d}.countdown-row.kind-birthday{--countdown-tone:#9cab8d}.countdown-row.today{--countdown-tone:#71856b}.countdown-row.past{--countdown-tone:#aaa094;opacity:.66}.countdown-row .pinned-icon{position:absolute;right:4px;top:5px}.countdown-icon{width:38px;height:38px;border-radius:12px;background:#fff2e8;display:grid;place-items:center;font-size:19px}.countdown-main{min-width:0;display:grid;gap:4px}.countdown-main>b{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:15px;color:#3f3932}.countdown-main>small{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:var(--muted);font-size:11px}.countdown-badges{display:flex;gap:5px}.countdown-badges em{font-style:normal;color:#8a7f72;font-size:10px}.countdown-badges em+em:before{content:'ยท';margin-right:5px;color:#c1b7aa}.countdown-state{display:grid;justify-items:end;gap:3px}.countdown-state strong{font-variant-numeric:tabular-nums;font-size:26px;line-height:1;color:#62594e}.countdown-state small{color:var(--muted);font-size:10px}.countdown-row.today .countdown-state strong,.countdown-row.today .countdown-state small{color:#71856b}.countdown-row.past .countdown-state strong{color:#887d70}.countdown-focus{--countdown-tone:#d9a17c;width:min(720px,100%);min-height:255px;margin:0 auto;display:grid;place-content:center;justify-items:center;gap:7px;border:1px solid color-mix(in srgb,var(--countdown-tone) 34%,var(--line));border-radius:16px;background:color-mix(in srgb,var(--countdown-tone) 7%,#fffdf8);padding:28px 24px;text-align:center;color:inherit;box-shadow:none;transition:border-color .15s ease,background .15s ease}.countdown-focus:hover{border-color:color-mix(in srgb,var(--countdown-tone) 54%,var(--line));background:color-mix(in srgb,var(--countdown-tone) 10%,#fffdf8)}.countdown-focus.kind-anniversary{--countdown-tone:#b69b7d}.countdown-focus.kind-birthday{--countdown-tone:#9cab8d}.countdown-focus>small{color:#8b8276;font-size:10px;font-weight:750;letter-spacing:.1em}.countdown-focus h3{margin:7px 0 0;font-size:20px;font-weight:680}.countdown-focus p{margin:1px 0 0;color:var(--muted);font-size:11px}.countdown-number{display:flex;align-items:end;gap:6px;margin:4px 0 3px}.countdown-number strong{font-variant-numeric:tabular-nums;font-size:76px;line-height:.9;font-weight:720;letter-spacing:-.05em;color:#3f3932}.countdown-number span{font-size:13px;color:#7a7165;padding-bottom:6px}.countdown-copy{font-size:12px;color:#71685e;font-weight:650}.countdown-empty{min-height:260px;background:#fffdf8;border:1px dashed var(--line);border-radius:16px;padding:26px;color:#766d60;text-align:center;display:grid;gap:9px;place-content:center;justify-items:center}.countdown-empty svg{color:var(--accent);width:30px;height:30px}.countdown-empty span{font-size:12px}.countdown-empty button{margin-top:5px}.archived-toggle,.archived-countdowns button{display:inline-flex;align-items:center;gap:5px;border:1px solid var(--line);background:#fff;border-radius:10px;padding:8px 11px;font-size:12px}.archived-toggle{justify-self:start}.archived-countdowns{display:grid;gap:10px}.archived-countdowns article{display:flex;align-items:center;gap:10px;background:#fff;border:1px solid var(--line);border-radius:14px;padding:12px 14px}.archived-countdowns article b{flex:1}.archived-countdowns article small{color:var(--muted)}.countdown-detail-mask,.countdown-modal-mask{position:fixed;inset:0;background:rgba(45,38,31,.36);display:grid;padding:20px}.countdown-detail-mask{z-index:85;place-items:end center}.countdown-detail-sheet{width:min(500px,100%);background:#fffdf8;border:1px solid var(--line);border-radius:20px;box-shadow:0 12px 36px rgba(56,40,24,.18);padding:18px;display:grid;gap:16px}.countdown-detail-sheet header{display:grid;grid-template-columns:42px 1fr 44px;align-items:center;gap:10px}.countdown-detail-sheet header small{color:var(--muted);font-size:11px}.countdown-detail-sheet header h3{margin:2px 0 0;font-size:19px}.countdown-detail-sheet header button{min-width:44px;min-height:44px;border:0;background:transparent;color:#766d60;border-radius:8px;width:44px;height:44px;display:grid;place-items:center}.countdown-modal header button{min-width:44px;min-height:44px;border:0;background:transparent;color:#766d60;border-radius:8px;width:44px;height:44px;display:grid;place-items:center}.countdown-detail-days{display:flex;align-items:baseline;gap:6px;padding:8px 0}.countdown-detail-days strong{font-variant-numeric:tabular-nums;font-size:46px;line-height:1}.countdown-detail-days span{color:var(--muted)}.countdown-detail-days b{margin-left:auto;color:var(--accent);font-size:13px}.countdown-detail-sheet dl{margin:0;display:grid;gap:1px;background:var(--line)}.countdown-detail-sheet dl div{display:grid;grid-template-columns:62px 1fr;gap:10px;background:#fffdf8;padding:10px 0}.countdown-detail-sheet dt{color:var(--muted);font-size:12px}.countdown-detail-sheet dd{margin:0;font-size:13px}.countdown-detail-sheet footer{display:flex;justify-content:flex-end;gap:8px}.countdown-detail-sheet footer button{min-height:44px;display:inline-flex;align-items:center;gap:6px;border:1px solid var(--line);background:#fff;border-radius:10px;padding:9px 13px}.countdown-modal-mask{z-index:90;place-items:center}.countdown-modal{width:min(420px,96vw);background:#fffdf8;border:1px solid var(--line);border-radius:18px;box-shadow:var(--shadow);padding:18px;display:grid;gap:12px}.countdown-modal header{display:flex;justify-content:space-between;align-items:start}.countdown-modal header small{color:var(--muted)}.countdown-modal header h3{margin:2px 0 0}.countdown-modal label{display:grid;gap:6px;color:#675f54;font-size:12px;font-weight:650}.countdown-modal input,.countdown-modal select{border:1px solid var(--line);background:#fff;border-radius:10px;padding:11px 12px;outline:none}.countdown-modal input:focus,.countdown-modal select:focus{border-color:var(--accent);box-shadow:0 0 0 3px rgba(241,90,41,.1)}.countdown-title-fields{display:grid;grid-template-columns:72px 1fr;gap:8px}.countdown-modal footer{display:flex;justify-content:flex-end;gap:8px;padding-top:6px}.countdown-advanced{border:1px solid var(--line);border-radius:11px;background:#fffaf4}.countdown-advanced summary{min-height:44px;display:flex;align-items:center;justify-content:space-between;padding:0 12px;cursor:pointer;color:#756d61;font-size:12px;font-weight:700;list-style:none}.countdown-advanced summary::-webkit-details-marker{display:none}.countdown-advanced summary svg{width:16px;height:16px;transition:transform .16s ease}.countdown-advanced[open] summary svg{transform:rotate(180deg)}.countdown-advanced>label,.countdown-advanced>.countdown-title-fields{margin:0 12px 12px}.countdown-detail-enter-active,.countdown-detail-leave-active{transition:background .2s ease}.countdown-detail-enter-active .countdown-detail-sheet,.countdown-detail-leave-active .countdown-detail-sheet{transition:transform .24s ease,opacity .2s ease}.countdown-detail-enter-from .countdown-detail-sheet,.countdown-detail-leave-to .countdown-detail-sheet{transform:translateY(100%);opacity:.6}@media(max-width:930px){.countdown-layout{grid-template-columns:1fr;gap:16px}.countdown-focus{display:grid;min-height:205px;padding:22px 16px}.countdown-number strong{font-size:64px}.countdown-timeline{gap:16px}}@media(max-width:800px){.countdown-hero{align-items:center}.countdown-hero h2{font-size:19px}.countdown-row{grid-template-columns:minmax(0,1fr) 72px;padding:9px 4px;gap:9px}.countdown-state strong{font-size:25px}.countdown-detail-mask,.countdown-modal-mask{place-items:end;padding:0}.countdown-detail-sheet,.countdown-modal{width:100%;border-radius:22px 22px 0 0;padding:18px 16px calc(18px + env(safe-area-inset-bottom));max-height:min(88dvh,760px);overflow:auto}.countdown-view{position:relative}} @media(max-width:930px){.task-tail{flex:0 1 auto;max-width:132px;align-self:stretch;align-items:center;overflow:hidden}.task-tail:has(.task-due--timed){flex:0 1 76px;max-width:76px}.task-row:has(>.task-tail .task-due--timed){height:66px;max-height:68px;}.task-row:has(>.task-tail .task-due--timed) .task-main{padding:4px 0}.task-due{max-width:100%;overflow:hidden}.task-due--timed .task-due__text{display:grid;justify-items:end;overflow:hidden;text-overflow:ellipsis;max-width:100%;line-height:1.2;white-space:normal}.task-due--timed .task-due__absolute,.task-due--timed .task-due__relative{max-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.task-due--timed .task-due__separator{display:none}.countdown-row,.countdown-row:first-of-type{min-height:62px;grid-template-columns:minmax(0,1fr) 72px;gap:8px;padding:8px 9px 8px 17px;background:transparent;border:0;border-bottom:1px solid var(--line);border-radius:0;box-shadow:none}.countdown-row:first-of-type{border-top:1px solid var(--line)}.countdown-row.pinned,.countdown-row.today{background:transparent}.countdown-state strong{font-size:24px}} diff --git a/frontend/src/style.test.ts b/frontend/src/style.test.ts index a72fd70..3dd6f35 100644 --- a/frontend/src/style.test.ts +++ b/frontend/src/style.test.ts @@ -1047,19 +1047,19 @@ describe('unified floating add interaction', () => { expect(css).toContain('@media(max-width:930px){.unified-fab{bottom:calc(82px + env(safe-area-inset-bottom))}') }) - it('renders a sleeping cream-orange cat that wakes while dragging and faces inward at an edge', () => { + it('renders the approved open-eyed orange cat and mirrors only its tail tip at an edge', () => { expect(floatingAdd).toContain('class="fab-cat"') - expect(floatingAdd).toContain('class="fab-cat-eye fab-cat-eye--sleeping"') - expect(floatingAdd).toContain('class="fab-cat-eye fab-cat-eye--awake"') + expect(floatingAdd).toContain('class="fab-cat__eye fab-cat__eye--left"') + expect(floatingAdd).toContain('class="fab-cat__eye fab-cat__eye--right"') expect(floatingAdd).toContain("const edge = ref<'left' | 'right'>('right')") expect(floatingAdd).toContain("'edge-left': edge === 'left'") - expect(floatingAdd).toContain(':class="{ dragging, snapping, awake: dragging, sleeping: !dragging') + expect(floatingAdd).not.toContain('sleeping: !dragging') expect(css).toContain('.unified-fab .fab-cat{') - expect(css).toContain('.unified-fab.sleeping .fab-cat-body{transform-origin:29px 40px;animation:fab-cat-breathe') - expect(css).toContain('.unified-fab.awake .fab-cat-eye--awake{opacity:1}') - expect(css).toContain('.unified-fab.edge-left .fab-cat{transform:scaleX(-1)}') - expect(css).toContain('@keyframes fab-cat-breathe') - expect(css).toContain('@media(prefers-reduced-motion:reduce){.unified-fab.sleeping .fab-cat-body{animation:none}') + expect(css).toContain('.fab-cat__eye{fill:#fff9f0;stroke:#98482c;stroke-width:1.15;') + expect(css).toContain('.unified-fab.edge-left .fab-cat__tail{transform:translateX(56px) scaleX(-1)}') + expect(css).not.toContain('.unified-fab.edge-left .fab-cat{transform:scaleX(-1)}') + expect(css).not.toContain('@keyframes fab-cat-breathe') + expect(css).toContain('@media(prefers-reduced-motion:reduce){.unified-fab,.unified-fab *') }) it('keeps the countdown close button but removes its orange circular background', () => { @@ -1317,3 +1317,49 @@ describe('sidebar layout', () => { expect(app).toContain("writeStoredNavigation(window.localStorage, NAVIGATION_STORAGE_KEY, view, activeList.value)") }) }) + +describe('orange dumpling cat floating add button', () => { + it('renders only the approved asymmetric cat head, tail tip, open eyes, and white forehead plus', () => { + expect(floatingAdd).toContain('class="fab-cat__tail"') + expect(floatingAdd).toContain('class="fab-cat__ear fab-cat__ear--left"') + expect(floatingAdd).toContain('class="fab-cat__ear fab-cat__ear--right"') + expect(floatingAdd).toContain('class="fab-cat__face-shape"') + expect(floatingAdd).toContain('class="fab-cat__pupils"') + expect(floatingAdd).toContain('class="fab-cat__plus"') + expect(floatingAdd).toContain('d="M24.8 20.4 H31.4 M28.1 17.1 V23.7"') + expect(floatingAdd).not.toMatch(/fab-cat-(body|back|sleep)| { + expect(floatingAdd).toContain('const pupilOffset = ref({ x: 0, y: 0 })') + expect(floatingAdd).toContain('let suppressClickTimer: number | undefined') + expect(floatingAdd).toContain("'--pupil-x': `${pupilOffset.value.x}px`") + expect(floatingAdd).toContain("'--pupil-y': `${pupilOffset.value.y}px`") + expect(floatingAdd).toContain('const length = Math.hypot(vectorX, vectorY)') + expect(floatingAdd).toContain('x: vectorX / length * 1.5') + expect(floatingAdd).toContain('y: vectorY / length * 1.1') + expect(floatingAdd).toContain('isFabDrag(deltaX, deltaY)') + expect(floatingAdd).toContain('if (suppressClickTimer) window.clearTimeout(suppressClickTimer)') + expect(floatingAdd).toContain("emit('activate', { x: rect.left + rect.width / 2, y: rect.top + rect.height / 2 })") + }) + + it('uses the approved colors and restrained state motion without mirroring the whole cat', () => { + expect(css).toContain('.unified-fab{display:grid;place-items:center;position:fixed;z-index:60;right:20px;bottom:22px;width:56px;height:56px;padding:0;border:1px solid #e9b88f;border-radius:50%;background:#fff3df;') + expect(css).toContain('.fab-cat__face-shape,.fab-cat__ear{fill:#f28c52;stroke:#98482c;stroke-width:1.5;') + expect(css).toContain('.fab-cat__plus{fill:none;stroke:#fff;stroke-width:2.4;') + expect(css).toContain('animation:fab-cat-blink 8s 2.4s infinite') + expect(css).toContain('@keyframes fab-cat-blink{0%,5%,100%{transform:scaleY(1)}1.875%,2.875%{transform:scaleY(.12)}}') + expect(css).toContain('@media(hover:hover) and (pointer:fine)') + expect(css).toContain('.unified-fab.dragging{box-shadow:inset 0 1px 0 rgba(255,255,255,.78),0 9px 20px rgba(112,65,35,.24)}') + expect(css).toContain('.unified-fab.snapping .fab-cat__tail{animation:fab-cat-tail-wag .46s cubic-bezier(.25,.8,.35,1) 1}') + expect(css).toContain('.unified-fab:focus-visible{outline:3px solid #a84628;outline-offset:3px}') + expect(css).not.toContain('.unified-fab.edge-left .fab-cat{transform:scaleX(-1)}') + expect(css).not.toContain('fab-cat-breathe') + }) + + it('disables every cat motion for reduced-motion users while leaving pointer behavior intact', () => { + expect(css).toContain('@media(prefers-reduced-motion:reduce){.unified-fab,.unified-fab *,.unified-fab:before,.unified-fab:after{animation:none!important;transition:none!important}') + expect(floatingAdd).toContain("window.matchMedia('(prefers-reduced-motion: reduce)').matches") + expect(floatingAdd).toContain('pupilOffset.value = { x: 0, y: 0 }') + }) +})