Merge pull request #1572 from gethinode/develop

fix: enable passthrough argument for building blocks
2025-10-17 06:53:11 +00:00 · 2025-09-10 16:53:01 +02:00 · 2025-09-10 16:46:32 +02:00
4 changed files with 78 additions and 64 deletions
--- a/component-library/helpers/component.html
+++ b/component-library/helpers/component.html
@@ -27,20 +27,35 @@
    {{- $resolved_component = $flat_component_path -}}
 {{- end -}}

+<!-- TODO: use initialized component args instead of component_props -->
+{{ $error := false }}
+{{ $args := dict }}
 {{- if $resolved_component -}}
+    {{ $args = partial "utilities/InitArgs.html" (dict "bookshop" $component_name "args" $component_props) }}
+    {{ if or $args.err $args.warnmsg }}
+        {{ partial (cond $args.err "utilities/LogErr.html" "utilities/LogWarn.html") (dict 
+            "partial" $resolved_component
+            "warnid"  "warn-invalid-arguments"
+            "msg"     "Invalid arguments"
+            "details" ($args.errmsg | append $args.warnmsg)
+            "file"    page.File
+        )}}
+    {{ end }}
+{{ end }}
+
+{{ if and $resolved_component (not $args.err) }}
    {{- $id := index $component_props "id" -}}
    {{- $cover := index $component_props "cover" -}}
    {{- $background := index $component_props "background" -}}
    {{- $backdrop := "" -}}
    {{- $fluid := index $component_props "fluid" | default true -}}
-    {{- $style := index $component_props "wrapper" -}}
+    {{- $wrapper := index $component_props "wrapper" -}}
    {{- $width := index $component_props "width" -}}
    {{- $justify := index $component_props "justify" | default "start" -}}
    {{- $paddingOuter := cond (ne $component_name "separator") (printf "px-xxl-0 px-%d py-0" $padding.x) "" -}}
    {{- $padding := cond (ne $component_name "separator") (printf "px-%d %spy-%d" $padding.x (cond $fluid "px-xxl-0 " "") $padding.y) "" -}}
-    {{- $wrapper := $style }}
    {{ with $background }}
-        {{ $wrapper = partial "utilities/GetBackgroundStyle.html" (dict "background" . "class" $style) }}
+        {{ $wrapper = partial "utilities/GetBackgroundStyle.html" (dict "background" . "class" $wrapper) }}
        {{ if reflect.IsMap $background }}
            {{ with $background.backdrop }}{{ $wrapper = "" }}{{ $backdrop = . }}{{ end }}
        {{ end }}
@@ -73,18 +88,21 @@
        {{- end -}}

        {{ $col := cond (and $width (lt $width 12)) (printf "col-12 col-md-%d" $width) "" }}
-
-        <div class="container-{{ cond $fluid "xxl" "fluid" }} {{ $padding }} d-flex flex-column align-items-{{ $justify }}">
-            {{ with $col }}
-                <div class="{{ . }}">{{ partial $resolved_component $component_props }}</div>
-            {{ else }}
-                {{ partial $resolved_component $component_props }}
-            {{ end}}
-        </div>
+        {{ if $args.passthrough }}
+            {{ partial $resolved_component $component_props }}
+        {{ else }}
+            <div class="container-{{ cond $fluid "xxl" "fluid" }} {{ $padding }} d-flex flex-column align-items-{{ $justify }}">
+                {{ with $col }}
+                    <div class="{{ . }}">{{ partial $resolved_component $component_props }}</div>
+                {{ else }}
+                    {{ partial $resolved_component $component_props }}
+                {{ end}}
+            </div>
+        {{ end }}
    </section>
    {{ if not $fluid }}</div>{{ end }}
    {{ "<!--bookshop-live end-->" | safeHTML }}
