Skip to content

Add margin-*, padding-*, scroll-snap-* CSS properties #1011

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

Merged
merged 4 commits into from
Dec 1, 2024
Merged

Add margin-*, padding-*, scroll-snap-* CSS properties #1011

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5dfe307
Add margin-*, padding-*, scroll-snap-* CSS properties
torusrxxx Nov 30, 2024
c5ddfc8
Use existing verifier for margin and padding
torusrxxx Dec 1, 2024
77623ef
Support CSS property text-orientation
torusrxxx Dec 1, 2024
b4d5b83
Add CSS property text-underline-offset
torusrxxx Dec 1, 2024
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
114 changes: 109 additions & 5 deletions src/freenet/client/filter/CSSTokenizerFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,10 +238,16 @@ public static <T> T[] concat(T[] a, T[] b) {
allelementVerifiers.add("list-style-position");
allelementVerifiers.add("list-style-type");
allelementVerifiers.add("list-style");
allelementVerifiers.add("margin-right");
allelementVerifiers.add("margin-block");
allelementVerifiers.add("margin-block-end");
allelementVerifiers.add("margin-block-start");
allelementVerifiers.add("margin-bottom");
allelementVerifiers.add("margin-inline");
allelementVerifiers.add("margin-inline-end");
allelementVerifiers.add("margin-inline-start");
allelementVerifiers.add("margin-left");
allelementVerifiers.add("margin-right");
allelementVerifiers.add("margin-top");
allelementVerifiers.add("margin-bottom");
allelementVerifiers.add("margin");
allelementVerifiers.add("max-block-size");
allelementVerifiers.add("max-height");
Expand All @@ -267,10 +273,16 @@ public static <T> T[] concat(T[] a, T[] b) {
allelementVerifiers.add("outline");
allelementVerifiers.add("overflow");
allelementVerifiers.add("overflow-wrap");
allelementVerifiers.add("padding-top");
allelementVerifiers.add("padding-right");
allelementVerifiers.add("padding-block");
allelementVerifiers.add("padding-block-end");
allelementVerifiers.add("padding-block-start");
allelementVerifiers.add("padding-bottom");
allelementVerifiers.add("padding-inline");
allelementVerifiers.add("padding-inline-end");
allelementVerifiers.add("padding-inline-start");
allelementVerifiers.add("padding-left");
allelementVerifiers.add("padding-right");
allelementVerifiers.add("padding-top");
allelementVerifiers.add("padding");
allelementVerifiers.add("page-break-after");
allelementVerifiers.add("page-break-before");
Expand All @@ -287,6 +299,10 @@ public static <T> T[] concat(T[] a, T[] b) {
allelementVerifiers.add("resize");
allelementVerifiers.add("richness");
allelementVerifiers.add("right");
allelementVerifiers.add("scroll-behavior");
allelementVerifiers.add("scroll-snap-align");
allelementVerifiers.add("scroll-snap-stop");
allelementVerifiers.add("scroll-snap-type");
allelementVerifiers.add("speak-header");
allelementVerifiers.add("speak-numeral");
allelementVerifiers.add("speak-punctuation");
Expand Down Expand Up @@ -346,7 +362,7 @@ public static <T> T[] concat(T[] a, T[] b) {
* Array for storing additional Verifier objects for validating Regular expressions in CSS Property value
* e.g. [ <color> | transparent]{1,4}. It is explained in detail in CSSPropertyVerifier class
*/
private final static CSSPropertyVerifier[] auxilaryVerifiers=new CSSPropertyVerifier[149];
private final static CSSPropertyVerifier[] auxilaryVerifiers=new CSSPropertyVerifier[150];
static
{
/*CSSPropertyVerifier(String[] allowedValues,String[] possibleValues,String expression,boolean onlyValueVerifier)*/
Expand Down Expand Up @@ -381,6 +397,11 @@ public static <T> T[] concat(T[] a, T[] b) {
auxilaryVerifiers[74]=new CSSPropertyVerifier(null, null, Arrays.asList("72<1,4>"), null, true);
auxilaryVerifiers[75]=new CSSPropertyVerifier(null, null, Arrays.asList("71a74a73"), null, true);

// <margin-block>
auxilaryVerifiers[80]=new CSSPropertyVerifier(Arrays.asList("auto"), Arrays.asList("le","pe"), null, null, true);
// <padding-block>
auxilaryVerifiers[81]=new CSSPropertyVerifier(null, Arrays.asList("le","pe"), null, null, true);

// <border-image-source>
auxilaryVerifiers[76]=new CSSPropertyVerifier(Arrays.asList("none"),Arrays.asList("ur"),null,null,true);

Expand Down Expand Up @@ -1211,6 +1232,36 @@ else if("margin-bottom".equalsIgnoreCase(element))
elementVerifiers.put(element,new CSSPropertyVerifier(Arrays.asList("auto"),ElementInfo.VISUALMEDIA,Arrays.asList("le","pe")));
allelementVerifiers.remove(element);
}
else if("margin-block".equalsIgnoreCase(element))
{
elementVerifiers.put(element,new CSSPropertyVerifier(null,ElementInfo.VISUALMEDIA,null,Arrays.asList("80<1,2>")));
allelementVerifiers.remove(element);
}
else if("margin-block-end".equalsIgnoreCase(element))
{
elementVerifiers.put(element,new CSSPropertyVerifier(Arrays.asList("auto"),ElementInfo.VISUALMEDIA,Arrays.asList("le","pe")));
allelementVerifiers.remove(element);
}
else if("margin-block-start".equalsIgnoreCase(element))
{
elementVerifiers.put(element,new CSSPropertyVerifier(Arrays.asList("auto"),ElementInfo.VISUALMEDIA,Arrays.asList("le","pe")));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this refer to auxilaryVerifiers[36] as 36 instead of hard-coding length | percentage?

(same for margin-block-end, similar for all the others padding/margin variants added)

allelementVerifiers.remove(element);
}
else if("margin-inline".equalsIgnoreCase(element))
{
elementVerifiers.put(element,new CSSPropertyVerifier(null,ElementInfo.VISUALMEDIA,null,Arrays.asList("80<1,2>")));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we refer to the existing auxilaryVerifiers[36] that is used for margin (after moving that one to the static initializer) as 36<1,2> instead of adding yet another verifier?

(same for margin-block)

allelementVerifiers.remove(element);
}
else if("margin-inline-end".equalsIgnoreCase(element))
{
elementVerifiers.put(element,new CSSPropertyVerifier(Arrays.asList("auto"),ElementInfo.VISUALMEDIA,Arrays.asList("le","pe")));
allelementVerifiers.remove(element);
}
else if("margin-inline-start".equalsIgnoreCase(element))
{
elementVerifiers.put(element,new CSSPropertyVerifier(Arrays.asList("auto"),ElementInfo.VISUALMEDIA,Arrays.asList("le","pe")));
allelementVerifiers.remove(element);
}
else if("margin".equalsIgnoreCase(element))
{
//margin-width
Expand Down Expand Up @@ -1347,6 +1398,36 @@ else if("padding-left".equalsIgnoreCase(element))
elementVerifiers.put(element,new CSSPropertyVerifier(null,ElementInfo.VISUALMEDIA,Arrays.asList("le","pe")));
allelementVerifiers.remove(element);
}
else if("padding-block".equalsIgnoreCase(element))
{
elementVerifiers.put(element,new CSSPropertyVerifier(null,ElementInfo.VISUALMEDIA,null,Arrays.asList("81<1,2>")));
allelementVerifiers.remove(element);
}
else if("padding-block-end".equalsIgnoreCase(element))
{
elementVerifiers.put(element,new CSSPropertyVerifier(null,ElementInfo.VISUALMEDIA,Arrays.asList("le","pe")));
allelementVerifiers.remove(element);
}
else if("padding-block-start".equalsIgnoreCase(element))
{
elementVerifiers.put(element,new CSSPropertyVerifier(null,ElementInfo.VISUALMEDIA,Arrays.asList("le","pe")));
allelementVerifiers.remove(element);
}
else if("padding-inline".equalsIgnoreCase(element))
{
elementVerifiers.put(element,new CSSPropertyVerifier(null,ElementInfo.VISUALMEDIA,null,Arrays.asList("81<1,2>")));
allelementVerifiers.remove(element);
}
else if("padding-inline-end".equalsIgnoreCase(element))
{
elementVerifiers.put(element,new CSSPropertyVerifier(null,ElementInfo.VISUALMEDIA,Arrays.asList("le","pe")));
allelementVerifiers.remove(element);
}
else if("padding-inline-start".equalsIgnoreCase(element))
{
elementVerifiers.put(element,new CSSPropertyVerifier(null,ElementInfo.VISUALMEDIA,Arrays.asList("le","pe")));
allelementVerifiers.remove(element);
}
else if("padding".equalsIgnoreCase(element))
{
//padding-width
Expand Down Expand Up @@ -1444,6 +1525,29 @@ else if("right".equalsIgnoreCase(element))
elementVerifiers.put(element,new CSSPropertyVerifier(Arrays.asList("auto"),ElementInfo.VISUALMEDIA,Arrays.asList("le","pe")));
allelementVerifiers.remove(element);
}
else if("scroll-behavior".equalsIgnoreCase(element))
{
elementVerifiers.put(element,new CSSPropertyVerifier(Arrays.asList("auto","smooth"),ElementInfo.VISUALMEDIA));
allelementVerifiers.remove(element);
}
else if("scroll-snap-align".equalsIgnoreCase(element))
{
auxilaryVerifiers[82]=new CSSPropertyVerifier(Arrays.asList("none","start","end","center"),null,null,null,true);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any reason for not describing this auxilaryVerifiers entry and the ones for scroll-snap-type in the static initializer together with the existing ones?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are lots of such cases, I think it is because if there's no use of this property in the CSS, then it does not need to initialize this entry.

elementVerifiers.put(element,new CSSPropertyVerifier(null,ElementInfo.VISUALMEDIA,null,Arrays.asList("82<1,2>")));
allelementVerifiers.remove(element);
}
else if("scroll-snap-stop".equalsIgnoreCase(element))
{
elementVerifiers.put(element,new CSSPropertyVerifier(Arrays.asList("normal","always"),ElementInfo.VISUALMEDIA));
allelementVerifiers.remove(element);
}
else if("scroll-snap-type".equalsIgnoreCase(element))
{
auxilaryVerifiers[103]=new CSSPropertyVerifier(Arrays.asList("x","y","block","inline","both"),null,null,null,true);
auxilaryVerifiers[149]=new CSSPropertyVerifier(Arrays.asList("mandatory","proximity"),null,null,null,true);
elementVerifiers.put(element,new CSSPropertyVerifier(Arrays.asList("none"),ElementInfo.VISUALMEDIA,null,Arrays.asList("103","103 149")));
allelementVerifiers.remove(element);
}
else if("speak-header".equalsIgnoreCase(element))
{
elementVerifiers.put(element,new CSSPropertyVerifier(Arrays.asList("once","always"),ElementInfo.AURALMEDIA));
Expand Down
5 changes: 5 additions & 0 deletions test/freenet/client/filter/CSSParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,6 +992,11 @@ public class CSSParserTest {
propertyTests.put("#x { text-combine-upright: all; }", "#x { text-combine-upright: all; }");
propertyTests.put("#x { text-decoration-thickness: 5px; }", "#x { text-decoration-thickness: 5px; }");
propertyTests.put("#x { dominant-baseline: alphabetic; }", "#x { dominant-baseline: alphabetic; }");
propertyTests.put("#x { margin-block: 3px 3%; margin-inline: 5%; margin-inline-end: 4px; margin-inline-start: auto; }", "#x { margin-block: 3px 3%; margin-inline: 5%; margin-inline-end: 4px; margin-inline-start: auto; }");
propertyTests.put("#x { padding-block: 3px 3%; padding-inline: 5%; padding-inline-end: 4px; padding-inline-start: 1em; }", "#x { padding-block: 3px 3%; padding-inline: 5%; padding-inline-end: 4px; padding-inline-start: 1em; }");
propertyTests.put("#x { scroll-snap-align: start end; }", "#x { scroll-snap-align: start end; }");
propertyTests.put("#x { scroll-snap-stop: always; }", "#x { scroll-snap-stop: always; }");
propertyTests.put("#x { scroll-snap-type: both proximity; }", "#x { scroll-snap-type: both proximity; }");

// text-emphasis
propertyTests.put("#x { text-emphasis: triangle blue; }", "#x { text-emphasis: triangle blue; }"); // java.lang.NullPointerException
Expand Down