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

Jump to bottom

fix: 🐛 prevent rewrite of inset property when border variant was selected in sd-teaser #422

Merged
merged 3 commits into from
Sep 22, 2023
Merged

fix: 🐛 prevent rewrite of inset property when border variant was selected in sd-teaser #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
89f67f5
fix: prevent rewrite of inset property
azraefendic Sep 21, 2023
356c60c
chore: add a new test for inset
azraefendic Sep 21, 2023
ebb2bc1
fix: remove extra line
azraefendic Sep 21, 2023
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
11 changes: 11 additions & 0 deletions packages/components/src/components/teaser/teaser.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,4 +172,15 @@ describe('<sd-teaser>', () => {
});
});
});
it('keeps inset property as false after changing variant', async () => {
const el = await fixture<SdTeaser>(html`<sd-teaser variant="white border-neutral-300"></sd-teaser>`);

expect(el.variant).to.equal('white border-neutral-300');

el.variant = 'neutral-100';
await el.updateComplete;

expect(el.variant).to.equal('neutral-100');
expect(el.inset).to.equal(false); // The inset should be false after the variant change
});
});
12 changes: 5 additions & 7 deletions packages/components/src/components/teaser/teaser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,7 @@ export default class SdTeaser extends SolidElement {
}

render() {
if (this.variant === 'white border-neutral-300') {
this.inset = true;
}
const inset = this.variant === 'white border-neutral-300' || this.inset;

const slots = {
'teaser-has-default': this.hasSlotController.test('[default]'),
Expand All @@ -102,13 +100,13 @@ export default class SdTeaser extends SolidElement {
}[this.variant],
this._orientation === 'vertical' && 'flex-col',
this._orientation === 'horizontal' && 'flex-row gap-8',
this._orientation === 'horizontal' && this.inset && 'py-8 px-10'
this._orientation === 'horizontal' && inset && 'py-8 px-10'
)}
part="base"
>
<div
style=${this._orientation === 'horizontal' ? `width: var(--distribution-media, 100%);` : ''}
class=${cx(!this.inset && this._orientation === 'vertical' && 'mb-4', !slots['teaser-has-media'] && 'hidden')}
class=${cx(!inset && this._orientation === 'vertical' && 'mb-4', !slots['teaser-has-media'] && 'hidden')}
part="media"
>
<slot name="media"></slot>
Expand All @@ -117,13 +115,13 @@ export default class SdTeaser extends SolidElement {
<div
style=${this._orientation === 'horizontal'
? `width: var(--distribution-content, 100%); ${
this.inset ? 'width: var(--distribution-content, calc(100% - 2rem));' : ''
inset ? 'width: var(--distribution-content, calc(100% - 2rem));' : ''
}`
: ''}
class=${cx(
'flex flex-col text-left',
this._orientation === 'horizontal' && `flex flex-col`,
this._orientation === 'vertical' && this.inset && 'm-4'
this._orientation === 'vertical' && inset && 'm-4'
)}
part="content"
>
Expand Down
Loading