Merge branch 'master' into bug-kw-radio-group-styling

Author: jfmcquade

src/app/shared/components/template/components/progress-path/progress-path.component.ts

@@ -5,7 +5,7 @@ import { TemplateTranslateService } from "../../services/template-translate.serv
 
 interface IProgressPathParams {
   /** TEMPLATE_PARAMETER: "variant". Default "wavy" */
-  variant: "basic" | "wavy";
+  variant: "basic" | "wavy" | "curved";
 }
 
 // HACK - hardcoded sizing values to make content fit reasonably well
@@ -27,7 +27,7 @@ const SIZING = {
 })
 export class TmplProgressPathComponent extends TemplateBaseComponent implements OnInit {
   private params: Partial<IProgressPathParams> = {};
-  private pathVariant: "basic" | "wavy";
+  private pathVariant: "basic" | "wavy" | "curved";
 
   public svgPath: string;
   public svgViewBox: string;
@@ -47,14 +47,14 @@ export class TmplProgressPathComponent extends TemplateBaseComponent implements
     this.params.variant = getStringParamFromTemplateRow(this._row, "variant", "wavy")
       .split(",")
       .join(" ") as IProgressPathParams["variant"];
-    this.pathVariant = this.params.variant.includes("basic") ? "basic" : "wavy";
+    this.pathVariant = this.params.variant;
   }
 
   /**
    * Generate a base SVG segment used to connect 2 progress items together
    * Roughly a horizontal line and smooth bend, adjusted for sizing
    */
-  private generateSVGPath(variant: "basic" | "wavy" = "wavy") {
+  private generateSVGPath(variant: "basic" | "curved" | "wavy" = "wavy") {
     // arbitrary values used to make base width/height fit
     const { widthPx, xOffset, yOffset, textContentHeight } = SIZING;
 
@@ -87,7 +87,23 @@ export class TmplProgressPathComponent extends TemplateBaseComponent implements
     c 48,0 72,64 48,${viewboxHeight - yOffset - 4}
     `.trim();
 
-    this.svgPath = variant === "basic" ? basic() : wavy();
+    const curved = () =>
+      `
+    M ${xOffset},${yOffset}
+    c 0,140 280,-80 252,160 1
+    v 80
+    `.trim();
+
+    switch (variant) {
+      case "basic":
+        this.svgPath = basic();
+        break;
+      case "curved":
+        this.svgPath = curved();
+        break;
+      default:
+        this.svgPath = wavy();
+    }
     this.svgViewBox = `0 0 ${widthPx} ${viewboxHeight}`;
     this.contentHeight = `${textContentHeight}px`;
   }

yarn.lock

@@ -6252,13 +6252,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/endpoint@npm:^10.0.0":
-  version: 10.1.2
-  resolution: "@octokit/endpoint@npm:10.1.2"
+"@octokit/endpoint@npm:^10.1.3":
+  version: 10.1.3
+  resolution: "@octokit/endpoint@npm:10.1.3"
   dependencies:
     "@octokit/types": ^13.6.2
     universal-user-agent: ^7.0.2
-  checksum: 425f4b0f12e2565d7270522e2e42d0595bd16c2c16fe262b540d50fc94d279e93b37b670370ae23dfe6117a2b74c69ffd7d3644e4dea5e6fc576a562ed75fba4
+  checksum: 47253e341ea1ef2d22fd33566753574f97fa28ebc8a9869821dd4f3f0eca2541562f31317118d203b91194804f1bac5f3373a261abb0b7b7a47ef84d6a88c124
   languageName: node
   linkType: hard
 
@@ -6378,7 +6378,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/request-error@npm:^6.0.1, @octokit/request-error@npm:^6.1.6":
+"@octokit/request-error@npm:^6.1.6":
   version: 6.1.6
   resolution: "@octokit/request-error@npm:6.1.6"
   dependencies:
@@ -6387,16 +6387,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@octokit/request-error@npm:^6.1.7":
+  version: 6.1.7
+  resolution: "@octokit/request-error@npm:6.1.7"
+  dependencies:
+    "@octokit/types": ^13.6.2
+  checksum: 02273f6388f1fa8e9962f5eeddffac784454200fa291d9e2333eeaa53f70fbf3fb8d9bca191f38457c455dda758b95c8db50167085cfd6f97dd7a67a5aff452d
+  languageName: node
+  linkType: hard
+
 "@octokit/request@npm:^9.1.4":
-  version: 9.2.0
-  resolution: "@octokit/request@npm:9.2.0"
+  version: 9.2.2
+  resolution: "@octokit/request@npm:9.2.2"
   dependencies:
-    "@octokit/endpoint": ^10.0.0
-    "@octokit/request-error": ^6.0.1
+    "@octokit/endpoint": ^10.1.3
+    "@octokit/request-error": ^6.1.7
     "@octokit/types": ^13.6.2
     fast-content-type-parse: ^2.0.0
     universal-user-agent: ^7.0.2
-  checksum: 24056e2c3c634bfca5f72277b6cd69f69ad2a58c033a0e96c2fa626e3e6a028f6ca58702aecceb5f2f4ed23a583b16df2dd728fa02dce910dc081bfcbc64ad92
+  checksum: b5600cca1823bd1a16a9d85298351d9879c399b5acbaf4c99c77c62c2eaf18fb66debc29ab82e8b0bc3e6b098ab01c0075a843dc57f0647ad9a6dc7cb8e18aa9
   languageName: node
   linkType: hard