Skip to content

[Fix]: Consistent UI for Breadcrumbs and resolve merge conflict #1727

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 3 commits into from
May 30, 2025
Merged

[Fix]: Consistent UI for Breadcrumbs and resolve merge conflict #1727

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51e2a54
Update Environments Breadcrumbs
iamfaran May 30, 2025
17f3c7d
Merge branch 'dev' of github.com:lowcoder-org/lowcoder into ui/enviro…
iamfaran May 30, 2025
17641cd
Merge branch 'dev' into ui/environments-breadcrumbs
FalkWolsky May 30, 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
Next Next commit
Update Environments Breadcrumbs
  • Loading branch information
@iamfaran
iamfaran committed May 30, 2025
commit 51e2a54c39ff2b6ba20d2d9945d2a0b3d3c438a5
90 changes: 44 additions & 46 deletions client/packages/lowcoder/src/pages/setting/environments/components/ModernBreadcrumbs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import React, { ReactNode } from 'react';
import { Breadcrumb } from 'antd';
import { default as AntdBreadcrumb } from 'antd/es/breadcrumb';
import { BreadcrumbProps } from 'antd/lib/breadcrumb';
import styled from 'styled-components';
import { ArrowIcon } from 'lowcoder-design';

interface ModernBreadcrumbsProps extends Omit<BreadcrumbProps, 'items'> {
/**
Expand All @@ -13,57 +15,53 @@ interface ModernBreadcrumbsProps extends Omit<BreadcrumbProps, 'items'> {
}[];
}

/**
* Modern styled breadcrumb component with consistent styling
*/
const Breadcrumb = styled(AntdBreadcrumb)`
font-size: 16px;
margin-bottom: 10px;

li:not(:last-child) {
color: #8b8fa3;
}

li:last-child {
font-weight: 500;
color: #222222;
}

li.ant-breadcrumb-separator {
display: flex;
flex-direction: column;
justify-content: center;
}
`;

const BreadcrumbItem = styled.div`
cursor: pointer;
`;


const ModernBreadcrumbs: React.FC<ModernBreadcrumbsProps> = ({ items = [], ...props }) => {
// Convert custom items format to Antd's expected format
// Convert custom items format to the standard format used throughout the application
const breadcrumbItems = items.map(item => ({
key: item.key,
title: item.onClick ? (
<span
style={{
cursor: "pointer",
color: '#1890ff',
fontWeight: '500',
transition: 'color 0.2s ease'
}}
onClick={item.onClick}
onMouseEnter={(e) => {
e.currentTarget.style.color = '#096dd9';
e.currentTarget.style.textDecoration = 'underline';
}}
onMouseLeave={(e) => {
e.currentTarget.style.color = '#1890ff';
e.currentTarget.style.textDecoration = 'none';
}}
>
{item.title}
</span>
) : (
<span style={{ color: '#222222', fontWeight: '500' }}>
{item.title}
</span>
)
title: item.title,
onClick: item.onClick
}));

return (
<div className="modern-breadcrumb" style={{
background: '#f5f5f5',
padding: '12px 20px',
borderRadius: '4px',
marginBottom: '20px',
border: '1px solid #e8e8e8',
boxShadow: '0 1px 2px rgba(0,0,0,0.04)',
display: 'flex',
alignItems: 'center'
}}>
<Breadcrumb
{...props}
separator={<span style={{ color: '#8b8fa3' }}>/</span>}
items={breadcrumbItems}
/>
</div>
<Breadcrumb
{...props}
separator={<ArrowIcon />}
items={breadcrumbItems}
itemRender={(item) => (
<BreadcrumbItem
key={item.key}
onClick={item.onClick}
>
{item.title}
</BreadcrumbItem>
)}
/>
);
};

Expand Down