Ensure that ID value in compiled CSS is applied to all rules #92
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
machow
requested changes
Dec 15, 2023
great_tables/_scss.py
Outdated
| @@ -138,7 +138,10 @@ def compile_scss(data: GTData, id: Optional[str], compress: bool = True) -> str: | |||
| if has_id: | |||
| compiled_css = re.sub(r"\.gt_", f"#{id} .gt_", compiled_css, 0, re.MULTILINE) | |||
| compiled_css = re.sub(r"thead", f"#{id} thead", compiled_css, 0, re.MULTILINE) | |||
| compiled_css = re.sub(r"^p \{", f"#{id} p " + "{", compiled_css, 0, re.MULTILINE) | |||
| if compress: | |||
| compiled_css = re.sub(r"^ p \{", f" #{id} p " + "{", compiled_css, 0, re.MULTILINE) | |||
There was a problem hiding this comment.
I wonder if this could be condensed into a single regex?
re.sub(r"^( p|p) \{", f" #{id} p {{", compiled_css, 0, re.MULTILINE)The main difference is using ^( p|p) to capture that the difference is whether people has a space or not.
Here's how I tested:
f = lambda x, id="ABC": re.sub(r"^( p|p) \{", f" #{id} p {{", x, 0, re.MULTILINE)
# substitutes
f(" p {abc")
f("p {abc")
# no substitute (good!)
f("group {abc")There was a problem hiding this comment.
Yep, that is totally good. I'll make the change!
|
I'm surprised this didn't fail / require regenerating any of the snapshot tests. (I guess maybe it's because the css one used condensed = False?). |
|
^^^ that's right. The snapshot test is only for that case. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes a
re.sub()statement in thecompile_scss()function so that the table ID is inserted before the rule for thepelement. This corrects a regression where the compiled CSS no longer worked with one of there.sub()statements. With this fix, the rule for the table's<p>element is specific to the table (and doesn't affect the page itself).