Updating formatting

framer · Nov 29, 2023 · 72f6eed · 72f6eed
1 parent b568ed4
commit 72f6eed
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 19 deletions.
diff --git a/packages/framer-motion/src/gestures/drag/VisualElementDragControls.ts b/packages/framer-motion/src/gestures/drag/VisualElementDragControls.ts
@@ -32,7 +32,7 @@ import { mix } from "../../utils/mix"
 import { percent } from "../../value/types/numbers/units"
 import { animateMotionValue } from "../../animation/interfaces/motion-value"
 import { frame } from "../../frameloop"
-import { getContextWindow } from "../../utils/getContextWindow";
+import { getContextWindow } from "../../utils/get-context-window"
 
 export const elementDragControls = new WeakMap<
     VisualElement,
@@ -215,7 +215,10 @@ export class VisualElementDragControls {
                 onMove,
                 onSessionEnd,
             },
-            { transformPagePoint: this.visualElement.getTransformPagePoint() , contextWindow: getContextWindow(this.visualElement) }
+            {
+                transformPagePoint: this.visualElement.getTransformPagePoint(),
+                contextWindow: getContextWindow(this.visualElement),
+            }
         )
     }
 

diff --git a/packages/framer-motion/src/gestures/pan/PanSession.ts b/packages/framer-motion/src/gestures/pan/PanSession.ts
@@ -97,8 +97,8 @@ interface PanSessionHandlers {
 }
 
 interface PanSessionOptions {
-    transformPagePoint?: TransformPoint,
-    contextWindow?: (Window & typeof globalThis) | null;
+    transformPagePoint?: TransformPoint
+    contextWindow?: (Window & typeof globalThis) | null
 }
 
 interface TimestampedPoint extends Point {
@@ -147,7 +147,7 @@ export class PanSession {
     /**
      * @internal
      */
-    private contextWindow: PanSessionOptions['contextWindow'] = window;
+    private contextWindow: PanSessionOptions["contextWindow"] = window
 
     constructor(
         event: PointerEvent,
@@ -159,7 +159,7 @@ export class PanSession {
 
         this.handlers = handlers
         this.transformPagePoint = transformPagePoint
-        this.contextWindow = contextWindow || window;
+        this.contextWindow = contextWindow || window
 
         const info = extractEventInfo(event)
         const initialInfo = transformPoint(info, this.transformPagePoint)
@@ -174,9 +174,21 @@ export class PanSession {
             onSessionStart(event, getPanInfo(initialInfo, this.history))
 
         this.removeListeners = pipe(
-            addPointerEvent(this.contextWindow, "pointermove", this.handlePointerMove),
-            addPointerEvent(this.contextWindow, "pointerup", this.handlePointerUp),
-            addPointerEvent(this.contextWindow, "pointercancel", this.handlePointerUp)
+            addPointerEvent(
+                this.contextWindow,
+                "pointermove",
+                this.handlePointerMove
+            ),
+            addPointerEvent(
+                this.contextWindow,
+                "pointerup",
+                this.handlePointerUp
+            ),
+            addPointerEvent(
+                this.contextWindow,
+                "pointercancel",
+                this.handlePointerUp
+            )
         )
     }
 

diff --git a/packages/framer-motion/src/gestures/pan/index.ts b/packages/framer-motion/src/gestures/pan/index.ts
@@ -3,7 +3,7 @@ import { addPointerEvent } from "../../events/add-pointer-event"
 import { Feature } from "../../motion/features/Feature"
 import { noop } from "../../utils/noop"
 import { frame } from "../../frameloop"
-import { getContextWindow } from "../../utils/getContextWindow";
+import { getContextWindow } from "../../utils/get-context-window"
 
 type PanEventHandler = (event: PointerEvent, info: PanInfo) => void
 const asyncHandler =
@@ -22,7 +22,10 @@ export class PanGesture extends Feature<Element> {
         this.session = new PanSession(
             pointerDownEvent,
             this.createPanHandlers(),
-            { transformPagePoint: this.node.getTransformPagePoint(), contextWindow: getContextWindow(this.node) }
+            {
+                transformPagePoint: this.node.getTransformPagePoint(),
+                contextWindow: getContextWindow(this.node),
+            }
         )
     }
 

diff --git a/packages/framer-motion/src/utils/get-context-window.ts b/packages/framer-motion/src/utils/get-context-window.ts
@@ -0,0 +1,5 @@
+import { VisualElement } from "../render/VisualElement"
+
+export const getContextWindow = ({ current }: VisualElement<Element>) => {
+    return current ? current.ownerDocument.defaultView : null
+}
diff --git a/packages/framer-motion/src/utils/getContextWindow.ts b/packages/framer-motion/src/utils/getContextWindow.ts