Merge pull request #1148 from ssi02014/refac/type

refactor: improved attributes-to-props, dom-to-react, utilities
remarkablemark · Nov 2, 2023 · a41c6de · a41c6de
2 parents a38ea33 + 049f19a
commit a41c6de
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/attributes-to-props.ts b/src/attributes-to-props.ts
@@ -69,12 +69,12 @@ export default function attributesToProps(
 
       // convert attribute to uncontrolled component prop (e.g., `value` to `defaultValue`)
       if (
-        UNCONTROLLED_COMPONENT_ATTRIBUTES.indexOf(
+        UNCONTROLLED_COMPONENT_ATTRIBUTES.includes(
           propName as UncontrolledComponentAttributes,
-        ) !== -1 &&
-        UNCONTROLLED_COMPONENT_NAMES.indexOf(
+        ) &&
+        UNCONTROLLED_COMPONENT_NAMES.includes(
           nodeName! as UncontrolledComponentNames,
-        ) !== -1 &&
+        ) &&
         !isInputValueOnly
       ) {
         propName = getPropName('default' + attributeNameLowerCased);

diff --git a/src/dom-to-react.ts b/src/dom-to-react.ts
@@ -95,7 +95,7 @@ export default function domToReact(
       props = attributesToProps(element.attribs, element.name);
     }
 
-    let children;
+    let children: ReturnType<typeof domToReact> | undefined;
 
     switch (node.type) {
       case 'script':

diff --git a/src/utilities.ts b/src/utilities.ts
@@ -29,9 +29,9 @@ type ReservedSvgMathmlElements =
  */
 export function isCustomComponent(
   tagName: string,
-  props?: Record<PropertyKey, any>,
+  props?: Record<PropertyKey, string>,
 ): boolean {
-  if (tagName.indexOf('-') === -1) {
+  if (!tagName.includes('-')) {
     return Boolean(props && typeof props.is === 'string');
   }