Skip to content

Commit 1a6c9cd

Browse files
committed
Merge branch 'chore_release-pd-8.5.0' into pd_fix-tipposition-reset
2 parents ecebc35 + 7bee414 commit 1a6c9cd

File tree

4 files changed

+42
-13
lines changed

4 files changed

+42
-13
lines changed

protocol-designer/src/components/molecules/CheckboxExpandStepFormField/index.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ export function CheckboxExpandStepFormField(
3535
disabled = false,
3636
} = fieldProps
3737

38-
const [targetProps, tooltipProps] = useHoverTooltip()
38+
const [targetProps, tooltipProps] = useHoverTooltip({
39+
placement: 'top-start',
40+
})
3941
return (
4042
<>
4143
<ListButton
@@ -53,15 +55,14 @@ export function CheckboxExpandStepFormField(
5355
width="100%"
5456
flexDirection={DIRECTION_COLUMN}
5557
gridGap={SPACING.spacing8}
58+
{...targetProps}
5659
>
5760
<Flex
5861
justifyContent={JUSTIFY_SPACE_BETWEEN}
5962
alignItems={ALIGN_CENTER}
6063
>
6164
<>
62-
<StyledText desktopStyle="bodyDefaultRegular" {...targetProps}>
63-
{title}
64-
</StyledText>
65+
<StyledText desktopStyle="bodyDefaultRegular">{title}</StyledText>
6566
<Btn
6667
data-testid={testId}
6768
onClick={() => {

protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepFormToolbox.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ export function StepFormToolbox(props: StepFormToolboxProps): JSX.Element {
140140
'application',
141141
'shared',
142142
'protocol_steps',
143+
'tooltip',
143144
])
144145
const dispatch = useDispatch()
145146
const { makeSnackbar } = useKitchen()

protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/utils.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,17 +193,17 @@ export const getVisibleProfileFormLevelErrors = (args: {
193193
})
194194
}
195195
export const getFieldDefaultTooltip = (name: string, t: any): string =>
196-
name != null ? t(`step_fields.defaults.${name}`) : ''
196+
name != null ? t(`tooltip:step_fields.defaults.${name}`) : ''
197197
export const getFieldIndeterminateTooltip = (name: string, t: any): string =>
198-
name != null ? t(`step_fields.indeterminate.${name}`) : ''
198+
name != null ? t(`tooltip:step_fields.indeterminate.${name}`) : ''
199199
export const getSingleSelectDisabledTooltip = (
200200
name: string,
201201
stepType: string,
202202
t: any
203203
): string =>
204204
name != null
205-
? t(`step_fields.${stepType}.disabled.${name}`)
206-
: t(`step_fields.${stepType}.disabled.$generic`)
205+
? t(`tooltip:step_fields.${stepType}.disabled.${name}`)
206+
: t(`tooltip:step_fields.${stepType}.disabled.$generic`)
207207

208208
export const getFieldCaptions = (
209209
name: string,

protocol-designer/src/steplist/formLevel/handleFormChange/utils.ts

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -523,8 +523,27 @@ const getNoLiquidClassValuesMoveLiquid = (
523523
return {}
524524
}
525525
const { aspirate, singleDispense, multiDispense } = liquidClassValuesForTip
526+
const { multiWellHandling } = getTransferPlanAndReferenceVolumes({
527+
pipetteSpecs,
528+
tiprackDefinition: null,
529+
conditioningByVolume: (multiDispense?.conditioningByVolume ?? []) as Array<
530+
[number, number]
531+
>,
532+
disposalByVolume: (multiDispense?.disposalByVolume ?? []) as Array<
533+
[number, number]
534+
>,
535+
volume,
536+
path: rawForm.path as PathOption,
537+
numDispenseWells: rawForm.dispense_wells.length,
538+
aspirateAirGapByVolume: aspirate.retract.airGapByVolume as Array<
539+
[number, number]
540+
>,
541+
})
542+
const { isSupported: isMultiDispenseSupported } = multiWellHandling
526543
const dispense =
527-
multiDispense != null && path === 'multiDispense'
544+
multiDispense != null &&
545+
path === 'multiDispense' &&
546+
isMultiDispenseSupported
528547
? multiDispense
529548
: singleDispense
530549
const aspirateFlowRateFields = getFlowRateFields(
@@ -753,7 +772,10 @@ const getLiquidClassValuesMoveLiquid = (args: {
753772
Object.values(labwareEntities).find(
754773
({ labwareDefURI }) => labwareDefURI === tipRack
755774
)?.def ?? null
756-
const byVolumeLookup = getTransferPlanAndReferenceVolumes({
775+
const {
776+
referenceVolumes: byVolumeLookup,
777+
multiWellHandling,
778+
} = getTransferPlanAndReferenceVolumes({
757779
pipetteSpecs,
758780
tiprackDefinition,
759781
conditioningByVolume,
@@ -764,7 +786,8 @@ const getLiquidClassValuesMoveLiquid = (args: {
764786
aspirateAirGapByVolume: aspirate.retract.airGapByVolume as Array<
765787
[number, number]
766788
>,
767-
}).referenceVolumes
789+
})
790+
const { isSupported: isMultiDispenseSupported } = multiWellHandling
768791
// top-level aspirate fields
769792
const aspiratePositionReferenceFields = getPositionReferenceFields(
770793
aspiratePositionReference,
@@ -833,7 +856,9 @@ const getLiquidClassValuesMoveLiquid = (args: {
833856
})
834857
const dispenseSubmergeFields = getSubmergeRetractFields({
835858
submergeRetractLookup:
836-
path === 'multiDispense' && multiDispense != null
859+
path === 'multiDispense' &&
860+
multiDispense != null &&
861+
isMultiDispenseSupported
837862
? multiDispense.submerge
838863
: singleDispense.submerge,
839864
volumes: byVolumeLookup,
@@ -851,7 +876,9 @@ const getLiquidClassValuesMoveLiquid = (args: {
851876
})
852877
const dispenseRetractFields = getSubmergeRetractFields({
853878
submergeRetractLookup:
854-
path === 'multiDispense' && multiDispense != null
879+
path === 'multiDispense' &&
880+
multiDispense != null &&
881+
isMultiDispenseSupported
855882
? multiDispense.retract
856883
: singleDispense.retract,
857884
volumes: byVolumeLookup,

0 commit comments

Comments
 (0)