Merge fb036a5 into 07ae681

naver · Jun 2, 2023 · 96aae84 · 96aae84
2 parents 07ae681 + fb036a5
commit 96aae84
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/packages/conveyer/src/Conveyer.ts b/packages/conveyer/src/Conveyer.ts
@@ -12,7 +12,7 @@ import {
   ConveyerOptions, FindItemOptions, ConveyerReactiveState,
   ScrollIntoViewOptions,
 } from "./types";
-import { isString } from "./utils";
+import { instanceOfElement, isString } from "./utils";
 
 
 /**
@@ -360,12 +360,16 @@ class Conveyer extends Component<ConveyerEvents> {
 
     if (isString(scrollArea)) {
       el = document.querySelector<HTMLElement>(scrollArea)!;
-    } else if (scrollArea instanceof Element) {
+    } else if (instanceOfElement(scrollArea)) {
       el = scrollArea;
     } else if ("value" in scrollArea || "current" in scrollArea) {
       el = scrollArea.value! || scrollArea.current!;
     }
 
+    if (!el) {
+      return;
+    }
+
     this._scrollAreaElement = el;
     let isDrag = false;
     const scrollAreaElement = this._scrollAreaElement;

diff --git a/packages/conveyer/src/utils.ts b/packages/conveyer/src/utils.ts
@@ -17,3 +17,8 @@ export function findIndex<T>(arr: T[], callback: (element: T, index: number) =>
   }
   return -1;
 }
+
+
+export function instanceOfElement(el: any): el is Element {
+  return el instanceof Element || ("tagName" in el && "nodeType" in el);
+}
diff --git a/packages/conveyer/test/unit/Conveyer.spec.ts b/packages/conveyer/test/unit/Conveyer.spec.ts
@@ -150,6 +150,24 @@ describe("test Conveyer", () => {
       expect(conveyer.isReachStart).to.be.equal(true);
       expect(conveyer.isReachEnd).to.be.equal(true);
     });
+    it("should check if it works even if there is a contaminated Element", () => {
+
+      // Given
+      const items = document.querySelector<HTMLElement>(".items")!;
+
+      // When
+      const Element = window.Element;
+      (window as any).Element = () => {};
+
+      try {
+        conveyer = new Conveyer(items);
+      } catch (e) {}
+
+      window.Element = Element;
+
+      // Thwn
+      expect(items.style.userSelect).to.be.equals("none");
+    });
   });
   describe("Reactvie Properties", () => {
     it("should check if isReachStart is true, isReachEnd is false if init", () => {