@homebound/form-state 2.3.0 → 2.5.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/FormStateApp.js +1 -1
- package/dist/formState.d.ts +4 -2
- package/dist/formState.js +25 -20
- package/dist/formState.test.js +114 -39
- package/dist/index.d.ts +1 -0
- package/dist/index.js +3 -1
- package/dist/setupTests.js +7 -2
- package/dist/useFormState.d.ts +1 -13
- package/dist/useFormState.js +41 -72
- package/dist/useFormState.test.js +95 -97
- package/dist/useFormStates.d.ts +12 -0
- package/dist/useFormStates.js +58 -0
- package/dist/useFormStates.test.d.ts +1 -0
- package/dist/useFormStates.test.js +136 -0
- package/dist/utils.d.ts +15 -0
- package/dist/utils.js +60 -1
- package/dist/utils.test.d.ts +1 -0
- package/dist/utils.test.js +102 -0
- package/package.json +15 -6
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const jsx_runtime_1 = require("react/jsx-runtime");
|
|
4
4
|
const rtl_utils_1 = require("@homebound/rtl-utils");
|
|
5
|
-
const
|
|
5
|
+
const react_1 = require("@testing-library/react");
|
|
6
6
|
const mobx_react_1 = require("mobx-react");
|
|
7
|
-
const
|
|
7
|
+
const react_2 = require("react");
|
|
8
8
|
const formState_1 = require("./formState");
|
|
9
9
|
const useFormState_1 = require("./useFormState");
|
|
10
10
|
describe("useFormState", () => {
|
|
@@ -27,7 +27,7 @@ describe("useFormState", () => {
|
|
|
27
27
|
it("memoizes on init.input being an array", async () => {
|
|
28
28
|
const config = { firstName: { type: "value" } };
|
|
29
29
|
function TestComponent() {
|
|
30
|
-
const [, setTick] =
|
|
30
|
+
const [, setTick] = react_2.useState(0);
|
|
31
31
|
const form = useFormState_1.useFormState({
|
|
32
32
|
config,
|
|
33
33
|
init: { input: ["a", "b"], map: ([a, b]) => ({ firstName: a + b }) },
|
|
@@ -86,7 +86,7 @@ describe("useFormState", () => {
|
|
|
86
86
|
it("uses init if set as a value", async () => {
|
|
87
87
|
const config = { firstName: { type: "value" } };
|
|
88
88
|
function TestComponent() {
|
|
89
|
-
const [, setTick] =
|
|
89
|
+
const [, setTick] = react_2.useState(0);
|
|
90
90
|
const form = useFormState_1.useFormState({
|
|
91
91
|
config,
|
|
92
92
|
// That's using a raw init value
|
|
@@ -154,7 +154,7 @@ describe("useFormState", () => {
|
|
|
154
154
|
],
|
|
155
155
|
};
|
|
156
156
|
// And we start out with data1
|
|
157
|
-
const [data, setData] =
|
|
157
|
+
const [data, setData] = react_2.useState(data1);
|
|
158
158
|
const form = useFormState_1.useFormState({ config, init: { input: data, map: (d) => d } });
|
|
159
159
|
function makeLocalChanges() {
|
|
160
160
|
form.firstName.value = "local";
|
|
@@ -230,7 +230,7 @@ describe("useFormState", () => {
|
|
|
230
230
|
books: [{ title: "a2" }],
|
|
231
231
|
};
|
|
232
232
|
// And we start out with data1
|
|
233
|
-
const [data, setData] =
|
|
233
|
+
const [data, setData] = react_2.useState(data1);
|
|
234
234
|
const form = useFormState_1.useFormState({
|
|
235
235
|
config,
|
|
236
236
|
init: { input: data, map: (d) => d },
|
|
@@ -271,9 +271,9 @@ describe("useFormState", () => {
|
|
|
271
271
|
const data1 = { firstName: "f1", lastName: "l1" };
|
|
272
272
|
const data2 = { firstName: "f2", lastName: "l2" };
|
|
273
273
|
// And we start out with data1
|
|
274
|
-
const [data, setData] =
|
|
275
|
-
const author =
|
|
276
|
-
const config =
|
|
274
|
+
const [data, setData] = react_2.useState(data1);
|
|
275
|
+
const author = react_2.useMemo(() => new AuthorRow(data.firstName, data.lastName), [data]);
|
|
276
|
+
const config = react_2.useMemo(() => ({
|
|
277
277
|
firstName: { type: "value" },
|
|
278
278
|
lastName: { type: "value" },
|
|
279
279
|
fullName: { type: "value", computed: true },
|
|
@@ -297,7 +297,7 @@ describe("useFormState", () => {
|
|
|
297
297
|
// Given a component
|
|
298
298
|
function TestComponent() {
|
|
299
299
|
// When the data is initially undefined
|
|
300
|
-
const [data, setData] =
|
|
300
|
+
const [data, setData] = react_2.useState();
|
|
301
301
|
const data2 = { books: [{ title: "Title 1" }] };
|
|
302
302
|
const form = useFormState_1.useFormState({
|
|
303
303
|
config: authorWithBooksConfig,
|
|
@@ -306,24 +306,24 @@ describe("useFormState", () => {
|
|
|
306
306
|
});
|
|
307
307
|
return (jsx_runtime_1.jsx(mobx_react_1.Observer, { children: () => (jsx_runtime_1.jsxs("div", { children: [jsx_runtime_1.jsx("button", { "data-testid": "refreshData", onClick: () => setData(data2) }, void 0),
|
|
308
308
|
jsx_runtime_1.jsx("button", { "data-testid": "add", onClick: () => form.books.add({ title: "New Book" }) }, void 0),
|
|
309
|
-
jsx_runtime_1.jsx("button", { "data-testid": "blurBookOne", onClick: () => form.books.rows[0].title
|
|
310
|
-
jsx_runtime_1.jsx("button", { "data-testid": "blurBookTwo", onClick: () => form.books.rows[1].title
|
|
309
|
+
jsx_runtime_1.jsx("button", { "data-testid": "blurBookOne", onClick: () => focusAndBlur(form.books.rows[0].title) }, void 0),
|
|
310
|
+
jsx_runtime_1.jsx("button", { "data-testid": "blurBookTwo", onClick: () => focusAndBlur(form.books.rows[1].title) }, void 0)] }, void 0)) }, void 0));
|
|
311
311
|
}
|
|
312
312
|
// Given a formState with `onBlur` set
|
|
313
313
|
const r = await rtl_utils_1.render(jsx_runtime_1.jsx(TestComponent, {}, void 0));
|
|
314
314
|
// When the data/child is now available
|
|
315
315
|
rtl_utils_1.click(r.refreshData);
|
|
316
316
|
// And the field is blurred
|
|
317
|
-
rtl_utils_1.
|
|
317
|
+
await rtl_utils_1.clickAndWait(r.blurBookOne);
|
|
318
318
|
// Then we don't auto-save because nothing has changed
|
|
319
319
|
expect(autoSave).toBeCalledTimes(0);
|
|
320
320
|
// And when adding a new book
|
|
321
|
-
rtl_utils_1.
|
|
321
|
+
await rtl_utils_1.clickAndWait(r.add);
|
|
322
322
|
// We autoSave the new row right away (because we don't have any validation rules
|
|
323
323
|
// that say the new row can't be empty)
|
|
324
324
|
expect(autoSave).toBeCalledTimes(1);
|
|
325
325
|
// And the new book is blurred
|
|
326
|
-
rtl_utils_1.
|
|
326
|
+
await rtl_utils_1.clickAndWait(r.blurBookTwo);
|
|
327
327
|
// Then we auto save again
|
|
328
328
|
expect(autoSave).toBeCalledTimes(2);
|
|
329
329
|
});
|
|
@@ -337,7 +337,7 @@ describe("useFormState", () => {
|
|
|
337
337
|
config,
|
|
338
338
|
init: data,
|
|
339
339
|
// And there is reactive business logic in the `autoSave` method
|
|
340
|
-
autoSave(state) {
|
|
340
|
+
async autoSave(state) {
|
|
341
341
|
state.lastName.set("l2");
|
|
342
342
|
autoSaves++;
|
|
343
343
|
},
|
|
@@ -346,79 +346,84 @@ describe("useFormState", () => {
|
|
|
346
346
|
}
|
|
347
347
|
const r = await rtl_utils_1.render(jsx_runtime_1.jsx(TestComponent, {}, void 0));
|
|
348
348
|
// When we change firstName
|
|
349
|
-
rtl_utils_1.
|
|
349
|
+
await rtl_utils_1.clickAndWait(r.setFirst);
|
|
350
350
|
// When autoSave didn't infinite loop
|
|
351
351
|
expect(autoSaves).toEqual(1);
|
|
352
352
|
});
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
`);
|
|
416
|
-
});
|
|
417
|
-
it("can pick a set observable list field", () => {
|
|
418
|
-
const books = mobx_1.observable([]);
|
|
419
|
-
const a = useFormState_1.pickFields(authorWithBooksConfig, { firstName: "a", b: "ignored", books });
|
|
420
|
-
expect(mobx_1.isObservable(a.books)).toEqual(true);
|
|
353
|
+
it("batches calls to auto-save", async () => {
|
|
354
|
+
// Given a component
|
|
355
|
+
const autoSave = jest.fn();
|
|
356
|
+
function TestComponent() {
|
|
357
|
+
const config = authorConfig;
|
|
358
|
+
const data = { firstName: "f1", lastName: "f1" };
|
|
359
|
+
const form = useFormState_1.useFormState({
|
|
360
|
+
config,
|
|
361
|
+
init: data,
|
|
362
|
+
autoSave: (form) => autoSave(form.changedValue),
|
|
363
|
+
});
|
|
364
|
+
return (jsx_runtime_1.jsx("div", { children: jsx_runtime_1.jsx("button", { "data-testid": "set", onClick: () => {
|
|
365
|
+
// And it sets two fields in a single callback
|
|
366
|
+
form.firstName.set("f2");
|
|
367
|
+
form.lastName.set("l2");
|
|
368
|
+
} }, void 0) }, void 0));
|
|
369
|
+
}
|
|
370
|
+
const r = await rtl_utils_1.render(jsx_runtime_1.jsx(TestComponent, {}, void 0));
|
|
371
|
+
// When we change both
|
|
372
|
+
await rtl_utils_1.clickAndWait(r.set);
|
|
373
|
+
// Then we only call autoSave once
|
|
374
|
+
expect(autoSave).toBeCalledTimes(1);
|
|
375
|
+
expect(autoSave).toBeCalledWith({ firstName: "f2", lastName: "l2" });
|
|
376
|
+
});
|
|
377
|
+
it("queues changes for auto save if a save is already in progress", async () => {
|
|
378
|
+
const autoSaveStub = jest.fn();
|
|
379
|
+
const config = {
|
|
380
|
+
id: { type: "value" },
|
|
381
|
+
firstName: { type: "value" },
|
|
382
|
+
lastName: { type: "value" },
|
|
383
|
+
};
|
|
384
|
+
// Given a component using `getObjectState` for lazily creating ObjectStates
|
|
385
|
+
function TestComponent() {
|
|
386
|
+
const [apiData, setApiData] = react_2.useState({ id: "a:1", firstName: "Brandon", lastName: "Dow" });
|
|
387
|
+
const state = useFormState_1.useFormState({ config, autoSave, init: { input: apiData, map: (v) => v } });
|
|
388
|
+
async function autoSave(form) {
|
|
389
|
+
autoSaveStub(form.changedValue);
|
|
390
|
+
const changed = form.changedValue;
|
|
391
|
+
// Pretend to make an API call and update the local state
|
|
392
|
+
await Promise.resolve(1);
|
|
393
|
+
setApiData((prevState) => ({ ...prevState, ...changed }));
|
|
394
|
+
}
|
|
395
|
+
return (jsx_runtime_1.jsxs("div", { children: [jsx_runtime_1.jsxs("div", Object.assign({ "data-testid": "name" }, { children: [apiData.firstName, " ", apiData.lastName] }), void 0),
|
|
396
|
+
jsx_runtime_1.jsx("button", { "data-testid": "focusSetAndSaveField", onClick: () => {
|
|
397
|
+
state.firstName.focus();
|
|
398
|
+
state.firstName.set("Foo");
|
|
399
|
+
state.firstName.maybeAutoSave();
|
|
400
|
+
state.firstName.blur();
|
|
401
|
+
} }, void 0),
|
|
402
|
+
jsx_runtime_1.jsx("button", { "data-testid": "focusSetAndSaveFieldLastName", onClick: () => {
|
|
403
|
+
state.lastName.focus();
|
|
404
|
+
state.lastName.set("Bar");
|
|
405
|
+
state.lastName.maybeAutoSave();
|
|
406
|
+
} }, void 0)] }, void 0));
|
|
407
|
+
}
|
|
408
|
+
const r = await rtl_utils_1.render(jsx_runtime_1.jsx(TestComponent, {}, void 0));
|
|
409
|
+
// And triggering the auto save behavior before awaiting the initial promise to
|
|
410
|
+
// resolve so we have pending changes.
|
|
411
|
+
rtl_utils_1.click(r.focusSetAndSaveField(), { allowAsync: true });
|
|
412
|
+
// Let the initial autoSave be called
|
|
413
|
+
react_1.act(() => {
|
|
414
|
+
jest.runOnlyPendingTimers();
|
|
421
415
|
});
|
|
416
|
+
expect(r.name()).toHaveTextContent("Brandon Dow");
|
|
417
|
+
expect(autoSaveStub).toBeCalledTimes(1);
|
|
418
|
+
expect(autoSaveStub).toBeCalledWith({ id: "a:1", firstName: "Foo" });
|
|
419
|
+
// And while that is in flight, trigger another user action
|
|
420
|
+
rtl_utils_1.click(r.focusSetAndSaveFieldLastName(), { allowAsync: true });
|
|
421
|
+
// (Use `wait` so that our timer flushes before the Promise.resolve(1) is ran)
|
|
422
|
+
await rtl_utils_1.wait();
|
|
423
|
+
// Then expect the auto save to only have been called twice. Once with each changedValues.
|
|
424
|
+
expect(autoSaveStub).toBeCalledTimes(2);
|
|
425
|
+
expect(autoSaveStub).toBeCalledWith({ id: "a:1", firstName: "Foo" });
|
|
426
|
+
expect(autoSaveStub).toBeCalledWith({ id: "a:1", lastName: "Bar" });
|
|
422
427
|
});
|
|
423
428
|
});
|
|
424
429
|
const authorConfig = {
|
|
@@ -426,18 +431,6 @@ const authorConfig = {
|
|
|
426
431
|
firstName: { type: "value" },
|
|
427
432
|
lastName: { type: "value" },
|
|
428
433
|
};
|
|
429
|
-
const authorWithAddressConfig = {
|
|
430
|
-
id: { type: "value" },
|
|
431
|
-
firstName: { type: "value" },
|
|
432
|
-
lastName: { type: "value" },
|
|
433
|
-
address: {
|
|
434
|
-
type: "object",
|
|
435
|
-
config: {
|
|
436
|
-
street: { type: "value", rules: [formState_1.required] },
|
|
437
|
-
city: { type: "value" },
|
|
438
|
-
},
|
|
439
|
-
},
|
|
440
|
-
};
|
|
441
434
|
const authorWithBooksConfig = {
|
|
442
435
|
id: { type: "value" },
|
|
443
436
|
firstName: { type: "value" },
|
|
@@ -472,3 +465,8 @@ const authorWithAddressAndBooksConfig = {
|
|
|
472
465
|
},
|
|
473
466
|
},
|
|
474
467
|
};
|
|
468
|
+
/** Emulates a user focusing and then blurring a field. */
|
|
469
|
+
function focusAndBlur(state) {
|
|
470
|
+
state.focus();
|
|
471
|
+
state.blur();
|
|
472
|
+
}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { ObjectConfig, ObjectState } from "./formState";
|
|
2
|
+
export declare type ObjectStateCache<T, I> = Record<string, [ObjectState<T>, I]>;
|
|
3
|
+
declare type UseFormStatesOpts<T, I> = {
|
|
4
|
+
config: ObjectConfig<T>;
|
|
5
|
+
autoSave?: (state: ObjectState<T>) => Promise<void>;
|
|
6
|
+
getId: (v: I) => string;
|
|
7
|
+
map?: (input: Exclude<I, null | undefined>) => T;
|
|
8
|
+
};
|
|
9
|
+
export declare function useFormStates<T, I>(opts: UseFormStatesOpts<T, I>): {
|
|
10
|
+
getObjectState: (input: I) => ObjectState<T>;
|
|
11
|
+
};
|
|
12
|
+
export {};
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.useFormStates = void 0;
|
|
4
|
+
const react_1 = require("react");
|
|
5
|
+
const formState_1 = require("./formState");
|
|
6
|
+
const utils_1 = require("./utils");
|
|
7
|
+
function useFormStates(opts) {
|
|
8
|
+
const { config, autoSave, getId, map } = opts;
|
|
9
|
+
const objectStateCache = react_1.useMemo(() => ({}), [config]);
|
|
10
|
+
// Keep track of ObjectStates that triggered auto-save when a save was already in progress.
|
|
11
|
+
const pendingAutoSaves = react_1.useRef([]);
|
|
12
|
+
// Use a ref so our memo'ized `autoSave` always see the latest value
|
|
13
|
+
const autoSaveRef = react_1.useRef(autoSave);
|
|
14
|
+
autoSaveRef.current = autoSave;
|
|
15
|
+
async function maybeAutoSave(form) {
|
|
16
|
+
if (isAutoSaving && !pendingAutoSaves.current.includes(form)) {
|
|
17
|
+
pendingAutoSaves.current.push(form);
|
|
18
|
+
}
|
|
19
|
+
// Don't use canSave() because we don't want to set touched for all the fields
|
|
20
|
+
if (autoSaveRef.current && form.dirty && form.valid && !isAutoSaving) {
|
|
21
|
+
try {
|
|
22
|
+
isAutoSaving = true;
|
|
23
|
+
await autoSaveRef.current(form);
|
|
24
|
+
}
|
|
25
|
+
finally {
|
|
26
|
+
isAutoSaving = false;
|
|
27
|
+
if (pendingAutoSaves.current.length > 0) {
|
|
28
|
+
await maybeAutoSave(pendingAutoSaves.current.shift());
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
return {
|
|
34
|
+
getObjectState: (input) => {
|
|
35
|
+
const existing = objectStateCache[getId(input)];
|
|
36
|
+
const form = existing
|
|
37
|
+
? existing[0]
|
|
38
|
+
: formState_1.createObjectState(config, utils_1.initValue(config, map ? { map, input } : input), {
|
|
39
|
+
maybeAutoSave: () => maybeAutoSave(form),
|
|
40
|
+
});
|
|
41
|
+
// If it didn't exist, then add to the cache.
|
|
42
|
+
if (!existing) {
|
|
43
|
+
objectStateCache[getId(input)] = [form, input];
|
|
44
|
+
}
|
|
45
|
+
// If the source of truth changed, then update the existing state and return it.
|
|
46
|
+
if (existing && existing[1] !== input) {
|
|
47
|
+
existing[0].set(utils_1.initValue(config, map ? { map, input } : input), { refreshing: true });
|
|
48
|
+
existing[1] = input;
|
|
49
|
+
}
|
|
50
|
+
return form;
|
|
51
|
+
},
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
exports.useFormStates = useFormStates;
|
|
55
|
+
// If the user's autoSave hook makes some last-minute `.set` calls to sneak
|
|
56
|
+
// in some business logic right before their GraphQL mutation call, ignore it
|
|
57
|
+
// so that we don't infinite loop.
|
|
58
|
+
let isAutoSaving = false;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,136 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const jsx_runtime_1 = require("react/jsx-runtime");
|
|
4
|
+
const rtl_utils_1 = require("@homebound/rtl-utils");
|
|
5
|
+
const react_1 = require("react");
|
|
6
|
+
const formState_1 = require("./formState");
|
|
7
|
+
const useFormStates_1 = require("./useFormStates");
|
|
8
|
+
describe("useFormStates", () => {
|
|
9
|
+
it("can lazily create form states", async () => {
|
|
10
|
+
const autoSave = jest.fn();
|
|
11
|
+
// Given a parent and child component, where the formState is created only for the child component.
|
|
12
|
+
function ChildComponent({ os }) {
|
|
13
|
+
return jsx_runtime_1.jsx("div", Object.assign({ "data-testid": "firstName" }, { children: os.firstName.value }), void 0);
|
|
14
|
+
}
|
|
15
|
+
function TestComponent() {
|
|
16
|
+
const config = { id: { type: "value" }, firstName: { type: "value" } };
|
|
17
|
+
const { getObjectState } = useFormStates_1.useFormStates({
|
|
18
|
+
config,
|
|
19
|
+
autoSave,
|
|
20
|
+
getId: (o) => o.id,
|
|
21
|
+
});
|
|
22
|
+
return (jsx_runtime_1.jsx("div", { children: jsx_runtime_1.jsx(ChildComponent, { os: getObjectState({ id: "a:1", firstName: "Brandon" }) }, void 0) }, void 0));
|
|
23
|
+
}
|
|
24
|
+
const r = await rtl_utils_1.render(jsx_runtime_1.jsx(TestComponent, {}, void 0));
|
|
25
|
+
// And the child component has defined state
|
|
26
|
+
expect(r.firstName()).toHaveTextContent("Brandon");
|
|
27
|
+
});
|
|
28
|
+
it("can update existing object state from cache with new values", async () => {
|
|
29
|
+
const autoSave = jest.fn();
|
|
30
|
+
const config = { id: { type: "value" }, firstName: { type: "value" } };
|
|
31
|
+
// Given a component using `getObjectState` for lazily creating ObjectStates
|
|
32
|
+
function TestComponent() {
|
|
33
|
+
const [apiData, setApiData] = react_1.useState({ id: "a:1", firstName: "Brandon" });
|
|
34
|
+
const { getObjectState } = useFormStates_1.useFormStates({ config, autoSave, getId: (o) => o.id });
|
|
35
|
+
// Memoize an original for comparing the update against.
|
|
36
|
+
const originalState = react_1.useMemo(() => getObjectState(apiData), []);
|
|
37
|
+
const state = getObjectState(apiData);
|
|
38
|
+
return (jsx_runtime_1.jsxs("div", { children: [jsx_runtime_1.jsx("div", Object.assign({ "data-testid": "firstName" }, { children: state.firstName.value }), void 0),
|
|
39
|
+
jsx_runtime_1.jsx("div", Object.assign({ "data-testid": "statesEqual" }, { children: JSON.stringify(state === originalState) }), void 0),
|
|
40
|
+
jsx_runtime_1.jsx("button", { "data-testid": "updateApiData", onClick: () => setApiData((prevState) => ({ ...prevState, firstName: "Bob" })) }, void 0)] }, void 0));
|
|
41
|
+
}
|
|
42
|
+
const r = await rtl_utils_1.render(jsx_runtime_1.jsx(TestComponent, {}, void 0));
|
|
43
|
+
// And the initial values for the form state display
|
|
44
|
+
expect(r.firstName()).toHaveTextContent("Brandon");
|
|
45
|
+
expect(r.statesEqual()).toHaveTextContent("true");
|
|
46
|
+
// When updating the API data
|
|
47
|
+
await rtl_utils_1.clickAndWait(r.updateApiData());
|
|
48
|
+
// Then the new value is shown in the component
|
|
49
|
+
expect(r.firstName()).toHaveTextContent("Bob");
|
|
50
|
+
// And the two states are using the same reference
|
|
51
|
+
expect(r.statesEqual()).toHaveTextContent("true");
|
|
52
|
+
});
|
|
53
|
+
it("can queue up changes for auto save if a save is already in progress - works across multiple states", async () => {
|
|
54
|
+
const autoSaveStub = jest.fn();
|
|
55
|
+
const config = {
|
|
56
|
+
id: { type: "value" },
|
|
57
|
+
firstName: { type: "value" },
|
|
58
|
+
lastName: { type: "value" },
|
|
59
|
+
};
|
|
60
|
+
// Given a component using `getObjectState` for lazily creating ObjectStates
|
|
61
|
+
function TestComponent() {
|
|
62
|
+
const [apiData, setApiData] = react_1.useState({ id: "a:1", firstName: "Tony", lastName: "Stark" });
|
|
63
|
+
const [apiData2, setApiData2] = react_1.useState({ id: "a:2", firstName: "Steve", lastName: "Rogers" });
|
|
64
|
+
const { getObjectState } = useFormStates_1.useFormStates({ config, autoSave, getId: (o) => o.id });
|
|
65
|
+
const state = getObjectState(apiData);
|
|
66
|
+
const state2 = getObjectState(apiData2);
|
|
67
|
+
async function autoSave(form) {
|
|
68
|
+
autoSaveStub(form.changedValue);
|
|
69
|
+
// Pretend to make an API call and update the local state
|
|
70
|
+
if (form.id.value === "a:1") {
|
|
71
|
+
setApiData((prevState) => ({ ...prevState, ...form.changedValue }));
|
|
72
|
+
}
|
|
73
|
+
else {
|
|
74
|
+
setApiData2((prevState) => ({ ...prevState, ...form.changedValue }));
|
|
75
|
+
}
|
|
76
|
+
await Promise.resolve(1);
|
|
77
|
+
}
|
|
78
|
+
return (jsx_runtime_1.jsxs("div", { children: [jsx_runtime_1.jsx("div", Object.assign({ "data-testid": "firstName" }, { children: state.firstName.value }), void 0),
|
|
79
|
+
jsx_runtime_1.jsx("button", { "data-testid": "focusSetAndSaveField", onClick: () => {
|
|
80
|
+
state.firstName.focus();
|
|
81
|
+
state.firstName.set("Foo");
|
|
82
|
+
state.firstName.maybeAutoSave();
|
|
83
|
+
} }, void 0),
|
|
84
|
+
jsx_runtime_1.jsx("button", { "data-testid": "focusSetAndSaveFieldLastName", onClick: () => {
|
|
85
|
+
state.lastName.focus();
|
|
86
|
+
state.lastName.set("Bar");
|
|
87
|
+
state.lastName.maybeAutoSave();
|
|
88
|
+
} }, void 0),
|
|
89
|
+
jsx_runtime_1.jsx("button", { "data-testid": "focusSetAndSaveField2", onClick: () => {
|
|
90
|
+
state2.lastName.focus();
|
|
91
|
+
state2.lastName.set("Bar");
|
|
92
|
+
state2.lastName.maybeAutoSave();
|
|
93
|
+
} }, void 0)] }, void 0));
|
|
94
|
+
}
|
|
95
|
+
const r = await rtl_utils_1.render(jsx_runtime_1.jsx(TestComponent, {}, void 0));
|
|
96
|
+
// And triggering the auto save behavior before awaiting the initial promise to resolve so we have pending changes.
|
|
97
|
+
rtl_utils_1.click(r.focusSetAndSaveField());
|
|
98
|
+
rtl_utils_1.click(r.focusSetAndSaveFieldLastName());
|
|
99
|
+
rtl_utils_1.click(r.focusSetAndSaveField2());
|
|
100
|
+
// Awaits the promises for all methods triggered above
|
|
101
|
+
await rtl_utils_1.wait();
|
|
102
|
+
// Then expect the auto save to only have been called three times. Once with each set of changedValues.
|
|
103
|
+
expect(autoSaveStub).toBeCalledTimes(3);
|
|
104
|
+
expect(autoSaveStub).toBeCalledWith({ id: "a:1", firstName: "Foo" });
|
|
105
|
+
expect(autoSaveStub).toBeCalledWith({ id: "a:1", lastName: "Bar" });
|
|
106
|
+
expect(autoSaveStub).toBeCalledWith({ id: "a:2", lastName: "Bar" });
|
|
107
|
+
});
|
|
108
|
+
it("clears out cache if configuration changes", async () => {
|
|
109
|
+
const autoSave = jest.fn();
|
|
110
|
+
// Given a component with stable API data.
|
|
111
|
+
const apiData = { id: "a:1", firstName: "Brandon", lastName: "Dow" };
|
|
112
|
+
// And two sets of configurations
|
|
113
|
+
const originalConfig = { id: { type: "value" }, firstName: { type: "value" } };
|
|
114
|
+
const updatedConfig = {
|
|
115
|
+
id: { type: "value" },
|
|
116
|
+
firstName: { type: "value", rules: [formState_1.required] },
|
|
117
|
+
};
|
|
118
|
+
function TestComponent() {
|
|
119
|
+
const [config, setConfig] = react_1.useState(originalConfig);
|
|
120
|
+
const { getObjectState } = useFormStates_1.useFormStates({ config, autoSave, getId: (o) => o.id });
|
|
121
|
+
// Memoize an original for comparing the update against.
|
|
122
|
+
const originalState = react_1.useMemo(() => getObjectState(apiData), []);
|
|
123
|
+
const state = getObjectState(apiData);
|
|
124
|
+
return (jsx_runtime_1.jsxs("div", { children: [jsx_runtime_1.jsx("div", Object.assign({ "data-testid": "statesEqual" }, { children: JSON.stringify(state === originalState) }), void 0),
|
|
125
|
+
jsx_runtime_1.jsx("button", { "data-testid": "updateConfig", onClick: () => setConfig(updatedConfig) }, void 0)] }, void 0));
|
|
126
|
+
}
|
|
127
|
+
// When rendered with the original configuration
|
|
128
|
+
const r = await rtl_utils_1.render(jsx_runtime_1.jsx(TestComponent, {}, void 0));
|
|
129
|
+
// Then the two form-states generated are equal
|
|
130
|
+
expect(r.statesEqual()).toHaveTextContent("true");
|
|
131
|
+
// When updating the configuration object
|
|
132
|
+
rtl_utils_1.click(r.updateConfig);
|
|
133
|
+
// Then the two form-states are no longer equal.
|
|
134
|
+
expect(r.statesEqual()).toHaveTextContent("false");
|
|
135
|
+
});
|
|
136
|
+
});
|
package/dist/utils.d.ts
CHANGED
|
@@ -1,2 +1,17 @@
|
|
|
1
|
+
import { ObjectConfig } from "./formState";
|
|
1
2
|
export declare function fail(message?: string): never;
|
|
2
3
|
export declare function assertNever(x: never): never;
|
|
4
|
+
/** Introspects the `init` prop to see if has a `map` function/etc. and returns the form value. */
|
|
5
|
+
export declare function initValue<T>(config: ObjectConfig<T>, init: any): T;
|
|
6
|
+
/**
|
|
7
|
+
* Picks ony fields out of `instance` that are in the `formConfig`.
|
|
8
|
+
*
|
|
9
|
+
* This is useful for creating a form input from a GraphQL query result,
|
|
10
|
+
* but ignoring extra data in the query that we don't want/need in the form.
|
|
11
|
+
*
|
|
12
|
+
* (Especially because the form.value will become our mutation's input type
|
|
13
|
+
* that goes on the wire, we don't want superfluous data in it.)
|
|
14
|
+
*/
|
|
15
|
+
export declare function pickFields<T, I>(formConfig: ObjectConfig<T>, instance: I): {
|
|
16
|
+
[K in keyof T]: K extends keyof I ? I[K] : never;
|
|
17
|
+
};
|
package/dist/utils.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.assertNever = exports.fail = void 0;
|
|
3
|
+
exports.pickFields = exports.initValue = exports.assertNever = exports.fail = void 0;
|
|
4
|
+
const is_plain_object_1 = require("is-plain-object");
|
|
5
|
+
const mobx_1 = require("mobx");
|
|
4
6
|
function fail(message) {
|
|
5
7
|
throw new Error(message || "Failed");
|
|
6
8
|
}
|
|
@@ -9,3 +11,60 @@ function assertNever(x) {
|
|
|
9
11
|
throw new Error("Unexpected object: " + x);
|
|
10
12
|
}
|
|
11
13
|
exports.assertNever = assertNever;
|
|
14
|
+
/** Introspects the `init` prop to see if has a `map` function/etc. and returns the form value. */
|
|
15
|
+
function initValue(config, init) {
|
|
16
|
+
const initValue = init && "input" in init && "map" in init
|
|
17
|
+
? init.input
|
|
18
|
+
? init.map(init.input)
|
|
19
|
+
: init.ifUndefined || {}
|
|
20
|
+
: init || {};
|
|
21
|
+
return pickFields(config, initValue);
|
|
22
|
+
}
|
|
23
|
+
exports.initValue = initValue;
|
|
24
|
+
/**
|
|
25
|
+
* Picks ony fields out of `instance` that are in the `formConfig`.
|
|
26
|
+
*
|
|
27
|
+
* This is useful for creating a form input from a GraphQL query result,
|
|
28
|
+
* but ignoring extra data in the query that we don't want/need in the form.
|
|
29
|
+
*
|
|
30
|
+
* (Especially because the form.value will become our mutation's input type
|
|
31
|
+
* that goes on the wire, we don't want superfluous data in it.)
|
|
32
|
+
*/
|
|
33
|
+
function pickFields(formConfig, instance) {
|
|
34
|
+
// If the caller is using classes, i.e. with their own custom observable behavior, then just use as-is
|
|
35
|
+
if (!is_plain_object_1.isPlainObject(instance)) {
|
|
36
|
+
return instance;
|
|
37
|
+
}
|
|
38
|
+
return Object.fromEntries(Object.entries(formConfig).map(([key, _keyConfig]) => {
|
|
39
|
+
const keyConfig = _keyConfig;
|
|
40
|
+
const value = instance[key];
|
|
41
|
+
if (keyConfig.type === "object") {
|
|
42
|
+
if (value) {
|
|
43
|
+
return [key, pickFields(keyConfig.config, value)];
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
return [key, value];
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
else if (keyConfig.type === "list") {
|
|
50
|
+
if (mobx_1.isObservable(value)) {
|
|
51
|
+
// If we hit an observable array, leave it as the existing proxy so the our
|
|
52
|
+
// ListFieldState will react to changes in the original array.
|
|
53
|
+
return [key, value];
|
|
54
|
+
}
|
|
55
|
+
else if (value) {
|
|
56
|
+
return [key, value.map((u) => pickFields(keyConfig.config, u))];
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
return [key, value];
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
else if (keyConfig.type === "value") {
|
|
63
|
+
return [key, value];
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
return assertNever(keyConfig);
|
|
67
|
+
}
|
|
68
|
+
}));
|
|
69
|
+
}
|
|
70
|
+
exports.pickFields = pickFields;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|