work for the surveyjs/survey-creator#4888

surveyjs · Nov 16, 2023 · 59e4d08 · 59e4d08
1 parent f90277a
commit 59e4d08
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/dragdrop/choices.ts b/src/dragdrop/choices.ts
@@ -82,7 +82,9 @@ export class DragDropChoices extends DragDropCore<QuestionSelectBase> {
     const imageContainerNode: any = itemValueNode.querySelector(".sd-imagepicker__image-container");
     let imageNode: any = itemValueNode.querySelector(item.imageLink ? "img" : ".sd-imagepicker__no-image").cloneNode(true);
 
-    this.imagepickerControlsNode.style.display = "none";
+    if (!!this.imagepickerControlsNode) {
+      this.imagepickerControlsNode.style.display = "none";
+    }
     imageContainerNode.style.width = imageNode.width + "px";
     imageContainerNode.style.height = imageNode.height + "px";
 
@@ -214,8 +216,10 @@ export class DragDropChoices extends DragDropCore<QuestionSelectBase> {
     if(!!this.parentElement) {
       this.updateVisibleChoices(this.parentElement);
     }
-    this.imagepickerControlsNode.style.display = "flex";
-    this.imagepickerControlsNode = null;
+    if (!!this.imagepickerControlsNode) {
+      this.imagepickerControlsNode.style.display = "flex";
+      this.imagepickerControlsNode = null;
+    }
     super.clear();
   }
 

diff --git a/tests/dragdrophelpertests.ts b/tests/dragdrophelpertests.ts
@@ -238,7 +238,7 @@ QUnit.test("createImagePickerShortcut", function (assert) {
   let ddHelper = new DragDropChoices();
   let item = new ImageItemValue("a");
 
-  const createImagePickerShortcut = ddHelper["createImagePickerShortcut"];
+  const createImagePickerShortcut = ddHelper["createImagePickerShortcut"].bind(ddHelper);
   const element = document.createElement("div");
   const testElement = document.body.appendChild(element);
   testElement.innerHTML = "<div data-sv-drop-target-item-value=\"camel\"><div class=\"sd-imagepicker__image-container\"><div class=\"sd-imagepicker__no-image\"></div><div class=\"svc-image-item-value-controls\"></div>";