chore: Safe typing for attribute editor (#1517)

cloudscape-design · Sep 7, 2023 · a7a9038 · a7a9038
1 parent 4df7f8d
commit a7a9038
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -181,7 +181,7 @@ module.exports = {
       },
     },
     {
-      files: ['none'],
+      files: ['src/attribute-editor/**'],
       excludedFiles: [
         'src/**/__tests__/**',
         'src/**/__integ__/**',

diff --git a/src/attribute-editor/interfaces.ts b/src/attribute-editor/interfaces.ts
@@ -47,6 +47,7 @@ export namespace AttributeEditorProps {
     focusAddButton(): void;
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   export interface I18nStrings<T = any> {
     errorIconAriaLabel?: string;
     itemRemovedAriaLive?: string;

diff --git a/src/attribute-editor/row.tsx b/src/attribute-editor/row.tsx
@@ -34,7 +34,14 @@ function render<T>(
   itemIndex: number,
   slot: AttributeEditorProps.FieldRenderable<T> | React.ReactNode | undefined
 ) {
-  return typeof slot === 'function' ? slot(item, itemIndex) : slot;
+  if (isSlotFunction(slot)) {
+    return slot(item, itemIndex);
+  }
+  return slot;
+
+  function isSlotFunction(slot: unknown): slot is AttributeEditorProps.FieldRenderable<T> {
+    return typeof slot === 'function';
+  }
 }
 
 const GRID_DEFINITION = [{ colspan: { default: 12, xs: 9 } }];