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.

Sign up for GitHub

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

Jump to bottom

improve render prop with input focus #3278

Merged
merged 5 commits into from Oct 28, 2020
Merged

improve render prop with input focus #3278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a4836c8
improve render prop with input focus
bluebill1049 Oct 27, 2020
1266f24
include ref for as prop
bluebill1049 Oct 27, 2020
288899c
fix one set of automation test for useFieldArray
bluebill1049 Oct 27, 2020
9aff7ab
update cypress automation
bluebill1049 Oct 28, 2020
fdae6ed
rename inputRef to ref
bluebill1049 Oct 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
46 changes: 23 additions & 23 deletions cypress/integration/useFieldArray.ts
View file
Open in desktop
Expand Up @@ -15,60 +15,60 @@ describe('useFieldArray', () => {
cy.get('#prepend').click();
cy.get('ul > li').its('length').should('equal', 2);

cy.get('ul > li').eq(0).get('input').should('have.value', '5');
cy.get('ul > li').eq(0).get('input').should('have.value', '6');

cy.get('#append').click();
cy.get('ul > li').its('length').should('equal', 3);

cy.get('ul > li').eq(2).find('input').should('have.value', '6');
cy.get('ul > li').eq(2).find('input').should('have.value', '8');

cy.get('#submit').click();
cy.get('#result').should(($state) =>
expect(JSON.parse($state.text())).to.be.deep.equal({
data: [{ name: '5' }, { name: '1' }, { name: '6' }],
data: [{ name: '6' }, { name: '1' }, { name: '8' }],
}),
);

cy.get('#swap').click();
cy.get('ul > li').eq(1).find('input').should('have.value', '6');
cy.get('ul > li').eq(1).find('input').should('have.value', '8');
cy.get('ul > li').eq(2).find('input').should('have.value', '1');

cy.get('#submit').click();
cy.get('#result').should(($state) =>
expect(JSON.parse($state.text())).to.be.deep.equal({
data: [{ name: '5' }, { name: '6' }, { name: '1' }],
data: [{ name: '6' }, { name: '8' }, { name: '1' }],
}),
);

cy.get('#move').click();
cy.get('ul > li').eq(0).find('input').should('have.value', '1');
cy.get('ul > li').eq(1).find('input').should('have.value', '5');
cy.get('ul > li').eq(1).find('input').should('have.value', '6');

cy.get('#submit').click();
cy.get('#result').should(($state) =>
expect(JSON.parse($state.text())).to.be.deep.equal({
data: [{ name: '1' }, { name: '5' }, { name: '6' }],
data: [{ name: '1' }, { name: '6' }, { name: '8' }],
}),
);

cy.get('#insert').click();
cy.get('ul > li').eq(1).find('input').should('have.value', '18');
cy.get('ul > li').eq(1).find('input').should('have.value', '21');

cy.get('#submit').click();
cy.get('#result').should(($state) =>
expect(JSON.parse($state.text())).to.be.deep.equal({
data: [{ name: '1' }, { name: '18' }, { name: '5' }, { name: '6' }],
data: [{ name: '1' }, { name: '21' }, { name: '6' }, { name: '8' }],
}),
);

cy.get('#remove').click();
cy.get('ul > li').eq(0).find('input').should('have.value', '1');
cy.get('ul > li').eq(1).find('input').should('have.value', '5');
cy.get('ul > li').eq(1).find('input').should('have.value', '6');

cy.get('#submit').click();
cy.get('#result').should(($state) =>
expect(JSON.parse($state.text())).to.be.deep.equal({
data: [{ name: '1' }, { name: '5' }, { name: '6' }],
data: [{ name: '1' }, { name: '6' }, { name: '8' }],
}),
);

Expand All @@ -77,7 +77,7 @@ describe('useFieldArray', () => {
cy.get('ul > li').its('length').should('equal', 2);

cy.get('ul > li').eq(0).find('input').should('have.value', '1');
cy.get('ul > li').eq(1).find('input').should('have.value', '6');
cy.get('ul > li').eq(1).find('input').should('have.value', '8');

cy.get('#delete1').click();

Expand All @@ -100,7 +100,7 @@ describe('useFieldArray', () => {
expect(JSON.parse($state.text())).to.be.deep.equal({}),
);

cy.get('#renderCount').contains('35');
cy.get('#renderCount').contains('38');
});

it('should behaviour correctly with defaultValue', () => {
Expand Down Expand Up @@ -183,14 +183,14 @@ describe('useFieldArray', () => {
);

cy.get('#insert').click();
cy.get('ul > li').eq(1).find('input').should('have.value', '18');
cy.get('ul > li').eq(1).find('input').should('have.value', '19');

cy.get('#submit').click();
cy.get('#result').should(($state) =>
expect(JSON.parse($state.text())).to.be.deep.equal({
data: [
{ name: 'test' },
{ name: '18' },
{ name: '19' },
{ name: '6' },
{ name: 'test1' },
{ name: 'test2' },
Expand Down Expand Up @@ -246,13 +246,13 @@ describe('useFieldArray', () => {

cy.get('#append').click();

cy.get('ul > li').eq(0).find('input').should('have.value', '35');
cy.get('ul > li').eq(0).find('input').should('have.value', '36');

cy.get('#prepend').click();

cy.get('ul > li').eq(0).find('input').should('have.value', '36');
cy.get('ul > li').eq(0).find('input').should('have.value', '38');

cy.get('#renderCount').contains('37');
cy.get('#renderCount').contains('39');
});

it('should behaviour correctly with defaultValue and without auto focus', () => {
Expand Down Expand Up @@ -577,23 +577,23 @@ describe('useFieldArray', () => {
);
cy.get('#insert').click();
cy.get('#touched').contains(
'[null,null,{"name":true},{"name":true},{"name":true},{"name":true}]',
'[{"name":true},null,{"name":true},{"name":true},{"name":true},{"name":true}]',
);
cy.get('#swap').click();
cy.get('#touched').contains(
'[null,{"name":true},{"name":true},{"name":true},{"name":true},{"name":true}]',
'[{"name":true},{"name":true},{"name":true},{"name":true},{"name":true},{"name":true}]',
);
cy.get('#move').click();
cy.get('#touched').contains(
'[{"name":true},null,{"name":true},{"name":true},{"name":true},{"name":true}]',
'[{"name":true},{"name":true},{"name":true},{"name":true},{"name":true},{"name":true}]',
);
cy.get('#insert').click();
cy.get('#touched').contains(
'[{"name":true},null,null,{"name":true},{"name":true},{"name":true},{"name":true}]',
'[{"name":true},null,{"name":true},{"name":true},{"name":true},{"name":true},{"name":true}]',
);
cy.get('#delete4').click();
cy.get('#touched').contains(
'[{"name":true},{"name":true},null,{"name":true},{"name":true},{"name":true}]',
'[{"name":true},{"name":true},{"name":true},{"name":true},{"name":true},{"name":true}]',
);
});

Expand Down
38 changes: 24 additions & 14 deletions cypress/integration/useFieldArrayUnregister.ts
View file
Open in desktop
Expand Up @@ -61,19 +61,22 @@ describe('useFieldArrayUnregister', () => {

cy.get('#touched').should(($state) =>
expect(JSON.parse($state.text())).to.be.deep.equal([
null,
{ name: true },
null,
{ name: true, conditional: true },
]),
);

cy.get('#insert').click();

cy.get('input[name="data[3].conditional"]').should('has.value', 'test');
cy.get('#insert').click();

cy.get('input[name="data[4].name"]').type('test');

cy.get('#dirtyFields').should(($state) =>
expect(JSON.parse($state.text())).to.be.deep.equal({
data: [
{ name: true },
{ name: true },
{ name: true },
{ name: true, conditional: true },
Expand All @@ -85,36 +88,40 @@ describe('useFieldArrayUnregister', () => {

cy.get('#touched').should(($state) =>
expect(JSON.parse($state.text())).to.be.deep.equal([
null,
null,
{ name: true },
{ name: true },
{ name: true },
null,
{ name: true, conditional: true },
]),
);

cy.get('#move').click();

cy.get('input[name="data[4].name"]').clear().type('bill');

cy.get('input[name="data[4].conditional"]').should('has.value', 'test');

cy.get('#dirtyFields').should(($state) =>
expect(JSON.parse($state.text())).to.be.deep.equal({
data: [
{ name: true },
{ name: true },
{ name: true },
{ name: true, conditional: true },
{ name: true },
{ name: true, conditional: true },
{ name: true },
],
}),
);

cy.get('#touched').should(($state) =>
expect(JSON.parse($state.text())).to.be.deep.equal([
null,
{ name: true },
null,
null,
{ name: true },
{ name: true, conditional: true },
{ name: true },
null,
]),
);

Expand All @@ -128,9 +135,10 @@ describe('useFieldArrayUnregister', () => {
expect(JSON.parse($state.text())).to.be.deep.equal({
data: [
{ name: '5' },
{ name: 'test2' },
{ name: 'test1', conditional: 'test' },
{ name: 'billtest', conditional: 'test' },
{ name: '8' },
{ name: 'bill', conditional: 'test' },
{ name: 'test2', conditional: 'test' },
],
}),
);
Expand All @@ -143,9 +151,10 @@ describe('useFieldArrayUnregister', () => {
expect(JSON.parse($state.text())).to.be.deep.equal({
data: [
{ name: '5' },
{ name: 'test2' },
{ name: 'test1', conditional: 'test' },
{ name: 'billtest', conditional: 'test' },
{ name: '8' },
{ name: 'billtest', conditional: 'test' },
{ name: 'test2', conditional: 'test' },
],
}),
);
Expand All @@ -158,8 +167,9 @@ describe('useFieldArrayUnregister', () => {
expect(JSON.parse($state.text())).to.be.deep.equal({
data: [
{ name: '5' },
{ name: 'test2' },
{ name: 'test1', conditional: 'test' },
{ name: 'billtest', conditional: 'test' },
{ name: '8' },
{ name: 'test2', conditional: 'test' },
],
}),
);
Expand Down
21 changes: 13 additions & 8 deletions src/controller.tsx
View file
Open in desktop
Expand Up @@ -65,6 +65,11 @@ const Controller = <
const [value, setInputStateValue] = React.useState(getInitialValue());
const valueRef = React.useRef(value);
const onFocusRef = React.useRef(onFocus);
const ref = React.useRef({
focus: () => {},
});

onFocusRef.current = onFocus || (() => ref.current.focus());

const shouldValidate = (isBlurEvent?: boolean) =>
!skipValidation({
Expand Down Expand Up @@ -168,25 +173,25 @@ const Controller = <
shouldDirty: true,
});

const props = {
...rest,
const commonProps = {
onChange,
onBlur,
name,
value,
ref,
};

const props = {
...rest,
...commonProps,
};

return as
? React.isValidElement(as)
? React.cloneElement(as, props)
: React.createElement(as as string, props as any)
: render
? render({
onChange,
onBlur,
value,
name,
})
? render(commonProps)
: null;
};

Expand Down
1 change: 1 addition & 0 deletions src/types/props.ts
View file
Open in desktop
Expand Up @@ -46,6 +46,7 @@ export type ControllerProps<
onBlur: () => void;
value: any;
name: FieldName<FieldValuesFromControl<TControl>>;
ref: React.MutableRefObject<any>;
}) => React.ReactElement;
}
) & {
Expand Down