Skip to content

Commit 9e2eb99

Browse files
committed
Place description below buttons
1 parent e8f849c commit 9e2eb99

File tree

2 files changed

+62
-44
lines changed

2 files changed

+62
-44
lines changed

src/split-panel/implementation.tsx

Lines changed: 43 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -115,49 +115,54 @@ export function SplitPanelImplementation({
115115
</div>
116116
{headerActions && <div className={styles['header-actions-slot']}>{headerActions}</div>}
117117
</div>
118-
{showDescription && <p className={styles['header-description']}>{headerDescription}</p>}
119-
</div>
120-
<div className={styles['header-actions']}>
121-
{!hidePreferencesButton && isOpen && (
122-
<>
118+
<div className={styles['header-actions']}>
119+
{!hidePreferencesButton && isOpen && (
120+
<>
121+
<InternalButton
122+
className={testUtilStyles['preferences-button']}
123+
iconName="settings"
124+
variant="icon"
125+
onClick={() => setPreferencesOpen(true)}
126+
formAction="none"
127+
ariaLabel={i18nStrings.preferencesTitle}
128+
ref={refs.preferences}
129+
/>
130+
<span className={styles.divider} />
131+
</>
132+
)}
133+
134+
{isOpen ? (
123135
<InternalButton
124-
className={testUtilStyles['preferences-button']}
125-
iconName="settings"
136+
className={testUtilStyles['close-button']}
137+
iconName={
138+
isRefresh && closeBehavior === 'collapse'
139+
? position === 'side'
140+
? 'angle-right'
141+
: 'angle-down'
142+
: 'close'
143+
}
126144
variant="icon"
127-
onClick={() => setPreferencesOpen(true)}
145+
onClick={onToggle}
128146
formAction="none"
129-
ariaLabel={i18nStrings.preferencesTitle}
130-
ref={refs.preferences}
147+
ariaLabel={i18nStrings.closeButtonAriaLabel}
148+
ariaExpanded={isOpen}
131149
/>
132-
<span className={styles.divider} />
133-
</>
134-
)}
135-
136-
{isOpen ? (
137-
<InternalButton
138-
className={testUtilStyles['close-button']}
139-
iconName={
140-
isRefresh && closeBehavior === 'collapse' ? (position === 'side' ? 'angle-right' : 'angle-down') : 'close'
141-
}
142-
variant="icon"
143-
onClick={onToggle}
144-
formAction="none"
145-
ariaLabel={i18nStrings.closeButtonAriaLabel}
146-
ariaExpanded={isOpen}
147-
/>
148-
) : position === 'side' || closeBehavior === 'hide' ? null : (
149-
<InternalButton
150-
className={testUtilStyles['open-button']}
151-
iconName="angle-up"
152-
variant="icon"
153-
formAction="none"
154-
ariaLabel={i18nStrings.openButtonAriaLabel}
155-
ref={refs.toggle}
156-
ariaExpanded={isOpen}
157-
onClick={hasCustomElements ? onToggle : undefined}
158-
/>
159-
)}
150+
) : position === 'side' || closeBehavior === 'hide' ? null : (
151+
<InternalButton
152+
className={testUtilStyles['open-button']}
153+
iconName="angle-up"
154+
variant="icon"
155+
formAction="none"
156+
ariaLabel={i18nStrings.openButtonAriaLabel}
157+
ref={refs.toggle}
158+
ariaExpanded={isOpen}
159+
onClick={hasCustomElements ? onToggle : undefined}
160+
/>
161+
)}
162+
</div>
160163
</div>
164+
165+
{showDescription && <p className={styles['header-description']}>{headerDescription}</p>}
161166
</div>
162167
);
163168

src/split-panel/styles.scss

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -228,18 +228,21 @@ $app-layout-drawer-width: calc(#{awsui.$space-layout-toggle-diameter} + 2 * #{aw
228228
}
229229

230230
.header {
231-
display: flex;
232-
flex: auto;
233-
flex-direction: row;
234-
align-items: flex-start;
235-
justify-content: space-between;
236231
inline-size: 100%;
237232
margin-block: awsui.$size-vertical-panel-icon-offset;
238233
margin-inline: 0;
239234
&.with-toolbar {
240235
margin-block: constants.$toolbar-vertical-panel-icon-offset;
241236
}
242237

238+
&-content,
239+
&-start,
240+
&-main-row,
241+
&-text-and-info {
242+
display: flex;
243+
flex-grow: 1;
244+
}
245+
243246
&-content,
244247
&-start,
245248
&-text-and-info {
@@ -249,12 +252,22 @@ $app-layout-drawer-width: calc(#{awsui.$space-layout-toggle-diameter} + 2 * #{aw
249252
&-main-row,
250253
&-start,
251254
&-text-and-info {
252-
display: flex;
253255
flex-wrap: wrap;
254256
column-gap: awsui.$space-scaled-xs;
255257
row-gap: awsui.$space-scaled-xxs;
256258
}
257259

260+
&-content {
261+
align-items: flex-start;
262+
}
263+
264+
&-main-row {
265+
flex: auto;
266+
flex-direction: row;
267+
align-items: flex-start;
268+
justify-content: space-between;
269+
}
270+
258271
&-start {
259272
align-items: center;
260273
}

0 commit comments

Comments
 (0)