From 64ff790f6c21a34053465188e86a44a9cd36a0d8 Mon Sep 17 00:00:00 2001 From: Cody Bennett <23324155+CodyJasonBennett@users.noreply.github.com> Date: Tue, 18 Oct 2022 15:03:01 -0500 Subject: [PATCH 1/3] fix(loop): export flush methods and types --- packages/fiber/src/core/index.tsx | 4 +++- packages/fiber/src/core/loop.ts | 2 +- packages/fiber/src/index.tsx | 3 +-- packages/fiber/src/native.tsx | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/fiber/src/core/index.tsx b/packages/fiber/src/core/index.tsx index c5922aa32c..87ee7397fb 100644 --- a/packages/fiber/src/core/index.tsx +++ b/packages/fiber/src/core/index.tsx @@ -17,7 +17,7 @@ import { privateKeys, } from './store' import { createRenderer, extend, Root } from './renderer' -import { createLoop, addEffect, addAfterEffect, addTail } from './loop' +import { createLoop, addEffect, addAfterEffect, addTail, flushGlobalEffects, GlobalRenderCallback } from './loop' import { getEventPriority, EventManager, ComputeFunction } from './events' import { is, @@ -545,9 +545,11 @@ export { invalidate, advance, extend, + GlobalRenderCallback, addEffect, addAfterEffect, addTail, + flushGlobalEffects, getRootState, act, roots as _roots, diff --git a/packages/fiber/src/core/loop.ts b/packages/fiber/src/core/loop.ts index eb2e0fa487..4c15b897cb 100644 --- a/packages/fiber/src/core/loop.ts +++ b/packages/fiber/src/core/loop.ts @@ -2,7 +2,7 @@ import * as THREE from 'three' import { Root } from './renderer' import { RootState, Subscription } from './store' -type GlobalRenderCallback = (timeStamp: number) => void +export type GlobalRenderCallback = (timeStamp: number) => void type SubItem = { callback: GlobalRenderCallback } function createSubs(callback: GlobalRenderCallback, subs: Set): () => void { diff --git a/packages/fiber/src/index.tsx b/packages/fiber/src/index.tsx index 5ba96c420c..8883f3aabc 100644 --- a/packages/fiber/src/index.tsx +++ b/packages/fiber/src/index.tsx @@ -12,9 +12,8 @@ export type { Performance, RootState, } from './core/store' -export type { ThreeEvent, Events, EventManager, ComputeFunction } from './core/events' +export type { ThreeEvent, Events, EventManager, ComputeFunction, createEvents } from './core/events' export type { ObjectMap, Camera } from './core/utils' export * from './web/Canvas' -export { createEvents } from './core/events' export { createPointerEvents as events } from './web/events' export * from './core' diff --git a/packages/fiber/src/native.tsx b/packages/fiber/src/native.tsx index 667a0596e5..65c656a66d 100644 --- a/packages/fiber/src/native.tsx +++ b/packages/fiber/src/native.tsx @@ -12,7 +12,7 @@ export type { Performance, RootState, } from './core/store' -export type { ThreeEvent, Events, EventManager, ComputeFunction } from './core/events' +export type { ThreeEvent, Events, EventManager, ComputeFunction, createEvents } from './core/events' export type { ObjectMap, Camera } from './core/utils' export * from './native/Canvas' export { createTouchEvents as events } from './native/events' From 2882ae87e766448afdc333528d630189df5c44b4 Mon Sep 17 00:00:00 2001 From: Cody Bennett <23324155+CodyJasonBennett@users.noreply.github.com> Date: Tue, 18 Oct 2022 15:09:08 -0500 Subject: [PATCH 2/3] fix(loop): also export effect types --- packages/fiber/src/core/index.tsx | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/fiber/src/core/index.tsx b/packages/fiber/src/core/index.tsx index 87ee7397fb..3b5cdc5dd3 100644 --- a/packages/fiber/src/core/index.tsx +++ b/packages/fiber/src/core/index.tsx @@ -17,7 +17,15 @@ import { privateKeys, } from './store' import { createRenderer, extend, Root } from './renderer' -import { createLoop, addEffect, addAfterEffect, addTail, flushGlobalEffects, GlobalRenderCallback } from './loop' +import { + createLoop, + addEffect, + addAfterEffect, + addTail, + GlobalEffectType, + flushGlobalEffects, + GlobalRenderCallback, +} from './loop' import { getEventPriority, EventManager, ComputeFunction } from './events' import { is, @@ -549,6 +557,7 @@ export { addEffect, addAfterEffect, addTail, + GlobalEffectType, flushGlobalEffects, getRootState, act, From 492c722a4e6ca695286fb86052712251097eed60 Mon Sep 17 00:00:00 2001 From: Cody Bennett <23324155+CodyJasonBennett@users.noreply.github.com> Date: Sat, 29 Oct 2022 06:42:16 -0500 Subject: [PATCH 3/3] fix: export types separately --- packages/fiber/src/core/index.tsx | 12 +----------- packages/fiber/src/index.tsx | 4 +++- packages/fiber/src/native.tsx | 4 +++- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/packages/fiber/src/core/index.tsx b/packages/fiber/src/core/index.tsx index 3b5cdc5dd3..db77218d81 100644 --- a/packages/fiber/src/core/index.tsx +++ b/packages/fiber/src/core/index.tsx @@ -17,15 +17,7 @@ import { privateKeys, } from './store' import { createRenderer, extend, Root } from './renderer' -import { - createLoop, - addEffect, - addAfterEffect, - addTail, - GlobalEffectType, - flushGlobalEffects, - GlobalRenderCallback, -} from './loop' +import { createLoop, addEffect, addAfterEffect, addTail, flushGlobalEffects } from './loop' import { getEventPriority, EventManager, ComputeFunction } from './events' import { is, @@ -553,11 +545,9 @@ export { invalidate, advance, extend, - GlobalRenderCallback, addEffect, addAfterEffect, addTail, - GlobalEffectType, flushGlobalEffects, getRootState, act, diff --git a/packages/fiber/src/index.tsx b/packages/fiber/src/index.tsx index 8883f3aabc..72efc6bd33 100644 --- a/packages/fiber/src/index.tsx +++ b/packages/fiber/src/index.tsx @@ -12,8 +12,10 @@ export type { Performance, RootState, } from './core/store' -export type { ThreeEvent, Events, EventManager, ComputeFunction, createEvents } from './core/events' +export type { ThreeEvent, Events, EventManager, ComputeFunction } from './core/events' +export { createEvents } from './core/events' export type { ObjectMap, Camera } from './core/utils' export * from './web/Canvas' export { createPointerEvents as events } from './web/events' +export type { GlobalRenderCallback, GlobalEffectType } from './core/loop' export * from './core' diff --git a/packages/fiber/src/native.tsx b/packages/fiber/src/native.tsx index 65c656a66d..3523b0c214 100644 --- a/packages/fiber/src/native.tsx +++ b/packages/fiber/src/native.tsx @@ -12,8 +12,10 @@ export type { Performance, RootState, } from './core/store' -export type { ThreeEvent, Events, EventManager, ComputeFunction, createEvents } from './core/events' +export type { ThreeEvent, Events, EventManager, ComputeFunction } from './core/events' +export { createEvents } from './core/events' export type { ObjectMap, Camera } from './core/utils' export * from './native/Canvas' export { createTouchEvents as events } from './native/events' +export type { GlobalRenderCallback, GlobalEffectType } from './core/loop' export * from './core'