-{{- else -}}
+{{- else if (not $args.err) -}}
    {{- $file_loc := slicestr $component_path 9 -}}
    {{- $flat_file_loc := slicestr $flat_component_path 9 -}}
    {{- partial "_bookshop/errors/err" (printf "Component \"%s\" does not exist.\n     Create this component by placing a file in your bookshop at %s or %s" $component_name $file_loc $flat_file_loc) -}}
--- a/exampleSite/hugo_stats.json
+++ b/exampleSite/hugo_stats.json
@@ -245,9 +245,6 @@
      "fa-activity",
      "fa-address-card",
      "fa-angle-left",
-      "fa-angle-right",
-      "fa-angles-left",
-      "fa-angles-right",
      "fa-arrow-left",
      "fa-arrow-right",
      "fa-bootstrap",
@@ -659,11 +656,11 @@
      "docs",
      "documentation",
      "dropdown-nav-0",
-      "dropdown-panel-0e0d7c1fd6d33e3180b75a3f126f5fea",
-      "dropdown-panel-3afb6d66b09dfeb4621548fc9812ce10",
-      "dropdown-panel-46f581d5bacea14d68114161d503d5c1",
-      "dropdown-panel-e37d2a3ed3fbb2ae9956fe2816627070",
-      "dropdown-panel-effd2deef2e0cded9c2d41c8aaec9646",
+      "dropdown-panel-4bb40e55576372d7d5033b3cb5988c2c",
+      "dropdown-panel-6dfba858bf9eaea88ebc32de712ebf3f",
+      "dropdown-panel-6fe204644b3fccca0d62ab3b712bf1cd",
+      "dropdown-panel-b8350cafdd51c4d33847172721da9800",
+      "dropdown-panel-e25d76a286385f8669a497412d250185",
      "elements-type",
      "entity-relationship-diagram",
      "example",
@@ -681,19 +678,16 @@
      "fab-medium",
      "fab-whatsapp",
      "fab-x-twitter",
-      "faq-963137b2b2e4941741e0ab33cf4fd1fe",
-      "faq-963137b2b2e4941741e0ab33cf4fd1fe-heading-faq-963137b2b2e4941741e0ab33cf4fd1fe",
-      "faq-963137b2b2e4941741e0ab33cf4fd1fe-item-0",
-      "faq-963137b2b2e4941741e0ab33cf4fd1fe-item-1",
-      "faq-963137b2b2e4941741e0ab33cf4fd1fe-item-2",
+      "faq-aa1b2fa31cd6205cdeb0e1b972a20584",
+      "faq-aa1b2fa31cd6205cdeb0e1b972a20584-heading-faq-aa1b2fa31cd6205cdeb0e1b972a20584",
+      "faq-aa1b2fa31cd6205cdeb0e1b972a20584-item-0",
+      "faq-aa1b2fa31cd6205cdeb0e1b972a20584-item-1",
+      "faq-aa1b2fa31cd6205cdeb0e1b972a20584-item-2",
      "fas-1",
      "fas-2",
      "fas-3",
      "fas-address-card",
      "fas-angle-left",
-      "fas-angle-right",
-      "fas-angles-left",
-      "fas-angles-right",
      "fas-arrow-left",
      "fas-arrow-right",
      "fas-chevron-right",
@@ -779,11 +773,11 @@
      "nav-0-btn-1",
      "nav-0-btn-2",
      "nav-nav-0",
-      "nav-panel-0e0d7c1fd6d33e3180b75a3f126f5fea",
-      "nav-panel-3afb6d66b09dfeb4621548fc9812ce10",
-      "nav-panel-46f581d5bacea14d68114161d503d5c1",
-      "nav-panel-e37d2a3ed3fbb2ae9956fe2816627070",
-      "nav-panel-effd2deef2e0cded9c2d41c8aaec9646",
+      "nav-panel-4bb40e55576372d7d5033b3cb5988c2c",
+      "nav-panel-6dfba858bf9eaea88ebc32de712ebf3f",
+      "nav-panel-6fe204644b3fccca0d62ab3b712bf1cd",
+      "nav-panel-b8350cafdd51c4d33847172721da9800",
+      "nav-panel-e25d76a286385f8669a497412d250185",
      "navbar",
      "navbar-0-collapse",
      "navbar-mode",
