turn on strip clipping by default

teunbrand · teunbrand · commit aec5b40417c2 · 2024-06-24T11:23:02.000+02:00
diff --git a/R/theme-defaults.R b/R/theme-defaults.R
@@ -205,7 +205,7 @@ theme_grey <- function(base_size = 11, base_family = "",
     panel.ontop    =     FALSE,
 
     strip.background =   element_rect(fill = "grey85", colour = NA),
-    strip.clip =         "inherit",
+    strip.clip =         "on",
     strip.text =         element_text(
                            colour = "grey10",
                            size = rel(0.8),
@@ -490,7 +490,7 @@ theme_void <- function(base_size = 11, base_family = "",
     legend.box.margin =  rel(0),
     legend.box.spacing = unit(0.2, "cm"),
     legend.ticks.length = rel(0.2),
-    strip.clip =         "inherit",
+    strip.clip =         "on",
     strip.text =         element_text(size = rel(0.8)),
     strip.switch.pad.grid = rel(0.5),
     strip.switch.pad.wrap = rel(0.5),
@@ -621,7 +621,7 @@ theme_test <- function(base_size = 11, base_family = "",
     panel.ontop    =     FALSE,
 
     strip.background =   element_rect(fill = "grey85", colour = "grey20"),
-    strip.clip =         "inherit",
+    strip.clip =         "on",
     strip.text =         element_text(
                            colour = "grey10",
                            size = rel(0.8),
diff --git a/tests/testthat/_snaps/facet-/facet-wrap-with-omitted-inner-axis-labels.svg b/tests/testthat/_snaps/facet-/facet-wrap-with-omitted-inner-axis-labels.svg
@@ -117,74 +117,110 @@
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
 <defs>
-  <clipPath id='cpMzcuNjl8MjQ5LjQ1fDI5NS44M3wzMjkuMTQ='>
-    <rect x='37.69' y='295.83' width='211.77' height='33.30' />
+  <clipPath id='cpMzcuNjl8MjQ5LjQ1fDI5NS44M3wzMTIuNDg='>
+    <rect x='37.69' y='295.83' width='211.77' height='16.65' />
   </clipPath>
 </defs>
-<g clip-path='url(#cpMzcuNjl8MjQ5LjQ1fDI5NS44M3wzMjkuMTQ=)'>
+<g clip-path='url(#cpMzcuNjl8MjQ5LjQ1fDI5NS44M3wzMTIuNDg=)'>
 <rect x='37.69' y='295.83' width='211.77' height='16.65' style='stroke-width: 1.07; stroke: #333333; fill: #D9D9D9;' />
 <text x='143.57' y='307.19' text-anchor='middle' style='font-size: 8.80px; fill: #1A1A1A; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>6</text>
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzcuNjl8MjQ5LjQ1fDMxMi40OHwzMjkuMTQ='>
+    <rect x='37.69' y='312.48' width='211.77' height='16.65' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzcuNjl8MjQ5LjQ1fDMxMi40OHwzMjkuMTQ=)'>
 <rect x='37.69' y='312.48' width='211.77' height='16.65' style='stroke-width: 1.07; stroke: #333333; fill: #D9D9D9;' />
 <text x='143.57' y='323.84' text-anchor='middle' style='font-size: 8.80px; fill: #1A1A1A; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>1</text>
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
 <defs>
-  <clipPath id='cpMjYwLjQxfDQ3Mi4xOHwyOTUuODN8MzI5LjE0'>
-    <rect x='260.41' y='295.83' width='211.77' height='33.30' />
+  <clipPath id='cpMjYwLjQxfDQ3Mi4xOHwyOTUuODN8MzEyLjQ4'>
+    <rect x='260.41' y='295.83' width='211.77' height='16.65' />
   </clipPath>
 </defs>
-<g clip-path='url(#cpMjYwLjQxfDQ3Mi4xOHwyOTUuODN8MzI5LjE0)'>
+<g clip-path='url(#cpMjYwLjQxfDQ3Mi4xOHwyOTUuODN8MzEyLjQ4)'>
 <rect x='260.41' y='295.83' width='211.77' height='16.65' style='stroke-width: 1.07; stroke: #333333; fill: #D9D9D9;' />
 <text x='366.30' y='307.19' text-anchor='middle' style='font-size: 8.80px; fill: #1A1A1A; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>8</text>
-<rect x='260.41' y='312.48' width='211.77' height='16.65' style='stroke-width: 1.07; stroke: #333333; fill: #D9D9D9;' />
-<text x='366.30' y='323.84' text-anchor='middle' style='font-size: 8.80px; fill: #1A1A1A; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>0</text>
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
 <defs>
-  <clipPath id='cpNDgzLjE0fDY5NC45MXwyOTUuODN8MzI5LjE0'>
-    <rect x='483.14' y='295.83' width='211.77' height='33.30' />
+  <clipPath id='cpMjYwLjQxfDQ3Mi4xOHwzMTIuNDh8MzI5LjE0'>
+    <rect x='260.41' y='312.48' width='211.77' height='16.65' />
   </clipPath>
 </defs>
-<g clip-path='url(#cpNDgzLjE0fDY5NC45MXwyOTUuODN8MzI5LjE0)'>
+<g clip-path='url(#cpMjYwLjQxfDQ3Mi4xOHwzMTIuNDh8MzI5LjE0)'>
+<rect x='260.41' y='312.48' width='211.77' height='16.65' style='stroke-width: 1.07; stroke: #333333; fill: #D9D9D9;' />
+<text x='366.30' y='323.84' text-anchor='middle' style='font-size: 8.80px; fill: #1A1A1A; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>0</text>
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
 <defs>
-  <clipPath id='cpMzcuNjl8MjQ5LjQ1fDM1LjYwfDY4Ljkw'>
-    <rect x='37.69' y='35.60' width='211.77' height='33.30' />
+  <clipPath id='cpMzcuNjl8MjQ5LjQ1fDM1LjYwfDUyLjI1'>
+    <rect x='37.69' y='35.60' width='211.77' height='16.65' />
   </clipPath>
 </defs>
-<g clip-path='url(#cpMzcuNjl8MjQ5LjQ1fDM1LjYwfDY4Ljkw)'>
+<g clip-path='url(#cpMzcuNjl8MjQ5LjQ1fDM1LjYwfDUyLjI1)'>
 <rect x='37.69' y='35.60' width='211.77' height='16.65' style='stroke-width: 1.07; stroke: #333333; fill: #D9D9D9;' />
 <text x='143.57' y='46.95' text-anchor='middle' style='font-size: 8.80px; fill: #1A1A1A; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>4</text>
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzcuNjl8MjQ5LjQ1fDUyLjI1fDY4Ljkw'>
+    <rect x='37.69' y='52.25' width='211.77' height='16.65' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzcuNjl8MjQ5LjQ1fDUyLjI1fDY4Ljkw)'>
 <rect x='37.69' y='52.25' width='211.77' height='16.65' style='stroke-width: 1.07; stroke: #333333; fill: #D9D9D9;' />
 <text x='143.57' y='63.60' text-anchor='middle' style='font-size: 8.80px; fill: #1A1A1A; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>0</text>
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
 <defs>
-  <clipPath id='cpMjYwLjQxfDQ3Mi4xOHwzNS42MHw2OC45MA=='>
-    <rect x='260.41' y='35.60' width='211.77' height='33.30' />
+  <clipPath id='cpMjYwLjQxfDQ3Mi4xOHwzNS42MHw1Mi4yNQ=='>
+    <rect x='260.41' y='35.60' width='211.77' height='16.65' />
   </clipPath>
 </defs>
-<g clip-path='url(#cpMjYwLjQxfDQ3Mi4xOHwzNS42MHw2OC45MA==)'>
+<g clip-path='url(#cpMjYwLjQxfDQ3Mi4xOHwzNS42MHw1Mi4yNQ==)'>
 <rect x='260.41' y='35.60' width='211.77' height='16.65' style='stroke-width: 1.07; stroke: #333333; fill: #D9D9D9;' />
 <text x='366.30' y='46.95' text-anchor='middle' style='font-size: 8.80px; fill: #1A1A1A; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>4</text>
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMjYwLjQxfDQ3Mi4xOHw1Mi4yNXw2OC45MA=='>
+    <rect x='260.41' y='52.25' width='211.77' height='16.65' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjYwLjQxfDQ3Mi4xOHw1Mi4yNXw2OC45MA==)'>
 <rect x='260.41' y='52.25' width='211.77' height='16.65' style='stroke-width: 1.07; stroke: #333333; fill: #D9D9D9;' />
 <text x='366.30' y='63.60' text-anchor='middle' style='font-size: 8.80px; fill: #1A1A1A; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>1</text>
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
 <defs>
-  <clipPath id='cpNDgzLjE0fDY5NC45MXwzNS42MHw2OC45MA=='>
-    <rect x='483.14' y='35.60' width='211.77' height='33.30' />
+  <clipPath id='cpNDgzLjE0fDY5NC45MXwzNS42MHw1Mi4yNQ=='>
+    <rect x='483.14' y='35.60' width='211.77' height='16.65' />
   </clipPath>
 </defs>
-<g clip-path='url(#cpNDgzLjE0fDY5NC45MXwzNS42MHw2OC45MA==)'>
+<g clip-path='url(#cpNDgzLjE0fDY5NC45MXwzNS42MHw1Mi4yNQ==)'>
 <rect x='483.14' y='35.60' width='211.77' height='16.65' style='stroke-width: 1.07; stroke: #333333; fill: #D9D9D9;' />
 <text x='589.02' y='46.95' text-anchor='middle' style='font-size: 8.80px; fill: #1A1A1A; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>6</text>
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNDgzLjE0fDY5NC45MXw1Mi4yNXw2OC45MA=='>
+    <rect x='483.14' y='52.25' width='211.77' height='16.65' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNDgzLjE0fDY5NC45MXw1Mi4yNXw2OC45MA==)'>
 <rect x='483.14' y='52.25' width='211.77' height='16.65' style='stroke-width: 1.07; stroke: #333333; fill: #D9D9D9;' />
 <text x='589.02' y='63.60' text-anchor='middle' style='font-size: 8.80px; fill: #1A1A1A; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>0</text>
 </g>
diff --git a/tests/testthat/_snaps/facet-layout/axes-are-positioned-correctly-in-non-table-layout.svg b/tests/testthat/_snaps/facet-layout/axes-are-positioned-correctly-in-non-table-layout.svg
@@ -349,15 +349,6 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
-<defs>
-  <clipPath id='cpMzIuNzl8MjU2LjM4fDM3NC42NnwzOTEuMzE='>
-    <rect x='32.79' y='374.66' width='223.59' height='16.65' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzIuNzl8MjU2LjM4fDM3NC42NnwzOTEuMzE=)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjYxLjg2fDQ4NS40NXwzNzQuNjZ8MzkxLjMx'>
     <rect x='261.86' y='374.66' width='223.59' height='16.65' />
@@ -380,15 +371,6 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
-<defs>
-  <clipPath id='cpMzIuNzl8MjU2LjM4fDE5OC43MnwyMTUuMzc='>
-    <rect x='32.79' y='198.72' width='223.59' height='16.65' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzIuNzl8MjU2LjM4fDE5OC43MnwyMTUuMzc=)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjYxLjg2fDQ4NS40NXwxOTguNzJ8MjE1LjM3'>
     <rect x='261.86' y='198.72' width='223.59' height='16.65' />
