From 7a4706a229b544c080de5e6ba9c0a5d31fd39f63 Mon Sep 17 00:00:00 2001 From: Matt Perry Date: Wed, 19 Jun 2024 11:22:16 +0200 Subject: [PATCH] Fixing conflicts --- packages/framer-motion/src/motion/index.tsx | 2 +- packages/framer-motion/src/motion/utils/use-visual-element.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/framer-motion/src/motion/index.tsx b/packages/framer-motion/src/motion/index.tsx index 053018f8ee..e5f2098400 100644 --- a/packages/framer-motion/src/motion/index.tsx +++ b/packages/framer-motion/src/motion/index.tsx @@ -14,7 +14,7 @@ import { LayoutGroupContext } from "../context/LayoutGroupContext" import { LazyContext } from "../context/LazyContext" import { motionComponentSymbol } from "./utils/symbol" import { CreateVisualElement } from "../render/types" -import { invariant, warning } from "../dom-entry" +import { invariant, warning } from "../utils/errors" import { featureDefinitions } from "./features/definitions" export interface MotionComponentConfig { diff --git a/packages/framer-motion/src/motion/utils/use-visual-element.ts b/packages/framer-motion/src/motion/utils/use-visual-element.ts index 9d27cb6c2c..0cde8f3aeb 100644 --- a/packages/framer-motion/src/motion/utils/use-visual-element.ts +++ b/packages/framer-motion/src/motion/utils/use-visual-element.ts @@ -11,12 +11,12 @@ import { MotionConfigContext } from "../../context/MotionConfigContext" import type { VisualElement } from "../../render/VisualElement" import { optimizedAppearDataAttribute } from "../../animation/optimized-appear/data-id" import { microtask } from "../../frameloop/microtask" +import { IProjectionNode } from "../../projection/node/types" +import { isRefObject } from "../../utils/is-ref-object" import { InitialPromotionConfig, SwitchLayoutGroupContext, } from "../../context/SwitchLayoutGroupContext" -import { IProjectionNode } from "../../projection/node/types" -import { isRefObject } from "../../utils/is-ref-object" let scheduleHandoffComplete = false