fix(useLoader): loosen GLTF inference check #3105
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This pull request is automatically built and testable in CodeSandbox. To see build info of the built libraries, click here or the icon next to each commit SHA. Latest deployment of this branch, based on commit 803ee2c:
|
itsdouges
reviewed
Nov 27, 2023
| // Use suspense to load async assets | ||
| const keys = (Array.isArray(input) ? input : [input]) as string[] | ||
| const results = suspend(loadingFn<L>(extensions, onProgress), [Proto, ...keys], { equal: is.equ }) | ||
| // Return the object/s | ||
| return (Array.isArray(input) ? results : results[0]) as U extends any[] | ||
| ? BranchingReturn<R, GLTF, GLTF & ObjectMap>[] | ||
| : BranchingReturn<R, GLTF, GLTF & ObjectMap> | ||
| ? BranchingReturn<R, GLTFLike, R & ObjectMap>[] |
There was a problem hiding this comment.
Do we have any tests asserting the type output? Would like to see an output where we're not relying on type augmentation to access nodes / materials / etc.
There was a problem hiding this comment.
I need to test with TS 4 and 5 since #2723 (comment).
There was a problem hiding this comment.
Looks like he shouldn't be declaring the generic?
There was a problem hiding this comment.
Looks like he shouldn't be declaring the generic?
Probably, but I'll do integration tests to make sure this will "just work" when we release in R3F. It's possible we need to regenerate types in Drei.
Do we have any tests asserting the type output? Would like to see an output where we're not relying on type augmentation to access nodes / materials / etc.
Done in 803ee2c.
renovate bot
referenced
this pull request
in simonknittel/sinister-incorporated
Dec 20, 2023
[](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@react-three/fiber](https://togithub.com/pmndrs/react-three-fiber) | [`8.15.10` -> `8.15.12`](https://renovatebot.com/diffs/npm/@react-three%2ffiber/8.15.10/8.15.12) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>pmndrs/react-three-fiber (@​react-three/fiber)</summary> ### [`v8.15.12`](https://togithub.com/pmndrs/react-three-fiber/releases/tag/v8.15.12) [Compare Source](https://togithub.com/pmndrs/react-three-fiber/compare/v8.15.11...v8.15.12) #### What's Changed - fix(useLoader): loosen GLTF inference check by [@​CodyJasonBennett](https://togithub.com/CodyJasonBennett) in [https://github.com/pmndrs/react-three-fiber/pull/3105](https://togithub.com/pmndrs/react-three-fiber/pull/3105) - fix(types): preserve deprecated XR type annotations by [@​CodyJasonBennett](https://togithub.com/CodyJasonBennett) in [https://github.com/pmndrs/react-three-fiber/pull/3111](https://togithub.com/pmndrs/react-three-fiber/pull/3111) **Full Changelog**: pmndrs/react-three-fiber@v8.15.11...v8.15.12 ### [`v8.15.11`](https://togithub.com/pmndrs/react-three-fiber/releases/tag/v8.15.11) [Compare Source](https://togithub.com/pmndrs/react-three-fiber/compare/v8.15.10...v8.15.11) #### What's Changed - fix(types): update import from three/examples by [@​Methuselah96](https://togithub.com/Methuselah96) in [https://github.com/pmndrs/react-three-fiber/pull/3095](https://togithub.com/pmndrs/react-three-fiber/pull/3095) #### New Contributors - [@​warrenseine](https://togithub.com/warrenseine) made their first contribution in [https://github.com/pmndrs/react-three-fiber/pull/3094](https://togithub.com/pmndrs/react-three-fiber/pull/3094) **Full Changelog**: pmndrs/react-three-fiber@v8.15.10...v8.15.11 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/simonknittel/sinister-incorporated). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4xMDMuMSIsInVwZGF0ZWRJblZlciI6IjM3LjEwMy4xIiwidGFyZ2V0QnJhbmNoIjoiZGV2ZWxvcCJ9-->
](https://renovatebot.com){kind=link}
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes cases where different
GLTFversions from@types/threeand forks likethree-stdlibmay disagree.