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

[RFR] Migrate ReferenceArrayInput to use hooks #3705

Merged
merged 3 commits into from
Sep 17, 2019
Merged

[RFR] Migrate ReferenceArrayInput to use hooks #3705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cdf0ce4
Migrate ReferenceArrayInput to use hooks
djhi Sep 17, 2019
c49f730
Review
djhi Sep 17, 2019
552d1be
Fix component
djhi Sep 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/ra-core/src/controller/input/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import ReferenceArrayInputController from './ReferenceArrayInputController';
import ReferenceInputController from './ReferenceInputController';
import useReferenceInputController from './useReferenceInputController';
import useReferenceArrayInputController from './useReferenceArrayInputController';

export {
ReferenceArrayInputController,
ReferenceInputController,
useReferenceInputController,
useReferenceArrayInputController,
};
63 changes: 42 additions & 21 deletions packages/ra-ui-materialui/src/input/ReferenceArrayInput.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import React from 'react';
import PropTypes from 'prop-types';
import compose from 'recompose/compose';
import { addField, translate, ReferenceArrayInputController } from 'ra-core';
import {
useReferenceArrayInputController,
useInput,
useTranslate,
} from 'ra-core';

import LinearProgress from '../layout/LinearProgress';
import Labeled from '../input/Labeled';
Expand Down Expand Up @@ -209,22 +212,48 @@ ReferenceArrayInputView.propTypes = {
* <SelectArrayInput optionText="name" />
* </ReferenceArrayInput>
*/
export const ReferenceArrayInput = ({ children, ...props }) => {
export const ReferenceArrayInput = ({
children,
id: idOverride,
onBlur,
onChange,
onFocus,
validate,
...props
}) => {
if (React.Children.count(children) !== 1) {
throw new Error(
'<ReferenceArrayInput> only accepts a single child (like <Datagrid>)'
);
}

const { id, input, isRequired, meta } = useInput({
id: idOverride,
onBlur,
onChange,
onFocus,
source: props.source,
validate,
});

const controllerProps = useReferenceArrayInputController({
...props,
input,
});

const translate = useTranslate();

return (
<ReferenceArrayInputController {...props}>
{controllerProps => (
<ReferenceArrayInputView
{...props}
{...{ children, ...controllerProps }}
/>
)}
</ReferenceArrayInputController>
<ReferenceArrayInputView
id={id}
input={input}
isRequired={isRequired}
meta={meta}
translate={translate}
children={children}
{...props}
{...controllerProps}
/>
);
};

Expand All @@ -235,18 +264,15 @@ ReferenceArrayInput.propTypes = {
className: PropTypes.string,
filter: PropTypes.object,
filterToQuery: PropTypes.func.isRequired,
input: PropTypes.object.isRequired,
label: PropTypes.string,
meta: PropTypes.object,
perPage: PropTypes.number,
reference: PropTypes.string.isRequired,
resource: PropTypes.string.isRequired,
resource: PropTypes.string,
sort: PropTypes.shape({
field: PropTypes.string,
order: PropTypes.oneOf(['ASC', 'DESC']),
}),
source: PropTypes.string,
translate: PropTypes.func.isRequired,
};

ReferenceArrayInput.defaultProps = {
Expand All @@ -257,9 +283,4 @@ ReferenceArrayInput.defaultProps = {
sort: { field: 'id', order: 'DESC' },
};

const EnhancedReferenceArrayInput = compose(
addField,
translate
)(ReferenceArrayInput);

export default EnhancedReferenceArrayInput;
export default ReferenceArrayInput;