diff --git a/packages/framer-motion/src/render/dom/scroll/utils/__tests__/offset-to-range.test.ts b/packages/framer-motion/src/render/dom/scroll/utils/__tests__/offset-to-range.test.ts index 335f825837..1b58b7fc7a 100644 --- a/packages/framer-motion/src/render/dom/scroll/utils/__tests__/offset-to-range.test.ts +++ b/packages/framer-motion/src/render/dom/scroll/utils/__tests__/offset-to-range.test.ts @@ -56,52 +56,19 @@ describe("offsetToViewTimelineRange", () => { }) }) - it("returns Enter preset for string offsets", () => { + it("returns undefined for string offsets (not accelerated)", () => { expect( offsetToViewTimelineRange(["start end", "end end"]) - ).toEqual({ - rangeStart: "entry 0%", - rangeEnd: "entry 100%", - }) - }) - - it("returns Exit preset for string offsets", () => { + ).toBeUndefined() expect( offsetToViewTimelineRange(["start start", "end start"]) - ).toEqual({ - rangeStart: "exit 0%", - rangeEnd: "exit 100%", - }) - }) - - it("returns Any preset for string offsets", () => { + ).toBeUndefined() expect( offsetToViewTimelineRange(["end start", "start end"]) - ).toEqual({ - rangeStart: "cover 0%", - rangeEnd: "cover 100%", - }) - }) - - it("returns All preset for string offsets", () => { - expect( - offsetToViewTimelineRange(["start start", "end end"]) - ).toEqual({ - rangeStart: "contain 0%", - rangeEnd: "contain 100%", - }) - }) - - it("returns All preset for string offsets", () => { + ).toBeUndefined() expect( offsetToViewTimelineRange(["start start", "end end"]) - ).toEqual({ - rangeStart: "contain 0%", - rangeEnd: "contain 100%", - }) - }) - - it("returns undefined for other string offsets", () => { + ).toBeUndefined() expect( offsetToViewTimelineRange(["start center", "end start"]) ).toBeUndefined() diff --git a/packages/framer-motion/src/render/dom/scroll/utils/offset-to-range.ts b/packages/framer-motion/src/render/dom/scroll/utils/offset-to-range.ts index 65fc4bf6e1..5a4fbb42c2 100644 --- a/packages/framer-motion/src/render/dom/scroll/utils/offset-to-range.ts +++ b/packages/framer-motion/src/render/dom/scroll/utils/offset-to-range.ts @@ -18,32 +18,12 @@ const presets: [ProgressIntersection[], string][] = [ [ScrollOffsetPresets.All, "contain"], ] -const stringToProgress: Record = { - start: 0, - end: 1, -} - -function parseStringOffset( - s: string -): ProgressIntersection | undefined { - const parts = s.trim().split(/\s+/) - if (parts.length !== 2) return undefined - const a = stringToProgress[parts[0]] - const b = stringToProgress[parts[1]] - if (a === undefined || b === undefined) return undefined - return [a, b] -} - function normaliseOffset(offset: ScrollOffset): ProgressIntersection[] | undefined { if (offset.length !== 2) return undefined const result: ProgressIntersection[] = [] for (const item of offset) { if (Array.isArray(item)) { result.push(item as ProgressIntersection) - } else if (typeof item === "string") { - const parsed = parseStringOffset(item) - if (!parsed) return undefined - result.push(parsed) } else { return undefined }