Skip to content

fix(Step): fix incorrect render order when sequence is 'reverse' #4267

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

Open
RylanBot wants to merge 1 commit into
base: develop
Choose a base branch
from
+77 −75
Open

fix(Step): fix incorrect render order when sequence is 'reverse' #4267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 11 additions & 9 deletions packages/components/steps/Steps.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,22 +90,24 @@ const Steps = forwardRefWithStatics(

const stepItemList = useMemo<React.ReactNode[]>(() => {
if (options) {
const optionsDisplayList = sequence === 'reverse' ? options.reverse() : options;
return options.map<React.ReactNode>((item, index) => {
const stepIndex = sequence === 'reverse' ? optionsDisplayList.length - index - 1 : index;
return <StepItem key={index} {...item} index={stepIndex} status={handleStatus(item, index)} />;
const displayList = sequence === 'reverse' ? [...options].reverse() : options;
return displayList.map<React.ReactNode>((item, index) => {
const originalIndex = sequence === 'reverse' ? displayList.length - index - 1 : index;
return (
<StepItem key={originalIndex} {...item} index={originalIndex} status={handleStatus(item, originalIndex)} />
);
});
}

const childrenList = React.Children.toArray(children);
const childrenDisplayList = sequence === 'reverse' ? childrenList.reverse() : childrenList;
const displayList = sequence === 'reverse' ? [...childrenList].reverse() : childrenList;

return childrenList.map((child: React.ReactElement<StepItemProps>, index: number) => {
const stepIndex = sequence === 'reverse' ? childrenDisplayList.length - index - 1 : index;
return displayList.map((child: React.ReactElement<StepItemProps>, index: number) => {
const originalIndex = sequence === 'reverse' ? displayList.length - index - 1 : index;
return React.cloneElement(child, {
...child.props,
index: stepIndex,
status: handleStatus(child.props, index),
index: originalIndex,
status: handleStatus(child.props, originalIndex),
});
});
}, [options, children, sequence, handleStatus]);
Expand Down
Loading
Loading