@@ -16,7 +16,7 @@ import * as Schema from "effect/Schema";
1616import { PlusIcon , XIcon } from "lucide-react" ;
1717
1818import { useNowMinute } from "../../hooks/useNowMinute" ;
19- import { reconcileSnoozeDraft } from "./SnoozePresetsSettings.logic" ;
19+ import { reconcileSnoozeDraft , sortSnoozeRows } from "./SnoozePresetsSettings.logic" ;
2020import { formatShortTimestamp } from "../../timestampFormat" ;
2121import { Button } from "../ui/button" ;
2222import { Input } from "../ui/input" ;
@@ -90,6 +90,16 @@ function nextCandidate(presets: ReadonlyArray<SnoozePresetSetting>): SnoozePrese
9090 ) ;
9191}
9292
93+ // Row order is only display order, so it does not make a list differ from the defaults.
94+ function sameSnoozePresets (
95+ left : ReadonlyArray < SnoozePresetSetting > ,
96+ right : ReadonlyArray < SnoozePresetSetting > ,
97+ ) {
98+ const ids = ( presets : ReadonlyArray < SnoozePresetSetting > ) =>
99+ presets . map ( snoozePresetId ) . toSorted ( ) ;
100+ return Equal . equals ( ids ( left ) , ids ( right ) ) ;
101+ }
102+
93103const isSnoozePresetDay = Schema . is ( SnoozePresetDay ) ;
94104
95105interface KindMemory {
@@ -109,16 +119,28 @@ function withWhen(
109119 return { kind : "at" , day : when , time : preset . kind === "at" ? preset . time : memory . time } ;
110120}
111121
112- /** Edits the snooze menu's options. Menus sort them by wake time, so rows keep the order they were added in. */
122+ /**
123+ * Edits the snooze menu's options. Rows sort by wake time like the menu, but only when focus
124+ * leaves the list, so a row never moves under the pointer mid-edit.
125+ */
113126export function SnoozePresetsRow ( ) {
114127 const settings = useScopedSettings ( ) ;
115128 const updateSettings = useUpdateScopedSettings ( ) ;
116129 const saved = settings . snoozePresets ;
130+ const nowMinute = useNowMinute ( ) ;
131+ const now = new Date ( `${ nowMinute } Z` ) ;
117132 // Edits build on a local draft, so a second edit before the first save echoes back
118133 // does not restore what the first one changed. Echoes of our own writes keep the draft.
119- const [ presets , setPresets ] = useState ( saved ) ;
120- // Row keys survive removals, so a row's in-progress field state stays with that row.
121- const [ keys , setKeys ] = useState < ReadonlyArray < number > > ( ( ) => saved . map ( ( _ , index ) => index ) ) ;
134+ // Row keys survive removals and sorts, so a row's in-progress field state stays with it.
135+ // One state, so a sort queued in the same event as an edit applies on top of it.
136+ const [ rows , setRows ] = useState ( ( ) =>
137+ sortSnoozeRows (
138+ saved ,
139+ saved . map ( ( _ , index ) => index ) ,
140+ now ,
141+ ) ,
142+ ) ;
143+ const { presets, keys } = rows ;
122144 const [ nextKey , setNextKey ] = useState ( saved . length ) ;
123145 // Null forces the next render to adopt the saved value, as after a failed write.
124146 const [ savedSource , setSavedSource ] = useState < ReadonlyArray < SnoozePresetSetting > | null > ( saved ) ;
@@ -134,8 +156,7 @@ export function SnoozePresetsRow() {
134156 const reconciled = reconcileSnoozeDraft ( written , saved ) ;
135157 if ( reconciled . adopt ) {
136158 setWritten ( [ ] ) ;
137- setPresets ( saved ) ;
138- setKeys ( freshKeys ( saved . length ) ) ;
159+ setRows ( sortSnoozeRows ( saved , freshKeys ( saved . length ) , now ) ) ;
139160 } else {
140161 setWritten ( reconciled . pending ) ;
141162 }
@@ -145,8 +166,7 @@ export function SnoozePresetsRow() {
145166 nextKeys : ReadonlyArray < number > = keys ,
146167 ) => {
147168 if ( ! mixed && Equal . equals ( snoozePresets , presets ) ) return ;
148- setPresets ( snoozePresets ) ;
149- setKeys ( nextKeys ) ;
169+ setRows ( { presets : snoozePresets , keys : nextKeys } ) ;
150170 setWritten ( ( previous ) => [ ...previous , snoozePresets ] ) ;
151171 updateSettings (
152172 { snoozePresets } ,
@@ -168,10 +188,17 @@ export function SnoozePresetsRow() {
168188 { ...searchableSetting ( "snooze-options" ) }
169189 description = "Choices in every snooze menu, listed soonest first. Weekdays mean the next one after today."
170190 resetAction = {
171- ! mixed && Equal . equals ( presets , DEFAULT_SNOOZE_PRESETS ) ? null : (
191+ ! mixed && sameSnoozePresets ( presets , DEFAULT_SNOOZE_PRESETS ) ? null : (
172192 < SettingResetButton
173193 label = "snooze options"
174- onClick = { ( ) => save ( DEFAULT_SNOOZE_PRESETS , freshKeys ( DEFAULT_SNOOZE_PRESETS . length ) ) }
194+ onClick = { ( ) => {
195+ const sorted = sortSnoozeRows (
196+ DEFAULT_SNOOZE_PRESETS ,
197+ freshKeys ( DEFAULT_SNOOZE_PRESETS . length ) ,
198+ now ,
199+ ) ;
200+ save ( sorted . presets , sorted . keys ) ;
201+ } }
175202 />
176203 )
177204 }
@@ -188,6 +215,7 @@ export function SnoozePresetsRow() {
188215 )
189216 }
190217 onAdd = { ( ) => save ( [ ...presets , nextCandidate ( presets ) ] , [ ...keys , ...freshKeys ( 1 ) ] ) }
218+ onSettle = { ( ) => setRows ( ( current ) => sortSnoozeRows ( current . presets , current . keys , now ) ) }
191219 />
192220 </ SettingsRow >
193221 ) ;
@@ -200,6 +228,7 @@ function SnoozePresetList(props: {
200228 onChange : ( index : number , preset : SnoozePresetSetting ) => void ;
201229 onRemove : ( index : number ) => void ;
202230 onAdd : ( ) => void ;
231+ onSettle : ( ) => void ;
203232} ) {
204233 const nowMinute = useNowMinute ( ) ;
205234 const now = new Date ( `${ nowMinute } Z` ) ;
@@ -232,7 +261,20 @@ function SnoozePresetList(props: {
232261 ) ;
233262
234263 return (
235- < div className = "flex flex-col gap-1.5 pt-3 pb-2" >
264+ < div
265+ className = "flex flex-col gap-1.5 pt-3 pb-2"
266+ onBlur = { ( event ) => {
267+ const list = event . currentTarget ;
268+ const next = event . relatedTarget ;
269+ if ( list . contains ( next ) ) return ;
270+ // Select popups portal out of the list, so focus moving into one is not leaving it.
271+ if ( next instanceof Element && next . closest ( '[data-slot="select-popup"]' ) ) return ;
272+ // Waits for the amount field's blur commit, and skips its Enter blur-and-refocus.
273+ queueMicrotask ( ( ) => {
274+ if ( ! list . contains ( document . activeElement ) ) props . onSettle ( ) ;
275+ } ) ;
276+ } }
277+ >
236278 { props . presets . map ( ( preset , index ) => {
237279 const preview = previews [ index ] ! ;
238280 return (
@@ -371,7 +413,7 @@ function DurationFields(props: { minutes: number; onChange: (minutes: number) =>
371413 < >
372414 < NumberField
373415 size = "sm"
374- className = "w-24 "
416+ className = "w-32 "
375417 min = { 1 }
376418 max = { maxAmount }
377419 step = { 1 }
0 commit comments