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

fix: form validators check and disabled prop #2397

Merged
merged 10 commits into from
Nov 12, 2024
Merged

fix: form validators check and disabled prop #2397

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a0fd6cb
fix(form-core): make use of `validatorName` and `type` to check valid…
hardikpthv Nov 4, 2024
6e8aae6
fix(form-core): check for nullability for disabled prop
hardikpthv Nov 4, 2024
303a139
fix: add `_$isValidator$` property to improve the check
hardikpthv Nov 6, 2024
c020b41
fix: disable dot notation to avoid the renaming for the prop during b…
hardikpthv Nov 6, 2024
23fd0cc
fix: disable dot notation to avoid the renaming for the prop during b…
hardikpthv Nov 7, 2024
faf21c9
test: add check for _$isValidator$
hardikpthv Nov 7, 2024
bec0242
chore: sync master
hardikpthv Nov 7, 2024
9ecd46b
chore: catch edge cases in cem script
tlouisse Nov 8, 2024
599cd4e
chore: cleanup, docs, and add prop on ctor to be more unobtrusive
tlouisse Nov 8, 2024
5eb7fc9
chore: changeset
tlouisse Nov 8, 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
2 changes: 1 addition & 1 deletion packages/ui/components/form-core/src/FormControlMixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ const FormControlMixinImplementation = superclass =>
super.updated(changedProperties);

if (changedProperties.has('disabled')) {
this._inputNode?.setAttribute('aria-disabled', this.disabled.toString());
this._inputNode?.setAttribute('aria-disabled', (this.disabled || false).toString());
}

if (changedProperties.has('_ariaLabelledNodes')) {
Expand Down
12 changes: 8 additions & 4 deletions packages/ui/components/form-core/src/validate/ValidateMixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import { SyncUpdatableMixin } from '../utils/SyncUpdatableMixin.js';
import { LionValidationFeedback } from './LionValidationFeedback.js';
import { ResultValidator as MetaValidator } from './ResultValidator.js';
import { Unparseable } from './Unparseable.js';
import { Validator } from './Validator.js';
import { Required } from './validators/Required.js';
import { FormControlMixin } from '../FormControlMixin.js';

// eslint-disable-next-line no-unused-vars
import { Validator } from './Validator.js';
// TODO: [v1] make all @readOnly => @readonly and actually make sure those values cannot be set

/**
Expand Down Expand Up @@ -460,7 +460,9 @@ export const ValidateMixinImplementation = superclass =>

if (isEmpty) {
const hasSingleValue = !(/** @type {* & ValidateHost} */ (this)._isFormOrFieldset);
const requiredValidator = this._allValidators.find(v => v instanceof Required);
const requiredValidator = this._allValidators.find(
v => /** @type {typeof Validator} */ (v.constructor)?.validatorName === 'Required',
hardikpthv marked this conversation as resolved.
Show resolved Hide resolved
);
if (requiredValidator) {
this.__syncValidationResult = [{ validator: requiredValidator, outcome: true }];
}
Expand Down Expand Up @@ -685,7 +687,9 @@ export const ValidateMixinImplementation = superclass =>
}

for (const validatorToSetup of this._allValidators) {
if (!(validatorToSetup instanceof Validator)) {
// disable dot notation to avoid the renaming for the prop during build/minification
// eslint-disable-next-line dot-notation
if (/** @type {typeof Validator} */ validatorToSetup['_$isValidator$'] === undefined) {
// throws in constructor are not visible to end user so we do both
const errorType = Array.isArray(validatorToSetup) ? 'array' : typeof validatorToSetup;
const errorMessage = `Validators array only accepts class instances of Validator. Type "${errorType}" found. This may be caused by having multiple installations of "@lion/ui/form-core.js".`;
Expand Down
1 change: 1 addition & 0 deletions packages/ui/components/form-core/src/validate/Validator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export class Validator extends EventTarget {
* @type {ValidationType}
*/
this.type = config?.type || 'error';
this._$isValidator$ = true;
hardikpthv marked this conversation as resolved.
Show resolved Hide resolved
}

/**
Expand Down