Skip to content

fix: check for CQU in shadow container for Safari (V24) #10325

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

Merged
merged 1 commit into from
Oct 15, 2025
Merged

fix: check for CQU in shadow container for Safari (V24) #10325

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
16 changes: 13 additions & 3 deletions packages/icon/src/vaadin-icon-helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,21 @@ export function supportsCQUnitsForPseudoElements() {
const testElement = document.createElement('div');
testElement.classList.add('vaadin-icon-test-element');

document.body.append(testStyle, testElement);
const { height } = getComputedStyle(testElement, '::before');
const shadowParent = document.createElement('div');
shadowParent.attachShadow({ mode: 'open' });
shadowParent.shadowRoot.innerHTML = '<slot></slot>';
shadowParent.append(testElement.cloneNode());

document.body.append(testStyle, testElement, shadowParent);

const needsFallback = [...document.querySelectorAll('.vaadin-icon-test-element')].find(
(el) => getComputedStyle(el, '::before').height !== '2px',
);

testStyle.remove();
testElement.remove();
return height === '2px';
shadowParent.remove();
return !needsFallback;
}

/**
Expand Down
13 changes: 13 additions & 0 deletions packages/icon/test/icon-font.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,5 +334,18 @@ describe('vaadin-icon - icon fonts', () => {
await nextFrame(icon);
expect(icon.style.getPropertyValue('--_vaadin-font-icon-size')).to.equal('');
});

fallBackIt('should have the same height as the host with shadow root', async () => {
icon = fixtureSync('<vaadin-icon char="foo" style="--vaadin-icon-size: 24px"></vaadin-icon>');
const parent = fixtureSync('<div></div>');
parent.attachShadow({ mode: 'open' });
parent.shadowRoot.innerHTML = '<slot></slot>';

parent.append(icon);
await nextResize(icon);

const fontIconStyle = getComputedStyle(icon, ':before');
expect(parseInt(fontIconStyle.height)).to.be.closeTo(24, 1);
});
});
});