crisbeto · Jul 31, 2022 · crisbeto · Jul 31, 2022 · crisbeto · Jul 31, 2022
diff --git a/packages/core/src/render3/component_ref.ts b/packages/core/src/render3/component_ref.ts
@@ -29,7 +29,7 @@ import {diPublicInInjector, getOrCreateNodeInjectorForNode, NodeInjector} from '
 import {throwProviderNotFoundError} from './errors_di';
 import {registerPostOrderHooks} from './hooks';
 import {reportUnknownPropertyError} from './instructions/element_validation';
-import {addToViewTree, CLEAN_PROMISE, createLView, createTView, getOrCreateTComponentView, getOrCreateTNode, initTNodeFlags, instantiateRootComponent, invokeHostBindingsInCreationMode, locateHostElement, markAsComponentHost, markDirtyIfOnPush, registerHostBindingOpCodes, renderView, setInputsForProperty} from './instructions/shared';
+import {addToViewTree, CLEAN_PROMISE, createLView, createTView, getOrCreateTComponentView, getOrCreateTNode, initTNodeFlags, instantiateRootComponent, invokeHostBindingsInCreationMode, locateHostElement, markAsComponentHost, markDirtyIfOnPush, registerHostBindingOpCodes, renderView, setInput} from './instructions/shared';
 import {ComponentDef, RenderFlags} from './interfaces/definition';
 import {PropertyAliasValue, TContainerNode, TElementContainerNode, TElementNode, TNode, TNodeType} from './interfaces/node';
 import {PlayerHandler} from './interfaces/player';
