Skip to content

Commit 979b0cd

Browse files
committed
Expand intercept blocks slightly and tighten target list sizing
We now use custom sizes, in each case set to the exact level required to avoid resizing the row (taking into account our new row sizes).
1 parent 7adedb4 commit 979b0cd

File tree

6 files changed

+19
-11
lines changed

6 files changed

+19
-11
lines changed

src/components/intercept/config/android-adb-config.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ const ConfigContainer = styled.div`
4646
}
4747
`;
4848

49+
const AdbTargetList = styled(InterceptionTargetList)`
50+
max-height: 280px;
51+
`;
52+
4953
const Footer = styled.p`
5054
font-size: 85%;
5155
font-style: italic;
@@ -88,10 +92,8 @@ class AndroidAdbConfig extends React.Component<{
8892
{ this.deviceIds.length > 1
8993
? <>
9094
<p>
91-
There are multiple ADB devices connected.
92-
</p>
93-
<p>
94-
Pick which device you'd like to intercept:
95+
There are multiple ADB devices connected. Pick which
96+
device you'd like to intercept:
9597
</p>
9698
</>
9799
: this.deviceIds.length === 1
@@ -115,7 +117,7 @@ class AndroidAdbConfig extends React.Component<{
115117
</p>
116118
</> }
117119

118-
<InterceptionTargetList
120+
<AdbTargetList
119121
spinnerText='Waiting for Android devices to intercept...'
120122
targets={this.deviceIds.map(id => {
121123
const activating = this.inProgressIds.includes(id);

src/components/intercept/config/docker-attach-config.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ const ConfigContainer = styled.div`
4242
}
4343
`;
4444

45+
const DockerTargetList = styled(InterceptionTargetList)`
46+
max-height: 262px;
47+
`;
48+
4549
const Footer = styled.p`
4650
font-size: 85%;
4751
font-style: italic;
@@ -101,7 +105,7 @@ class DockerAttachConfig extends React.Component<{
101105
Pick a container to restart it with all traffic intercepted:
102106
</p>
103107

104-
<InterceptionTargetList
108+
<DockerTargetList
105109
spinnerText='Looking for Docker containers to intercept...'
106110
interceptTarget={this.interceptTarget}
107111
ellipseDirection='left'

src/components/intercept/config/frida-config.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const ConfigContainer = styled.div`
2424
user-select: text;
2525
2626
height: 100%;
27-
max-height: 390px;
27+
max-height: 410px;
2828
display: flex;
2929
flex-direction: column;
3030
justify-content: start;

src/components/intercept/config/intercept-target-list.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ const ListScrollContainer = styled.div`
3434
margin: 10px -15px;
3535
flex-grow: 1;
3636
flex-shrink: 1;
37-
38-
max-height: 279px;
3937
`;
4038

4139
const TargetList = styled.ul`

src/components/intercept/config/jvm-config.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ import { InterceptionTargetList } from './intercept-target-list';
1313

1414
type JvmTarget = { pid: string, name: string, interceptedByProxy: number | undefined };
1515

16+
const JvmTargetList = styled(InterceptionTargetList)`
17+
max-height: 282px;
18+
`;
19+
1620
@inject('proxyStore')
1721
@observer
1822
class JvmConfig extends React.Component<{
@@ -59,7 +63,7 @@ class JvmConfig extends React.Component<{
5963
Pick which JVM process you'd like to intercept:
6064
</p>
6165

62-
<InterceptionTargetList
66+
<JvmTargetList
6367
spinnerText='Looking for JVM processes to intercept...'
6468
interceptTarget={this.interceptTarget}
6569
ellipseDirection='left'

src/components/intercept/intercept-page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const InterceptPageContainer = styled.section`
3838
padding: 40px;
3939
}
4040
41-
grid-auto-rows: minmax(200px, auto);
41+
grid-auto-rows: minmax(210px, auto);
4242
grid-auto-flow: row dense;
4343
4444
max-width: 1200px;

0 commit comments

Comments
 (0)