javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-05 21:58:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:ionic-team/ionic-framework into FW-6757

Browse Source
This commit is contained in:
Maria Hutt
2025-10-29 13:05:46 -07:00
parent eaa64fdb73 10f895b8b6
commit 45b78c16b8
88 changed files with 1532 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/components/checkbox/checkbox.tsx
View File

@ -34,7 +34,6 @@ export class Checkbox implements ComponentInterface {
private inputLabelId = `${this.inputId}-lbl`;
private helperTextId = `${this.inputId}-helper-text`;
private errorTextId = `${this.inputId}-error-text`;
private focusEl?: HTMLElement;
private inheritedAttributes: Attributes = {};
@Element() el!: HTMLIonCheckboxElement;
@ -157,9 +156,7 @@ export class Checkbox implements ComponentInterface {
/** @internal */
@Method()
async setFocus() {
if (this.focusEl) {
this.focusEl.focus();
}
this.el.focus();
}
/**
@ -179,7 +176,6 @@ export class Checkbox implements ComponentInterface {
private toggleChecked = (ev: Event) => {
ev.preventDefault();
this.setFocus();
this.setChecked(!this.checked);
this.indeterminate = false;
};
@ -313,6 +309,9 @@ export class Checkbox implements ComponentInterface {
aria-required={required ? 'true' : undefined}
tabindex={disabled ? undefined : 0}
onKeyDown={this.onKeyDown}
onFocus={this.onFocus}
onBlur={this.onBlur}
onClick={this.onClick}
class={createColorClasses(color, {
[mode]: true,
'in-item': hostContext('ion-item', el),
@ -324,7 +323,6 @@ export class Checkbox implements ComponentInterface {
[`checkbox-alignment-${alignment}`]: alignment !== undefined,
[`checkbox-label-placement-${labelPlacement}`]: true,
})}
onClick={this.onClick}
>
<label class="checkbox-wrapper" htmlFor={inputId}>
{/*
@ -337,9 +335,6 @@ export class Checkbox implements ComponentInterface {
disabled={disabled}
id={inputId}
onChange={this.toggleChecked}
onFocus={() => this.onFocus()}
onBlur={() => this.onBlur()}
ref={(focusEl) => (this.focusEl = focusEl)}
required={required}
{...inheritedAttributes}
/>