Skip to content

style(navigation): adjust collapse button layout to fix alignment issue #2406 #2620

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

Open
Shabi-x wants to merge 2 commits into
base: release
Choose a base branch
from
Open

style(navigation): adjust collapse button layout to fix alignment issue #2406 #2620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a085bb7
style(navigation): adjust collapse button layout to fix alignment iss…
Dec 10, 2024
ff51f2e
feat(form/story): enhance form state display with improved readabilit…
Dec 12, 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
8 changes: 8 additions & 0 deletions packages/semi-foundation/navigation/navigation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,14 @@ $module: #{$prefix}-navigation;
.#{$module}-collapse-btn {
text-overflow: ellipsis;
white-space: nowrap;
width: 100%;
display: flex;
&-inner {
flex: 1;
span{
margin-right: auto;
}
}
}
}
}
Expand Down
43 changes: 38 additions & 5 deletions packages/semi-ui/form/_story/Hook/hookDemo.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,11 @@ const UseFormApiDemo = () => {
};

const CustomStringify = values => {
return JSON.stringify(values, (k, v) => (v === undefined ? '__undefined' : v)).replace(
return JSON.stringify(
values,
(k, v) => (v === undefined ? '__undefined' : v),
2
).replace(
'"__undefined"',
'undefined'
);
Expand Down Expand Up @@ -97,15 +101,44 @@ const ComponentUsingFormApi = () => {
);
};



// const ComponentUsingFormState = () => {
// const formState = useFormState();
// return (
// <pre>
// <code style={{ wordBreak: 'break-all', width: 600, whiteSpace: 'normal' }}>{JSON.stringify(formState)}</code>
// {/* <code style={{wordBreak:'break-all', width: 600, whiteSpace: 'normal'}}>{CustomStringify(formState)}</code> */}
// </pre>
// );
// };
/** */
const ComponentUsingFormState = () => {
const formState = useFormState();
return (
<pre>
<code style={{ wordBreak: 'break-all', width: 600, whiteSpace: 'normal' }}>{JSON.stringify(formState)}</code>
{/* <code style={{wordBreak:'break-all', width: 600, whiteSpace: 'normal'}}>{CustomStringify(formState)}</code> */}
</pre>
<div
style={{
backgroundColor: '#f4f4f4',
borderRadius: '8px',
padding: '16px',
border: '1px solid #e0e0e0',
margin: '16px 0',
}}
>
<pre>
<code
style={{
fontSize: '14px',
lineHeight: '1.5',
color: '#333',
whiteSpace: 'pre-wrap',
wordBreak: 'break-all'
}}
>
{JSON.stringify(formState, null, 2)}
</code>
</pre>
</div>
);
};

Expand Down
2 changes: 1 addition & 1 deletion packages/semi-ui/navigation/CollapseButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default function CollapseButton({ prefixCls, locale, collapseText, isColl
<Button {...(btnProps as any)} />
</Tooltip>
) : (
<Button {...(btnProps as any)}>{finalCollapseText}</Button>
<Button className={`${prefixCls}-collapse-btn-inner`} {...(btnProps as any)}>{finalCollapseText}</Button>
)}
</div>
);
Expand Down