@react-three/fiber 8.10.1 → 8.10.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @react-three/fiber
 
+## 8.10.2
+
+### Patch Changes
+
+- 564edbbb: fix port inject layers, it should allow root props to overwrite indefined portal props"
+
 ## 8.10.1
 
 ### Patch Changes

package/dist/{index-5d1efa67.cjs.prod.js → index-661b9d11.cjs.prod.js}

@@ -586,6 +586,7 @@ function createEvents(store) {
   /**  Handles intersections by forwarding them to handlers */
   function handleIntersects(intersections, event, delta, callback) {
     const rootState = store.getState();
+
     // If anything has been found, forward it to the event listeners
     if (intersections.length) {
       const localState = {
@@ -755,7 +756,6 @@ function createEvents(store) {
       const isPointerMove = name === 'onPointerMove';
       const isClickEvent = name === 'onClick' || name === 'onContextMenu' || name === 'onDoubleClick';
       const filter = isPointerMove ? filterPointerEvents : undefined;
-      // const hits = patchIntersects(intersect(filter), event)
       const hits = intersect(event, filter);
       const delta = isClickEvent ? calculateDistance(event) : 0;
 
@@ -779,6 +779,7 @@ function createEvents(store) {
         const eventObject = data.eventObject;
         const instance = eventObject.__r3f;
         const handlers = instance == null ? void 0 : instance.handlers;
+
         // Check presence of handlers
         if (!(instance != null && instance.eventCount)) return;
         if (isPointerMove) {
@@ -1990,7 +1991,6 @@ function Portal({
    *  the "R3F hooks can only be used within the Canvas component!" warning:
    *  <Canvas>
    *    {createPortal(...)} */
-
   const {
     events,
     size,
@@ -2012,7 +2012,8 @@ function Portal({
       // Some props should be off-limits
       privateKeys.includes(key) ||
       // Otherwise filter out the props that are different and let the inject layer take precedence
-      rootState[key] !== injectState[key]) {
+      // Unless the inject layer props is undefined, then we keep the root layer
+      rootState[key] !== injectState[key] && injectState[key]) {
         delete intersect[key];
       }
     });

package/dist/{index-f2e97578.cjs.dev.js → index-bf8a2906.cjs.dev.js}

@@ -586,6 +586,7 @@ function createEvents(store) {
   /**  Handles intersections by forwarding them to handlers */
   function handleIntersects(intersections, event, delta, callback) {
     const rootState = store.getState();
+
     // If anything has been found, forward it to the event listeners
     if (intersections.length) {
       const localState = {
@@ -755,7 +756,6 @@ function createEvents(store) {
       const isPointerMove = name === 'onPointerMove';
       const isClickEvent = name === 'onClick' || name === 'onContextMenu' || name === 'onDoubleClick';
       const filter = isPointerMove ? filterPointerEvents : undefined;
-      // const hits = patchIntersects(intersect(filter), event)
       const hits = intersect(event, filter);
       const delta = isClickEvent ? calculateDistance(event) : 0;
 
@@ -779,6 +779,7 @@ function createEvents(store) {
         const eventObject = data.eventObject;
         const instance = eventObject.__r3f;
         const handlers = instance == null ? void 0 : instance.handlers;
+
         // Check presence of handlers
         if (!(instance != null && instance.eventCount)) return;
         if (isPointerMove) {
@@ -1990,7 +1991,6 @@ function Portal({
    *  the "R3F hooks can only be used within the Canvas component!" warning:
    *  <Canvas>
    *    {createPortal(...)} */
-
   const {
     events,
     size,
@@ -2012,7 +2012,8 @@ function Portal({
       // Some props should be off-limits
       privateKeys.includes(key) ||
       // Otherwise filter out the props that are different and let the inject layer take precedence
-      rootState[key] !== injectState[key]) {
+      // Unless the inject layer props is undefined, then we keep the root layer
+      rootState[key] !== injectState[key] && injectState[key]) {
         delete intersect[key];
       }
     });

package/dist/{index-adfddf12.esm.js → index-fb77d67d.esm.js}

@@ -559,6 +559,7 @@ function createEvents(store) {
   /**  Handles intersections by forwarding them to handlers */
   function handleIntersects(intersections, event, delta, callback) {
     const rootState = store.getState();
+
     // If anything has been found, forward it to the event listeners
     if (intersections.length) {
       const localState = {
@@ -728,7 +729,6 @@ function createEvents(store) {
       const isPointerMove = name === 'onPointerMove';
       const isClickEvent = name === 'onClick' || name === 'onContextMenu' || name === 'onDoubleClick';
       const filter = isPointerMove ? filterPointerEvents : undefined;
-      // const hits = patchIntersects(intersect(filter), event)
       const hits = intersect(event, filter);
       const delta = isClickEvent ? calculateDistance(event) : 0;
 
@@ -752,6 +752,7 @@ function createEvents(store) {
         const eventObject = data.eventObject;
         const instance = eventObject.__r3f;
         const handlers = instance == null ? void 0 : instance.handlers;
+
         // Check presence of handlers
         if (!(instance != null && instance.eventCount)) return;
         if (isPointerMove) {
@@ -1963,7 +1964,6 @@ function Portal({
    *  the "R3F hooks can only be used within the Canvas component!" warning:
    *  <Canvas>
    *    {createPortal(...)} */
-
   const {
     events,
     size,
@@ -1985,7 +1985,8 @@ function Portal({
       // Some props should be off-limits
       privateKeys.includes(key) ||
       // Otherwise filter out the props that are different and let the inject layer take precedence
-      rootState[key] !== injectState[key]) {
+      // Unless the inject layer props is undefined, then we keep the root layer
+      rootState[key] !== injectState[key] && injectState[key]) {
         delete intersect[key];
       }
     });

package/dist/react-three-fiber.cjs.dev.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-f2e97578.cjs.dev.js');
+var index = require('./index-bf8a2906.cjs.dev.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');

package/dist/react-three-fiber.cjs.prod.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-5d1efa67.cjs.prod.js');
+var index = require('./index-661b9d11.cjs.prod.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');

package/dist/react-three-fiber.esm.js

@@ -1,5 +1,5 @@
-import { c as createEvents, e as extend, u as useMutableCallback, a as createRoot, i as isRef, E as ErrorBoundary, B as Block, b as useIsomorphicLayoutEffect, d as unmountComponentAtNode } from './index-adfddf12.esm.js';
-export { t as ReactThreeFiber, w as _roots, v as act, o as addAfterEffect, n as addEffect, p as addTail, m as advance, j as applyProps, f as context, c as createEvents, g as createPortal, a as createRoot, k as dispose, e as extend, q as flushGlobalEffects, s as getRootState, l as invalidate, h as reconciler, r as render, d as unmountComponentAtNode, A as useFrame, C as useGraph, x as useInstanceHandle, D as useLoader, y as useStore, z as useThree } from './index-adfddf12.esm.js';
+import { c as createEvents, e as extend, u as useMutableCallback, a as createRoot, i as isRef, E as ErrorBoundary, B as Block, b as useIsomorphicLayoutEffect, d as unmountComponentAtNode } from './index-fb77d67d.esm.js';
+export { t as ReactThreeFiber, w as _roots, v as act, o as addAfterEffect, n as addEffect, p as addTail, m as advance, j as applyProps, f as context, c as createEvents, g as createPortal, a as createRoot, k as dispose, e as extend, q as flushGlobalEffects, s as getRootState, l as invalidate, h as reconciler, r as render, d as unmountComponentAtNode, A as useFrame, C as useGraph, x as useInstanceHandle, D as useLoader, y as useStore, z as useThree } from './index-fb77d67d.esm.js';
 import _extends from '@babel/runtime/helpers/esm/extends';
 import * as React from 'react';
 import * as THREE from 'three';

package/native/dist/react-three-fiber-native.cjs.dev.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('../../dist/index-f2e97578.cjs.dev.js');
+var index = require('../../dist/index-bf8a2906.cjs.dev.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');

package/native/dist/react-three-fiber-native.cjs.prod.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('../../dist/index-5d1efa67.cjs.prod.js');
+var index = require('../../dist/index-661b9d11.cjs.prod.js');
 var _extends = require('@babel/runtime/helpers/extends');
 var React = require('react');
 var THREE = require('three');

package/native/dist/react-three-fiber-native.esm.js

@@ -1,5 +1,5 @@
-import { c as createEvents, e as extend, u as useMutableCallback, a as createRoot, E as ErrorBoundary, B as Block, d as unmountComponentAtNode } from '../../dist/index-adfddf12.esm.js';
-export { t as ReactThreeFiber, w as _roots, v as act, o as addAfterEffect, n as addEffect, p as addTail, m as advance, j as applyProps, f as context, c as createEvents, g as createPortal, a as createRoot, k as dispose, e as extend, q as flushGlobalEffects, s as getRootState, l as invalidate, h as reconciler, r as render, d as unmountComponentAtNode, A as useFrame, C as useGraph, x as useInstanceHandle, D as useLoader, y as useStore, z as useThree } from '../../dist/index-adfddf12.esm.js';
+import { c as createEvents, e as extend, u as useMutableCallback, a as createRoot, E as ErrorBoundary, B as Block, d as unmountComponentAtNode } from '../../dist/index-fb77d67d.esm.js';
+export { t as ReactThreeFiber, w as _roots, v as act, o as addAfterEffect, n as addEffect, p as addTail, m as advance, j as applyProps, f as context, c as createEvents, g as createPortal, a as createRoot, k as dispose, e as extend, q as flushGlobalEffects, s as getRootState, l as invalidate, h as reconciler, r as render, d as unmountComponentAtNode, A as useFrame, C as useGraph, x as useInstanceHandle, D as useLoader, y as useStore, z as useThree } from '../../dist/index-fb77d67d.esm.js';
 import _extends from '@babel/runtime/helpers/esm/extends';
 import * as React from 'react';
 import * as THREE from 'three';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-three/fiber",
-  "version": "8.10.1",
+  "version": "8.10.2",
   "description": "A React renderer for Threejs",
   "keywords": [
     "react",