fix: avoid ngTemplateOutletContext to modify object reference

alauda · Jan 8, 2021 · 55f28f8 · 55f28f8
1 parent 476b435
commit 55f28f8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/select/base-select.ts b/src/select/base-select.ts
@@ -403,14 +403,9 @@ export abstract class BaseSelect<T>
     if (this.focusedOption) {
       this.focusedOption.blur();
     }
+
     this.focusedOption = focusedOption;
-    // TODO: 避免 aui-option 中的 labelContext 的引用被修改，为什么？
-    // http://jira.alauda.cn/browse/AIT-4714
-    if (focusedOption?.labelContext) {
-      this.focusedOption.labelContext = {
-        ...(focusedOption.labelContext as Record<string, unknown>),
-      };
-    }
+
     if (this.focusedOption) {
       this.focusedOption.focus();
       this.scrollToOption(this.focusedOption);

diff --git a/src/select/select.component.ts b/src/select/select.component.ts
@@ -105,7 +105,10 @@ export class SelectComponent
         option
           ? {
               label: option.label || coerceString(trackFn(option.value)),
-              labelContext: option.labelContext,
+              // In ng 11, ngTemplateOutletContext will modify the object reference.
+              labelContext: {
+                ...(option.labelContext as Record<string, unknown>),
+              },
             }
           : { label: coerceString(trackFn(value)) },
       ),