Skip to content

Commit 058b72b

Browse files
ncdiehl11ncdiehl11
committed
Merge branch 'chore_release-pd-8.4.0' into mergeback_release-pd-840_into_edge
2 parents 73b70f4 + 09e127d commit 058b72b

File tree

61 files changed

+1535
-510
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1535
-510
lines changed

‎components/src/atoms/ListButton/__tests__/ListButton.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ describe('ListButton', () => {
2525
it('should render correct style - noActive', () => {
2626
render(props)
2727
const listButton = screen.getByTestId('ListButton_noActive')
28-
expect(listButton).toHaveStyle(`backgroundColor: ${COLORS.grey30}`)
28+
expect(listButton).toHaveStyle(`backgroundColor: ${COLORS.grey20}`)
2929
})
3030
it('should render correct style - connected', () => {
3131
props.type = 'connected'

‎components/src/atoms/ListButton/index.tsx

+8-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ const LISTBUTTON_PROPS_BY_TYPE: Record<
2323
{ backgroundColor: string; hoverBackgroundColor: string }
2424
> = {
2525
noActive: {
26-
backgroundColor: COLORS.grey30,
27-
hoverBackgroundColor: COLORS.grey35,
26+
backgroundColor: COLORS.grey20,
27+
hoverBackgroundColor: COLORS.grey30,
2828
},
2929
connected: {
3030
backgroundColor: COLORS.green30,
@@ -60,13 +60,19 @@ export function ListButton(props: ListButtonProps): JSX.Element {
6060
? COLORS.grey20
6161
: listButtonProps.hoverBackgroundColor};
6262
}
63+
64+
&:focus-visible {
65+
outline: 2px solid ${COLORS.blue50};
66+
outline-offset: 0.25rem;
67+
}
6368
`
6469

6570
return (
6671
<Flex
6772
data-testid={`ListButton_${type}`}
6873
onClick={onClick}
6974
css={LIST_BUTTON_STYLE}
75+
tabIndex={0}
7076
{...styleProps}
7177
>
7278
{children}

‎components/src/atoms/buttons/EmptySelectorButton.tsx

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import {
44
ALIGN_CENTER,
55
CURSOR_DEFAULT,
66
CURSOR_POINTER,
7-
FLEX_MAX_CONTENT,
87
Icon,
98
JUSTIFY_CENTER,
109
JUSTIFY_START,
@@ -62,8 +61,8 @@ interface ButtonProps {
6261

6362
const StyledButton = styled.button<ButtonProps>`
6463
border: none;
65-
width: ${FLEX_MAX_CONTENT};
66-
height: ${FLEX_MAX_CONTENT};
64+
width: 100%;
65+
height: 100%;
6766
cursor: ${CURSOR_POINTER};
6867
background-color: ${COLORS.blue30};
6968
border-radius: ${BORDERS.borderRadius8};

‎components/src/atoms/buttons/LargeButton.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,9 @@ export function LargeButton(props: LargeButtonProps): JSX.Element {
206206
207207
border: ${buttonType === 'stroke'
208208
? `2px solid ${COLORS.blue55}`
209-
: `${computedBorderStyle()}`};
209+
: buttonType === 'primary'
210+
? `4px solid ${COLORS.blue55}`
211+
: computedBorderStyle()};
210212
}
211213
212214
&:focus-visible {

‎components/src/molecules/DropdownMenu/index.tsx

+15-6
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import { LiquidIcon } from '../LiquidIcon'
2727
import { DeckInfoLabel } from '../DeckInfoLabel'
2828

2929
import type { FocusEventHandler } from 'react'
30+
import type { FlattenSimpleInterpolation } from 'styled-components'
3031

3132
export interface DropdownOption {
3233
name: string
@@ -268,7 +269,7 @@ export function DropdownMenu(props: DropdownMenuProps): JSX.Element {
268269
>
269270
<StyledText
270271
desktopStyle="captionRegular"
271-
css={LINE_CLAMP_TEXT_STYLE}
272+
css={LINE_CLAMP_TEXT_STYLE(1)}
272273
>
273274
{currentOption.name}
274275
</StyledText>
@@ -327,12 +328,15 @@ export function DropdownMenu(props: DropdownMenuProps): JSX.Element {
327328
flexDirection={DIRECTION_COLUMN}
328329
gridGap={option.subtext != null ? SPACING.spacing4 : '0'}
329330
>
330-
<StyledText desktopStyle="captionRegular">
331+
<StyledText
332+
desktopStyle="captionRegular"
333+
css={LINE_CLAMP_TEXT_STYLE(3)}
334+
>
331335
{option.name}
332336
</StyledText>
333337
<StyledText
334338
desktopStyle="captionRegular"
335-
color={COLORS.black70}
339+
color={COLORS.grey60}
336340
>
337341
{option.subtext}
338342
</StyledText>
@@ -363,12 +367,17 @@ export function DropdownMenu(props: DropdownMenuProps): JSX.Element {
363367
)
364368
}
365369

366-
const LINE_CLAMP_TEXT_STYLE = css`
370+
export const LINE_CLAMP_TEXT_STYLE = (
371+
lineClamp?: number,
372+
title?: boolean
373+
): FlattenSimpleInterpolation => css`
367374
display: -webkit-box;
368375
-webkit-box-orient: vertical;
369376
overflow: ${OVERFLOW_HIDDEN};
370377
text-overflow: ellipsis;
371378
word-wrap: break-word;
372-
-webkit-line-clamp: 1;
373-
word-break: break-all;
379+
-webkit-line-clamp: ${lineClamp ?? 1};
380+
word-break: ${title === true
381+
? 'normal'
382+
: 'break-all'}; // normal for tile and break-all for a non word case like aaaaaaaa
374383
`

‎protocol-designer/fixtures/protocol/8/doItAllV4MigratedToV8.json

+146
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
"form": [],
2626
"timeline": []
2727
},
28+
"dismissedWarnings": {
29+
"form": [],
30+
"timeline": []
31+
},
2832
"ingredients": {
2933
"0": {
3034
"displayName": "Water",
@@ -116,6 +120,86 @@
116120
"volume": 100
117121
}
118122
}
123+
"A1": {
124+
"0": {
125+
"volume": 100
126+
}
127+
},
128+
"B1": {
129+
"0": {
130+
"volume": 100
131+
}
132+
},
133+
"C1": {
134+
"0": {
135+
"volume": 100
136+
}
137+
},
138+
"D1": {
139+
"0": {
140+
"volume": 100
141+
}
142+
},
143+
"E1": {
144+
"0": {
145+
"volume": 100
146+
}
147+
},
148+
"F1": {
149+
"0": {
150+
"volume": 100
151+
}
152+
},
153+
"G1": {
154+
"0": {
155+
"volume": 100
156+
}
157+
},
158+
"H1": {
159+
"0": {
160+
"volume": 100
161+
}
162+
},
163+
"A2": {
164+
"0": {
165+
"volume": 100
166+
}
167+
},
168+
"B2": {
169+
"0": {
170+
"volume": 100
171+
}
172+
},
173+
"C2": {
174+
"0": {
175+
"volume": 100
176+
}
177+
},
178+
"D2": {
179+
"0": {
180+
"volume": 100
181+
}
182+
},
183+
"E2": {
184+
"0": {
185+
"volume": 100
186+
}
187+
},
188+
"F2": {
189+
"0": {
190+
"volume": 100
191+
}
192+
},
193+
"G2": {
194+
"0": {
195+
"volume": 100
196+
}
197+
},
198+
"H2": {
199+
"0": {
200+
"volume": 100
201+
}
202+
}
119203
}
120204
},
121205
"savedStepForms": {
@@ -1336,6 +1420,11 @@
13361420
"y": 0,
13371421
"z": 0
13381422
}
1423+
"cornerOffsetFromSlot": {
1424+
"x": 0,
1425+
"y": 0,
1426+
"z": 0
1427+
}
13391428
},
13401429
"opentrons/nest_96_wellplate_100ul_pcr_full_skirt/1": {
13411430
"ordering": [
@@ -2236,6 +2325,9 @@
22362325
},
22372326
"groups": [
22382327
{
2328+
"metadata": {
2329+
"wellBottomShape": "v"
2330+
},
22392331
"metadata": {
22402332
"wellBottomShape": "v"
22412333
},
@@ -2354,6 +2446,11 @@
23542446
"y": 0,
23552447
"z": 0
23562448
}
2449+
"cornerOffsetFromSlot": {
2450+
"x": 0,
2451+
"y": 0,
2452+
"z": 0
2453+
}
23572454
},
23582455
"opentrons/opentrons_24_aluminumblock_generic_2ml_screwcap/1": {
23592456
"ordering": [
@@ -2647,13 +2744,23 @@
26472744
"brandId": [],
26482745
"links": []
26492746
}
2747+
"brand": {
2748+
"brand": "generic",
2749+
"brandId": [],
2750+
"links": []
2751+
}
26502752
}
26512753
],
26522754
"cornerOffsetFromSlot": {
26532755
"x": 0,
26542756
"y": 0,
26552757
"z": 0
26562758
}
2759+
"cornerOffsetFromSlot": {
2760+
"x": 0,
2761+
"y": 0,
2762+
"z": 0
2763+
}
26572764
}
26582765
},
26592766
"liquidSchemaId": "opentronsLiquidSchemaV1",
@@ -2683,6 +2790,9 @@
26832790
"location": {
26842791
"slotName": "1"
26852792
},
2793+
"location": {
2794+
"slotName": "1"
2795+
},
26862796
"moduleId": "0b419310-75c7-11ea-b42f-4b64e50f43e5:magneticModuleType"
26872797
}
26882798
},
@@ -2694,6 +2804,9 @@
26942804
"location": {
26952805
"slotName": "3"
26962806
},
2807+
"location": {
2808+
"slotName": "3"
2809+
},
26972810
"moduleId": "0b4319b0-75c7-11ea-b42f-4b64e50f43e5:temperatureModuleType"
26982811
}
26992812
},
@@ -2709,6 +2822,9 @@
27092822
"location": {
27102823
"slotName": "2"
27112824
}
2825+
"location": {
2826+
"slotName": "2"
2827+
}
27122828
}
27132829
},
27142830
{
@@ -2813,6 +2929,11 @@
28132929
"x": 0,
28142930
"y": 0
28152931
}
2932+
"offset": {
2933+
"z": 1,
2934+
"x": 0,
2935+
"y": 0
2936+
}
28162937
},
28172938
"flowRate": 46.43
28182939
}
@@ -2832,6 +2953,11 @@
28322953
"x": 0,
28332954
"y": 0
28342955
}
2956+
"offset": {
2957+
"z": 0.5,
2958+
"x": 0,
2959+
"y": 0
2960+
}
28352961
},
28362962
"flowRate": 46.43
28372963
}
@@ -2847,6 +2973,11 @@
28472973
"y": 0,
28482974
"z": 0
28492975
},
2976+
"offset": {
2977+
"x": 0,
2978+
"y": 0,
2979+
"z": 0
2980+
},
28502981
"alternateDropLocation": true
28512982
}
28522983
},
@@ -2881,6 +3012,11 @@
28813012
"x": 0,
28823013
"y": 0
28833014
}
3015+
"offset": {
3016+
"z": 1,
3017+
"x": 0,
3018+
"y": 0
3019+
}
28843020
},
28853021
"flowRate": 46.43
28863022
}
@@ -2900,6 +3036,11 @@
29003036
"x": 0,
29013037
"y": 0
29023038
}
3039+
"offset": {
3040+
"z": 0.5,
3041+
"x": 0,
3042+
"y": 0
3043+
}
29033044
},
29043045
"flowRate": 46.43
29053046
}
@@ -2915,6 +3056,11 @@
29153056
"y": 0,
29163057
"z": 0
29173058
},
3059+
"offset": {
3060+
"x": 0,
3061+
"y": 0,
3062+
"z": 0
3063+
},
29183064
"alternateDropLocation": true
29193065
}
29203066
},

0 commit comments

Comments
 (0)