Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: send updates only when not rendering #2707

Merged
merged 10 commits into from
Sep 11, 2024
26 changes: 25 additions & 1 deletion packages/ts/react-crud/test/autocrud.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,14 @@ import ConfirmDialogController from './ConfirmDialogController.js';
import { CrudController } from './CrudController.js';
import FormController from './FormController';
import GridController from './GridController';
import { getItem, PersonModel, personService } from './test-models-and-services.js';
import {
createService,
getItem,
PersonModel,
personService,
type UserData,
UserDataModel,
} from './test-models-and-services.js';

use(sinonChai);
use(chaiDom);
Expand Down Expand Up @@ -325,6 +332,23 @@ describe('@vaadin/hilla-react-crud', () => {
expect((await form.getField('Last name')).value).to.equal('');
});

it('opens the form in a dialog when row has undefined value', async () => {
const nullData: UserData[] = [
{
id: 1,
name: undefined,
},
];
const customService = createService(nullData);
const result = render(<AutoCrud service={customService} model={UserDataModel} />);
const grid = await GridController.init(result, user);
await grid.toggleRowSelected(0);

const form = await FormController.init(user);
expect(form.instance).to.exist;
expect((await form.getField('Name')).value).to.equal(undefined);
});

it('closes the dialog when clicking close button', async () => {
const result = render(<TestAutoCrud service={service} />);
const grid = await GridController.init(result, user);
Expand Down
30 changes: 29 additions & 1 deletion packages/ts/react-crud/test/test-models-and-services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export interface Address {
}

export interface Department extends HasIdVersion {
name: string;
name?: string;
}

export interface Person extends HasIdVersion, Named {
Expand Down Expand Up @@ -74,6 +74,10 @@ export interface ColumnRendererTestValues extends HasIdVersion {
nested?: NestedTestValues;
}

export interface UserData extends HasIdVersion {
name?: string;
}

class GenderModel extends EnumModel<typeof Gender> {
static override createEmptyValue = makeEnumEmptyValueCreator(GenderModel);
readonly [_enum] = Gender;
Expand Down Expand Up @@ -349,6 +353,30 @@ export class ColumnRendererTestModel<
}
}

export class UserDataModel<T extends UserData = UserData> extends ObjectModel<T> {
static override createEmptyValue = makeObjectEmptyValueCreator(UserDataModel);

get id(): NumberModel {
return this[_getPropertyModel](
'id',
(parent, key) =>
new NumberModel(parent, key, true, { meta: { annotations: [{ name: 'jakarta.persistence.Id' }] } }),
);
}

get version(): NumberModel {
return this[_getPropertyModel](
'version',
(parent, key) =>
new NumberModel(parent, key, true, { meta: { annotations: [{ name: 'jakarta.persistence.Version' }] } }),
);
}

get name(): StringModel {
return this[_getPropertyModel]('name', (parent, key) => new StringModel(parent, key, true));
}
}

type HasIdVersion = {
id?: number;
version?: number;
Expand Down
13 changes: 11 additions & 2 deletions packages/ts/react-form/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,16 @@ import type { Writable } from 'type-fest';
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
__REGISTER__();

let isRendering = false;

function useUpdate() {
const [_, update] = useReducer((x: number) => x + 1, 0);
return update;
const [_, count] = useReducer((x: number) => x + 1, 0);
return () => {
if (isRendering) {
return;
}
count();
};
}

export type FieldDirectiveResult = Readonly<{
Expand Down Expand Up @@ -128,6 +135,7 @@ function useFields<M extends AbstractModel>(node: BinderNode<M>): FieldDirective
const registry = new WeakMap<AbstractModel, FieldState>();

return ((model: AbstractModel) => {
isRendering = true;
const n = getBinderNode(model);

let fieldState = registry.get(model);
Expand Down Expand Up @@ -211,6 +219,7 @@ function useFields<M extends AbstractModel>(node: BinderNode<M>): FieldDirective
fieldState.strategy.invalid = n.invalid;
}

isRendering = false;
return {
name: n.name,
ref: fieldState.ref,
Expand Down