@hmcts/ccd-case-ui-toolkit 7.4.24 → 7.4.25

package/fesm2022/hmcts-ccd-case-ui-toolkit.mjs

@@ -4053,6 +4053,7 @@ class CaseTab {
     order;
     fields;
     show_condition;
+    defaultFocus;
 }
 __decorate([
     Type(() => CaseField),
@@ -41714,7 +41715,7 @@ class CaseFullAccessViewComponent {
         if (!hasHash && !isSpecialTabPath) {
             const paths = url.split('/');
             const lastPath = decodeURIComponent(paths[paths.length - 1]);
-            let foundTab = null;
+            let foundTab;
             if (!this.prependedTabs) {
                 this.prependedTabs = [];
             }
@@ -41735,10 +41736,13 @@ class CaseFullAccessViewComponent {
                 });
             }
             else {
-                this.caseDetails.tabs.sort((aTab, bTab) => aTab.order > bTab.order ? 1 : (bTab.order > aTab.order ? -1 : 0));
+                this.caseDetails.tabs = this.orderService.sort(this.caseDetails.tabs);
+                // Presuming default focus only set for one tab here - multiple tabs with default focus are not handled as is a contradiction
+                let preSelectTab = this.caseDetails.tabs.find((tab) => tab.defaultFocus === true) ?? null;
+                // Attempt to pre-select the tab based on the preferred label for the current case type
                 const preferredLabel = FieldsUtils.defaultTabList?.[this.caseDetails?.case_type?.id];
-                let preSelectTab = null;
-                if (preferredLabel) {
+                // If no tab has default focus, attempt to use the preferred label for the current case type
+                if (!preSelectTab && preferredLabel) {
                     preSelectTab = this.caseDetails.tabs.find((tab) => (tab.label === preferredLabel) || (tab.id === preferredLabel)) ?? null;
                 }
                 if (!preSelectTab) {