Skip to content

Commit a652af2

Browse files
committed
Fix test util selectors behavior
1 parent f5b4475 commit a652af2

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

src/app-layout/__tests__/split-panel.test.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ afterEach(() => {
6464
window.getComputedStyle = originalGetComputedStyle;
6565
});
6666

67-
describeEachAppLayout({ sizes: ['desktop'] }, ({ theme }) => {
67+
describeEachAppLayout({ sizes: ['desktop'] }, () => {
6868
test('should render split panel in bottom position', () => {
6969
const { wrapper } = renderComponent(
7070
<AppLayout
@@ -104,10 +104,8 @@ describeEachAppLayout({ sizes: ['desktop'] }, ({ theme }) => {
104104
);
105105
expect(wrapper.findSplitPanelOpenButton()).not.toBeNull();
106106
wrapper.findSplitPanelOpenButton()!.click();
107-
if (theme === 'classic' || (theme === 'refresh' && position === 'bottom')) {
107+
if (position === 'bottom') {
108108
expect(wrapper.findSplitPanelOpenButton()).toBeNull();
109-
} else {
110-
expect(wrapper.findSplitPanelOpenButton()).not.toBeNull();
111109
}
112110
wrapper.findSplitPanel()!.findCloseButton()!.click();
113111
expect(wrapper.findSplitPanelOpenButton()).not.toBeNull();

src/app-layout/visual-refresh-toolbar/toolbar/drawer-triggers.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ export function DrawerTriggers({
110110
const toolsOnlyMode = drawers.length === 1 && drawers[0].id === TOOLS_DRAWER_ID;
111111
const globalDrawersStartIndex = drawers.length;
112112
const hasOpenDrawer = !!activeDrawerId || (splitPanelPosition === 'side' && splitPanelOpen);
113+
const splitPanelResolvedPosition = splitPanelToggleProps?.position;
113114

114115
return (
115116
<aside
@@ -135,12 +136,12 @@ export function DrawerTriggers({
135136
className={clsx(
136137
styles['drawers-trigger'],
137138
testutilStyles['drawers-trigger'],
138-
splitPanelTestUtilStyles['open-button']
139+
splitPanelResolvedPosition === 'side' && splitPanelTestUtilStyles['open-button']
139140
)}
140141
iconName={splitPanelToggleProps.position === 'side' ? 'view-vertical' : 'view-horizontal'}
141142
onClick={() => onSplitPanelToggle?.()}
142143
selected={splitPanelToggleProps.active}
143-
ref={splitPanelFocusRef}
144+
ref={splitPanelResolvedPosition === 'side' ? splitPanelFocusRef : undefined}
144145
hasTooltip={true}
145146
isMobile={isMobile}
146147
isForSplitPanel={true}

0 commit comments

Comments
 (0)