@@ -288,17 +288,21 @@ export class ComponentRef<T> extends AbstractComponentRef<T> {
     let dataValue: PropertyAliasValue|undefined;
     if (inputData !== null && (dataValue = inputData[name])) {
       const lView = this._rootLView;
-      setInputsForProperty(lView[TVIEW], lView, dataValue, name, value);
-      markDirtyIfOnPush(lView, this._tNode.index);
-    } else {
-      if (ngDevMode) {
-        const cmpNameForError = stringifyForError(this.componentType);
-        let message =
-            `Can't set value of the '${name}' input on the '${cmpNameForError}' component. `;
-        message += `Make sure that the '${
-            name}' property is annotated with @Input() or a mapped @Input('${name}') exists.`;
-        reportUnknownPropertyError(message);
+      for (let i = 0; i < dataValue.length; i += 2) {
+        const index = dataValue[i] as number;
+        if (this._rootLView[index] === this.instance) {
+          setInput(lView[TVIEW], this.instance, index, name, dataValue[i + 1] as string, value);
+          markDirtyIfOnPush(lView, this._tNode.index);
+          break;
+        }
       }
+    } else if (ngDevMode) {
+      const cmpNameForError = stringifyForError(this.componentType);
+      let message =
+          `Can't set value of the '${name}' input on the '${cmpNameForError}' component. `;
+      message += `Make sure that the '${
+          name}' property is annotated with @Input() or a mapped @Input('${name}') exists.`;
+      reportUnknownPropertyError(message);
     }
   }
 
@@ -435,7 +439,7 @@ export function createRootComponentView(
  * Creates a root component and sets it up with features and host bindings.Shared by
  * renderComponent() and ViewContainerRef.createComponent().
  */
-export function createRootComponent<T>(
+function createRootComponent<T>(
     componentView: LView, componentDef: ComponentDef<T>, rootLView: LView, rootContext: RootContext,
     hostFeatures: HostFeature[]|null): any {
   const tView = rootLView[TVIEW];

diff --git a/packages/core/src/render3/instructions/shared.ts b/packages/core/src/render3/instructions/shared.ts
@@ -1992,17 +1992,33 @@ export function handleError(lView: LView, error: any): void {
  */
 export function setInputsForProperty(
     tView: TView, lView: LView, inputs: PropertyAliasValue, publicName: string, value: any): void {
-  for (let i = 0; i < inputs.length;) {
-    const index = inputs[i++] as number;
-    const privateName = inputs[i++] as string;
+  for (let i = 0; i < inputs.length; i += 2) {
+    const index = inputs[i] as number;
+    const privateName = inputs[i + 1] as string;
     const instance = lView[index];
     ngDevMode && assertIndexInRange(lView, index);
-    const def = tView.data[index] as DirectiveDef<any>;
-    if (def.setInput !== null) {
-      def.setInput!(instance, value, publicName, privateName);
-    } else {
-      instance[privateName] = value;
-    }
+    setInput(tView, instance, index, publicName, privateName, value);
+  }
+}
+
+/**
+ * Sets a single input on a directive instance.
+ *
+ * @param tView Current TView.
+ * @param instance Directive instance to which to write the input.
+ * @param index Index at which to find the directive's defintion in the TView.
+ * @param publicName Public name of the input.
+ * @param privateName Private name of the input.
+ * @param value New value that should be assigned.
+ */
+export function setInput(
+    tView: TView, instance: any, index: number, publicName: string, privateName: string,
+    value: unknown) {
+  const def = tView.data[index] as DirectiveDef<any>;
+  if (def.setInput !== null) {
+    def.setInput(instance, value, publicName, privateName);
+  } else {
+    instance[privateName] = value;
   }
 }
 

diff --git a/packages/core/test/bundling/animations/bundle.golden_symbols.json b/packages/core/test/bundling/animations/bundle.golden_symbols.json
@@ -1283,6 +1283,9 @@
   {
     "name": "setInjectImplementation"
   },
+  {
+    "name": "setInput"
+  },
   {
     "name": "setInputsForProperty"
   },

diff --git a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
@@ -812,6 +812,9 @@
   {
     "name": "markAsComponentHost"
   },
+  {
+    "name": "markDirtyIfOnPush"
+  },
   {
     "name": "maybeWrapInNotSelector"
   },
@@ -966,7 +969,7 @@
     "name": "setInjectImplementation"
   },
   {
-    "name": "setInputsForProperty"
+    "name": "setInput"
   },
   {
     "name": "setInputsFromAttrs"

diff --git a/packages/core/test/bundling/forms_reactive/bundle.golden_symbols.json b/packages/core/test/bundling/forms_reactive/bundle.golden_symbols.json
@@ -1430,6 +1430,9 @@
   {
     "name": "setInjectImplementation"
   },
+  {
+    "name": "setInput"
+  },
   {
     "name": "setInputsForProperty"
   },

diff --git a/packages/core/test/bundling/forms_template_driven/bundle.golden_symbols.json b/packages/core/test/bundling/forms_template_driven/bundle.golden_symbols.json
@@ -1406,6 +1406,9 @@
   {
     "name": "setInjectImplementation"
   },
+  {
+    "name": "setInput"
+  },
   {
     "name": "setInputsForProperty"
   },

diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
@@ -599,6 +599,9 @@
   {
     "name": "makeRecord"
   },
+  {
+    "name": "markDirtyIfOnPush"
+  },
   {
     "name": "maybeWrapInNotSelector"
   },
@@ -713,6 +716,9 @@
   {
     "name": "setInjectImplementation"
   },
+  {
+    "name": "setInput"
+  },
   {
     "name": "setSelectedIndex"
   },

diff --git a/packages/core/test/bundling/router/bundle.golden_symbols.json b/packages/core/test/bundling/router/bundle.golden_symbols.json
@@ -1559,6 +1559,9 @@
   {
     "name": "markAsComponentHost"
   },
+  {
+    "name": "markDirtyIfOnPush"
+  },
   {
     "name": "markViewDirty"
   },
@@ -1824,7 +1827,7 @@
     "name": "setInjectImplementation"
   },
   {
-    "name": "setInputsForProperty"
+    "name": "setInput"
   },
   {
     "name": "setInputsFromAttrs"

diff --git a/packages/core/test/bundling/standalone_bootstrap/bundle.golden_symbols.json b/packages/core/test/bundling/standalone_bootstrap/bundle.golden_symbols.json
@@ -683,6 +683,9 @@
   {
     "name": "makeRecord"
   },
+  {
+    "name": "markDirtyIfOnPush"
+  },
   {
     "name": "maybeWrapInNotSelector"
   },
@@ -803,6 +806,9 @@
   {
     "name": "setInjectImplementation"
   },
+  {
+    "name": "setInput"
+  },
   {
     "name": "setSelectedIndex"
   },

diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -1193,6 +1193,9 @@
   {
     "name": "setInjectImplementation"
   },
+  {
+    "name": "setInput"
+  },
   {
     "name": "setInputsForProperty"
   },
-Original file line number
+Diff line change
@@ Expand Up / @@ -1283,6 +1283,9 @@ @@
       {
         "name": "setInjectImplementation"
       },
+      {
+        "name": "setInput"
+      },
       {
         "name": "setInputsForProperty"
       },
@@ Expand Down @@