Skip to content
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.

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

Extending cameras #1858

Merged
merged 3 commits into from Jan 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions dev/package.json
@@ -1,6 +1,6 @@
{
"name": "framer-motion--dev",
"version": "8.1.1",
"version": "8.1.2-beta.0",
"private": true,
"scripts": {
"dev": "webpack serve --config ./webpack/config.js --hot"
Expand All @@ -9,7 +9,7 @@
"@react-three/drei": "^7.27.3",
"@react-three/fiber": "^8.2.2",
"framer-motion": "^8.1.1",
"framer-motion-3d": "^8.1.1",
"framer-motion-3d": "^8.1.2-beta.0",
"path-browserify": "^1.0.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
@@ -1,5 +1,5 @@
{
"version": "8.1.1",
"version": "8.1.2-beta.0",
"packages": [
"packages/*"
],
Expand Down
2 changes: 1 addition & 1 deletion packages/framer-motion-3d/package.json
@@ -1,6 +1,6 @@
{
"name": "framer-motion-3d",
"version": "8.1.1",
"version": "8.1.2-beta.0",
"description": "A simple and powerful React animation library for @react-three/fiber",
"main": "dist/cjs/index.js",
"module": "dist/es/index.mjs",
Expand Down
3 changes: 3 additions & 0 deletions packages/framer-motion-3d/src/components/LayoutCamera.tsx
Expand Up @@ -5,6 +5,9 @@ import { LayoutCameraProps } from "./types"
import { motion } from "../render/motion"
import { useLayoutCamera } from "./use-layout-camera"
import { ThreeMotionProps } from "../types"
import { extend } from "@react-three/fiber"

extend({ PerspectiveCamera: PerspectiveCameraImpl })

type Props = JSX.IntrinsicElements["perspectiveCamera"] &
LayoutCameraProps &
Expand Down
Expand Up @@ -5,6 +5,9 @@ import { motion } from "../render/motion"
import { LayoutCameraProps } from "./types"
import { useLayoutCamera } from "./use-layout-camera"
import { ThreeMotionProps } from "../types"
import { extend } from "@react-three/fiber"

extend({ OrthographicCamera: OrthographicCameraImpl })

type Props = JSX.IntrinsicElements["orthographicCamera"] &
LayoutCameraProps &
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Expand Up @@ -7909,8 +7909,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: ^8.1.0
framer-motion-3d: ^8.1.0
framer-motion: ^8.1.1
framer-motion-3d: ^8.1.2-beta.0
path-browserify: ^1.0.1
react: ^18.2.0
react-dom: ^18.2.0
Expand Down Expand Up @@ -7976,14 +7976,14 @@ __metadata:
languageName: unknown
linkType: soft

"framer-motion-3d@^8.1.0, framer-motion-3d@workspace:packages/framer-motion-3d":
"framer-motion-3d@^8.1.2-beta.0, framer-motion-3d@workspace:packages/framer-motion-3d":
version: 0.0.0-use.local
resolution: "framer-motion-3d@workspace:packages/framer-motion-3d"
dependencies:
"@react-three/fiber": ^8.2.2
"@react-three/test-renderer": ^9.0.0
"@rollup/plugin-commonjs": ^22.0.1
framer-motion: ^8.1.0
framer-motion: ^8.1.1
react-merge-refs: ^2.0.1
peerDependencies:
"@react-three/fiber": ^8.2.2
Expand All @@ -7993,7 +7993,7 @@ __metadata:
languageName: unknown
linkType: soft

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