Merge pull request #31 from dfalling/switch_to_rescript_webapi

Switch from bs-webapi to rescript-webapi

Author: Alex Fedoseev

bsconfig.json

@@ -13,7 +13,7 @@
   ],
   "bs-dependencies": [
     "@rescript/react",
-    "bs-webapi",
+    "rescript-webapi",
     "rescript-logger"
   ],
   "bs-dev-dependencies": [

package.json

@@ -46,10 +46,10 @@
   },
   "peerDependencies": {
     "@rescript/react": ">=0.10.3",
-    "bs-webapi": ">=0.15.9"
+    "rescript-webapi": ">=0.6.0"
   },
   "devDependencies": {
-    "@rescript/react": "0.10.3",
+    "@rescript/react": ">=0.10.3",
     "autoprefixer": "9.8.6",
     "bs-webapi": "0.19.1",
     "bsb-js": "1.1.7",

src/Dnd__DndManager.res

@@ -794,7 +794,7 @@ module Make = (Context: Context.T) => {
         let scrollPosition = Scrollable.Window.getScrollPosition()
 
         let rect = item.element->HtmlElement.getBoundingClientRect
-        let style = window->Window.getComputedStyle(item.element->Web.htmlElementToElement, _)
+        let style = window->Window.getComputedStyle(item.element->Web.htmlElementToElement)
 
         let viewportRect = rect->Geometry.getViewportRect
         let pageRect = viewportRect->Geometry.getPageRectFromViewportRect(scrollPosition)
@@ -843,22 +843,22 @@ module Make = (Context: Context.T) => {
                 "MouseSubscriptions::SubscriptionsInstalled"
                 ("ItemId", itemId)
               )
-              Window.addMouseMoveEventListener(onMouseMove, window)
-              Window.addMouseUpEventListener(onMouseUp, window)
-              HtmlElement.addKeyDownEventListener(onKeyDown, ghost.element)
-              Window.addEventListener("resize", onResize, window)
-              Window.addEventListener("visibilitychange", onVisibilityChange, window)
+              Window.addMouseMoveEventListener(window, onMouseMove)
+              Window.addMouseUpEventListener(window, onMouseUp)
+              HtmlElement.addKeyDownEventListener(ghost.element, onKeyDown)
+              Window.addEventListener(window, "resize", onResize)
+              Window.addEventListener(window, "visibilitychange", onVisibilityChange)
             },
             drop: () => {
               %log.debug(
                 "MouseSubscriptions::SubscriptionsDropped"
                 ("ItemId", itemId)
               )
-              Window.removeMouseMoveEventListener(onMouseMove, window)
-              Window.removeMouseUpEventListener(onMouseUp, window)
-              HtmlElement.removeKeyDownEventListener(onKeyDown, ghost.element)
-              Window.removeEventListener("resize", onResize, window)
-              Window.removeEventListener("visibilitychange", onVisibilityChange, window)
+              Window.removeMouseMoveEventListener(window, onMouseMove)
+              Window.removeMouseUpEventListener(window, onMouseUp)
+              HtmlElement.removeKeyDownEventListener(ghost.element, onKeyDown)
+              Window.removeEventListener(window, "resize", onResize)
+              Window.removeEventListener(window, "visibilitychange", onVisibilityChange)
             },
           }
         | #Touch =>
@@ -875,22 +875,22 @@ module Make = (Context: Context.T) => {
                 "TouchSubscriptions::SubscriptionsInstalled"
                 ("ItemId", itemId)
               )
-              Window.addEventListener("touchmove", onTouchMove, window)
-              Window.addEventListener("touchend", onTouchEnd, window)
-              Window.addEventListener("contextmenu", onContextMenu, window)
-              Window.addEventListener("orientationchange", onOrientationChange, window)
-              Window.addEventListener("visibilitychange", onVisibilityChange, window)
+              Window.addEventListener(window, "touchmove", onTouchMove)
+              Window.addEventListener(window, "touchend", onTouchEnd)
+              Window.addEventListener(window, "contextmenu", onContextMenu)
+              Window.addEventListener(window, "orientationchange", onOrientationChange)
+              Window.addEventListener(window, "visibilitychange", onVisibilityChange)
             },
             drop: () => {
               %log.debug(
                 "TouchSubscriptions::SubscriptionsDropped"
                 ("ItemId", itemId)
               )
-              Window.removeEventListener("touchmove", onTouchMove, window)
-              Window.removeEventListener("touchend", onTouchEnd, window)
-              Window.removeEventListener("contextmenu", onContextMenu, window)
-              Window.removeEventListener("orientationchange", onOrientationChange, window)
-              Window.removeEventListener("visibilitychange", onVisibilityChange, window)
+              Window.removeEventListener(window, "touchmove", onTouchMove)
+              Window.removeEventListener(window, "touchend", onTouchEnd)
+              Window.removeEventListener(window, "contextmenu", onContextMenu)
+              Window.removeEventListener(window, "orientationchange", onOrientationChange)
+              Window.removeEventListener(window, "visibilitychange", onVisibilityChange)
             },
           }
         }

