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

fix: 修复 collapse 组件同时设置 activeKey 和 defaultActiveKey 属性属性导致的 bug #698

Merged
merged 6 commits into from
Jun 30, 2021
Merged

fix: 修复 collapse 组件同时设置 activeKey 和 defaultActiveKey 属性属性导致的 bug #698

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a9a2586
Merge branch 'master' of github.com:ZhongAnTech/zarm
JeromeLin Jun 29, 2021
d3fa7cb
fix: 修复同时设置 activeKey 和 defaultActiveKey 导致的 bug
BestDingSheng Jun 29, 2021
598c5c6
fix: 修复同时设置 activeKey 和 defaultActiveKey 导致的 bug
BestDingSheng Jun 29, 2021
6874a4a
perf: 代码优化
BestDingSheng Jun 30, 2021
d41b14c
chore: merge master
BestDingSheng Jun 30, 2021
bb0b526
fix: 解决动画丢失问题
BestDingSheng Jun 30, 2021
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
27 changes: 13 additions & 14 deletions packages/zarm/src/collapse/Collapse.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@ interface CollapseStates {

const getActiveKey = (props: CollapseProps) => {
const { multiple, activeKey, defaultActiveKey } = props;

let value;

if (typeof activeKey !== 'undefined') {
value = activeKey;
}
if (typeof defaultActiveKey !== 'undefined') {

if (!('activeKey' in props) && typeof defaultActiveKey !== 'undefined') {
value = defaultActiveKey;
}

Expand All @@ -50,19 +52,16 @@ export default class Collapse extends Component<CollapseProps, CollapseStates> {

static getDerivedStateFromProps(nextProps: CollapseProps, state: CollapseStates) {
const newState: CollapseStates = {};
if ('activeKey' in nextProps && nextProps.activeKey !== state.prevActiveKey) {

if ('activeKey' in nextProps && nextProps.activeKey !== state.activeKey) {
newState.activeKey = getActiveKey(nextProps);
newState.prevActiveKey = nextProps.activeKey;
}
if ('animated' in nextProps) {
newState.animated = nextProps.animated;
}
if ('multiple' in nextProps) {
newState.multiple = nextProps.multiple;

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

删除 animated 后，动画效果丢失了

if ('activeKey' in newState) {
return newState;
}
return 'activeKey' in newState || 'animated' in newState || 'multiple' in newState
? newState
: null;

return null;
}

onItemChange = (onItemChange, key) => {
Expand Down Expand Up @@ -102,7 +101,8 @@ export default class Collapse extends Component<CollapseProps, CollapseStates> {
};

renderItems = () => {
const { activeKey, multiple, animated } = this.state;
const { activeKey } = this.state;
const { multiple, animated } = this.props;
return Children.map(this.props.children, (ele: ReactElement<CollapseItemProps>) => {
const { disabled, onChange } = ele.props;
const { key } = ele;
Expand All @@ -128,10 +128,9 @@ export default class Collapse extends Component<CollapseProps, CollapseStates> {
defaultActiveKey,
...rest
} = this.props;
const { animated: animatedState } = this.state;

const cls = classnames(prefixCls, className, {
[`${prefixCls}--animated`]: animatedState,
[`${prefixCls}--animated`]: animated,
});

return (
Expand Down