Merge pull request #842 from vrk-kpa/fix/remove-props-from-dom

[Fix] Remove unwanted props from DOM + remove redundant never types from some conditional props
vrk-kpa · Mar 22, 2024 · e9decf7 · e9decf7
2 parents 2816e25 + 60fb814
commit e9decf7
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/src/core/Button/Button.tsx b/src/core/Button/Button.tsx
@@ -39,7 +39,7 @@ export type ForcedAccessibleNameProps =
 
 export type LoadingProps =
   | {
-      loading?: false | never;
+      loading?: false;
       ariaLoadingText?: never;
     }
   | {

diff --git a/src/core/Form/Select/MultiSelect/MultiSelect/MultiSelect.tsx b/src/core/Form/Select/MultiSelect/MultiSelect/MultiSelect.tsx
@@ -106,7 +106,7 @@ type AriaSelectedAmountProps =
 
 type LoadingProps =
   | {
-      loading?: false | never;
+      loading?: false;
       loadingText?: string;
     }
   | {
@@ -198,7 +198,7 @@ interface InternalMultiSelectProps<T extends MultiSelectData> {
 
 type AllowItemAdditionProps =
   | {
-      allowItemAddition?: false | never;
+      allowItemAddition?: false;
       itemAdditionHelpText?: never;
       noItemsText: string;
     }

diff --git a/src/core/Form/Select/SingleSelect/SingleSelect.tsx b/src/core/Form/Select/SingleSelect/SingleSelect.tsx
@@ -132,7 +132,7 @@ export interface InternalSingleSelectProps<T extends SingleSelectData> {
 
 type LoadingProps =
   | {
-      loading?: false | never;
+      loading?: false;
       loadingText?: string;
     }
   | {
@@ -146,7 +146,7 @@ type LoadingProps =
 
 type AllowItemAdditionProps =
   | {
-      allowItemAddition?: false | never;
+      allowItemAddition?: false;
       itemAdditionHelpText?: never;
       noItemsText: string;
     }

diff --git a/src/core/Tooltip/Tooltip.tsx b/src/core/Tooltip/Tooltip.tsx
@@ -154,6 +154,8 @@ class BaseTooltip extends Component<TooltipProps & { className?: string }> {
       forwardedRef,
       anchorElement,
       className,
+      onToggleButtonClick,
+      onCloseButtonClick,
       ...passProps
     } = this.props;
     const open = 'open' in this.props ? propsOpen : this.state.open;

diff --git a/src/core/VisuallyHidden/VisuallyHidden.tsx b/src/core/VisuallyHidden/VisuallyHidden.tsx
@@ -12,9 +12,10 @@ export interface VisuallyHiddenProps extends HtmlSpanProps {
 
 const baseClassName = 'fi-visually-hidden';
 
-const StyledVisuallyHidden = styled((props: VisuallyHiddenProps) => (
-  <HtmlSpan {...props} />
-))`
+const StyledVisuallyHidden = styled((props: VisuallyHiddenProps) => {
+  const { forwardedRef, ...passProps } = props;
+  return <HtmlSpan forwardedRef={forwardedRef} {...passProps} />;
+})`
   position: absolute;
   clip: rect(0 0 0 0);
   height: 1px;