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

CB-4776 fix: input default value handling #2518

Merged
merged 2 commits into from
Apr 2, 2024
Merged

CB-4776 fix: input default value handling #2518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c905c1
CB-4776 fix: input default value handling
Wroud Mar 28, 2024
9b4e0f6
Merge branch 'devel' into fix/cb-4776/input-default-value-handling
EvgeniaBzzz Mar 29, 2024
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
12 changes: 3 additions & 9 deletions webapp/packages/core-blocks/src/FormControls/InputField/InputFieldState.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,8 @@ export const InputFieldState: InputFieldType = observer<InputFieldStateProps<any
return null;
}

return (
<InputFieldBase
{...rest}
ref={ref}
name={name}
value={(controlState.stringValue || controlState.defaultValue) ?? ''}
onChange={controlState.onChange}
/>
);
const defaultValue = rest.type === 'password' ? null : controlState.defaultStringValue;

return <InputFieldBase {...rest} ref={ref} name={name} value={controlState.stringValue ?? defaultValue ?? ''} onChange={controlState.onChange} />;
}),
) as InputFieldType;
8 changes: 4 additions & 4 deletions webapp/packages/core-blocks/src/FormControls/useFormStateControl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ export function useFormStateControl<TState extends Record<string, any>, TKey ext
value = value[name];
}

let stringValue: string | typeof value;
let defaultStringValue: string | typeof defaultValue;
let stringValue: string | typeof value | null;
let defaultStringValue: string | typeof defaultValue | null;
if (mapToString) {
stringValue = mapToString(value as any);
defaultStringValue = mapToString(defaultValue as any);
} else {
stringValue = isNotNullDefined(value) ? String(value) : '';
defaultStringValue = isNotNullDefined(defaultValue) ? String(defaultValue) : '';
stringValue = isNotNullDefined(value) ? String(value) : null;
defaultStringValue = isNotNullDefined(defaultValue) ? String(defaultValue) : null;
}

const hide = 'autoHide' in rest && !!rest.autoHide && presented === false;
Expand Down
Loading