-
Notifications
You must be signed in to change notification settings - Fork 904
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(radio): add required constraint validation
Fixes #4316 PiperOrigin-RevId: 585713253
- Loading branch information
1 parent
bedcd65
commit 4358930
Showing
10 changed files
with
356 additions
and
196 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,97 @@ | ||
/** | ||
* @license | ||
* Copyright 2023 Google LLC | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
import {Validator} from './validator.js'; | ||
|
||
/** | ||
* Constraint validation properties for a radio. | ||
*/ | ||
export interface RadioState { | ||
/** | ||
* Whether the radio is checked. | ||
*/ | ||
readonly checked: boolean; | ||
|
||
/** | ||
* Whether the radio is required. | ||
*/ | ||
readonly required: boolean; | ||
} | ||
|
||
/** | ||
* Radio constraint validation properties for a single radio and its siblings. | ||
*/ | ||
export type RadioGroupState = readonly [RadioState, ...RadioState[]]; | ||
|
||
/** | ||
* A validator that provides constraint validation that emulates | ||
* `<input type="radio">` validation. | ||
*/ | ||
export class RadioValidator extends Validator<RadioGroupState> { | ||
private radioElement?: HTMLInputElement; | ||
|
||
protected override computeValidity(states: RadioGroupState) { | ||
if (!this.radioElement) { | ||
// Lazily create the radio element | ||
this.radioElement = document.createElement('input'); | ||
this.radioElement.type = 'radio'; | ||
this.radioElement.name = 'a'; // A name is required for validation to run | ||
} | ||
|
||
let isRequired = false; | ||
let hasCheckedSibling = false; | ||
for (const {checked, required} of states) { | ||
if (required) { | ||
isRequired = true; | ||
} | ||
|
||
if (checked) { | ||
hasCheckedSibling = true; | ||
} | ||
} | ||
|
||
// Firefox v119 doesn't compute grouped radio validation correctly while | ||
// they are detached from the DOM, which is why we don't render multiple | ||
// virtual <input>s. Instead, we can check the required/checked states and | ||
// grab the i18n'd validation message if the value is missing. | ||
this.radioElement.checked = hasCheckedSibling; | ||
this.radioElement.required = isRequired; | ||
return { | ||
validity: { | ||
valueMissing: isRequired && !hasCheckedSibling, | ||
}, | ||
validationMessage: this.radioElement.validationMessage, | ||
}; | ||
} | ||
|
||
protected override equals( | ||
prevGroup: RadioGroupState, | ||
nextGroup: RadioGroupState, | ||
) { | ||
if (prevGroup.length !== nextGroup.length) { | ||
return false; | ||
} | ||
|
||
for (let i = 0; i < prevGroup.length; i++) { | ||
const prev = prevGroup[i]; | ||
const next = nextGroup[i]; | ||
if (prev.checked !== next.checked || prev.required !== next.required) { | ||
return false; | ||
} | ||
} | ||
|
||
return true; | ||
} | ||
|
||
protected override copy(states: RadioGroupState): RadioGroupState { | ||
// Cast as unknown since typescript does not have enough information to | ||
// infer that the array always has at least one element. | ||
return states.map(({checked, required}) => ({ | ||
checked, | ||
required, | ||
})) as unknown as RadioGroupState; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
/** | ||
* @license | ||
* Copyright 2023 Google LLC | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
// import 'jasmine'; (google3-only) | ||
|
||
import {RadioValidator} from './radio-validator.js'; | ||
|
||
describe('RadioValidator', () => { | ||
it('is invalid when required and no radios are checked', () => { | ||
const states = [ | ||
{ | ||
required: true, | ||
checked: false, | ||
}, | ||
{ | ||
required: true, | ||
checked: false, | ||
}, | ||
{ | ||
required: true, | ||
checked: false, | ||
}, | ||
] as const; | ||
|
||
const validator = new RadioValidator(() => states); | ||
const {validity, validationMessage} = validator.getValidity(); | ||
expect(validity.valueMissing).withContext('valueMissing').toBeTrue(); | ||
expect(validationMessage).withContext('validationMessage').not.toBe(''); | ||
}); | ||
|
||
it('is valid when required and any radio is checked', () => { | ||
const states = [ | ||
{ | ||
required: true, | ||
checked: false, | ||
}, | ||
{ | ||
required: true, | ||
checked: true, | ||
}, | ||
{ | ||
required: true, | ||
checked: false, | ||
}, | ||
] as const; | ||
|
||
const validator = new RadioValidator(() => states); | ||
const {validity, validationMessage} = validator.getValidity(); | ||
expect(validity.valueMissing).withContext('valueMissing').toBeFalse(); | ||
expect(validationMessage).withContext('validationMessage').toBe(''); | ||
}); | ||
|
||
it('is valid when not required', () => { | ||
const states = [ | ||
{ | ||
required: false, | ||
checked: false, | ||
}, | ||
{ | ||
required: false, | ||
checked: false, | ||
}, | ||
{ | ||
required: false, | ||
checked: false, | ||
}, | ||
] as const; | ||
|
||
const validator = new RadioValidator(() => states); | ||
const {validity, validationMessage} = validator.getValidity(); | ||
expect(validity.valueMissing).withContext('valueMissing').toBeFalse(); | ||
expect(validationMessage).withContext('validationMessage').toBe(''); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
/** | ||
* @license | ||
* Copyright 2023 Google LLC | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
import {html, render} from 'lit'; | ||
|
||
import {Validator} from './validator.js'; | ||
|
||
/** | ||
* Constraint validation properties for a select dropdown. | ||
*/ | ||
export interface SelectState { | ||
/** | ||
* The current selected value. | ||
*/ | ||
readonly value: string; | ||
|
||
/** | ||
* Whether the select is required. | ||
*/ | ||
readonly required: boolean; | ||
} | ||
|
||
/** | ||
* A validator that provides constraint validation that emulates `<select>` | ||
* validation. | ||
*/ | ||
export class SelectValidator extends Validator<SelectState> { | ||
private selectControl?: HTMLSelectElement; | ||
|
||
protected override computeValidity(state: SelectState) { | ||
if (!this.selectControl) { | ||
// Lazily create the platform select | ||
this.selectControl = document.createElement('select'); | ||
} | ||
|
||
render(html`<option value=${state.value}></option>`, this.selectControl); | ||
|
||
this.selectControl.value = state.value; | ||
this.selectControl.required = state.required; | ||
return { | ||
validity: this.selectControl.validity, | ||
validationMessage: this.selectControl.validationMessage, | ||
}; | ||
} | ||
|
||
protected override equals(prev: SelectState, next: SelectState) { | ||
return prev.value === next.value && prev.required === next.required; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
/** | ||
* @license | ||
* Copyright 2023 Google LLC | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
// import 'jasmine'; (google3-only) | ||
|
||
import {SelectValidator} from './select-validator.js'; | ||
|
||
describe('SelectValidator', () => { | ||
it('is invalid when required and value is empty', () => { | ||
const state = { | ||
required: true, | ||
value: '', | ||
}; | ||
|
||
const validator = new SelectValidator(() => state); | ||
const {validity, validationMessage} = validator.getValidity(); | ||
expect(validity.valueMissing).withContext('valueMissing').toBeTrue(); | ||
expect(validationMessage).withContext('validationMessage').not.toBe(''); | ||
}); | ||
|
||
it('is valid when required and value is provided', () => { | ||
const state = { | ||
required: true, | ||
value: 'Foo', | ||
}; | ||
|
||
const validator = new SelectValidator(() => state); | ||
const {validity, validationMessage} = validator.getValidity(); | ||
expect(validity.valueMissing).withContext('valueMissing').toBeFalse(); | ||
expect(validationMessage).withContext('validationMessage').toBe(''); | ||
}); | ||
|
||
it('is valid when not required', () => { | ||
const state = { | ||
required: false, | ||
value: '', | ||
}; | ||
|
||
const validator = new SelectValidator(() => state); | ||
const {validity, validationMessage} = validator.getValidity(); | ||
expect(validity.valueMissing).withContext('valueMissing').toBeFalse(); | ||
expect(validationMessage).withContext('validationMessage').toBe(''); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.