@hmcts/ccd-case-ui-toolkit 7.4.13-hdpi-8362 → 7.4.14-5337-rc1

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

@@ -15975,13 +15975,16 @@ class WriteCaseFlagFieldComponent extends AbstractFieldWriteJourneyComponent {
                 if (!this.selectedFlag.originalStatus) {
                     this.selectedFlag.originalStatus = flagDetailToUpdate.value?.status;
                 }
-                // If the description FormControls don't exist, it means these fields weren't visited as part of the "Update Flag"
-                // journey, so do *not* update their values (otherwise they will become undefined)
-                if (this.caseFlagParentFormGroup.get(CaseFlagFormFields.OTHER_FLAG_DESCRIPTION)) {
-                    flagDetailToUpdate.value.otherDescription = this.caseFlagParentFormGroup.get(CaseFlagFormFields.OTHER_FLAG_DESCRIPTION).value;
-                }
-                if (this.caseFlagParentFormGroup.get(CaseFlagFormFields.OTHER_FLAG_DESCRIPTION_WELSH)) {
-                    flagDetailToUpdate.value.otherDescription_cy = this.caseFlagParentFormGroup.get(CaseFlagFormFields.OTHER_FLAG_DESCRIPTION_WELSH).value;
+                // Update description fields only if flag type is "Other" (flag code OT0001); these fields apply only to that flag type
+                // If their FormControls don't exist, it means these fields weren't visited as part of the "Update Flag" journey, so do
+                // *not* update their values (otherwise they will become undefined)
+                if (flagDetailToUpdate.value?.flagCode === this.otherFlagTypeCode) {
+                    if (this.caseFlagParentFormGroup.get(CaseFlagFormFields.OTHER_FLAG_DESCRIPTION)) {
+                        flagDetailToUpdate.value.otherDescription = this.caseFlagParentFormGroup.get(CaseFlagFormFields.OTHER_FLAG_DESCRIPTION).value;
+                    }
+                    if (this.caseFlagParentFormGroup.get(CaseFlagFormFields.OTHER_FLAG_DESCRIPTION_WELSH)) {
+                        flagDetailToUpdate.value.otherDescription_cy = this.caseFlagParentFormGroup.get(CaseFlagFormFields.OTHER_FLAG_DESCRIPTION_WELSH).value;
+                    }
                 }
                 // Ensure that any comments entered with language set to Welsh do not end up in the English comments field
                 if (this.rpxTranslationService.language !== 'cy') {
@@ -26649,7 +26652,18 @@ const richTextNodes = {
             }, 0]
     }
 };
-const richTextSchema = new Schema({ nodes: richTextNodes, marks: marks });
+const richTextMarks = {
+    ...marks,
+    em: {
+        ...marks.em,
+        toDOM: () => ['i', 0]
+    },
+    strong: {
+        ...marks.strong,
+        toDOM: () => ['b', 0]
+    }
+};
+const richTextSchema = new Schema({ nodes: richTextNodes, marks: richTextMarks });
 class WriteRichTextAreaFieldComponent extends AbstractFieldWriteComponent {
     editorHost;
     editor;
@@ -27487,6 +27501,7 @@ class WriteRichTextAreaFieldComponent extends AbstractFieldWriteComponent {
         this.removeUnsupportedMarkup(documentElement);
         this.normaliseDateRangeSpacing(documentElement);
         this.removeUnsupportedAttributes(documentElement);
+        this.normaliseDocmosisInlineFormatting(documentElement);
         const hasMeaningfulContent = this.hasMeaningfulRichTextContent(documentElement);
         if (hasMeaningfulContent) {
             this.preserveDocmosisBlankParagraphs(documentElement);
@@ -27512,6 +27527,7 @@ class WriteRichTextAreaFieldComponent extends AbstractFieldWriteComponent {
         this.removeUnsupportedMarkup(documentElement);
         this.normaliseDateRangeSpacing(documentElement);
         this.removeUnsupportedAttributes(documentElement);
+        this.normaliseDocmosisInlineFormatting(documentElement);
         const hasMeaningfulContent = this.hasMeaningfulRichTextContent(documentElement);
         if (hasMeaningfulContent) {
             this.preserveDocmosisBlankParagraphs(documentElement);
@@ -27528,6 +27544,24 @@ class WriteRichTextAreaFieldComponent extends AbstractFieldWriteComponent {
     preserveDocmosisBlankParagraphs(documentElement) {
         this.replaceBlankParagraphContent(documentElement, '\u00a0');
     }
+    /**
+     * Uses the presentational tags supported by Docmosis while continuing to
+     * accept the equivalent semantic tags when existing content is loaded.
+     */
+    normaliseDocmosisInlineFormatting(documentElement) {
+        this.replaceElements(documentElement, 'strong', 'b');
+        this.replaceElements(documentElement, 'em', 'i');
+    }
+    replaceElements(documentElement, sourceTag, targetTag) {
+        const elements = Array.prototype.slice.call(documentElement.body.querySelectorAll(sourceTag));
+        elements.forEach((element) => {
+            const replacement = documentElement.createElement(targetTag);
+            while (element.firstChild) {
+                replacement.appendChild(element.firstChild);
+            }
+            element.replaceWith(replacement);
+        });
+    }
     hasMeaningfulRichTextContent(documentElement) {
         const visibleText = (documentElement.body.textContent || '')
             .replace(/[\s\u00a0\u200b-\u200d\ufeff]/g, '');
@@ -29263,7 +29297,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: 139 }); })();
+(() => { (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: 151 }); })();
 
 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); }; })();