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

Feature/collapse #571

Merged
merged 2 commits into from
Apr 12, 2022
Merged

Feature/collapse #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03167ba
refactor: optimize the method of initializing collapse panel id
asbstty Apr 12, 2022
1039bc5
Merge branch 'develop' into feature/collapse
asbstty Apr 12, 2022
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
10 changes: 6 additions & 4 deletions src/collapse/collapse-panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,25 @@ export default defineComponent({
const { value, disabled, destroyOnCollapse } = toRefs(props);
const collapseValue: Ref<CollapseValue> = inject('collapseValue');
const updateCollapseValue: Function = inject('updateCollapseValue');
const getUniqId: Function = inject('getUniqId', () => undefined, false);
const {
defaultExpandAll,
disabled: disableAll,
expandIconPlacement,
expandOnRowClick,
expandIcon,
} = inject('collapseProps');
const innerValue = value.value || getUniqId();
if (defaultExpandAll.value) {
updateCollapseValue(value.value);
updateCollapseValue(innerValue);
}
const { beforeEnter, enter, afterEnter, beforeLeave, leave, afterLeave } = useCollapseAnimation();
const headRef = ref<HTMLElement>();
const isDisabled = computed(() => disabled.value || disableAll.value);
const isActive = computed(() =>
collapseValue.value instanceof Array
? collapseValue.value.includes(value.value)
: collapseValue.value === value.value,
? collapseValue.value.includes(innerValue)
: collapseValue.value === innerValue,
);
const classes = computed(() => {
return [componentName.value, { [disableClass.value]: isDisabled.value }];
Expand All @@ -44,7 +46,7 @@ export default defineComponent({
(expandOnRowClick.value && e.target === headRef.value) ||
(e.target as Element).getAttribute('name') === 'arrow';
if (canExpand && !isDisabled.value) {
updateCollapseValue(value.value);
updateCollapseValue(innerValue);
}
};
const renderIcon = (direction: string) => {
Expand Down
15 changes: 5 additions & 10 deletions src/collapse/collapse.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,16 @@ export default defineComponent({
},
];
});
const getUniqId = (() => {
let index = 0;
return () => index++;
})();
provide('collapseValue', collapseValue);
provide('updateCollapseValue', updateCollapseValue);
provide('collapseProps', toRefs(props));
provide('getUniqId', getUniqId);
return () => {
const nodes = renderTNodeJSX('default');
if (Array.isArray(nodes)) {
nodes.forEach((node, index) => {
const { props, type } = node;
if ((type as any)?.name === 'TCollapsePanel' && props?.value === undefined) {
if (props) {
props.value = index;
}
}
});
}
return <div class={classes.value}>{nodes}</div>;
};
},
Expand Down