Merge pull request #148 from element-hq/react-warnings

Fix some React warnings
element-hq · Feb 12, 2024 · 14a139d · 14a139d
2 parents 075650a + d153f50
commit 14a139d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/src/components/Form/Controls/Text/Text.tsx b/src/components/Form/Controls/Text/Text.tsx
@@ -40,12 +40,10 @@ type TextProps = {
  * A styled text input, for standalone use.
  */
 export const TextInput = forwardRef<HTMLInputElement, TextProps>(
-  function TextInput(props, ref) {
-    const classes = classNames(
-      styles.control,
-      props.className,
-      props.enableLigatures && styles["enable-ligatures"],
-    );
+  function TextInput({ className, enableLigatures, ...props }, ref) {
+    const classes = classNames(styles.control, className, {
+      [styles["enable-ligatures"]]: enableLigatures,
+    });
     return <input ref={ref} {...props} className={classes} />;
   },
 );

diff --git a/src/components/Icon/IndicatorIcon/IndicatorIcon.tsx b/src/components/Icon/IndicatorIcon/IndicatorIcon.tsx
@@ -41,18 +41,16 @@ type IconButtonProps = {
 };
 
 export const IndicatorIcon = forwardRef<
-  HTMLButtonElement,
+  HTMLDivElement,
   PropsWithChildren<IconButtonProps>
->(function IconButton({
-  children,
-  className,
-  size = "100%",
-  colour,
-  indicator,
-}) {
+>(function IconButton(
+  { children, className, size = "100%", colour, indicator },
+  ref,
+) {
   const classes = classnames(styles["indicator-icon"], className);
   return (
     <div
+      ref={ref}
       className={classes}
       data-indicator={indicator}
       style={