@hmcts/ccd-case-ui-toolkit 7.3.99-cot-1286 → 7.3.99

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

@@ -6308,7 +6308,7 @@ class FormValidatorsService {
         // Matches: [text](url), ![alt](url), <img ...>, <a ...>...</a>
         const inlineMarkdownPattern = /(?:!?\[[^\]]{0,500}\]\([^)]{0,500}\)|<(?:img\b[^>]{0,500}>|a\b[^>]{0,500}>[\s\S]*?<\/a>))/i;
         // Matches: [text][id], ![alt][id], and the collapsed form [text][]
-        const referenceBoxPattern = /(!)?\[((?:[^[\]\\]|\\.){0,500})\]\s*\[([^\]]{0,100})\]/;
+        const referenceBoxPattern = /(!)?\[((?:[^[\]\\]|\\.){0,500})\]\[([^\]]{0,100})\](?!\s*\/)/;
         // Matches: autolinks such as <http://example.com>
         const autolinkPattern = /<(?:[A-Za-z][A-Za-z0-9+.-]*:[^ <>\n]*|[A-Za-z0-9.!#$%&'*+/=?^_`{|}~-]+@[A-Za-z0-9-]+(?:\.[A-Za-z0-9-]+)+)>/;
         // Matches: bare www.example.com autolinks
@@ -26578,6 +26578,7 @@ class WriteRichTextAreaFieldComponent extends AbstractFieldWriteComponent {
             },
             plugins: [
                 new Plugin({
+                    appendTransaction: (transactions, oldState, newState) => this.renumberContinuedOrderedLists(transactions, oldState, newState),
                     props: {
                         handlePaste: (_view, event) => this.handleEditorPaste(event),
                         handleDOMEvents: {
@@ -27061,6 +27062,71 @@ class WriteRichTextAreaFieldComponent extends AbstractFieldWriteComponent {
             ? candidateOrder === adjacentOrder + adjacentList.childCount
             : candidateOrder + candidateList.childCount === adjacentOrder;
     }
+    renumberContinuedOrderedLists(transactions, oldState, newState) {
+        if (!transactions.some((transaction) => transaction.docChanged)) {
+            return null;
+        }
+        const oldChildren = [];
+        let oldPosition = 0;
+        oldState.doc.forEach((node) => {
+            oldChildren.push({ node, position: oldPosition });
+            oldPosition += node.nodeSize;
+        });
+        const mapPosition = (position) => transactions.reduce((mappedPosition, transaction) => transaction.mapping.map(mappedPosition, 1), position);
+        const effectiveOrders = new Map();
+        let result = null;
+        oldChildren.forEach(({ node: candidate, position: candidatePosition }, candidateIndex) => {
+            if (candidate.type.name !== 'ordered_list') {
+                return;
+            }
+            let previousIndex = candidateIndex - 1;
+            while (previousIndex >= 0 &&
+                this.isOrderedListContinuationSeparator(oldChildren[previousIndex].node, candidate)) {
+                previousIndex--;
+            }
+            if (previousIndex < 0) {
+                return;
+            }
+            const previous = oldChildren[previousIndex].node;
+            const previousPosition = oldChildren[previousIndex].position;
+            if (previous.type.name !== 'ordered_list' ||
+                !this.hasMatchingListType(candidate, previous) ||
+                candidate.attrs.indent !== previous.attrs.indent ||
+                !this.isSequentialList(candidate, previous, 1)) {
+                return;
+            }
+            const mappedPreviousPosition = mapPosition(previousPosition);
+            const mappedCandidatePosition = mapPosition(candidatePosition);
+            const newPrevious = newState.doc.nodeAt(mappedPreviousPosition);
+            const newCandidate = newState.doc.nodeAt(mappedCandidatePosition);
+            if (!newPrevious || !newCandidate ||
+                newPrevious.type.name !== 'ordered_list' || newCandidate.type.name !== 'ordered_list' ||
+                newPrevious.firstChild?.textContent !== previous.firstChild?.textContent ||
+                newCandidate.firstChild?.textContent !== candidate.firstChild?.textContent ||
+                !this.hasMatchingListType(newCandidate, newPrevious) ||
+                newCandidate.attrs.indent !== newPrevious.attrs.indent) {
+                return;
+            }
+            const previousOrder = effectiveOrders.get(previousPosition) ?? (Number(newPrevious.attrs.order) || 1);
+            const expectedOrder = previousOrder + newPrevious.childCount;
+            effectiveOrders.set(candidatePosition, expectedOrder);
+            if (Number(newCandidate.attrs.order) === expectedOrder) {
+                return;
+            }
+            result = (result || newState.tr).setNodeMarkup(mappedCandidatePosition, newCandidate.type, {
+                ...newCandidate.attrs,
+                order: expectedOrder
+            });
+        });
+        return result;
+    }
+    isOrderedListContinuationSeparator(node, candidate) {
+        if (this.isEmptyParagraph(node) || this.isListSectionHeading(node)) {
+            return true;
+        }
+        return this.isList(node) &&
+            (Number(node.attrs.indent) || 0) > (Number(candidate.attrs.indent) || 0);
+    }
     hasListContinuation(list) {
         return list.type.name === 'ordered_list' || Boolean(list.attrs.continuationOrder);
     }
@@ -27326,7 +27392,10 @@ class WriteRichTextAreaFieldComponent extends AbstractFieldWriteComponent {
         this.removeUnsupportedMarkup(documentElement);
         this.normaliseDateRangeSpacing(documentElement);
         this.removeUnsupportedAttributes(documentElement);
-        return this.normalisePlainTextValue(sanitiseRichTextDocument(documentElement));
+        const sanitisedValue = sanitiseRichTextDocument(documentElement);
+        return this.hasMeaningfulRichTextContent(documentElement)
+            ? this.normalisePlainTextValue(sanitisedValue)
+            : '';
     }
     normaliseRichTextValue(value) {
         if (!value) {
@@ -27344,7 +27413,15 @@ class WriteRichTextAreaFieldComponent extends AbstractFieldWriteComponent {
         this.removeUnsupportedMarkup(documentElement);
         this.normaliseDateRangeSpacing(documentElement);
         this.removeUnsupportedAttributes(documentElement);
-        return this.normalisePlainTextValue(sanitiseRichTextDocument(documentElement));
+        const sanitisedValue = sanitiseRichTextDocument(documentElement);
+        return this.hasMeaningfulRichTextContent(documentElement)
+            ? this.normalisePlainTextValue(sanitisedValue)
+            : '';
+    }
+    hasMeaningfulRichTextContent(documentElement) {
+        const visibleText = (documentElement.body.textContent || '')
+            .replace(/[\s\u00a0\u200b-\u200d\ufeff]/g, '');
+        return visibleText.length > 0 || Boolean(documentElement.body.querySelector('hr'));
     }
     syncAccessibilityLater() {
         setTimeout(() => this.syncAccessibilityState());
@@ -27457,13 +27534,31 @@ class WriteRichTextAreaFieldComponent extends AbstractFieldWriteComponent {
         }
         this.isNormalisingValue = true;
         try {
-            this.richTextAreaControl.setValue(normalisedValue, { emitEvent: false });
-            this.editor.setContent(normalisedValue || '');
+            this.richTextAreaControl.setValue(normalisedValue, {
+                emitEvent: false,
+                emitModelToViewChange: false
+            });
+            if (normalisedValue || this.editorHasMeaningfulRichTextContent()) {
+                this.editor.setContent(normalisedValue || '');
+            }
         }
         finally {
             this.isNormalisingValue = false;
         }
     }
+    editorHasMeaningfulRichTextContent() {
+        const documentNode = this.editor.view.state.doc;
+        const visibleText = documentNode.textContent.replace(/[\s\u00a0\u200b-\u200d\ufeff]/g, '');
+        let hasHorizontalRule = false;
+        documentNode.descendants((node) => {
+            if (node.type.name === 'horizontal_rule') {
+                hasHorizontalRule = true;
+                return false;
+            }
+            return !hasHorizontalRule;
+        });
+        return visibleText.length > 0 || hasHorizontalRule;
+    }
     richTextRequiredValidator() {
         return (control) => {
             const textValue = this.htmlToText(control.value);
@@ -28114,7 +28209,7 @@ class WriteRichTextAreaFieldComponent extends AbstractFieldWriteComponent {
         }
         return value
             .replace(/!?\[([^\]]{0,500})\]\(([^)]{0,500})\)/g, (_match, text, url) => text || url)
-            .replace(/!?\[((?:[^[\]\\]|\\.){0,500})\]\s*\[[^\]]{0,100}\]/g, '$1');
+            .replace(/!?\[((?:[^[\]\\]|\\.){0,500})\]\[[^\]]{0,100}\](?!\s*\/)/g, '$1');
     }
     unwrapElement(element) {
         const parentNode = element.parentNode;
@@ -28133,6 +28228,8 @@ class WriteRichTextAreaFieldComponent extends AbstractFieldWriteComponent {
         const state = {
             listStack: [],
             listParents: [],
+            listRunDeclaredLevel: null,
+            listRunVisualLevel: null,
             resetListLevels: new Map(),
             previousListId: null
         };
@@ -28161,12 +28258,19 @@ class WriteRichTextAreaFieldComponent extends AbstractFieldWriteComponent {
     resetWordListConversionState(state) {
         state.listStack.length = 0;
         state.listParents.length = 0;
+        state.listRunDeclaredLevel = null;
+        state.listRunVisualLevel = null;
         state.resetListLevels.clear();
         state.previousListId = null;
     }
     wordListRequestedLevel(paragraph, listId, wordListIndents, state) {
         const declaredLevel = this.wordListDeclaredLevel(paragraph);
-        let requestedLevel = this.wordListLevel(paragraph, wordListIndents);
+        const visualLevel = this.wordListVisualLevel(paragraph, wordListIndents);
+        if (state.listRunDeclaredLevel === null || state.listRunVisualLevel === null) {
+            state.listRunDeclaredLevel = declaredLevel;
+            state.listRunVisualLevel = visualLevel;
+        }
+        let requestedLevel = Math.max(1, declaredLevel - state.listRunDeclaredLevel + 1, visualLevel - state.listRunVisualLevel + 1);
         const rememberedResetLevel = declaredLevel === 1 ? state.resetListLevels.get(listId) : null;
         if (rememberedResetLevel) {
             return Math.max(requestedLevel, rememberedResetLevel);
@@ -28187,7 +28291,8 @@ class WriteRichTextAreaFieldComponent extends AbstractFieldWriteComponent {
         let currentList = state.listStack[stackIndex];
         if (currentList?.tagName.toLowerCase() !== listType || currentList?.getAttribute('type') !== orderedListType ||
             state.listParents[stackIndex] !== listParent) {
-            currentList = this.createWordList(documentElement, paragraph, listType, orderedListType, parentListItem);
+            const rootIndent = level === 1 ? state.listRunVisualLevel - 1 : 0;
+            currentList = this.createWordList(documentElement, paragraph, listType, orderedListType, parentListItem, rootIndent);
             state.listStack[stackIndex] = currentList;
             state.listParents[stackIndex] = listParent;
         }
@@ -28195,15 +28300,18 @@ class WriteRichTextAreaFieldComponent extends AbstractFieldWriteComponent {
         state.listParents.length = level;
         return currentList;
     }
-    createWordList(documentElement, paragraph, listType, orderedListType, parentListItem) {
+    createWordList(documentElement, paragraph, listType, orderedListType, parentListItem, rootIndent) {
         const list = documentElement.createElement(listType);
-        const listStart = this.wordListStart(paragraph);
+        const listStart = this.wordListStart(paragraph, orderedListType);
         if (listType === 'ol' && listStart > 1) {
             list.setAttribute('start', listStart.toString());
         }
         if (orderedListType) {
             list.setAttribute('type', orderedListType);
         }
+        if (rootIndent > 0) {
+            list.dataset.indent = Math.min(6, rootIndent).toString();
+        }
         if (parentListItem) {
             parentListItem.appendChild(list);
         }
@@ -28262,11 +28370,10 @@ class WriteRichTextAreaFieldComponent extends AbstractFieldWriteComponent {
             .find((element) => /mso-list:\s*Ignore/i.test(element.getAttribute('style') || ''));
         return (markerElement ? markerElement.textContent : paragraph.textContent).trim();
     }
-    wordListLevel(paragraph, wordListIndents) {
-        const declaredLevel = this.wordListDeclaredLevel(paragraph);
+    wordListVisualLevel(paragraph, wordListIndents) {
         const indent = this.wordListIndent(paragraph);
         const visualLevel = wordListIndents.indexOf(indent) + 1;
-        return Math.max(declaredLevel, visualLevel || 1);
+        return visualLevel || 1;
     }
     wordListDeclaredLevel(paragraph) {
         const match = (paragraph.getAttribute('style') || '').match(/mso-list:[^;]*\blevel(\d+)/i);
@@ -28287,9 +28394,18 @@ class WriteRichTextAreaFieldComponent extends AbstractFieldWriteComponent {
         const indent = Math.max(this.cssLengthToPixels(this.cssStyleLength(style, 'margin-left')), this.cssLengthToPixels(this.cssStyleLength(style, 'margin-inline-start')), this.cssLengthToPixels(this.cssStyleLength(style, 'mso-para-margin-left')), this.cssLengthToPixels(this.cssStyleLength(style, 'mso-margin-left-alt')), this.cssLengthToPixels(this.cssMarginLeftLength(style)));
         return Math.round(indent);
     }
-    wordListStart(paragraph) {
-        const match = /^(\d+)[.)]/.exec(this.wordListMarker(paragraph));
-        return match ? Number(match[1]) : 1;
+    wordListStart(paragraph, orderedListType) {
+        const match = /^\(?([a-z]+|\d+)[.)]/i.exec(this.wordListMarker(paragraph));
+        if (!match) {
+            return 1;
+        }
+        if (/^\d+$/.test(match[1])) {
+            return Number(match[1]);
+        }
+        if (orderedListType === 'a') {
+            return match[1].toLowerCase().split('').reduce((start, character) => (start * 26) + character.charCodeAt(0) - 96, 0);
+        }
+        return 1;
     }
     copyListItemContents(documentElement, paragraph, listItem) {
         Array.prototype.slice.call(paragraph.childNodes).forEach((childNode) => {
@@ -29008,7 +29124,7 @@ class WriteRichTextAreaFieldComponent extends AbstractFieldWriteComponent {
             type: ViewChild,
             args: ['editorHost']
         }] }); })();
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(WriteRichTextAreaFieldComponent, { className: "WriteRichTextAreaFieldComponent", filePath: "lib/shared/components/palette/rich-text-area/write-rich-text-area-field.component.ts", lineNumber: 137 }); })();
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(WriteRichTextAreaFieldComponent, { className: "WriteRichTextAreaFieldComponent", filePath: "lib/shared/components/palette/rich-text-area/write-rich-text-area-field.component.ts", lineNumber: 139 }); })();
 
 class ReadTextFieldComponent extends AbstractFieldReadComponent {
     static ɵfac = /*@__PURE__*/ (() => { let ɵReadTextFieldComponent_BaseFactory; return function ReadTextFieldComponent_Factory(__ngFactoryType__) { return (ɵReadTextFieldComponent_BaseFactory || (ɵReadTextFieldComponent_BaseFactory = i0.ɵɵgetInheritedFactory(ReadTextFieldComponent)))(__ngFactoryType__ || ReadTextFieldComponent); }; })();
@@ -42619,12 +42735,9 @@ class EventStartStateMachineService {
     }
     entryActionForStateNoTask(state, context) {
         // Trigger final state to complete processing of state machine
-        const task = context.tasks[0];
-        const jurisdiction = task?.jurisdiction ?? context.caseDetails?.case_type?.jurisdiction?.id;
-        const caseTypeId = task?.case_type_id ?? context.caseDetails?.case_type?.id;
         state.trigger(EventStartStates.FINAL);
         // Navigate to no tasks available error page
-        context.router.navigate([`/cases/case-details/${jurisdiction}/${caseTypeId}/${context.caseId}/no-tasks-available`], { relativeTo: context.route });
+        context.router.navigate([`/cases/case-details/${context.tasks[0]?.jurisdiction}/${context.tasks[0]?.case_type_id}/${context.caseId}/no-tasks-available`], { relativeTo: context.route });
     }
     entryActionForStateOneOrMoreTasks(state, context) {
         state.trigger(EventStartStates.TASK_ASSIGNED_TO_USER);
@@ -42782,9 +42895,8 @@ class EventStartComponent {
     }
     ngOnInit() {
         // Get task and case id payload from route data
-        const caseDetails = this.route.snapshot.data.case;
         const tasks = this.route.snapshot.data.tasks;
-        const caseId = caseDetails.case_id;
+        const caseId = this.route.snapshot.data.case.case_id;
         const eventId = this.route.snapshot.queryParams['eventId'];
         const taskId = this.route.snapshot.queryParams['taskId'];
         // Setup the context
@@ -42793,7 +42905,6 @@ class EventStartComponent {
             caseId,
             eventId,
             taskId,
-            caseDetails,
             router: this.router,
             route: this.route,
             sessionStorageService: this.sessionStorageService,