@timmo001/groundwork-ui 0.8.0 → 0.9.1

package/custom-elements.json

@@ -3250,12 +3250,18 @@
               "kind": "field",
               "name": "#lead",
               "privacy": "private",
+              "type": {
+                "text": "HTMLSpanElement"
+              },
               "readonly": true
             },
             {
               "kind": "field",
               "name": "#text",
               "privacy": "private",
+              "type": {
+                "text": "HTMLSpanElement"
+              },
               "readonly": true
             },
             {
@@ -21389,13 +21395,17 @@
         },
         {
           "kind": "class",
-          "description": "Fills as many columns as fit, each at least `--gw-grid-min` wide.",
+          "description": "Fills as many columns as fit, each at least `--gw-grid-min` wide, and at\nmost `max` of them when it's set.",
           "name": "GwGrid",
           "cssProperties": [
             {
               "description": "The narrowest a column gets. Defaults to `18rem`.",
               "name": "--gw-grid-min"
             },
+            {
+              "description": "The most columns it shows, as a number. Unset by default, so as many fit as the width allows.",
+              "name": "--gw-grid-max"
+            },
             {
               "description": "The gap. Defaults to `--gw-space-3`.",
               "name": "--gw-gap"
@@ -21415,7 +21425,7 @@
                 "text": "readonly CSSStyleSheet[]"
               },
               "static": true,
-              "default": "[ base, gaps, css` :host { display: grid; grid-template-columns: repeat( auto-fill, minmax(min(100%, var(--gw-grid-min, 18rem)), 1fr) ); gap: var(--gw-gap, var(--gw-space-3)); } `, ]",
+              "default": "[ base, gaps, css` :host { /* A column's width at the cap. Invalid while --gw-grid-max is unset, so the var() below falls back to 0px and the cap does nothing */ --_gw-grid-cap: calc( (100% - (var(--gw-grid-max) - 1) * var(--gw-gap, var(--gw-space-3))) / var(--gw-grid-max) ); display: grid; grid-template-columns: repeat( auto-fill, minmax( min(100%, max(var(--gw-grid-min, 18rem), var(--_gw-grid-cap, 0px))), 1fr ) ); gap: var(--gw-gap, var(--gw-space-3)); } :host([max=\"2\"]) { --gw-grid-max: 2; } :host([max=\"3\"]) { --gw-grid-max: 3; } :host([max=\"4\"]) { --gw-grid-max: 4; } :host([max=\"5\"]) { --gw-grid-max: 5; } :host([max=\"6\"]) { --gw-grid-max: 6; } `, ]",
               "inheritedFrom": {
                 "name": "GwElement",
                 "module": "src/element.ts"
@@ -21753,6 +21763,13 @@
               },
               "description": "A smaller or larger gap.",
               "name": "gap"
+            },
+            {
+              "type": {
+                "text": "\"2\"|\"3\"|\"4\"|\"5\"|\"6\""
+              },
+              "description": "The most columns it shows. Sets `--gw-grid-max`.",
+              "name": "max"
             }
           ],
           "superclass": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@timmo001/groundwork-ui",
-  "version": "0.8.0",
+  "version": "0.9.1",
   "description": "Groundwork's framework-free web components, styled by the --gw-* tokens",
   "license": "Apache-2.0",
   "type": "module",

package/src/gw-button.ts

@@ -366,7 +366,9 @@ export class GwButton extends GwElement {
 
   readonly #swatch = h("span", { class: "swatch", "aria-hidden": "true" });
 
-  readonly #lead = h(
+  // Typed, since inferring through h() and the tag map that holds this
+  // element is circular for consumers that type-check the source
+  readonly #lead: HTMLSpanElement = h(
     "span",
     { class: "lead" },
     this.#icon,
@@ -375,7 +377,7 @@ export class GwButton extends GwElement {
     h("span", { class: "ring" }),
   );
 
-  readonly #text = h("span", { class: "text" }, h("slot"));
+  readonly #text: HTMLSpanElement = h("span", { class: "text" }, h("slot"));
 
   readonly #over = h("span", { class: "ring over" });
 

package/src/layout.ts

@@ -138,16 +138,19 @@ export class GwRow extends GwSlotted {
 }
 
 /**
- * Fills as many columns as fit, each at least `--gw-grid-min` wide.
+ * Fills as many columns as fit, each at least `--gw-grid-min` wide, and at
+ * most `max` of them when it's set.
  *
  * @element gw-grid
  * @summary Children in responsive columns.
  *
  * @attr {"s"|"l"} gap - A smaller or larger gap.
+ * @attr {"2"|"3"|"4"|"5"|"6"} max - The most columns it shows. Sets `--gw-grid-max`.
  *
  * @slot - The children.
  *
  * @cssprop --gw-grid-min - The narrowest a column gets. Defaults to `18rem`.
+ * @cssprop --gw-grid-max - The most columns it shows, as a number. Unset by default, so as many fit as the width allows.
  * @cssprop --gw-gap - The gap. Defaults to `--gw-space-3`.
  */
 export class GwGrid extends GwSlotted {
@@ -156,13 +159,42 @@ export class GwGrid extends GwSlotted {
     gaps,
     css`
       :host {
+        /* A column's width at the cap. Invalid while --gw-grid-max is unset,
+           so the var() below falls back to 0px and the cap does nothing */
+        --_gw-grid-cap: calc(
+          (100% - (var(--gw-grid-max) - 1) * var(--gw-gap, var(--gw-space-3))) /
+            var(--gw-grid-max)
+        );
         display: grid;
         grid-template-columns: repeat(
           auto-fill,
-          minmax(min(100%, var(--gw-grid-min, 18rem)), 1fr)
+          minmax(
+            min(100%, max(var(--gw-grid-min, 18rem), var(--_gw-grid-cap, 0px))),
+            1fr
+          )
         );
         gap: var(--gw-gap, var(--gw-space-3));
       }
+
+      :host([max="2"]) {
+        --gw-grid-max: 2;
+      }
+
+      :host([max="3"]) {
+        --gw-grid-max: 3;
+      }
+
+      :host([max="4"]) {
+        --gw-grid-max: 4;
+      }
+
+      :host([max="5"]) {
+        --gw-grid-max: 5;
+      }
+
+      :host([max="6"]) {
+        --gw-grid-max: 6;
+      }
     `,
   ];
 }