Skip to content

Commit 2691e12

Browse files
committed
fix(SplitterLayout): implement latest design specs (#6885)
1 parent 8354630 commit 2691e12

File tree

2 files changed

+41
-21
lines changed

2 files changed

+41
-21
lines changed

packages/main/src/components/Splitter/Splitter.module.css

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
outline-offset: -0.2rem;
1414
outline: var(--_ui5wcr_Splitter_BarOutline);
1515
}
16-
.icon {
17-
z-index: 1;
18-
}
1916
}
2017

2118
&[data-splitter-vertical='horizontal'] {
@@ -44,6 +41,14 @@
4441
.lineAfter {
4542
background-image: linear-gradient(to bottom, var(--_ui5wcr_Splitter_ContentBorderColor), transparent);
4643
}
44+
.gripContainer {
45+
height: 2rem;
46+
width: 1.5rem;
47+
}
48+
.gripButton {
49+
min-width: 1.5rem;
50+
height: 1.625rem;
51+
}
4752
}
4853

4954
&[data-splitter-vertical='vertical'] {
@@ -78,6 +83,14 @@
7883
background-image: linear-gradient(to left, var(--_ui5wcr_Splitter_ContentBorderColor), transparent);
7984
}
8085
}
86+
.gripContainer {
87+
height: 1.5rem;
88+
width: 2rem;
89+
}
90+
.gripButton {
91+
height: 1.5rem;
92+
min-width: 1.625rem;
93+
}
8194
}
8295

8396
&:hover {
@@ -89,10 +102,15 @@
89102
}
90103
}
91104

92-
.gripButton {
93-
min-width: 1.5rem !important;
94-
height: 1.625rem;
105+
.gripContainer {
106+
display: flex;
107+
justify-content: center;
108+
align-items: center;
95109
z-index: 1;
110+
}
111+
112+
.gripButton {
113+
cursor: inherit;
96114

97115
&:active {
98116
z-index: 2;

packages/main/src/components/Splitter/index.tsx

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -264,21 +264,23 @@ const Splitter = forwardRef<HTMLDivElement, SplitterPropTypes>((props, ref) => {
264264
aria-label={i18nBundle.getText(PRESS_ARROW_KEYS_TO_MOVE)}
265265
>
266266
<div className={classNames.lineBefore} />
267-
{isHighContrast ? (
268-
<Button
269-
className={classNames.gripButton}
270-
tabIndex={-1}
271-
icon={vertical ? horizontalGripIcon : verticalGripIcon}
272-
design={ButtonDesign.Transparent}
273-
data-component-name="SplitterLayoutSplitterGrip"
274-
/>
275-
) : (
276-
<Icon
277-
className={classNames.icon}
278-
name={vertical ? horizontalGripIcon : verticalGripIcon}
279-
data-component-name="SplitterLayoutSplitterGrip"
280-
/>
281-
)}
267+
<div className={classNames.gripContainer}>
268+
{isHighContrast ? (
269+
<Button
270+
className={classNames.gripButton}
271+
tabIndex={-1}
272+
icon={vertical ? horizontalGripIcon : verticalGripIcon}
273+
design={ButtonDesign.Transparent}
274+
data-component-name="SplitterLayoutSplitterGrip"
275+
/>
276+
) : (
277+
<Icon
278+
className={classNames.icon}
279+
name={vertical ? horizontalGripIcon : verticalGripIcon}
280+
data-component-name="SplitterLayoutSplitterGrip"
281+
/>
282+
)}
283+
</div>
282284
<div className={classNames.lineAfter} />
283285
</div>
284286
);

0 commit comments

Comments
 (0)