Skip to content

fix: correctly scope CSS selectors with descendant combinators #10502

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.

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 22 commits into from
Feb 16, 2024

Conversation

Rich-Harris
Copy link
Member

@Rich-Harris Rich-Harris commented Feb 16, 2024

Ok, I've been on a journey.

It turns out our current logic for scoping CSS selectors with descendant combinators is flawed. We're also adding scoping classes in places where it shouldn't be necessary (though that's still true, to an extent, in this PR — might be good follow-up work).

Consider a case like this, where the <Y> component consists of <y><slot /></y>:

<script>
  import Y from './Y.svelte';
</script>

<x>
  <y>
    <z>this should be red</z>
  </y>
</x>

<x>
  <Y>
    <z>this should not be red</z>
  </Y>
</x>

<style>
  x y z {
    display: block;
    color: red;
  }
</style>

Currently, we turn that into x.blah y z.blah {...} and apply the corresponding classes to <x> and <z>. But that means we incorrectly target the second <z> element.

Fixing that without breaking anything else turned out to be hellaciously complicated. All the tests are passing now, but the code could probably use a bit of tidying up.

Before submitting the PR, please make sure you do the following

  • It's really useful if your PR references an issue where it is discussed ahead of time. In many cases, features are absent for a reason. For large changes, please create an RFC: https://github.com/sveltejs/rfcs
  • Prefix your PR title with feat:, fix:, chore:, or docs:.
  • This message body should clearly illustrate what problems it solves.
  • Ideally, include a test that fails without this PR but passes with it.

Tests and linting

  • Run the tests with pnpm test and lint the project with pnpm lint

Copy link

changeset-bot bot commented Feb 16, 2024

🦋 Changeset detected

Latest commit: 7a79279

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
Name Type
svelte Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@Rich-Harris Rich-Harris marked this pull request as draft February 16, 2024 21:16
@Rich-Harris Rich-Harris merged commit 91d02cc into css-nesting Feb 16, 2024
@Rich-Harris Rich-Harris deleted the css-descendant-combinator branch February 16, 2024 22:27
Rich-Harris added a commit that referenced this pull request Feb 16, 2024
* parse nested CSS

* tests

* track parent rules

* some progress

* switch it up

* pruning

* works

* changeset

* lint

* error early on invalid nesting selector

* tidy

* note to self

* fix some specificity stuff

* failing test

* note to self

* fix: correctly scope CSS selectors with descendant combinators (#10502)

* fix traversal, but break some other stuff

* man this is fucken hard

* fixes

* getting closer

* be conservative for now

* tidy

* invert

* invert

* simplify

* switch

* for now

* progress

* i think it works?

* fix

* tidy up

* revert some stuff

* remove some junk

* handle weird cases

* update

* tweak

* shrink

* changeset

---------

Co-authored-by: Rich Harris <[email protected]>

---------

Co-authored-by: Rich Harris <[email protected]>
Rich-Harris added a commit that referenced this pull request Feb 17, 2024
* failing test for :is(...)

* simplify

* trim

* factor out truncate function

* pass stylesheet around

* recurse into :is and :where

* fix types

* fix types

* almost there

* gah so close

* tada

* changeset

* simplify

* feat: nested CSS support (#10491)

* parse nested CSS

* tests

* track parent rules

* some progress

* switch it up

* pruning

* works

* changeset

* lint

* error early on invalid nesting selector

* tidy

* note to self

* fix some specificity stuff

* failing test

* note to self

* fix: correctly scope CSS selectors with descendant combinators (#10502)

* fix traversal, but break some other stuff

* man this is fucken hard

* fixes

* getting closer

* be conservative for now

* tidy

* invert

* invert

* simplify

* switch

* for now

* progress

* i think it works?

* fix

* tidy up

* revert some stuff

* remove some junk

* handle weird cases

* update

* tweak

* shrink

* changeset

---------

Co-authored-by: Rich Harris <[email protected]>

---------

Co-authored-by: Rich Harris <[email protected]>

* Update playgrounds/sandbox/run.js

* changeset

---------

Co-authored-by: Rich Harris <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant