neptune/ghost-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support lookupName in UI component lookups (#6202)

Browse Source
This commit is contained in:
Jaco 2021-09-26 16:47:58 +03:00 committed by GitHub
parent a99162fe8c
commit ce5e182390
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/react-params/src/Param/findComponent.ts
View File

@ -85,7 +85,7 @@ const components: ComponentMap = componentDef.reduce((components, { c, t }): Com
const warnList: string[] = [];
function fromDef ({ displayName, info, sub, type }: TypeDef): string {
function fromDef ({ displayName, info, lookupName, sub, type }: TypeDef): string {
if (displayName && SPECIAL_TYPES.includes(displayName)) {
return displayName;
}
@ -127,7 +127,7 @@ function fromDef ({ displayName, info, sub, type }: TypeDef): string {
return 'VecFixed';
default:
return type;
return lookupName || type;
}
}
@ -144,13 +144,13 @@ export default function findComponent (registry: Registry, def: TypeDef, overrid
const instance = registry.createType(type as 'u32');
const raw = getTypeDef(instance.toRawType());
Component = findOne(raw.type);
Component = findOne(raw.lookupName || raw.type);
if (Component) {
return Component;
} else if (isBn(instance)) {
return Amount;
} else if ([TypeDefInfo.Enum, TypeDefInfo.Struct, TypeDefInfo.Tuple].includes(raw.info)) {
} else if ([TypeDefInfo.Enum, TypeDefInfo.Struct, TypeDefInfo.Tuple, TypeDefInfo.Vec].includes(raw.info)) {
return findComponent(registry, raw, overrides);
} else if (raw.info === TypeDefInfo.VecFixed && (raw.sub as TypeDef).type !== 'u8') {
return findComponent(registry, raw, overrides);
@ -163,7 +163,7 @@ export default function findComponent (registry: Registry, def: TypeDef, overrid
if (!warnList.includes(type)) {
warnList.push(type);
error && console.error(`params: findComponent: ${error}`);
console.info(`params: findComponent: No pre-defined component for type ${type} from ${JSON.stringify(def)}, using defaults`);
console.info(`params: findComponent: No pre-defined component for type ${type} from ${TypeDefInfo[def.info]}: ${JSON.stringify(def)}`);
}
}