Merge branch 'main' of https://github.com/rmrk-team/rmrk-js

rmrk-team · Mar 19, 2024 · fe74944 · fe74944
2 parents 4fdc5b6 + 82cd556
commit fe74944
Show file tree

Hide file tree

Showing 9 changed files with 255 additions and 10 deletions.
diff --git a/.changeset/ten-squids-cheat.md b/.changeset/ten-squids-cheat.md
diff --git a/apps/composable-nft-renderer-app/next.config.mjs b/apps/composable-nft-renderer-app/next.config.mjs
@@ -3,6 +3,10 @@
  */
 const nextConfig = {
   transpilePackages: ['@rmrk-team/nft-renderer', '@rmrk-team/rmrk-evm-utils'],
+  webpack: (config) => {
+    config.externals = [...config.externals, { canvas: 'canvas' }];
+    return config;
+  },
 };
 
 export default nextConfig;
diff --git a/apps/composable-nft-renderer-app/package.json b/apps/composable-nft-renderer-app/package.json
@@ -14,10 +14,11 @@
     "@ark-ui/react": "^1.2.1",
     "@rainbow-me/rainbowkit": "^2.0.0-beta.1",
     "@rmrk-team/nft-renderer": "workspace:*",
+    "@rmrk-team/rmrk-2d-renderer": "workspace:*",
     "@rmrk-team/rmrk-evm-utils": "workspace:*",
     "@rmrk-team/rmrk-hooks": "workspace:*",
-    "@rmrk-team/rmrk-2d-renderer": "workspace:*",
     "@tanstack/react-query": "^5.17.12",
+    "canvas": "^2.11.2",
     "lucide-react": "^0.303.0",
     "next": "13.4.1",
     "react": "18.2.0",

diff --git a/packages/nft-renderer/CHANGELOG.md b/packages/nft-renderer/CHANGELOG.md
@@ -1,5 +1,25 @@
 # @rmrk-team/nft-renderer
 
+## 0.2.0
+
+### Minor Changes
+
+- [`325e6e2`](https://github.com/rmrk-team/rmrk-js/commit/325e6e2bec733177cbe86e966ffc821603653bb2) Thanks [@YuriGii](https://github.com/YuriGii)! - fix nft-renderer config and add equipped item details to useGetComposedState
+
+### Patch Changes
+
+- Updated dependencies [[`325e6e2`](https://github.com/rmrk-team/rmrk-js/commit/325e6e2bec733177cbe86e966ffc821603653bb2)]:
+  - @rmrk-team/rmrk-hooks@0.2.0
+
+## 0.1.2
+
+### Patch Changes
+
+- [`eaeabbe`](https://github.com/rmrk-team/rmrk-js/commit/eaeabbebfe0818793fc17d5b381685f4d20bda9c) Thanks [@Yuripetusko](https://github.com/Yuripetusko)! - Wait until we have all metadatas before fetching uris
+
+- Updated dependencies [[`eaeabbe`](https://github.com/rmrk-team/rmrk-js/commit/eaeabbebfe0818793fc17d5b381685f4d20bda9c)]:
+  - @rmrk-team/rmrk-hooks@0.1.2
+
 ## 0.1.1
 
 ### Patch Changes

diff --git a/packages/nft-renderer/package.json b/packages/nft-renderer/package.json
@@ -2,7 +2,7 @@
   "name": "@rmrk-team/nft-renderer",
   "description": "React NFT renderer for multi layered composable NFTs built on RMRK standards",
   "bugs": "https://github.com/rmrk-team/rmrk-js/issues",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "private": false,
   "access": "public",
   "repository": {

diff --git a/packages/rmrk-hooks/CHANGELOG.md b/packages/rmrk-hooks/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @rmrk-team/rmrk-hooks
 
+## 0.2.0
+
+### Minor Changes
+
+- [`325e6e2`](https://github.com/rmrk-team/rmrk-js/commit/325e6e2bec733177cbe86e966ffc821603653bb2) Thanks [@YuriGii](https://github.com/YuriGii)! - fix nft-renderer config and add equipped item details to useGetComposedState
+
+## 0.1.2
+
+### Patch Changes
+
+- [`eaeabbe`](https://github.com/rmrk-team/rmrk-js/commit/eaeabbebfe0818793fc17d5b381685f4d20bda9c) Thanks [@Yuripetusko](https://github.com/Yuripetusko)! - Wait until we have all metadatas before fetching uris
+
 ## 0.1.1
 
 ### Patch Changes

diff --git a/packages/rmrk-hooks/package.json b/packages/rmrk-hooks/package.json
@@ -3,7 +3,7 @@
   "description": "React hooks for working with NFTs built on RMRK standards",
   "bugs": "https://github.com/rmrk-team/rmrk-js/issues",
   "homepage": "https://github.com/rmrk-team/rmrk-js",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "private": false,
   "access": "public",
   "repository": {

diff --git a/packages/rmrk-hooks/src/lib/hooks/use-get-composed-state.ts b/packages/rmrk-hooks/src/lib/hooks/use-get-composed-state.ts
@@ -124,7 +124,13 @@ export const useGetComposedState = (
   return {
     data: {
       fixedPartsWithMetadatas,
-      slotPartsWithMetadatas,
+      slotPartsWithMetadatas:
+        !!slotPartsWithMetadatas && !!slotParts
+          ? slotPartsWithMetadatas.map((partWithMetadata) => ({
+              ...partWithMetadata,
+              ...slotParts.find((part) => part.z === partWithMetadata.z),
+            }))
+          : undefined,
       assetMetadataUri,
       equippableGroupId,
       catalogAddress,