Merge pull request #173 from JudicialCouncilOfCalifornia/DCAS-166-fix…

…-php-and-twig-warnings-and-notices [DCAS-166] -- Alter the ResultExcerpt component to help address some twig/php notices and warnings showing in the logs
JudicialCouncilOfCalifornia · Dec 21, 2023 · cd20883 · cd20883
2 parents 0078157 + 3d1a2c7
commit cd20883
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/src/stories/Molecules/ResultExcerpt/ResultExcerpt.css b/src/stories/Molecules/ResultExcerpt/ResultExcerpt.css
@@ -1,7 +1,7 @@
 .result-excerpt__header {
   overflow: hidden;
   /* align-items: center; */
-  --gap: var(--s1)
+  --gap: var(--s1);
 }
 
 .result-excerpt__brow {
@@ -46,12 +46,13 @@
 /* Media headings must always appear as H4 visually. */
 .result-excerpt__heading {
   font-size: var(--s1);
+  line-height: var(--s3);
 }
 
 .result-excerpt__button {
   /* Negative margin hides border when wrapped. */
   /* margin-inline-start: -1px; */
-  border-inline-start: 1px solid var(--color-base);
+  /* border-inline-start: 1px solid var(--color-base); */
   padding-inline: var(--s1);
   display: flex;
   flex-shrink: 1;
@@ -71,7 +72,7 @@
 }
 
 .result-excerpt__content {
-  margin-block-start: var(--s-6);
+  margin-block-start: var(--s0);
 }
 
 .result-excerpt__content.stack > * + * {

diff --git a/src/stories/Molecules/ResultExcerpt/ResultExcerpt.data.js b/src/stories/Molecules/ResultExcerpt/ResultExcerpt.data.js
@@ -1,6 +1,6 @@
 // import '../../../js/detectWrap.js';
-import Pills from "../../Molecules/Pills/Pills.twig";
-import { Default as PillsDefault } from "../../Molecules/Pills/Pills.stories";
+import Pill from "../../Atoms/Pill/Pill.twig";
+import { Default as PillDefault } from "../../Atoms/Pill/Pill.stories";
 
 export default {
   default: {
@@ -32,6 +32,17 @@ export default {
         "Report",
       ],
     },
-    pills: Pills({ ...PillsDefault.args }),
+    pills: {
+      variant: "default",
+      icon_data: {
+        icon: "translation",
+        color: false,
+      },
+      items: [
+        Pill({ ...PillDefault.args }),
+        Pill({ ...PillDefault.args }),
+        Pill({ ...PillDefault.args }),
+      ],
+    },
   },
 };
diff --git a/src/stories/Molecules/ResultExcerpt/ResultExcerpt.twig b/src/stories/Molecules/ResultExcerpt/ResultExcerpt.twig
@@ -44,7 +44,7 @@
 
   {% if detail_list_data or pills or content %}
     <div class="result-excerpt__content stack">
-      {{ content }}
+      <div>{{ content }}</div>
 
       {% if detail_list_data or pills %}
         {% if detail_list_data %}
@@ -61,7 +61,7 @@
         {% endif %}
         {% if pills %}
         <div class="result-excerpt__pills">
-          {{ pills }}
+          {% include "@molecules/Pills/Pills.twig" with pills %}
         </div>
         {% endif %}
       {% endif %}