Refactor prop destructuring

facultyai · Feb 11, 2024 · 08e85c6 · 08e85c6
1 parent 3386dd9
commit 08e85c6
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 21 deletions.
diff --git a/src/components/breadcrumb/Breadcrumb.js b/src/components/breadcrumb/Breadcrumb.js
@@ -9,25 +9,17 @@ import {sanitizeAndCheckUrl} from '../../private/util';
  * Use breadcrumbs to create a navigation breadcrumb in your app.
  */
 
-const BreadcrumbItem = ({
-  item,
-  idx,
-  item_class_name,
-  itemClassName,
-  setProps
-}) => {
-  const sanitizedUrl = sanitizeAndCheckUrl(item.href, setProps);
+const BreadcrumbItem = ({href, setProps, external_link, label, ...otherProps}) => {
+  const sanitizedUrl = sanitizeAndCheckUrl(href, setProps);
 
   return (
     <RBBreadcrumb.Item
-      key={`${item.value}${idx}`}
-      active={item.active}
       linkAs={sanitizedUrl && Link}
-      className={item_class_name || itemClassName}
       href={sanitizedUrl}
-      linkProps={sanitizedUrl && {external_link: item.external_link}}
+      linkProps={sanitizedUrl && { external_link }}
+      {...otherProps}
     >
-      {item.label}
+      {label}
     </RBBreadcrumb.Item>
   );
 };
@@ -55,11 +47,9 @@ const Breadcrumb = ({
     {(items || []).map((item, idx) => (
       <BreadcrumbItem
         key={`${item.value}${idx}`}
-        idx={idx}
-        item={item}
-        item_class_name={item_class_name}
-        itemClassName={itemClassName}
+        className={item_class_name || itemClassName}
         setProps={setProps}
+        {...item}
       />
     ))}
   </RBBreadcrumb>

diff --git a/src/components/card/CardLink.js b/src/components/card/CardLink.js
@@ -42,7 +42,7 @@ const CardLink = props => {
       disabled={disabled}
       href={sanitizedUrl}
       className={class_name || className}
-      {...omit(['setProps', 'n_clicks', 'n_clicks_timestamp'], otherProps)}
+      {...omit(['n_clicks', 'n_clicks_timestamp'], otherProps)}
     >
       {children}
     </RBCard.Link>

diff --git a/src/components/nav/NavbarBrand.js b/src/components/nav/NavbarBrand.js
@@ -9,12 +9,20 @@ import {sanitizeAndCheckUrl} from '../../private/util';
  * Call out attention to a brand name or site title within a navbar.
  */
 const NavbarBrand = props => {
-  const {children, loading_state, className, class_name, ...otherProps} = props;
-  const sanitizedUrl = sanitizeAndCheckUrl(props.href, props.setProps);
+  const {
+    children,
+    loading_state,
+    className,
+    class_name,
+    href,
+    setProps,
+    ...otherProps
+  } = props;
+  const sanitizedUrl = sanitizeAndCheckUrl(href, setProps);
   return (
     <RBNavbarBrand
       className={class_name || className}
-      {...omit(['setProps'], otherProps)}
+      {...otherProps}
       as={sanitizedUrl ? Link : 'span'}
       href={sanitizedUrl}
       data-dash-is-loading={