Skip to content

style(collapse): refactor DOM, enhance CSS vars, accessible header inherits parent width #5520

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
RSS1102 wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

style(collapse): refactor DOM, enhance CSS vars, accessible header inherits parent width #5520

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
f646946
refactor(collapse-panel): optimize layout structure
RSS1102 May 29, 2025
ef1e8bc
test(collapse-panel): update test selectors for header content
RSS1102 May 29, 2025
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
7 changes: 2 additions & 5 deletions packages/components/collapse/__tests__/index.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ describe('Collapse', () => {
},
});

const panel = wrapper.findComponent({ ref: '1' });

expect(wrapper.classes()).not.toContain('t--border-less');

borderless.value = true;
Expand All @@ -27,7 +25,6 @@ describe('Collapse', () => {
});

test(':defaultExpandAll', async () => {
const defaultExpandAll = ref(false);
const wrapper = mount({
setup() {
return () => (
Expand Down Expand Up @@ -355,7 +352,7 @@ describe('CollapsePanel', () => {
});

const panel = wrapper.findComponent({ ref: '1' });
expect(panel.find('.t-collapse-panel__header > h4').html()).toBe('<h4>标题</h4>');
expect(panel.find('.t-collapse-panel__header-content > h4').html()).toBe('<h4>标题</h4>');
});

test('headerRightContent', () => {
Expand All @@ -374,7 +371,7 @@ describe('CollapsePanel', () => {
});

const panel = wrapper.findComponent({ ref: '1' });
expect(panel.find('.t-collapse-panel__header > div > span').html()).toBe('<span>操作</span>');
expect(panel.find('.t-collapse-panel__header-right-content > span').html()).toBe('<span>操作</span>');
});

test('content', () => {
Expand Down
31 changes: 20 additions & 11 deletions packages/components/collapse/collapse-panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,7 @@ export default defineComponent({
}
e.stopPropagation();
};
const handleHeaderRightContentClick = (e: MouseEvent) => {
e.stopPropagation();
};

const renderDefaultIcon = () => {
return <FakeArrow overlayClassName={`${componentName.value}__icon--default`} />;
};
Expand All @@ -68,14 +66,11 @@ export default defineComponent({
</div>
);
};

const renderBlank = () => {
return <div class={`${componentName.value}__header--blank`}></div>;
};
const renderHeaderRightContent = () => {
const headerRightContent = renderTNodeJSX('headerRightContent');

return headerRightContent ? <div onClick={handleHeaderRightContentClick}>{headerRightContent}</div> : null;
};
const renderHeader = () => {
const cls = [
`${componentName.value}__header`,
Expand All @@ -84,13 +79,27 @@ export default defineComponent({
},
];

const handleHeaderRightContentClick = (e: MouseEvent) => {
e.stopPropagation();
};

const renderHeaderRightContent = () => (
<div class={`${componentName.value}__header-right-content`} onClick={handleHeaderRightContentClick}>
{renderTNodeJSX('headerRightContent')}
</div>
);

return (
<div class={cls} onClick={handleClick}>
{expandIconPlacement.value === 'left' && renderIcon()}
{renderTNodeJSX('header')}
<div class={`${componentName.value}__header-left`}>
{expandIconPlacement.value === 'left' && renderIcon()}
</div>
<div class={`${componentName.value}__header-content`}>{renderTNodeJSX('header')}</div>
{renderBlank()}
{renderHeaderRightContent()}
{expandIconPlacement.value === 'right' && renderIcon()}
<div class={`${componentName.value}__header-right`}>
{renderHeaderRightContent()}
{expandIconPlacement.value === 'right' && renderIcon()}
</div>
</div>
);
};
Expand Down