From afdc1a243a7da38cce64ec8325e36465f6250de8 Mon Sep 17 00:00:00 2001 From: Keith Ingram Date: Wed, 6 Nov 2019 12:25:33 +0100 Subject: [PATCH] react-params prioritize displayName (#1846) * constructor index bug * Contract fixes * lint * console * console * prioritize displayName params * linting --- packages/react-params/src/Param/findComponent.ts | 6 +++++- packages/react-params/src/Param/index.tsx | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/react-params/src/Param/findComponent.ts b/packages/react-params/src/Param/findComponent.ts index d4e8030f29..f36b999ac5 100644 --- a/packages/react-params/src/Param/findComponent.ts +++ b/packages/react-params/src/Param/findComponent.ts @@ -72,7 +72,11 @@ const components: ComponentMap = ([ export default function findComponent (def: TypeDef, overrides: ComponentMap = {}): React.ComponentType { const findOne = (type: string): React.ComponentType | null => overrides[type] || components[type]; - const type = (({ info, sub, type }: TypeDef): string => { + const type = (({ displayName, info, sub, type }: TypeDef): string => { + if (displayName) { + return displayName; + } + switch (info) { case TypeDefInfo.Compact: return (sub as TypeDef).type; diff --git a/packages/react-params/src/Param/index.tsx b/packages/react-params/src/Param/index.tsx index ec8346d0c8..8114e6f7b3 100644 --- a/packages/react-params/src/Param/index.tsx +++ b/packages/react-params/src/Param/index.tsx @@ -27,8 +27,8 @@ function Param ({ className, defaultValue, isDisabled, isOptional, name, onChang } const label = isUndefined(name) - ? type.type - : `${name}: ${type.type}`; + ? (type.displayName || type.type) + : `${name}: ${type.displayName || type.type}`; return isOptional ? (