Merge pull request #14044 from calixteman/bug1719148

Annotations - Avoid empty value in text field when storage contains something for it (bug 1719148)

Author: Snuffleupagus

src/display/annotation_storage.js

@@ -42,7 +42,12 @@ class AnnotationStorage {
    * @returns {Object}
    */
   getValue(key, defaultValue) {
-    return this._storage.get(key) ?? defaultValue;
+    const value = this._storage.get(key);
+    if (value === undefined) {
+      return defaultValue;
+    }
+
+    return Object.assign(defaultValue, value);
   }
 
   /**

test/unit/annotation_storage_spec.js

@@ -35,6 +35,24 @@ describe("AnnotationStorage", function () {
       }).value;
       expect(value).toEqual("hello world");
     });
+
+    it("should get set values and default ones in the annotation storage", function () {
+      const annotationStorage = new AnnotationStorage();
+      annotationStorage.setValue("123A", {
+        value: "hello world",
+        hello: "world",
+      });
+
+      const result = annotationStorage.getValue("123A", {
+        value: "an other string",
+        world: "hello",
+      });
+      expect(result).toEqual({
+        value: "hello world",
+        hello: "world",
+        world: "hello",
+      });
+    });
   });
 
   describe("SetValue", function () {