refactor: simplify reflected attribute accesses

Esri · Sep 19, 2024 · 7b44dd4 · 7b44dd4
1 parent 6f42a86
commit 7b44dd4
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 20 deletions.
diff --git a/packages/calcite-components/src/components/button/button.tsx b/packages/calcite-components/src/components/button/button.tsx
@@ -267,7 +267,7 @@ export class Button
       <InteractiveContainer disabled={this.disabled}>
         <Tag
           aria-disabled={childElType === "a" ? toAriaBoolean(this.disabled || this.loading) : null}
-          aria-expanded={this.el.getAttribute("aria-expanded")}
+          aria-expanded={this.el.ariaExpanded}
           aria-label={!this.loading ? getLabelText(this) : this.messages.loading}
           aria-live="polite"
           class={{

diff --git a/packages/calcite-components/src/components/dialog/dialog.tsx b/packages/calcite-components/src/components/dialog/dialog.tsx
@@ -255,7 +255,6 @@ export class Dialog
             [CSS.containerOpen]: opened,
             [CSS.containerEmbedded]: this.embedded,
           }}
-          ref={this.setContainerEl}
         >
           {this.modal ? (
             <calcite-scrim class={CSS.scrim} onClick={this.handleOutsideClose} />
@@ -364,8 +363,6 @@ export class Dialog
 
   transitionEl: HTMLDivElement;
 
-  containerEl: HTMLDivElement;
-
   focusTrap: FocusTrap;
 
   private resizePosition: DialogResizePosition = { ...initialResizePosition };
@@ -764,10 +761,6 @@ export class Dialog
     }
   }
 
-  private setContainerEl = (el: HTMLDivElement): void => {
-    this.containerEl = el;
-  };
-
   private setTransitionEl = (el: HTMLDivElement): void => {
     this.transitionEl = el;
     this.setupInteractions();

diff --git a/packages/calcite-components/src/components/input-date-picker/input-date-picker.tsx b/packages/calcite-components/src/components/input-date-picker/input-date-picker.tsx
@@ -774,9 +774,9 @@ export class InputDatePicker
 
   @State() private localeData: DateLocaleData;
 
-  private startInput: HTMLCalciteInputElement;
+  private startInput: HTMLCalciteInputTextElement;
 
-  private endInput: HTMLCalciteInputElement;
+  private endInput: HTMLCalciteInputTextElement;
 
   private floatingEl: HTMLDivElement;
 
@@ -884,11 +884,11 @@ export class InputDatePicker
     syncHiddenFormInput("date", this, input);
   }
 
-  setStartInput = (el: HTMLCalciteInputElement): void => {
+  setStartInput = (el: HTMLCalciteInputTextElement): void => {
     this.startInput = el;
   };
 
-  setEndInput = (el: HTMLCalciteInputElement): void => {
+  setEndInput = (el: HTMLCalciteInputTextElement): void => {
     this.endInput = el;
   };
 

diff --git a/packages/calcite-components/src/components/input-number/input-number.tsx b/packages/calcite-components/src/components/input-number/input-number.tsx
@@ -1095,8 +1095,8 @@ export class InputNumber
         autofocus={this.el.autofocus ? true : null}
         defaultValue={this.defaultValue}
         disabled={this.disabled ? true : null}
-        enterKeyHint={this.el.enterKeyHint || this.el.getAttribute("enterkeyhint")}
-        inputMode={this.el.inputMode || this.el.getAttribute("inputmode") || "decimal"}
+        enterKeyHint={this.el.enterKeyHint}
+        inputMode={this.el.inputMode || "decimal"}
         key="localized-input"
         maxLength={this.maxLength}
         minLength={this.minLength}

diff --git a/packages/calcite-components/src/components/input-text/input-text.tsx b/packages/calcite-components/src/components/input-text/input-text.tsx
@@ -680,8 +680,8 @@ export class InputText
         }}
         defaultValue={this.defaultValue}
         disabled={this.disabled ? true : null}
-        enterKeyHint={this.el.enterKeyHint || this.el.getAttribute("enterkeyhint")}
-        inputMode={this.el.inputMode || this.el.getAttribute("inputmode")}
+        enterKeyHint={this.el.enterKeyHint}
+        inputMode={this.el.inputMode}
         maxLength={this.maxLength}
         minLength={this.minLength}
         name={this.name}

diff --git a/packages/calcite-components/src/components/input/input.tsx b/packages/calcite-components/src/components/input/input.tsx
@@ -1171,9 +1171,9 @@ export class Input
     const prefixText = <div class={CSS.prefix}>{this.prefixText}</div>;
     const suffixText = <div class={CSS.suffix}>{this.suffixText}</div>;
 
-    const autofocus = this.el.autofocus || this.el.hasAttribute("autofocus") ? true : null;
-    const enterKeyHint = this.el.enterKeyHint || this.el.getAttribute("enterkeyhint");
-    const inputMode = this.el.inputMode || this.el.getAttribute("inputmode");
+    const autofocus = this.el.autofocus ? true : null;
+    const enterKeyHint = this.el.enterKeyHint;
+    const inputMode = this.el.inputMode;
 
     const localeNumberInput =
       this.type === "number" ? (

diff --git a/packages/calcite-components/src/components/menu/menu.tsx b/packages/calcite-components/src/components/menu/menu.tsx
@@ -228,7 +228,7 @@ export class CalciteMenu implements LocalizedComponent, T9nComponent, LoadableCo
   }
 
   private getEffectiveRole(): string {
-    return this.el.getAttribute("role") || "menubar";
+    return this.el.role || "menubar";
   }
 
   // --------------------------------------------------------------------------