@abgov/jsonforms-components 2.35.0 → 2.36.1

package/index.esm.js

@@ -8989,12 +8989,8 @@ const TaskList = ({
     }
     return sections;
   }, [categories]);
-  // Derived values
-  const totalGroups = useMemo(() => mergedSections.filter(section => section.categories.some(shouldShow)).length, [mergedSections]);
-  const completedGroups = useMemo(() => mergedSections.filter(section => {
-    const visibleCats = section.categories.filter(shouldShow);
-    return visibleCats.length > 0 && visibleCats.every(cat => cat.isCompleted);
-  }).length, [mergedSections]);
+  const totalPages = useMemo(() => mergedSections.reduce((count, section) => count + section.categories.filter(shouldShow).length, 0), [mergedSections]);
+  const completedPages = useMemo(() => mergedSections.reduce((count, section) => count + section.categories.filter(cat => shouldShow(cat) && cat.isCompleted).length, 0), [mergedSections]);
   let globalIndex = 0;
   let sectionIndex = 1;
   return jsx(PageBorder, {
@@ -9012,8 +9008,8 @@ const TaskList = ({
         ml: "xl",
         children: subtitle
       }), jsx(ApplicationStatus, {
-        completedGroups: completedGroups,
-        totalGroups: totalGroups
+        completedGroups: completedPages,
+        totalGroups: totalPages
       }), jsx(GoATable, {
         width: "100%",
         children: jsxs("tbody", {
@@ -10743,7 +10739,7 @@ const ObjectArrayControl = props => {
     visible: visible,
     "data-testid": "jsonforms-object-list-wrapper",
     children: [jsxs(ToolBarHeader, {
-      children: [isInReview && listTitle && isListWithDetail && additionalProps.required && (data === null || data === undefined) ? jsx("b", {
+      children: [isInReview ? listTitle ? isListWithDetail && additionalProps.required && (data === null || data === undefined) ? jsx("b", {
         children: jsxs(ListWithDetailWarningIconDiv, {
           children: [jsx(GoAIcon, {
             type: "warning",
@@ -10764,9 +10760,15 @@ const ObjectArrayControl = props => {
           },
           children: maxItemsError
         })]
-      }), !isInReview && listTitle && jsxs(ObjectArrayTitle, {
+      }) : null : listTitle && jsxs(ObjectArrayTitle, {
         children: [listTitle, " ", jsx("span", {
           children: additionalProps.required && '(required)'
+        }), maxItemsError && jsx("span", {
+          style: {
+            color: 'red',
+            marginLeft: '1rem'
+          },
+          children: maxItemsError
         })]
       }), !isInReview && jsx(ObjectArrayToolBar, {
         errors: errors,
@@ -11739,6 +11741,69 @@ const HelpContentDiv = styled.div(_t$1 || (_t$1 = _$1`
   .single-line {
     margin: var(--goa-space-2xs) 0 var(--goa-space-2xs) 0;
   }
+
+  .help-content-markdown details {
+    margin: 1.5rem 0 !important;
+    font-family: system-ui, -apple-system, 'Segoe UI', Roboto, Arial, sans-serif !important;
+  }
+
+  .help-content-markdown details summary {
+    font-size: 1.5em;
+    font-weight: bold;
+    color: red;
+    list-style: none;
+    cursor: pointer;
+    position: relative;
+    padding-left: 0;
+    font-weight: 600;
+    font-size: 1.125rem; /* 18px */
+    color: #111827; /* gray-900 */
+    user-select: none;
+    border-left: 0; /* vertical line */
+  }
+
+  .help-content-markdown details summary::before {
+    content: '';
+    display: inline-block;
+    width: 1.25rem;
+    height: 1.25rem;
+    margin-right: 0.5rem;
+    background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'><path fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round' stroke-width='48' d='M184 112l144 144-144 144'/></svg>");
+    background-size: contain;
+    background-repeat: no-repeat;
+    transition: opacity 0.2s ease;
+  }
+
+  .help-content-markdown details[open] summary::before {
+    background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'><path fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round' stroke-width='48' d='M112 184l144 144 144-144'/></svg>");
+  }
+
+  .help-content-markdown details[open] {
+    margin-left: 1.75rem !important;
+  }
+  .help-content-markdown details[open] summary {
+    margin-left: -1.75rem !important;
+  }
+
+  .help-content-markdown details[open] {
+    position: relative;
+  }
+
+  .help-content-markdown details[open]::before {
+    margin-left: -1.75rem !important;
+    content: '';
+    position: absolute;
+    left: 0.6rem;
+    top: 2.2rem;
+    bottom: 0.5rem;
+    width: 2px;
+    background-color: #ccc;
+    pointer-events: none;
+  }
+
+  .help-content-markdown summary {
+    text-decoration: underline;
+  }
 `));
 const InvalidMarkdown = styled.div(_t2 || (_t2 = _$1`
   color: var(--goa-color-interactive-error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/jsonforms-components",
-  "version": "2.35.0",
+  "version": "2.36.1",
   "license": "Apache-2.0",
   "description": "Government of Alberta - React renderers for JSON Forms based on the design system.",
   "repository": "https://github.com/GovAlta/adsp-monorepo",