Skip to content

Commit 26e7399

Browse files
committed
Fix panel icon alignment (again)
previous fixes were on a specified font size. had to fix the viewbox to span the full path to make its alignment accurate
1 parent de9e00c commit 26e7399

File tree

3 files changed

+37
-20
lines changed

3 files changed

+37
-20
lines changed

packages/react-devtools-shared/src/devtools/views/ButtonIcon.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ type Props = {
5252
type: IconType,
5353
};
5454

55-
const panelIcons = '0 -960 960 820';
55+
const panelIconsViewBox = '144 -816 672 672';
5656
export default function ButtonIcon({className = '', type}: Props): React.Node {
5757
let pathData = null;
5858
let viewBox = '0 0 24 24';
@@ -131,27 +131,27 @@ export default function ButtonIcon({className = '', type}: Props): React.Node {
131131
break;
132132
case 'panel-left-close':
133133
pathData = PATH_MATERIAL_PANEL_LEFT_CLOSE;
134-
viewBox = panelIcons;
134+
viewBox = panelIconsViewBox;
135135
break;
136136
case 'panel-left-open':
137137
pathData = PATH_MATERIAL_PANEL_LEFT_OPEN;
138-
viewBox = panelIcons;
138+
viewBox = panelIconsViewBox;
139139
break;
140140
case 'panel-right-close':
141141
pathData = PATH_MATERIAL_PANEL_RIGHT_CLOSE;
142-
viewBox = panelIcons;
142+
viewBox = panelIconsViewBox;
143143
break;
144144
case 'panel-right-open':
145145
pathData = PATH_MATERIAL_PANEL_RIGHT_OPEN;
146-
viewBox = panelIcons;
146+
viewBox = panelIconsViewBox;
147147
break;
148148
case 'panel-bottom-open':
149149
pathData = PATH_MATERIAL_PANEL_BOTTOM_OPEN;
150-
viewBox = panelIcons;
150+
viewBox = panelIconsViewBox;
151151
break;
152152
case 'panel-bottom-close':
153153
pathData = PATH_MATERIAL_PANEL_BOTTOM_CLOSE;
154-
viewBox = panelIcons;
154+
viewBox = panelIconsViewBox;
155155
break;
156156
case 'suspend':
157157
pathData = PATH_SUSPEND;

packages/react-devtools-shared/src/devtools/views/SuspenseTab/SuspenseTab.css

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@
5353
display: none;
5454
}
5555

56+
57+
.TogglePanelIcon {
58+
width: 16px;
59+
height: 16px;
60+
}
61+
5662
@container devtools (width < 600px) {
5763
.SuspenseTab {
5864
flex-direction: column;
@@ -111,14 +117,24 @@
111117

112118
.SuspenseTreeViewHeader {
113119
padding: 0.25rem;
114-
display: grid;
120+
display: grid;
115121
grid-template-columns: auto 1fr auto;
116-
align-items: flex-start;
122+
grid-template-rows: auto auto;
123+
grid-template-areas:
124+
"toggle-left timeline toggle-right"
125+
". breadcrumbs breadcrumbs";
117126
}
118127

119-
.SuspenseTreeViewHeaderMain {
120-
display: grid;
121-
grid-template-rows: auto auto;
128+
.ToggleTreeList {
129+
grid-area: toggle-left;
130+
}
131+
132+
.SuspenseTimeline {
133+
grid-area: timeline;
134+
}
135+
136+
.ToggleInspectedElement {
137+
grid-area: toggle-right;;
122138
}
123139

124140
.SuspenseBreadcrumbs {
@@ -127,4 +143,5 @@
127143
* OwnerStack has more constraints that make it easier so it won't be a 1:1 port.
128144
*/
129145
overflow-x: auto;
146+
grid-area: breadcrumbs;
130147
}

packages/react-devtools-shared/src/devtools/views/SuspenseTab/SuspenseTab.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ function ToggleTreeList({
5757
}) {
5858
return (
5959
<Button
60+
className={styles.ToggleTreeList}
6061
onClick={() =>
6162
dispatch({
6263
type: 'ACTION_SET_TREE_LIST_TOGGLE',
@@ -65,6 +66,7 @@ function ToggleTreeList({
6566
}
6667
title={state.treeListHidden ? 'Show Tree List' : 'Hide Tree List'}>
6768
<ButtonIcon
69+
className={styles.TogglePanelIcon}
6870
type={state.treeListHidden ? 'panel-left-open' : 'panel-left-close'}
6971
/>
7072
</Button>
@@ -105,7 +107,7 @@ function ToggleInspectedElement({
105107
? 'Show Inspected Element'
106108
: 'Hide Inspected Element'
107109
}>
108-
<ButtonIcon type={iconType} />
110+
<ButtonIcon className={styles.TogglePanelIcon} type={iconType} />
109111
</Button>
110112
);
111113
}
@@ -307,13 +309,11 @@ function SuspenseTab(_: {}) {
307309
<div className={styles.TreeView}>
308310
<div className={styles.SuspenseTreeViewHeader}>
309311
<ToggleTreeList dispatch={dispatch} state={state} />
310-
<div className={styles.SuspenseTreeViewHeaderMain}>
311-
<div className={styles.SuspenseTimeline}>
312-
<SuspenseTimeline />
313-
</div>
314-
<div className={styles.SuspenseBreadcrumbs}>
315-
<SuspenseBreadcrumbs />
316-
</div>
312+
<div className={styles.SuspenseTimeline}>
313+
<SuspenseTimeline />
314+
</div>
315+
<div className={styles.SuspenseBreadcrumbs}>
316+
<SuspenseBreadcrumbs />
317317
</div>
318318
<ToggleInspectedElement
319319
dispatch={dispatch}

0 commit comments

Comments
 (0)