@hmcts/ccd-case-ui-toolkit 7.4.3 → 7.4.4-default-focus

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

@@ -3960,6 +3960,7 @@ class CaseTab {
     order;
     fields;
     show_condition;
+    defaultFocus;
 }
 __decorate([
     Type(() => CaseField),
@@ -14766,6 +14767,9 @@ class CaseFileViewFieldComponent {
     ngAfterViewInit() {
         const slider = this.elementRef.nativeElement.querySelector('.slider');
         const documentTreeContainer = this.elementRef.nativeElement.querySelector('.document-tree-container');
+        if (!slider || !documentTreeContainer) {
+            return;
+        }
         const mousedown$ = fromEvent(slider, 'mousedown');
         const mousemove$ = fromEvent(document, 'mousemove');
         const mouseup$ = fromEvent(document, 'mouseup');
@@ -41501,7 +41505,12 @@ class CaseFullAccessViewComponent {
         let hashValue = url.substring(url.indexOf('#') + 1);
         const hasHash = url.includes('#');
         const isSpecialTabPath = url.includes('roles-and-access') || url.includes('tasks') || url.includes('hearings');
-        if (!hasHash && !isSpecialTabPath) {
+        // TODO: Remove defaultFocusDemo once QA'd
+        const defaultFocusDemo = url.includes('default-focus-demo');
+        if (defaultFocusDemo) {
+            this.caseDetails.tabs[Number(url.substring(url.indexOf('default-focus-demo-') + 19))].defaultFocus = true;
+        }
+        if (defaultFocusDemo || (!hasHash && !isSpecialTabPath)) {
             const paths = url.split('/');
             const lastPath = decodeURIComponent(paths[paths.length - 1]);
             let foundTab = null;
@@ -41525,10 +41534,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) {