From 64ee99513ac3d68b6f508976f1badf0afcd1f0e0 Mon Sep 17 00:00:00 2001 From: Caner Akdas Date: Thu, 12 Mar 2026 19:01:23 +0300 Subject: [PATCH 1/4] refactor: function return type container --- .../Signature/SignatureRoot/index.module.css | 3 ++- .../FunctionSignature/index.stories.tsx | 11 ++++++++++ .../Containers/FunctionSignature/index.tsx | 20 ++++++++++++++++--- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/packages/ui-components/src/Common/Signature/SignatureRoot/index.module.css b/packages/ui-components/src/Common/Signature/SignatureRoot/index.module.css index 15d730563dc28..b7e2a6aa7016f 100644 --- a/packages/ui-components/src/Common/Signature/SignatureRoot/index.module.css +++ b/packages/ui-components/src/Common/Signature/SignatureRoot/index.module.css @@ -12,7 +12,8 @@ } .root { - @apply flex + @apply mb-1 + flex flex-col gap-4 rounded-sm diff --git a/packages/ui-components/src/Containers/FunctionSignature/index.stories.tsx b/packages/ui-components/src/Containers/FunctionSignature/index.stories.tsx index 4aebee4bdee88..49ae8a3efca08 100644 --- a/packages/ui-components/src/Containers/FunctionSignature/index.stories.tsx +++ b/packages/ui-components/src/Containers/FunctionSignature/index.stories.tsx @@ -118,6 +118,17 @@ export const Nested: Story = { }, ], }, + { + name: 'Returns', + kind: 'return', + description: 'description', + type: ( + <> + <Promise>| + <AsyncIterable> + + ), + }, ], }, }; diff --git a/packages/ui-components/src/Containers/FunctionSignature/index.tsx b/packages/ui-components/src/Containers/FunctionSignature/index.tsx index 96eeaf00b53be..04c9888f47ed8 100644 --- a/packages/ui-components/src/Containers/FunctionSignature/index.tsx +++ b/packages/ui-components/src/Containers/FunctionSignature/index.tsx @@ -29,10 +29,24 @@ const renderSignature = (param: SignatureDefinition, index: number) => ( const FunctionSignature: FC = ({ title, items }) => { if (title) { + const attributes: Array = []; + const returnTypes: Array = []; + + for (const item of items) { + (item.kind === 'return' ? returnTypes : attributes).push(item); + } + return ( - - {items.map((param, i) => renderSignature(param, i))} - + <> + + {attributes.map((param, i) => renderSignature(param, i))} + + {returnTypes.length > 0 && ( + + {returnTypes.map((param, i) => renderSignature(param, i))} + + )} + ); } From d4e198e1ac70aa18829c1f9b1111fab93db20d01 Mon Sep 17 00:00:00 2001 From: Caner Akdas Date: Thu, 12 Mar 2026 19:11:23 +0300 Subject: [PATCH 2/4] chore: patch and unique key --- packages/ui-components/package.json | 2 +- .../ui-components/src/Containers/FunctionSignature/index.tsx | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/ui-components/package.json b/packages/ui-components/package.json index 6235ce5011b40..352ef6f559df1 100644 --- a/packages/ui-components/package.json +++ b/packages/ui-components/package.json @@ -1,6 +1,6 @@ { "name": "@node-core/ui-components", - "version": "1.6.2", + "version": "1.6.3", "type": "module", "exports": { "./*": { diff --git a/packages/ui-components/src/Containers/FunctionSignature/index.tsx b/packages/ui-components/src/Containers/FunctionSignature/index.tsx index 04c9888f47ed8..113808e23ac07 100644 --- a/packages/ui-components/src/Containers/FunctionSignature/index.tsx +++ b/packages/ui-components/src/Containers/FunctionSignature/index.tsx @@ -43,7 +43,9 @@ const FunctionSignature: FC = ({ title, items }) => { {returnTypes.length > 0 && ( - {returnTypes.map((param, i) => renderSignature(param, i))} + {returnTypes.map((param, i) => + renderSignature(param, attributes.length + i) + )} )} From 01dff7806b983afa323266aaa6fa7808b04f2c83 Mon Sep 17 00:00:00 2001 From: Caner Akdas Date: Thu, 12 Mar 2026 19:23:44 +0300 Subject: [PATCH 3/4] chore: remove unnecessary container --- .../Common/Signature/SignatureRoot/index.module.css | 2 +- .../src/Containers/FunctionSignature/index.tsx | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/packages/ui-components/src/Common/Signature/SignatureRoot/index.module.css b/packages/ui-components/src/Common/Signature/SignatureRoot/index.module.css index b7e2a6aa7016f..fa97a8e31f87b 100644 --- a/packages/ui-components/src/Common/Signature/SignatureRoot/index.module.css +++ b/packages/ui-components/src/Common/Signature/SignatureRoot/index.module.css @@ -12,7 +12,7 @@ } .root { - @apply mb-1 + @apply mb-3 flex flex-col gap-4 diff --git a/packages/ui-components/src/Containers/FunctionSignature/index.tsx b/packages/ui-components/src/Containers/FunctionSignature/index.tsx index 113808e23ac07..ed82920b9ae9e 100644 --- a/packages/ui-components/src/Containers/FunctionSignature/index.tsx +++ b/packages/ui-components/src/Containers/FunctionSignature/index.tsx @@ -41,13 +41,11 @@ const FunctionSignature: FC = ({ title, items }) => { {attributes.map((param, i) => renderSignature(param, i))} - {returnTypes.length > 0 && ( - - {returnTypes.map((param, i) => - renderSignature(param, attributes.length + i) - )} - - )} + + {returnTypes.length > 0 && + returnTypes.map((param, i) => + renderSignature(param, attributes.length + i) + )} ); } From 3fcee57fa3949580bf8a377cff4ea272d365f95b Mon Sep 17 00:00:00 2001 From: Caner Akdas Date: Sat, 14 Mar 2026 11:06:06 +0300 Subject: [PATCH 4/4] chore: review updates --- .../ui-components/src/Containers/FunctionSignature/index.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/ui-components/src/Containers/FunctionSignature/index.tsx b/packages/ui-components/src/Containers/FunctionSignature/index.tsx index ed82920b9ae9e..0f661394643d8 100644 --- a/packages/ui-components/src/Containers/FunctionSignature/index.tsx +++ b/packages/ui-components/src/Containers/FunctionSignature/index.tsx @@ -33,7 +33,9 @@ const FunctionSignature: FC = ({ title, items }) => { const returnTypes: Array = []; for (const item of items) { - (item.kind === 'return' ? returnTypes : attributes).push(item); + const target = item.kind === 'return' ? returnTypes : attributes; + + target.push(item); } return (