@@ -792,36 +786,36 @@
      "navigation",
      "notification",
      "overview",
-      "panel-0e0d7c1fd6d33e3180b75a3f126f5fea-0",
-      "panel-0e0d7c1fd6d33e3180b75a3f126f5fea-1",
-      "panel-0e0d7c1fd6d33e3180b75a3f126f5fea-2",
-      "panel-0e0d7c1fd6d33e3180b75a3f126f5fea-btn-0",
-      "panel-0e0d7c1fd6d33e3180b75a3f126f5fea-btn-1",
-      "panel-0e0d7c1fd6d33e3180b75a3f126f5fea-btn-2",
-      "panel-3afb6d66b09dfeb4621548fc9812ce10-0",
-      "panel-3afb6d66b09dfeb4621548fc9812ce10-1",
-      "panel-3afb6d66b09dfeb4621548fc9812ce10-2",
-      "panel-3afb6d66b09dfeb4621548fc9812ce10-btn-0",
-      "panel-3afb6d66b09dfeb4621548fc9812ce10-btn-1",
-      "panel-3afb6d66b09dfeb4621548fc9812ce10-btn-2",
-      "panel-46f581d5bacea14d68114161d503d5c1-0",
-      "panel-46f581d5bacea14d68114161d503d5c1-1",
-      "panel-46f581d5bacea14d68114161d503d5c1-2",
-      "panel-46f581d5bacea14d68114161d503d5c1-btn-0",
-      "panel-46f581d5bacea14d68114161d503d5c1-btn-1",
-      "panel-46f581d5bacea14d68114161d503d5c1-btn-2",
-      "panel-e37d2a3ed3fbb2ae9956fe2816627070-0",
-      "panel-e37d2a3ed3fbb2ae9956fe2816627070-1",
-      "panel-e37d2a3ed3fbb2ae9956fe2816627070-2",
-      "panel-e37d2a3ed3fbb2ae9956fe2816627070-btn-0",
-      "panel-e37d2a3ed3fbb2ae9956fe2816627070-btn-1",
-      "panel-e37d2a3ed3fbb2ae9956fe2816627070-btn-2",
-      "panel-effd2deef2e0cded9c2d41c8aaec9646-0",
-      "panel-effd2deef2e0cded9c2d41c8aaec9646-1",
-      "panel-effd2deef2e0cded9c2d41c8aaec9646-2",
-      "panel-effd2deef2e0cded9c2d41c8aaec9646-btn-0",
-      "panel-effd2deef2e0cded9c2d41c8aaec9646-btn-1",
-      "panel-effd2deef2e0cded9c2d41c8aaec9646-btn-2",
+      "panel-4bb40e55576372d7d5033b3cb5988c2c-0",
+      "panel-4bb40e55576372d7d5033b3cb5988c2c-1",
+      "panel-4bb40e55576372d7d5033b3cb5988c2c-2",
+      "panel-4bb40e55576372d7d5033b3cb5988c2c-btn-0",
+      "panel-4bb40e55576372d7d5033b3cb5988c2c-btn-1",
+      "panel-4bb40e55576372d7d5033b3cb5988c2c-btn-2",
+      "panel-6dfba858bf9eaea88ebc32de712ebf3f-0",
+      "panel-6dfba858bf9eaea88ebc32de712ebf3f-1",
+      "panel-6dfba858bf9eaea88ebc32de712ebf3f-2",
+      "panel-6dfba858bf9eaea88ebc32de712ebf3f-btn-0",
+      "panel-6dfba858bf9eaea88ebc32de712ebf3f-btn-1",
+      "panel-6dfba858bf9eaea88ebc32de712ebf3f-btn-2",
+      "panel-6fe204644b3fccca0d62ab3b712bf1cd-0",
+      "panel-6fe204644b3fccca0d62ab3b712bf1cd-1",
+      "panel-6fe204644b3fccca0d62ab3b712bf1cd-2",
+      "panel-6fe204644b3fccca0d62ab3b712bf1cd-btn-0",
+      "panel-6fe204644b3fccca0d62ab3b712bf1cd-btn-1",
+      "panel-6fe204644b3fccca0d62ab3b712bf1cd-btn-2",
+      "panel-b8350cafdd51c4d33847172721da9800-0",
+      "panel-b8350cafdd51c4d33847172721da9800-1",
+      "panel-b8350cafdd51c4d33847172721da9800-2",
+      "panel-b8350cafdd51c4d33847172721da9800-btn-0",
+      "panel-b8350cafdd51c4d33847172721da9800-btn-1",
+      "panel-b8350cafdd51c4d33847172721da9800-btn-2",
+      "panel-e25d76a286385f8669a497412d250185-0",
+      "panel-e25d76a286385f8669a497412d250185-1",
+      "panel-e25d76a286385f8669a497412d250185-2",
+      "panel-e25d76a286385f8669a497412d250185-btn-0",
+      "panel-e25d76a286385f8669a497412d250185-btn-1",
+      "panel-e25d76a286385f8669a497412d250185-btn-2",
      "persona",
      "pie-chart",
      "pills",
