@fieldia/core 0.31.0 → 0.32.0

package/src/lib/record/form.mjs

@@ -22,7 +22,7 @@ import { askKey, cellOf, listedColumns, notOffered } from './line-choices.mjs';
 import { loadedRecordOf, saveProblemOf, } from './data-source.mjs';
 import { formLimitsPart, hasLimits } from './taking.mjs';
 import { formLanguagesPart, hasLanguages } from './languages.mjs';
-import { draftRead, resumeStep } from './drafts.mjs';
+import { draftRead, resumeStep, timedStore } from './drafts.mjs';
 import { waitingOn, workedOutFrom } from './waits.mjs';
 import { createUploads, fileBytesIn, uploadGoing, withoutFileBytes } from './uploads.mjs';
 import { hostScheduler } from './scheduler.mjs';
@@ -608,7 +608,8 @@ function innerForm(options, within, place, outer) {
         started: () => started,
         listened: () => listeners.size > 0,
         disposed: () => disposed,
-        keep: () => void ((options.drafts || onServer()) && scheduleDraft()),
+        // A clock started is kept at once where drafts are kept here: a reload a moment after Start finds it.
+        keep: () => (onServer() ? scheduleDraft() : keepHere(draftNow())),
         order: (list) => void (steps = list ?? layoutSteps),
         refuse(name, message) {
             // Said until the field changes from what it holds, as a refused save's words are.
@@ -1666,8 +1667,10 @@ function innerForm(options, within, place, outer) {
      * form continues one by its key). A page without either keeps its drafts where it always did.
      */
     const onServer = () => !!options.dataSource?.saveDraft && !!options.dataSource.loadDraft && (page.continueLater === true || !!options.resume);
-    /** Whether drafts are kept: the app gave a store, or they are kept on the server. */
-    const draftsOn = () => !!options.drafts || onServer();
+    /** Where drafts are kept in the browser: the app's store, else a timed page's tab (`timedStore`); none else. */
+    const draftStore = options.drafts?.store ?? timedStore(page);
+    /** Whether drafts are kept: in a store, or on the server. */
+    const draftsOn = () => !!draftStore || onServer();
     /** The key of the draft kept on the server for the record shown; null until the source gave one. */
     let serverKey = null;
     /** Counted each time the draft is let go (sent, discarded, another record shown): a keeping answered after is dropped. */
@@ -1707,7 +1710,7 @@ function innerForm(options, within, place, outer) {
     /** A draft in the browser's store, where the app gave one: a store that is full keeps none. */
     function keepHere(kept) {
         try {
-            options.drafts?.store.setItem(storeKey(), JSON.stringify(kept));
+            draftStore?.setItem(storeKey(), JSON.stringify(kept));
         }
         catch {
             // The draft is a convenience: the form goes on without it.
@@ -1780,12 +1783,15 @@ function innerForm(options, within, place, outer) {
         serverKey = null;
         if (state.resume)
             set({ resume: null });
-        options.drafts?.store.removeItem(storeKey());
+        draftStore?.removeItem(storeKey());
     }
-    /** A draft found: laid at once (`restore: "auto"`, or a draft continued from its key over nothing typed), else offered. */
-    function offer(draft, auto = options.drafts?.restore === 'auto') {
+    /**
+     * A draft found: laid at once (`restore: "auto"`, a draft continued from its key over nothing typed, one kept in a
+     * timed page's tab, or one whose clock started — let go, it would start again), else offered.
+     */
+    function offer(draft, auto = !options.drafts || options.drafts.restore === 'auto') {
         // What the person typed while it was asked for is theirs: the draft is offered, never laid over it.
-        if (auto && !state.dirty.length && !Object.keys(state.unread).length)
+        if ((auto || draft.timers) && !state.dirty.length && !Object.keys(state.unread).length)
             return applyDraft(draft);
         found = draft;
         set({ draft: { savedAt: draft.savedAt } });
@@ -1799,7 +1805,7 @@ function innerForm(options, within, place, outer) {
         const source = options.dataSource;
         const given = resumeKey;
         resumeKey = undefined;
-        const kept = given ? null : draftRead(options.drafts?.store.getItem(storeKey()) ?? null);
+        const kept = given ? null : draftRead(draftStore?.getItem(storeKey()) ?? null);
         if (!given && !kept)
             return;
         if (kept && !('key' in kept))
@@ -1817,7 +1823,7 @@ function innerForm(options, within, place, outer) {
                 set({ status: 'ready' });
             if (!draft) {
                 // Sent, or gone: the form starts empty, and says so where it was asked to continue it.
-                options.drafts?.store.removeItem(storeKey());
+                draftStore?.removeItem(storeKey());
                 if (given)
                     set({ resume: { key, missing: true } });
                 return;
@@ -2186,6 +2192,11 @@ function innerForm(options, within, place, outer) {
             sentAs = baseline;
             // Its version now, for the next save to carry; and what the person may do now, when the save changed that.
             // The person's changes it did not send are at risk (`unsent`): every way out asks before it leaves them.
+            // A save starts the person's changes afresh, as one saved is no change to take back (the viewer's Ctrl+Z says
+            // nothing changed since). Not on a page that saves itself as it is changed (`autosave`), whose changes are taken
+            // back across its saves; nor where a change made while it saved goes on past it.
+            if (!options.autosave && !dirty.length && got)
+                noted = [];
             set({ status: 'saved', recordId: result.id, values, dirty, warnings: withValues(values, collectWarnings), version: result.version ?? null, ...(result.can ? { can: result.can } : {}) });
             // Changed while it saved: kept in a draft, and saved as any change is.
             if (dirty.length) {
@@ -3432,7 +3443,7 @@ function innerForm(options, within, place, outer) {
             return () => void heard.delete(listener);
         },
         restoreDraft() {
-            const kept = found ?? draftRead(options.drafts?.store.getItem(storeKey()) ?? null);
+            const kept = found ?? draftRead(draftStore?.getItem(storeKey()) ?? null);
             if (kept && 'values' in kept)
                 applyDraft(kept);
         },