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

Add SimpleFormIterator label function #6305

Merged
merged 5 commits into from
Jun 22, 2021
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
refactor: extract DefaultLabelFn
iamstiil committed May 25, 2021
commit 856a15aee3e5be4914c32e7a2721a040262201bb
33 changes: 17 additions & 16 deletions packages/ra-ui-materialui/src/form/SimpleFormIterator.tsx
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
import Button from '@material-ui/core/Button';
import FormHelperText from '@material-ui/core/FormHelperText';
import { makeStyles } from '@material-ui/core/styles';
import Typography from '@material-ui/core/Typography';
import AddIcon from '@material-ui/icons/AddCircleOutline';
import CloseIcon from '@material-ui/icons/RemoveCircleOutline';
import classNames from 'classnames';
import get from 'lodash/get';
import PropTypes from 'prop-types';
import { Record, useTranslate, ValidationError } from 'ra-core';
import * as React from 'react';
import {
Children,
cloneElement,
FC,
isValidElement,
useRef,
ReactElement,
FC,
useRef,
} from 'react';
import PropTypes from 'prop-types';
import { CSSTransition, TransitionGroup } from 'react-transition-group';
import get from 'lodash/get';
import Typography from '@material-ui/core/Typography';
import Button from '@material-ui/core/Button';
import FormHelperText from '@material-ui/core/FormHelperText';
import { makeStyles } from '@material-ui/core/styles';
import CloseIcon from '@material-ui/icons/RemoveCircleOutline';
import AddIcon from '@material-ui/icons/AddCircleOutline';
import { useTranslate, ValidationError, Record } from 'ra-core';
import classNames from 'classnames';
import { FieldArrayRenderProps } from 'react-final-form-arrays';

import FormInput from './FormInput';
import { CSSTransition, TransitionGroup } from 'react-transition-group';
import { ClassesOverride } from '../types';
import FormInput from './FormInput';

const useStyles = makeStyles(
theme => ({
@@ -83,6 +82,8 @@ const DefaultAddButton = props => {
);
};

const DefaultLabelFn = index => index + 1;

const DefaultRemoveButton = props => {
const classes = useStyles(props);
const translate = useTranslate();
@@ -113,7 +114,7 @@ const SimpleFormIterator: FC<SimpleFormIteratorProps> = props => {
margin,
TransitionProps,
defaultValue,
labelFn = index => index + 1,
labelFn = DefaultLabelFn,
} = props;
const classes = useStyles(props);
const nodeRef = useRef(null);