Skip to content

Commit 60368c1

Browse files
author
Brijesh Bittu
committed
Fix argument processing for constant string css
1 parent cc1bf6f commit 60368c1

File tree

4 files changed

+19
-4
lines changed

4 files changed

+19
-4
lines changed

packages/pigment-css-core/src/processors/css.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ export class CssObjectProcessor extends BaseCssProcessor {
249249

250250
getDependencies(): ExpressionValue[] {
251251
const [, ...params] = this.callParam;
252-
return params.flat().filter((param) => 'kind' in param);
252+
return params.flat().filter((param) => 'kind' in param && param.kind !== ValueType.CONST);
253253
}
254254

255255
isMaybeTransformedTemplateLiteral(values: ValueCache): boolean {
@@ -278,13 +278,15 @@ export class CssObjectProcessor extends BaseCssProcessor {
278278
const { themeArgs, pigmentFeatures: { useLayer = true } = {} } = this
279279
.options as TransformedInternalConfig;
280280

281-
const evaluatedValues = (callParams as (LazyValue | FunctionValue)[]).map((param) =>
282-
values.get(param.ex.name),
281+
const evaluatedValues = (callParams as ExpressionValue[]).map((param) =>
282+
param.kind === ValueType.CONST ? param.value : values.get(param.ex.name),
283283
);
284284
let stylesList: (object | Function)[];
285285
// let metadata: any;
286286
// check for css(metadata, [styles]) or css(metadata, style) call
287287
const locations: (SourceLocation | null | undefined)[] = [];
288+
// Remove this condition as this supports an older API that has since been
289+
// removed from TS support.
288290
if (
289291
evaluatedValues.length === 2 &&
290292
evaluatedValues[0] &&

packages/pigment-css-core/tests/css/fixtures/css.input.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,3 +165,10 @@ export const cls6 = css(({ theme }) => ({
165165
},
166166
],
167167
}));
168+
169+
export const cls7 = css(
170+
{
171+
color: '$palette.main',
172+
},
173+
`display: black`,
174+
);

packages/pigment-css-core/tests/css/fixtures/css.output.css

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/pigment-css-core/tests/css/fixtures/css.output.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
css as _css4,
66
css as _css5,
77
css as _css6,
8+
css as _css7,
89
} from '@pigment-css/core/runtime';
910
export const cls1 = /*#__PURE__*/ _css({
1011
classes: 'cx3ztpe',
@@ -113,3 +114,6 @@ export const cls6 = /*#__PURE__*/ _css6({
113114
},
114115
],
115116
});
117+
export const cls7 = /*#__PURE__*/ _css7({
118+
classes: 'c10qevxu c10qevxu-1',
119+
});

0 commit comments

Comments
 (0)