Skip to content

[LoadingIndicator]: Replace defaultProps with destructuring #2601

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 7 commits into from
Jan 23, 2025
Merged

[LoadingIndicator]: Replace defaultProps with destructuring #2601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
578e70b
Remove defaultProps from LoadingIndicator
its-me-abhishek Jan 20, 2025
eb8153a
Merge branch 'main' into defaultprops-removal-loading
its-me-abhishek Jan 21, 2025
1dfe627
Remove LoadingIndicatorProps from LoadingIndicator
its-me-abhishek Jan 21, 2025
c679e86
Removed optional feat from centered, classname, and style
its-me-abhishek Jan 21, 2025
337a101
Merge branch 'main' into defaultprops-removal-loading
its-me-abhishek Jan 22, 2025
5bbeb93
Added optional feat to centered, classname, and style
its-me-abhishek Jan 23, 2025
8d44145
run prettier
yurishkuro Jan 23, 2025
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
4 changes: 0 additions & 4 deletions ...eger-ui/src/components/DeepDependencies/SidePanel/__snapshots__/DetailsPanel.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,7 @@ exports[`<SidePanel> render renders detailLink 1`] = `
className="Ddg--DetailsPanel--LoadingWrapper"
>
<LoadingIndicator
centered={false}
className="Ddg--DetailsPanel--LoadingIndicator"
small={false}
/>
</div>
<VerticalResizer
Expand Down Expand Up @@ -268,9 +266,7 @@ exports[`<SidePanel> render renders while loading 1`] = `
className="Ddg--DetailsPanel--LoadingWrapper"
>
<LoadingIndicator
centered={false}
className="Ddg--DetailsPanel--LoadingIndicator"
small={false}
/>
</div>
<VerticalResizer
Expand Down
2 changes: 0 additions & 2 deletions ...ges/jaeger-ui/src/components/Monitor/ServicesView/__snapshots__/serviceGraph.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,6 @@ exports[`<ServiceGraph> Loading indicator is displayed 1`] = `
>
<LoadingIndicator
centered={true}
small={false}
/>
</div>
</div>
Expand Down Expand Up @@ -735,7 +734,6 @@ exports[`<ServiceGraph> Loading indicator is displayed when xDomain is empty 1`]
>
<LoadingIndicator
centered={true}
small={false}
/>
</div>
</div>
Expand Down
1 change: 0 additions & 1 deletion ...rc/components/Monitor/ServicesView/operationDetailsTable/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ exports[`<OperationTableDetails> "Couldn’t fetch data" displayed 1`] = `
exports[`<OperationTableDetails> Loading indicator is displayed 1`] = `
<LoadingIndicator
centered={true}
small={false}
/>
`;

Expand Down
1 change: 0 additions & 1 deletion packages/jaeger-ui/src/components/QualityMetrics/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ exports[`QualityMetrics UnconnectedQualityMetrics render renders when loading 1`
/>
<LoadingIndicator
centered={true}
small={false}
/>
</div>
`;
Expand Down
25 changes: 12 additions & 13 deletions packages/jaeger-ui/src/components/common/LoadingIndicator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,27 @@ import { LuLoader2 } from 'react-icons/lu';

import './LoadingIndicator.css';

type LoadingIndicatorProps = {
export default function LoadingIndicator({
centered = false,
vcentered,
className = '',
small = false,
style,
...rest
}: {
centered?: boolean;
vcentered?: boolean;
className?: string;
small?: boolean;
style?: React.CSSProperties;
};

export default function LoadingIndicator(props: LoadingIndicatorProps) {
const { centered, vcentered, className, small, ...rest } = props;
}) {
const cls = `
LoadingIndicator
${centered ? 'is-centered' : ''}
${vcentered ? 'is-vcentered' : ''}
${small ? 'is-small' : ''}
${className || ''}
${className}
`;
return <LuLoader2 className={cls} {...rest} />;
}

LoadingIndicator.defaultProps = {
centered: false,
className: undefined,
small: false,
};
return <LuLoader2 className={cls} {...rest} style={style} />;
}
Loading