--- a/go.mod
+++ b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/gethinode/mod-lottie v1.6.1 // indirect
 	github.com/gethinode/mod-mermaid/v3 v3.0.1 // indirect
 	github.com/gethinode/mod-simple-datatables/v2 v2.0.2 // indirect
-	github.com/gethinode/mod-utils/v4 v4.14.0 // indirect
+	github.com/gethinode/mod-utils/v4 v4.15.0 // indirect
 	github.com/nextapps-de/flexsearch v0.0.0-20250907103239-defb38b083f0 // indirect
 	github.com/twbs/bootstrap v5.3.8+incompatible // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -506,6 +506,8 @@ github.com/gethinode/mod-utils/v4 v4.13.0 h1:VKAA+wKy4saayXfgJuVBRfhNVWQWmxOjO8L
 github.com/gethinode/mod-utils/v4 v4.13.0/go.mod h1:bYmvRdAo4ICy5MpSGafDvO4p5bTDpsDKFCPL3bH0mN4=
 github.com/gethinode/mod-utils/v4 v4.14.0 h1:CF5dy+HWg22L306bWVhClWK9b1NVinEqtb4Qr2vcl9A=
 github.com/gethinode/mod-utils/v4 v4.14.0/go.mod h1:bYmvRdAo4ICy5MpSGafDvO4p5bTDpsDKFCPL3bH0mN4=
+github.com/gethinode/mod-utils/v4 v4.15.0 h1:Zocy3qEVluYcx9te7bN6Serwp49kjhuH+eIvcCYpeC8=
+github.com/gethinode/mod-utils/v4 v4.15.0/go.mod h1:bYmvRdAo4ICy5MpSGafDvO4p5bTDpsDKFCPL3bH0mN4=
 github.com/nextapps-de/flexsearch v0.0.0-20230711092928-1243fd883ec3 h1:H/qVR5O4BXjRjD+5PZB+r4ug2BSJ2Of4RtwOntd+OKo=
 github.com/nextapps-de/flexsearch v0.0.0-20230711092928-1243fd883ec3/go.mod h1:5GdMfPAXzbA2gXBqTjC6l27kioSYzHlqDMh0+wyx7sU=
 github.com/nextapps-de/flexsearch v0.0.0-20240108021025-afd75f742f22 h1:re7L8FxbXQpnX8BgzkdUnDpsUmloGNyLmiy2ZCln8pg=
Author	SHA1	Message	Date
Mark Dumay	9c746ec7f2	Merge pull request #1572 from gethinode/develop fix: enable passthrough argument for building blocks	2025-09-10 16:53:01 +02:00
Mark Dumay	c161063dca	fix: enable passthrough argument for building blocks	2025-09-10 16:46:32 +02:00