Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(components, app): add custom pipette select with category support #3996

Merged
merged 11 commits into from
Sep 17, 2019
Merged

feat(components, app): add custom pipette select with category support #3996

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
67d6c37
customize select a nit
b-cooper Aug 28, 2019
337debd
adjust pipetteSelect
b-cooper Aug 30, 2019
a342800
put it in app
b-cooper Aug 30, 2019
7ace4de
in RA, but alignment is a little wonky
b-cooper Aug 30, 2019
d6cb68b
alignment tweaks
b-cooper Sep 3, 2019
4951a8a
feat(components, app): add custom pipette select with category support
b-cooper Sep 3, 2019
6faeece
feat(components, app): add custom pipette select with category support
b-cooper Sep 3, 2019
d375c48
address comments, add comment
b-cooper Sep 17, 2019
0a7f733
flow fixes
b-cooper Sep 17, 2019
b234605
fix css lint
b-cooper Sep 17, 2019
2485cb5
formatting changes
b-cooper Sep 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
flow fixes
  • Loading branch information
@b-cooper
b-cooper committed Sep 17, 2019
commit 0a7f733ee36bb23400536ec23cacb324e4e6c249
2 changes: 1 addition & 1 deletion app/src/components/ChangePipette/Instructions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export default function Instructions(props: ChangePipetteProps) {
>
{!actualPipette && !wantedPipette && (
<PipetteSelection
onChange={props.onPipetteSelect}
onPipetteChange={props.onPipetteSelect}
__pipettePlusEnabled={props.__pipettePlusEnabled}
/>
)}
Expand Down
2 changes: 1 addition & 1 deletion app/src/components/ChangePipette/PipetteSelection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default function PipetteSelection(props: PipetteSelectionProps) {
<span className={styles.pipette_selection_label}>{LABEL}</span>
<PipetteSelect
value={props.value}
onPipetteChange={props.onChange}
onPipetteChange={props.onPipetteChange}
nameBlacklist={nameBlacklist}
/>
</label>
Expand Down
2 changes: 1 addition & 1 deletion app/src/components/ChangePipette/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ type SP = {|
type DP = {|
exit: () => mixed,
back: () => mixed,
onPipetteSelect: $PropertyType<PipetteSelectionProps, 'onChange'>,
onPipetteSelect: $PropertyType<PipetteSelectionProps, 'onPipetteChange'>,
moveToFront: () => mixed,
checkPipette: () => mixed,
goToConfirmUrl: () => mixed,
Expand Down
2 changes: 1 addition & 1 deletion app/src/components/ChangePipette/types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export type ChangePipetteProps = {
exit: () => mixed,
setWantedName: (name: string | null) => mixed,
moveToFront: () => mixed,
onPipetteSelect: $PropertyType<PipetteSelectionProps, 'onChange'>,
onPipetteSelect: $PropertyType<PipetteSelectionProps, 'onPipetteChange'>,
checkPipette: () => mixed,
goToConfirmUrl: () => mixed,
__pipettePlusEnabled: boolean,
Expand Down