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

Allow numbers to be used as values in styleMap() #3788

Merged
merged 3 commits into from Apr 5, 2023
Merged

Allow numbers to be used as values in styleMap() #3788

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1bd878
Allow numbers to be used as values in styleMap()
justinfagnani Apr 5, 2023
1a60f44
Update packages/lit-html/src/test/directives/style-map_test.ts
justinfagnani Apr 5, 2023
e33a2b2
Apply suggestions from code review
augustjk Apr 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/slimy-clouds-roll.md
View file
Open in desktop
@@ -0,0 +1,7 @@
---
'lit-html': patch
'lit': patch
'lit-element': patch
augustjk marked this conversation as resolved.
Show resolved Hide resolved
---

Allow numbers to be used as values in styleMap()
9 changes: 6 additions & 3 deletions packages/lit-html/src/directives/style-map.ts
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ import {
* for CSSStyleDeclaration like `backgroundColor`.
*/
export interface StyleInfo {
[name: string]: string | undefined | null;
[name: string]: string | number | undefined | null;
}

const important = 'important';
Expand Down Expand Up @@ -101,11 +101,14 @@ class StyleMapDirective extends Directive {
const value = styleInfo[name];
if (value != null) {
this._previousStyleProperties.add(name);
const isImportant = value.endsWith(importantFlag);
const isImportant =
typeof value === 'string' && value.endsWith(importantFlag);
if (name.includes('-') || isImportant) {
style.setProperty(
name,
isImportant ? value.slice(0, flagTrim) : value,
isImportant
? (value as string).slice(0, flagTrim)
: (value as string),
isImportant ? important : ''
);
} else {
Expand Down
14 changes: 12 additions & 2 deletions packages/lit-html/src/test/directives/style-map_test.ts
View file
Open in desktop
Expand Up @@ -79,12 +79,22 @@ suite('styleMap', () => {
});

test('adds and updates properties', () => {
renderStyleMap({marginTop: '2px', 'padding-bottom': '4px', opacity: '0.5'});
renderStyleMap({
marginTop: '2px',
'padding-bottom': '4px',
opacity: '0.5',
'z-index': 10,
});
const el = container.firstElementChild as HTMLElement;
assert.equal(el.style.marginTop, '2px');
assert.equal(el.style.paddingBottom, '4px');
assert.equal(el.style.opacity, '0.5');
augustjk marked this conversation as resolved.
Show resolved Hide resolved
renderStyleMap({marginTop: '4px', paddingBottom: '8px', opacity: '0.55'});
renderStyleMap({
marginTop: '4px',
paddingBottom: '8px',
opacity: '0.55',
'z-index': 1,
});
assert.equal(el.style.marginTop, '4px');
assert.equal(el.style.paddingBottom, '8px');
assert.equal(el.style.opacity, '0.55');
justinfagnani marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
4 changes: 2 additions & 2 deletions packages/tests/src/web-test-runner.config.ts
View file
Open in desktop
Expand Up @@ -24,8 +24,8 @@ const browserPresets = {
// Default set of Playwright browsers to test when running locally.
local: [
'chromium', // keep browsers on separate lines
'firefox', // to make it easier to comment out
'webkit', // individual browsers
// 'firefox', // to make it easier to comment out
// 'webkit', // individual browsers
augustjk marked this conversation as resolved.
Show resolved Hide resolved
],

// Browsers to test during automated continuous integration.
Expand Down