src/Dnd__DraggableItem.res

@@ -14,7 +14,10 @@ module Make = (Context: Context.T) => {
   module Helpers = {
     let clearSelection = () => {
       open Webapi.Dom
-      window->Window.getSelection->Selection.removeAllRanges
+      switch window->Window.getSelection {
+      | Some(selection) => Selection.removeAllRanges(selection)
+      | None => ()
+      }
     }
 
     let getGeometry = element =>

src/Dnd__Events.res

@@ -5,59 +5,59 @@ let addOptions = {"passive": false, "once": false, "capture": false}
 let removeOptions = {"passive": false, "capture": false}
 
 let subscribeToMouseMove = handler =>
-  Window.addMouseMoveEventListenerWithOptions(handler, addOptions, window)
+  Window.addMouseMoveEventListenerWithOptions(window, handler, addOptions)
 let unsubscribeFromMouseMove = handler =>
-  Window.removeMouseMoveEventListenerWithOptions(handler, removeOptions, window)
+  Window.removeMouseMoveEventListenerWithOptions(window, handler, removeOptions)
 
 let subscribeToMouseUp = handler =>
-  Window.addMouseUpEventListenerWithOptions(handler, addOptions, window)
+  Window.addMouseUpEventListenerWithOptions(window, handler, addOptions)
 let unsubscribeFromMouseUp = handler =>
-  Window.removeMouseUpEventListenerWithOptions(handler, removeOptions, window)
+  Window.removeMouseUpEventListenerWithOptions(window, handler, removeOptions)
 
 let subscribeToDrag = handler =>
-  Window.addEventListenerWithOptions("drag", handler, addOptions, window)
+  Window.addEventListenerWithOptions(window, "drag", handler, addOptions)
 let unsubscribeFromDrag = handler =>
-  Window.removeEventListenerWithOptions("drag", handler, removeOptions, window)
+  Window.removeEventListenerWithOptions(window, "drag", handler, removeOptions)
 
 let subscribeToResize = handler =>
-  Window.addEventListenerWithOptions("resize", handler, addOptions, window)
+  Window.addEventListenerWithOptions(window, "resize", handler, addOptions)
 let unsubscribeFromResize = handler =>
-  Window.removeEventListenerWithOptions("resize", handler, removeOptions, window)
+  Window.removeEventListenerWithOptions(window, "resize", handler, removeOptions)
 
 let subscribeToKeyUp = handler =>
-  Window.addKeyUpEventListenerWithOptions(handler, addOptions, window)
+  Window.addKeyUpEventListenerWithOptions(window, handler, addOptions)
 let unsubscribeFromKeyUp = handler =>
-  Window.removeKeyUpEventListenerWithOptions(handler, removeOptions, window)
+  Window.removeKeyUpEventListenerWithOptions(window, handler, removeOptions)
 
 let subscribeToKeyDown = handler =>
-  Window.addKeyDownEventListenerWithOptions(handler, addOptions, window)
+  Window.addKeyDownEventListenerWithOptions(window, handler, addOptions)
 let unsubscribeFromKeyDown = handler =>
-  Window.removeKeyDownEventListenerWithOptions(handler, removeOptions, window)
+  Window.removeKeyDownEventListenerWithOptions(window, handler, removeOptions)
 
 let subscribeToTouchMove = handler =>
-  Window.addEventListenerWithOptions("touchmove", handler, addOptions, window)
+  Window.addEventListenerWithOptions(window, "touchmove", handler, addOptions)
 let unsubscribeFromTouchMove = handler =>
-  Window.removeEventListenerWithOptions("touchmove", handler, removeOptions, window)
+  Window.removeEventListenerWithOptions(window, "touchmove", handler, removeOptions)
 
 let subscribeToTouchEnd = handler =>
-  Window.addEventListenerWithOptions("touchend", handler, addOptions, window)
+  Window.addEventListenerWithOptions(window, "touchend", handler, addOptions)
 let unsubscribeFromTouchEnd = handler =>
-  Window.removeEventListenerWithOptions("touchend", handler, removeOptions, window)
+  Window.removeEventListenerWithOptions(window, "touchend", handler, removeOptions)
 
 let subscribeToOrientationChange = handler =>
-  Window.addEventListenerWithOptions("orientationchange", handler, addOptions, window)
+  Window.addEventListenerWithOptions(window, "orientationchange", handler, addOptions)
 let unsubscribeFromOrientationChange = handler =>
-  Window.removeEventListenerWithOptions("orientationchange", handler, removeOptions, window)
+  Window.removeEventListenerWithOptions(window, "orientationchange", handler, removeOptions)
 
 let subscribeToContextMenu = handler =>
-  Window.addEventListenerWithOptions("contextmenu", handler, addOptions, window)
+  Window.addEventListenerWithOptions(window, "contextmenu", handler, addOptions)
 let unsubscribeFromContextMenu = handler =>
-  Window.removeEventListenerWithOptions("contextmenu", handler, removeOptions, window)
+  Window.removeEventListenerWithOptions(window, "contextmenu", handler, removeOptions)
 
 let subscribeToVisibilityChange = handler =>
-  Window.addEventListenerWithOptions("visibilitychange", handler, addOptions, window)
+  Window.addEventListenerWithOptions(window, "visibilitychange", handler, addOptions)
 let unsubscribeFromVisibilityChange = handler =>
-  Window.removeEventListenerWithOptions("visibilitychange", handler, removeOptions, window)
+  Window.removeEventListenerWithOptions(window, "visibilitychange", handler, removeOptions)
 
 module Mouse = {
   let leftClick = event => event->ReactEvent.Mouse.button === 0

src/Dnd__Geometry.res

@@ -99,7 +99,7 @@ let getGeometry = (rect, style, scroll) => {
 let getElementGeometry = (el: Dom.htmlElement) =>
   getGeometry(
     el->HtmlElement.getBoundingClientRect,
-    window->Window.getComputedStyle(el->Web.htmlElementToElement, _),
+    window->Window.getComputedStyle(el->Web.htmlElementToElement),
   )
 
 let getViewport = () => {

src/Dnd__Scrollable.res

@@ -75,7 +75,7 @@ module Element = {
     element
     ->Webapi.Dom.HtmlElement.parentElement
     ->Option.flatMap(element => {
-      let style = Webapi.Dom.window->Webapi.Dom.Window.getComputedStyle(element, _)
+      let style = Webapi.Dom.window->Webapi.Dom.Window.getComputedStyle(element)
       if style->isScrollable {
         let element = {
           open Webapi.Dom

src/Dnd__Scroller.res

@@ -145,7 +145,7 @@ let windowScroller = (
         Webapi.requestCancellableAnimationFrame(_ => {
           {
             open Webapi.Dom
-            window->Window.scrollBy(x, y, _)
+            window->Window.scrollBy(x, y)
           }
 
           onScroll()
@@ -157,7 +157,7 @@ let windowScroller = (
         Webapi.requestCancellableAnimationFrame(_ => {
           {
             open Webapi.Dom
-            window->Window.scrollBy(x, 0., _)
+            window->Window.scrollBy(x, 0.)
           }
 
           onScroll()
@@ -169,7 +169,7 @@ let windowScroller = (
         Webapi.requestCancellableAnimationFrame(_ => {
           {
             open Webapi.Dom
-            window->Window.scrollBy(0., y, _)
+            window->Window.scrollBy(0., y)
           }
 
           onScroll()

src/Dnd__Style.res

@@ -15,5 +15,5 @@ let translate = (x, y) => "translate(" ++ (x->px ++ (", " ++ (y->px ++ ")")))
 
 let getComputedStyle = element => {
   open Webapi.Dom
-  window->Window.getComputedStyle(element->Web.htmlElementToElement, _)
+  window->Window.getComputedStyle(element->Web.htmlElementToElement)
 }