Skip to content

refactor: use new form on RangesPickingOptionPanel #4255

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

Open
Sebastien-Ahkrin wants to merge 2 commits into
base: main
Choose a base branch
from
Open

refactor: use new form on RangesPickingOptionPanel #4255

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c61df6b
refactor: use new form on RangesPickingOptionPanel
Sebastien-Ahkrin Jul 8, 2026
b5807a9
fix: make changes according to reviewer
Sebastien-Ahkrin Jul 8, 2026
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
128 changes: 69 additions & 59 deletions src/component/header/RangesPickingOptionPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,43 @@
import { Button, Checkbox } from '@blueprintjs/core';
import { yupResolver } from '@hookform/resolvers/yup';
import { useForm } from 'react-hook-form';
import * as Yup from 'yup';
import { Checkbox, FormGroup, NumericInput } from '@blueprintjs/core';
import styled from '@emotion/styled';
import { revalidateLogic } from '@tanstack/react-form';
import { AppForm, useForm } from 'react-science/ui';
import { z } from 'zod';

import { useDispatch } from '../context/DispatchContext.js';
import { useToaster } from '../context/ToasterContext.js';
import Label from '../elements/Label.js';
import { NumberInput2Controller } from '../elements/NumberInput2Controller.js';
import {
MIN_AREA_POINTS,
useCheckPointsNumberInWindowArea,
} from '../hooks/useCheckPointsNumberInWindowArea.js';

import { headerLabelStyle } from './Header.js';
import { HeaderWrapper } from './HeaderWrapper.js';

interface AutoRangesOptions {
minMaxRatio: number;
lookNegative: boolean;
}

const validationSchema = Yup.object().shape({
minMaxRatio: Yup.number().min(0).required(),
lookNegative: Yup.boolean().required(),
const validationZodSchema = z.object({
minMaxRatio: z.coerce.number<string>().min(0),
lookNegative: z.boolean(),
});

const initialValues: AutoRangesOptions = {
minMaxRatio: 0.05,
const defaultValues: AutoRangesOptionsInput = {
minMaxRatio: '0.05',
lookNegative: false,
};

const AppFormContainer = styled(AppForm)`
display: flex;
flex-direction: row;
gap: 10px;
align-items: center;
`;
Comment on lines +24 to +29

@tpoisseau tpoisseau Jul 8, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could style Checkbox and FormGroup here too.


type AutoRangesOptionsInput = z.input<typeof validationZodSchema>;
type AutoRangesOptions = z.output<typeof validationZodSchema>;

function RangesPickingOptionPanel() {
const dispatch = useDispatch();
const {
handleSubmit,
register,
control,
formState: { isValid },
} = useForm<AutoRangesOptions>({
defaultValues: initialValues,
resolver: yupResolver(validationSchema),
mode: 'onChange',
});

const hasEnoughPoints = useCheckPointsNumberInWindowArea();
const toaster = useToaster();

function handleRangesPicking(values: any) {
function handleRangesPicking(values: AutoRangesOptions) {
if (hasEnoughPoints) {
dispatch({
type: 'AUTO_RANGES_DETECTION',
Expand All @@ -59,37 +51,55 @@ function RangesPickingOptionPanel() {
}
}

const form = useForm({
defaultValues,
validationLogic: revalidateLogic({ modeAfterSubmission: 'change' }),
validators: {
onDynamic: validationZodSchema,
},
onSubmit: ({ value }) => {
const parsedValues = validationZodSchema.parse(value);
handleRangesPicking(parsedValues);
},
});

return (
<HeaderWrapper>
<Label title="Detect negative" style={headerLabelStyle}>
<Checkbox
style={{ margin: 0 }}
{...register(`lookNegative`)}
defaultChecked={false}
/>
</Label>
<Label title="Min/max ratio:" style={headerLabelStyle}>
<NumberInput2Controller
control={control}
name="minMaxRatio"
min={0}
stepSize={0.01}
majorStepSize={0.01}
minorStepSize={0.01}
style={{ width: '70px' }}
debounceTime={500}
/>
</Label>
<AppFormContainer form={form}>
<form.AppField name="lookNegative">
{(field) => (
<Checkbox
style={{ marginBottom: 0 }}
label="Detect negative"
checked={field.state.value}
onBlur={field.handleBlur}
onChange={({ target: { checked } }) => field.handleChange(checked)}
/>
)}
</form.AppField>

<form.AppField name="minMaxRatio">
{(field) => (
<FormGroup label="Min/max ratio:" inline style={{ marginBottom: 0 }}>
<NumericInput
value={field.state.value ?? ''}
onBlur={field.handleBlur}
min={0}
stepSize={0.01}
minorStepSize={0.01}
onValueChange={(_, valueAsString) => {
field.handleChange(valueAsString);
}}
/>
</FormGroup>
)}
</form.AppField>

<Button
intent="success"
onClick={() => handleSubmit(handleRangesPicking)()}
style={{ margin: '0 10px' }}
disabled={!isValid}
>
Auto ranges picking
</Button>
</HeaderWrapper>
<div>
<form.SubmitButton intent="success">
Auto ranges picking
</form.SubmitButton>
</div>
</AppFormContainer>
);
}

Expand Down
Loading