@hmcts/media-viewer 4.2.40-redaction-save-issue → 4.2.40

package/fesm2022/hmcts-media-viewer.mjs

@@ -1426,9 +1426,9 @@ function redactionReducer(state = initialRedactionState, action) {
         }
         case REDACT_SUCCESS: {
             const redactedDocumentInfo = action.payload;
-            // Markers persist on the backend, so keep them in state to stay consistent with a reload
             return {
                 ...state,
+                ...initialRedactionState,
                 redactedDocumentInfo
             };
         }
@@ -2065,8 +2065,8 @@ class HighlightCreateDirective {
         }
         this.setPageProperties(page);
         const range = selection.getRangeAt(0).cloneRange();
-        const clientRects = range.getClientRects();
-        if (!clientRects || clientRects.length === 0) {
+        const selectionRects = this.getSelectionRectangles(range);
+        if (!selectionRects || selectionRects.length === 0) {
             return [];
         }
         let textLayerElement = range.startContainer;
@@ -2078,7 +2078,7 @@ class HighlightCreateDirective {
             return [];
         }
         this.removeEnhancedTextModeStyling(textLayerElement);
-        return this.processClientRects(clientRects, textLayer);
+        return this.processClientRects(selectionRects, textLayer);
     }
     onPdfViewerClick(event) {
         this.store.dispatch(new SelectedAnnotation({
@@ -2096,14 +2096,17 @@ class HighlightCreateDirective {
             this.removeEnhancedTextModeStyling(localElement);
             if (selection.rangeCount && !selection.isCollapsed) {
                 const range = selection.getRangeAt(0).cloneRange();
-                const clientRects = range.getClientRects();
-                if (clientRects) {
+                const selectionRects = this.getSelectionRectangles(range);
+                if (selectionRects) {
                     const textLayer = localElement.closest(".textLayer");
-                    return this.processClientRects(clientRects, textLayer);
+                    return this.processClientRects(selectionRects, textLayer);
                 }
             }
         }
     }
+    getSelectionRectangles(range) {
+        return range.getClientRects();
+    }
     createTextRectangle(rect, parentRect) {
         const height = rect.bottom - rect.top;
         const width = rect.right - rect.left;
@@ -2136,7 +2139,10 @@ class HighlightCreateDirective {
         const selectionRectangles = [];
         for (let i = 0; i < clientRects.length; i++) {
             const selectionRectangle = this.createTextRectangle(clientRects[i], parentRect);
-            const findSelectionRectangle = selectionRectangles.find((rect) => rect.width === selectionRectangle.width && rect.x === selectionRectangle.x);
+            const findSelectionRectangle = selectionRectangles.find((rect) => rect.width === selectionRectangle.width
+                && rect.height === selectionRectangle.height
+                && rect.x === selectionRectangle.x
+                && rect.y === selectionRectangle.y);
             if (!findSelectionRectangle) {
                 selectionRectangles.push(selectionRectangle);
             }