From e20294a2d0e6102b0cca995a6137b0683ad0fd13 Mon Sep 17 00:00:00 2001 From: Matt Perry Date: Tue, 23 Nov 2021 15:24:24 +0000 Subject: [PATCH 1/3] Changing at-rest z-index for Reorder.Item to unset --- CHANGELOG.md | 1 + src/components/Reorder/Item.tsx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bd541848..fdc87d583 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ Framer Motion adheres to [Semantic Versioning](http://semver.org/). ### Fixed - Fixing animating to CSS variables with `SVGElement`. [Issue](https://github.com/framer/motion/issues/1334) +- Unsetting `z-index` for resting `Reorder.Item` components. [Issue](https://github.com/framer/motion/issues/1313) ## [5.3.2] 2021-11-23 diff --git a/src/components/Reorder/Item.tsx b/src/components/Reorder/Item.tsx index 5819164ae..5d12b7aa9 100644 --- a/src/components/Reorder/Item.tsx +++ b/src/components/Reorder/Item.tsx @@ -59,7 +59,7 @@ export function ReorderItem( } const zIndex = useTransform([point.x, point.y], ([latestX, latestY]) => - latestX || latestY ? 1 : 0 + latestX || latestY ? 1 : "unset" ) const layout = useRef(null) From 3b70672feb93ee6f88402d5733001513d6548e9e Mon Sep 17 00:00:00 2001 From: Matt Perry Date: Tue, 23 Nov 2021 15:27:10 +0000 Subject: [PATCH 2/3] Changing tests --- src/components/Reorder/__tests__/index.test.tsx | 4 ++-- src/motion/__tests__/ssr.test.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/Reorder/__tests__/index.test.tsx b/src/components/Reorder/__tests__/index.test.tsx index b4bdb5b79..6315b6b99 100644 --- a/src/components/Reorder/__tests__/index.test.tsx +++ b/src/components/Reorder/__tests__/index.test.tsx @@ -15,7 +15,7 @@ describe("Reorder", () => { const staticMarkup = renderToStaticMarkup() const string = renderToString() - const expectedMarkup = `
` + const expectedMarkup = `
` expect(staticMarkup).toBe(expectedMarkup) expect(string).toBe(expectedMarkup) @@ -34,7 +34,7 @@ describe("Reorder", () => { const staticMarkup = renderToStaticMarkup() const string = renderToString() - const expectedMarkup = `
` + const expectedMarkup = `
` expect(staticMarkup).toBe(expectedMarkup) expect(string).toBe(expectedMarkup) diff --git a/src/motion/__tests__/ssr.test.tsx b/src/motion/__tests__/ssr.test.tsx index 3e8b248e6..7534af21e 100644 --- a/src/motion/__tests__/ssr.test.tsx +++ b/src/motion/__tests__/ssr.test.tsx @@ -133,7 +133,7 @@ function runTests(render: (components: any) => string) { const div = render() expect(div).toBe( - `
` + `
` ) }) @@ -163,7 +163,7 @@ function runTests(render: (components: any) => string) { const div = render() expect(div).toBe( - `
` + `
` ) }) } From 7f0230966ec4aa83ed63d6882fa6173caf42ce18 Mon Sep 17 00:00:00 2001 From: Matt Perry Date: Tue, 23 Nov 2021 15:56:49 +0000 Subject: [PATCH 3/3] Fixing test --- src/motion/__tests__/ssr.test.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/motion/__tests__/ssr.test.tsx b/src/motion/__tests__/ssr.test.tsx index 7534af21e..d42dd6c3d 100644 --- a/src/motion/__tests__/ssr.test.tsx +++ b/src/motion/__tests__/ssr.test.tsx @@ -148,7 +148,9 @@ function runTests(render: (components: any) => string) { } const div = render() - expect(div).toBe(`
`) + expect(div).toBe( + `
` + ) }) test("Reorder: Renders provided element", () => {