Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 28 additions & 0 deletions src/tests/__snapshots__/cssNamespace.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,34 @@ export default MyStyledComponent;
"
`;

exports[`styled-components-css-namespace adds workspace to simple component with nested css: adds workspace to simple component with nested css 1`] = `
"
const styled = { div() {} };

const padding = 'padding: 2px 2px 2px 2px;';

const MyStyledComponent = styled.div\`
\${padding}
\`;

export default MyStyledComponent;

↓ ↓ ↓ ↓ ↓ ↓

const styled = {
div() {}

};
const padding = 'padding: 2px 2px 2px 2px;';
const MyStyledComponent = styled.div\`
.class-wrapper .other-wrapper & {
\${padding}
}
\`;
export default MyStyledComponent;
"
`;

exports[`styled-components-css-namespace does not add extra selectors to child helper styles: does not add extra selectors to child helper styles 1`] = `
"
const styled = { div() {} };
Expand Down
10 changes: 10 additions & 0 deletions src/tests/cssNamespace.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,16 @@ pluginTester({
__dirname,
'./fixtures/reordered-template-expressions.js'
)
},
{
title: 'adds workspace to simple component with nested css',
pluginOptions: {
cssNamespace: '.class-wrapper .other-wrapper'
},
fixture: path.join(
__dirname,
'./fixtures/simple_composed_styled_component.js'
)
}

/**
Expand Down
9 changes: 9 additions & 0 deletions src/tests/fixtures/simple_composed_styled_component.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
const styled = { div() {} };

const padding = 'padding: 2px 2px 2px 2px;';

const MyStyledComponent = styled.div`
${padding}
`;

export default MyStyledComponent;
4 changes: 3 additions & 1 deletion src/visitors/cssNamespace.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,9 @@ export default (path, state) => {
rawValueWithoutWhiteSpace.endsWith('{') ||
rawValueWithoutWhiteSpace.endsWith('}') ||
rawValueWithoutWhiteSpace.endsWith(';')) &&
(!nextQuasi || (nextQuasi && nextQuasi.value.raw.startsWith(';')))
(!nextQuasi ||
(nextQuasi.value.raw.startsWith(';') ||
nextQuasi.value.raw.trim() === ''))
) {
return `${rawValue}${EXPRESSION}-${i}: ${FAKE_VALUE}`;
}
Expand Down