Skip to content

correcting lint issue in collapsible component #684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 27, 2024
Merged

correcting lint issue in collapsible component #684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b179c0f
Changes to collapsible component #528
g-charan Dec 26, 2024
cf94fa5
correcting lint issue
g-charan Dec 26, 2024
b240cdd
Merge branch 'rad-ui:main' into improve-collapsible-component
g-charan Dec 26, 2024
909114c
Merge branch 'improve-collapsible-component' of https://github.com/g-…
g-charan Dec 26, 2024
6bf535d
corrected lint issues
g-charan Dec 26, 2024
9017adc
correcting css issue in collapsible
g-charan Dec 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions src/components/ui/Collapsible/Collapsible.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ const Collapsible = ({ children, ...props }: CollapsibleProps) => {
// Collapsible Content
const collapsibleContent = props.collapsibleContent;

const DisabledContent = () => {
return <>{children && children}
{collapsibleContent && collapsibleContent}</>
}
Comment on lines +47 to +50
Copy link
Contributor

@coderabbitai coderabbitai bot Dec 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Refactor DisabledContent to follow React best practices

The component definition inside the render method can cause performance issues and should be moved outside. Also, the implementation can be simplified.

Apply these changes:

-  const DisabledContent = () => {
-    return <>{children && children}
-         {collapsibleContent && collapsibleContent}</>
-  }
+type DisabledContentProps = {
+  children?: React.ReactNode;
+  collapsibleContent?: React.ReactNode;
+};
+
+const DisabledContent: React.FC<DisabledContentProps> = ({
+  children,
+  collapsibleContent
+}) => (
+  <>
+    {children}
+    {collapsibleContent}
+  </>
+);
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
const DisabledContent = () => {
return <>{children && children}
{collapsibleContent && collapsibleContent}</>
}
type DisabledContentProps = {
children?: React.ReactNode;
collapsibleContent?: React.ReactNode;
};
const DisabledContent: React.FC<DisabledContentProps> = ({
children,
collapsibleContent
}) => (
<>
{children}
{collapsibleContent}
</>
);

return (
<CollapsibleComponent.Root
open={props.open ?? open}
Expand All @@ -52,25 +56,22 @@ const Collapsible = ({ children, ...props }: CollapsibleProps) => {
>
<CollapsibleComponent.Header title={title}>
{/* Button */}

<CollapsibleComponent.Trigger asChild>
{props.trigger && props.trigger}
</CollapsibleComponent.Trigger>


<CollapsibleComponent.Trigger asChild>
{props.trigger && props.trigger}
</CollapsibleComponent.Trigger>
</CollapsibleComponent.Header>

{/* Conditonal Loop */}
{disabled ? (
// loops through all the items with no toggle
<>{children && children}
{collapsibleContent && collapsibleContent}</>
) : (
{/* Conditional Loop */}
{disabled
? <DisabledContent />
: (
<>
{/* Default Content */}
{children && children}
{/* Collapsable Content */}
{/* Collapsable Content */}
<CollapsibleComponent.Content>
{collapsibleContent && collapsibleContent}
{collapsibleContent && collapsibleContent}
</CollapsibleComponent.Content>
</>
)}
Expand Down
2 changes: 1 addition & 1 deletion styles/themes/components/collapsible.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
padding: 10px;
border: 1px solid var(--rad-ui-color-gray-1000);
border-radius: 5px;
width: "full";
width: 100%;
color: black;
background: var(--rad-ui-color-accent-200);

Expand Down
Loading