Skip to content

Commit 9ad475d

Browse files
committed
chore: DeploymentConfigDiff, CollapsibleList: UI/UX Changes
1 parent 27893ab commit 9ad475d

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

src/Shared/Components/CollapsibleList/CollapsibleList.component.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ export const CollapsibleList = ({ config, onCollapseBtnClick }: CollapsibleListP
2525
<div className="flexbox dc__align-items-center dc__gap-4 py-6 px-8 br-4 dc__hover-n50">
2626
<button
2727
type="button"
28-
className="dc__unset-button-styles mw-none flexbox dc__align-items-center flex-grow-1 p-0 cn-9 fs-12 lh-1-5 fw-6 dc__gap-4"
28+
className="dc__unset-button-styles mw-none flexbox dc__align-items-center flex-grow-1 p-0 cn-9 fs-13 lh-1-5 fw-6 dc__gap-4"
2929
onClick={(e) => onCollapseBtnClick(id, e)}
3030
>
3131
<ICExpand
32-
className="icon-dim-16 fcn-6 dc__no-shrink cursor rotate"
32+
className="icon-dim-20 fcn-6 dc__no-shrink cursor rotate"
3333
style={{ ['--rotateBy' as string]: isExpanded ? '90deg' : '0deg' }}
3434
/>
3535
<span className="flex-grow-1 dc__align-left dc__truncate">{header}</span>
@@ -46,14 +46,14 @@ export const CollapsibleList = ({ config, onCollapseBtnClick }: CollapsibleListP
4646
>
4747
<headerIconConfig.Icon
4848
{...headerIconConfig.props}
49-
className={`icon-dim-16 ${headerIconConfig.props?.className || ''}`}
49+
className={`icon-dim-20 ${headerIconConfig.props?.className || ''}`}
5050
/>
5151
</button>
5252
</ConditionalWrap>
5353
)}
5454
</div>
5555
<Collapse expand={isExpanded}>
56-
<div className="collapsible ml-16 pl-4 dc__border-left">
56+
<div className="collapsible ml-18 pl-4 dc__border-left">
5757
{!items.length ? (
5858
<div className="collapsible__item flexbox dc__gap-8 dc__no-decor no-hover br-4 py-6 px-8">
5959
<span className="collapsible__item__title dc__truncate fs-13 lh-20 cn-5">
@@ -89,7 +89,7 @@ export const CollapsibleList = ({ config, onCollapseBtnClick }: CollapsibleListP
8989
>
9090
<iconConfig.Icon
9191
{...iconConfig.props}
92-
className={`icon-dim-16 dc__no-shrink cursor ${iconConfig.props?.className || ''}`}
92+
className={`icon-dim-20 dc__no-shrink cursor ${iconConfig.props?.className || ''}`}
9393
/>
9494
</ConditionalWrap>
9595
)}

src/Shared/Components/DeploymentConfigDiff/DeploymentConfigDiffMain.tsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Fragment, useEffect, useState } from 'react'
1+
import { Fragment, TransitionEvent, useEffect, useState } from 'react'
22

33
import { ReactComponent as ICSortArrowDown } from '@Icons/ic-sort-arrow-down.svg'
44
import { ReactComponent as ICSort } from '@Icons/ic-arrow-up-down.svg'
@@ -29,8 +29,8 @@ export const DeploymentConfigDiffMain = ({
2929
})
3030
}
3131

32-
const handleTransitionEnd = () => {
33-
if (scrollIntoViewId) {
32+
const handleTransitionEnd = (id: string) => (e: TransitionEvent<HTMLDivElement>) => {
33+
if (e.target === e.currentTarget && scrollIntoViewId === id) {
3434
const element = document.querySelector(`#${scrollIntoViewId}`)
3535
element?.scrollIntoView({ block: 'start' })
3636
}
@@ -63,6 +63,7 @@ export const DeploymentConfigDiffMain = ({
6363
) : (
6464
configItem.text
6565
)}
66+
{index !== list.length - 1 && <span className="cn-9 fs-13 lh-20">/</span>}
6667
</Fragment>
6768
)
6869
}
@@ -122,7 +123,7 @@ export const DeploymentConfigDiffMain = ({
122123
isExpanded={expandedView[id]}
123124
hasDiff={hasDiff}
124125
onClick={handleAccordionClick(id)}
125-
onTransitionEnd={handleTransitionEnd}
126+
onTransitionEnd={handleTransitionEnd(id)}
126127
>
127128
{isDeploymentTemplate ? (
128129
<>
@@ -164,12 +165,12 @@ export const DeploymentConfigDiffMain = ({
164165
return (
165166
<div className="bcn-0 deployment-config-diff__main-top">
166167
<div className="dc__border-bottom-n1 flexbox dc__align-items-center dc__position-sticky dc__top-0 bcn-0 w-100 dc__zi-11">
167-
<div className="flexbox dc__align-items-center p-12 dc__gap-4 deployment-config-diff__main-top__header">
168+
<div className="flexbox dc__align-items-center p-12 dc__gap-8 deployment-config-diff__main-top__header">
168169
<p className="m-0 cn-9 fs-13 lh-20">{headerText}</p>
169170
{renderHeaderSelectors(selectorsConfig.primaryConfig)}
170171
</div>
171172
<div className="dc__border-left flexbox dc__align-items-center deployment-config-diff__main-top__header">
172-
<div className="flex-grow-1 flexbox dc__align-items-center dc__gap-4 p-12">
173+
<div className="flex-grow-1 flexbox dc__align-items-center dc__gap-8 p-12">
173174
{renderHeaderSelectors(selectorsConfig.secondaryConfig)}
174175
</div>
175176
{renderSortButton()}

src/Shared/Components/DeploymentConfigDiff/DeploymentConfigDiffNavigation.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export const DeploymentConfigDiffNavigation = ({
7878
onClick={onClick}
7979
>
8080
<span className="dc__truncate">{title}</span>
81-
{hasDiff && <ICDiffFileUpdated className="icon-dim-16 dc__no-shrink" />}
81+
{hasDiff && <ICDiffFileUpdated className="icon-dim-20 dc__no-shrink" />}
8282
</NavLink>
8383
))}
8484
<CollapsibleList config={collapsibleListConfig} onCollapseBtnClick={onCollapseBtnClick} />

0 commit comments

Comments
 (0)