Skip to content

[pull] main from framer:main #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 6 commits into from
May 25, 2022
Merged

[pull] main from framer:main #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7f22cbd
add reducedMotion to useMemo dependencies so that context value can u…
kalimantos May 23, 2022
98bac16
Merge branch 'main' into fix-motion-config-update-issue
mattgperry May 25, 2022
e5c3d56
Merge pull request #1542 from kalimantos/fix-motion-config-update-issue
mergetron[bot] May 25, 2022
b42e85e
Updating changelog
mattgperry May 25, 2022
3b07786
v6.3.4
mattgperry May 25, 2022
719c44f
Updating lockfile
mattgperry May 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

Framer Motion adheres to [Semantic Versioning](http://semver.org/).

## [6.3.4] 2022-05-25

### Fixed

- Updating `reducedMotion` prop in `MotionConfig` now correctly updates throughout the tree.

## [6.3.3] 2022-04-28

### Fixed
Expand Down
6 changes: 3 additions & 3 deletions dev/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "framer-motion--dev",
"version": "6.3.3",
"version": "6.3.4",
"private": true,
"scripts": {
"dev": "webpack serve --config ./webpack/config.js --hot"
},
"dependencies": {
"@react-three/drei": "^7.27.3",
"@react-three/fiber": "^7.0.24",
"framer-motion": "^6.3.3",
"framer-motion-3d": "^6.3.3",
"framer-motion": "^6.3.4",
"framer-motion-3d": "^6.3.4",
"path-browserify": "^1.0.1",
"popmotion": "11.0.3",
"react": "^17.0.2",
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "6.3.3",
"version": "6.3.4",
"packages": [
"packages/*"
],
Expand Down
4 changes: 2 additions & 2 deletions packages/framer-motion-3d/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "framer-motion-3d",
"version": "6.3.3",
"version": "6.3.4",
"description": "A simple and powerful React animation library for @react-three/fiber",
"main": "dist/cjs/index.js",
"module": "dist/es/index.mjs",
Expand Down Expand Up @@ -45,7 +45,7 @@
"postpublish": "git push --tags"
},
"dependencies": {
"framer-motion": "^6.3.3",
"framer-motion": "^6.3.4",
"react-merge-refs": "^1.1.0"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/framer-motion/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "framer-motion",
"version": "6.3.3",
"version": "6.3.4",
"description": "A simple and powerful React animation library",
"main": "dist/cjs/index.js",
"module": "dist/es/index.mjs",
Expand Down
2 changes: 1 addition & 1 deletion packages/framer-motion/src/components/MotionConfig/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export function MotionConfig({
*/
const context = useMemo(
() => config,
[JSON.stringify(config.transition), config.transformPagePoint]
[JSON.stringify(config.transition), config.transformPagePoint, config.reducedMotion]
)

return (
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7599,8 +7599,8 @@ __metadata:
cache-loader: ^1.2.5
convert-tsconfig-paths-to-webpack-aliases: ^0.9.2
fork-ts-checker-webpack-plugin: ^6.2.0
framer-motion: ^6.3.3
framer-motion-3d: ^6.3.3
framer-motion: ^6.3.4
framer-motion-3d: ^6.3.4
path-browserify: ^1.0.1
popmotion: 11.0.3
react: ^17.0.2
Expand Down Expand Up @@ -7665,7 +7665,7 @@ __metadata:
languageName: unknown
linkType: soft

"framer-motion-3d@^6.3.3, framer-motion-3d@workspace:packages/framer-motion-3d":
"framer-motion-3d@^6.3.4, framer-motion-3d@workspace:packages/framer-motion-3d":
version: 0.0.0-use.local
resolution: "framer-motion-3d@workspace:packages/framer-motion-3d"
dependencies:
Expand All @@ -7681,7 +7681,7 @@ __metadata:
"@types/react-dom": ^17.0.11
bundlesize: ^0.18.0
convert-tsconfig-paths-to-webpack-aliases: ^0.9.2
framer-motion: ^6.3.3
framer-motion: ^6.3.4
jest: ^24.8.0
jest-dom: ^3.5.0
jest-junit: ^6.4.0
Expand All @@ -7708,7 +7708,7 @@ __metadata:
languageName: unknown
linkType: soft

"framer-motion@^6.3.3, framer-motion@workspace:packages/framer-motion":
"framer-motion@^6.3.4, framer-motion@workspace:packages/framer-motion":
version: 0.0.0-use.local
resolution: "framer-motion@workspace:packages/framer-motion"
dependencies:
Expand Down