@hmcts/ccd-case-ui-toolkit 7.4.3-redact → 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');
@@ -27404,8 +27408,12 @@ class WriteRichTextAreaFieldComponent extends AbstractFieldWriteComponent {
         this.removeUnsupportedMarkup(documentElement);
         this.normaliseDateRangeSpacing(documentElement);
         this.removeUnsupportedAttributes(documentElement);
+        const hasMeaningfulContent = this.hasMeaningfulRichTextContent(documentElement);
+        if (hasMeaningfulContent) {
+            this.preserveDocmosisBlankParagraphs(documentElement);
+        }
         const sanitisedValue = sanitiseRichTextDocument(documentElement);
-        return this.hasMeaningfulRichTextContent(documentElement)
+        return hasMeaningfulContent
             ? this.normalisePlainTextValue(sanitisedValue)
             : '';
     }
@@ -27425,11 +27433,22 @@ class WriteRichTextAreaFieldComponent extends AbstractFieldWriteComponent {
         this.removeUnsupportedMarkup(documentElement);
         this.normaliseDateRangeSpacing(documentElement);
         this.removeUnsupportedAttributes(documentElement);
+        const hasMeaningfulContent = this.hasMeaningfulRichTextContent(documentElement);
+        if (hasMeaningfulContent) {
+            this.preserveDocmosisBlankParagraphs(documentElement);
+        }
         const sanitisedValue = sanitiseRichTextDocument(documentElement);
-        return this.hasMeaningfulRichTextContent(documentElement)
+        return hasMeaningfulContent
             ? this.normalisePlainTextValue(sanitisedValue)
             : '';
     }
+    /**
+     * Gives intentionally blank paragraphs content so Docmosis preserves them as blank lines.
+    * This runs only when the document has meaningful content, so a completely empty field remains empty.
+    */
+    preserveDocmosisBlankParagraphs(documentElement) {
+        this.replaceBlankParagraphContent(documentElement, '\u00a0');
+    }
     hasMeaningfulRichTextContent(documentElement) {
         const visibleText = (documentElement.body.textContent || '')
             .replace(/[\s\u00a0\u200b-\u200d\ufeff]/g, '');
@@ -27550,7 +27569,8 @@ class WriteRichTextAreaFieldComponent extends AbstractFieldWriteComponent {
                 emitEvent: false,
                 emitModelToViewChange: false
             });
-            if (normalisedValue || this.editorHasMeaningfulRichTextContent()) {
+            if ((normalisedValue || this.editorHasMeaningfulRichTextContent())
+                && !this.differsOnlyByDocmosisBlankParagraphs(value, normalisedValue)) {
                 this.editor.setContent(normalisedValue || '');
             }
         }
@@ -27558,6 +27578,34 @@ class WriteRichTextAreaFieldComponent extends AbstractFieldWriteComponent {
             this.isNormalisingValue = false;
         }
     }
+    differsOnlyByDocmosisBlankParagraphs(value, normalisedValue) {
+        if (!value || !normalisedValue) {
+            return false;
+        }
+        const originalDocument = new DOMParser().parseFromString(value, 'text/html');
+        const normalisedDocument = new DOMParser().parseFromString(normalisedValue, 'text/html');
+        this.clearBlankParagraphs(originalDocument);
+        this.clearBlankParagraphs(normalisedDocument);
+        return originalDocument.body.innerHTML === normalisedDocument.body.innerHTML;
+    }
+    /**
+     * Canonicalises visually blank paragraphs to <p></p> before comparing two HTML values.
+    * This lets the editor avoid reloading when only the Docmosis blank-line representation changed.
+    */
+    clearBlankParagraphs(documentElement) {
+        this.replaceBlankParagraphContent(documentElement, '');
+    }
+    replaceBlankParagraphContent(documentElement, replacement) {
+        const paragraphs = Array.prototype.slice.call(documentElement.body.querySelectorAll('p'));
+        paragraphs.forEach((paragraph) => {
+            // Ignore standard whitespace (\s), non-breaking spaces (U+00A0), zero-width characters
+            // (U+200B–U+200D), and the byte-order mark (U+FEFF) when checking for visible text.
+            const visibleText = (paragraph.textContent || '').replace(/[\s\u00a0\u200b-\u200d\ufeff]/g, '');
+            if (!visibleText && !paragraph.querySelector('hr')) {
+                paragraph.textContent = replacement;
+            }
+        });
+    }
     editorHasMeaningfulRichTextContent() {
         const documentNode = this.editor.view.state.doc;
         const visibleText = documentNode.textContent.replace(/[\s\u00a0\u200b-\u200d\ufeff]/g, '');
@@ -41457,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;
@@ -41481,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) {