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

Fix: border-left not being rendered #128

Merged
merged 2 commits into from
Dec 11, 2023
Merged

Fix: border-left not being rendered #128

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
587ca6e
Fix: border-left not being rendered
nmn Dec 11, 2023
816f97d
Update snapshots
nmn Dec 11, 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
51 changes: 51 additions & 0 deletions packages/babel-plugin/__tests__/stylex-transform-call-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1142,6 +1142,57 @@ describe('@stylexjs/babel-plugin', () => {
`);
});

test('stylex call with composition border shorthands with external styles', () => {
expect(
transform(`
import stylex from 'stylex';
stylex(styles.default, props);
const styles = stylex.create({
default: {
borderTop: '5px solid blue',
borderLeft: '5px solid blue',
borderRight: '5px solid blue',
borderBottom: '5px solid blue',
},
});
`),
).toMatchInlineSnapshot(`
"import stylex from 'stylex';
stylex(styles.default, props);
stylex.inject(".x16gpukw{border-top:5px solid blue}", 2000);
stylex.inject(".x13nwy86{border-left:5px solid blue}", 2000);
stylex.inject(".x2ekbea{border-right:5px solid blue}", 2000);
stylex.inject(".x1o3008b{border-bottom:5px solid blue}", 2000);
const styles = {
default: {
borderTop: "x16gpukw",
borderTopWidth: null,
borderTopStyle: null,
borderTopColor: null,
borderLeft: "x13nwy86",
borderLeftWidth: null,
borderInlineStartWidth: null,
borderInlineEndWidth: null,
borderLeftStyle: null,
borderInlineStartStyle: null,
borderInlineEndStyle: null,
borderLeftColor: null,
borderInlineStartColor: null,
borderInlineEndColor: null,
borderRight: "x2ekbea",
borderRightWidth: null,
borderRightStyle: null,
borderRightColor: null,
borderBottom: "x1o3008b",
borderBottomWidth: null,
borderBottomStyle: null,
borderBottomColor: null,
$$css: true
}
};"
`);
});

test('stylex call using exported styles with pseudo selectors, and queries', () => {
expect(
transform(`
Expand Down
24 changes: 14 additions & 10 deletions packages/babel-plugin/__tests__/stylex-transform-create-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,10 +727,8 @@ describe('@stylexjs/babel-plugin', () => {
stylex.inject(".x1lh7sze{border-color:var(--divider)}", 2000);
stylex.inject(".xud65wk{border-bottom-color:red}", 4000);
stylex.inject(".x12oqio5{border-radius:4px}", 2000);
stylex.inject(".x1lmef92{padding:calc((100% - 50px) * .5) var(--rightpadding,20px)}", 1000);
stylex.inject(".xexx8yu{padding-top:0}", 4000);
stylex.inject(".xcrpjku{padding-right:var(--rightpadding,20px)}", 3000, ".xcrpjku{padding-left:var(--rightpadding,20px)}");
stylex.inject(".x18xuxqe{padding-bottom:calc((100% - 50px) * .5)}", 4000);
stylex.inject(".xyv1419{padding-left:var(--rightpadding,20px)}", 3000, ".xyv1419{padding-right:var(--rightpadding,20px)}");
stylex.inject(".x1bg2uv5{border-color:green}", 2000);"
`);
});
Expand Down Expand Up @@ -893,17 +891,23 @@ describe('@stylexjs/babel-plugin', () => {
$$css: true
},
short: {
padding: "x1lmef92",
paddingStart: null,
paddingLeft: null,
paddingEnd: null,
paddingRight: null,
paddingTop: "xexx8yu",
paddingEnd: "xcrpjku",
paddingBottom: "x18xuxqe",
paddingStart: "xyv1419",
paddingBottom: null,
$$css: true
},
shortReversed: {
paddingTop: "xx5yw1q",
paddingEnd: "xcrpjku",
paddingBottom: "x18xuxqe",
paddingStart: "xyv1419",
paddingTop: null,
padding: "x1lmef92",
paddingStart: null,
paddingLeft: null,
paddingEnd: null,
paddingRight: null,
paddingBottom: null,
$$css: true
},
valid: {
Expand Down
25 changes: 9 additions & 16 deletions packages/shared/__tests__/stylex-create-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,33 +204,26 @@ describe('stylex-create-test', () => {
{
"short": {
"$$css": true,
"paddingBottom": "x18xuxqe",
"paddingEnd": "xcrpjku",
"paddingStart": "xyv1419",
"padding": "x1lmef92",
"paddingBottom": null,
"paddingEnd": null,
"paddingLeft": null,
"paddingRight": null,
"paddingStart": null,
"paddingTop": "xexx8yu",
},
},
{
"x18xuxqe": {
"ltr": ".x18xuxqe{padding-bottom:calc((100% - 50px) * .5)}",
"priority": 4000,
"x1lmef92": {
"ltr": ".x1lmef92{padding:calc((100% - 50px) * .5) var(--rightpadding,20px)}",
"priority": 1000,
"rtl": null,
},
"xcrpjku": {
"ltr": ".xcrpjku{padding-right:var(--rightpadding,20px)}",
"priority": 3000,
"rtl": ".xcrpjku{padding-left:var(--rightpadding,20px)}",
},
"xexx8yu": {
"ltr": ".xexx8yu{padding-top:0}",
"priority": 4000,
"rtl": null,
},
"xyv1419": {
"ltr": ".xyv1419{padding-left:var(--rightpadding,20px)}",
"priority": 3000,
"rtl": ".xyv1419{padding-right:var(--rightpadding,20px)}",
},
},
]
`);
Expand Down
36 changes: 11 additions & 25 deletions packages/shared/src/preprocess-rules/application-order.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

import type { TStyleValue } from '../common-types';

import splitValue from '../utils/split-css-value';

/**
* Shorthand properties:
* - [x] all - Should be banned
Expand Down Expand Up @@ -156,15 +154,15 @@ const shorthands = {
['borderBottomColor', null],
],
// @Deprecated
borderInlineStart: (_rawValue: TStyleValue): TReturn => [
['borderInlineStart', null],
borderInlineStart: (rawValue: TStyleValue): TReturn => [
['borderInlineStart', rawValue],
...shorthands.borderInlineStartWidth(null),
...shorthands.borderInlineStartStyle(null),
...shorthands.borderInlineStartColor(null),
],
// @Deprecated
borderLeft: (_rawValue: TStyleValue): TReturn => [
['borderLeft', null],
borderLeft: (rawValue: TStyleValue): TReturn => [
['borderLeft', rawValue],
...shorthands.borderLeftWidth(null),
...shorthands.borderLeftStyle(null),
...shorthands.borderLeftColor(null),
Expand Down Expand Up @@ -567,26 +565,14 @@ const shorthands = {
],

padding: (rawValue: TStyleValue): TReturn => {
const values =
typeof rawValue === 'number' ? [rawValue] : splitValue(rawValue);
if (values.length === 1) {
return [
['padding', values[0]],
['paddingStart', null],
['paddingLeft', null],
['paddingEnd', null],
['paddingRight', null],
['paddingTop', null],
['paddingBottom', null],
];
}
// @Deprecated
const [top, right = top, bottom = top, left = right] = values;
return [
['paddingTop', top],
['paddingEnd', right],
['paddingBottom', bottom],
['paddingStart', left],
['padding', rawValue],
['paddingStart', null],
['paddingLeft', null],
['paddingEnd', null],
['paddingRight', null],
['paddingTop', null],
['paddingBottom', null],
];
},
paddingInline: (rawValue: TStyleValue): TReturn => [
Expand Down
Loading