From 964b9bd3ee546d41bbc17568ffa6b1c217f8c7ef Mon Sep 17 00:00:00 2001
From: Kevin Bond <kevinbond@gmail.com>
Date: Thu, 20 Jan 2022 12:51:29 -0500
Subject: [PATCH] [TwigComponent] make public component properties available
 directly

---
 src/LiveComponent/src/Resources/doc/index.rst | 36 +++++++++----------
 src/TwigComponent/CHANGELOG.md                |  4 +++
 src/TwigComponent/src/ComponentRenderer.php   |  2 +-
 src/TwigComponent/src/Resources/doc/index.rst | 14 +++++---
 .../components/component_a.html.twig          |  2 +-
 .../templates/components/custom1.html.twig    |  2 +-
 6 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/src/LiveComponent/src/Resources/doc/index.rst b/src/LiveComponent/src/Resources/doc/index.rst
index d962afd9c6c..7cc35def450 100644
--- a/src/LiveComponent/src/Resources/doc/index.rst
+++ b/src/LiveComponent/src/Resources/doc/index.rst
@@ -45,7 +45,7 @@ A real-time product search component might look like this::
         <input
             type="search"
             name="query"
-            value="{{ this.query }}"
+            value="{{ query }}"
             data-action="live#update"
         >
 
@@ -247,19 +247,19 @@ Let's add two inputs to our template:
     <div {{ init_live_component(this) }}>
         <input
             type="number"
-            value="{{ this.min }}"
+            value="{{ min }}"
             data-model="min"
             data-action="live#update"
         >
 
         <input
             type="number"
-            value="{{ this.max }}"
+            value="{{ max }}"
             data-model="max"
             data-action="live#update"
         >
 
-        Generating a number between {{ this.min }} and {{ this.max }}
+        Generating a number between {{ min }} and {{ max }}
         <strong>{{ this.randomNumber }}</strong>
     </div>
 
@@ -316,7 +316,7 @@ happens, add it to the ``data-action`` call:
 
       <input
           type="number"
-          value="{{ this.max }}"
+          value="{{ max }}"
           data-model="max"
     -     data-action="live#update"
     +     data-action="change->live#update"
@@ -341,7 +341,7 @@ clicked). To do that, use the ``updateDefer`` method:
 
       <input
           type="number"
-          value="{{ this.max }}"
+          value="{{ max }}"
           data-model="max"
     -     data-action="live#update"
     +     data-action="live#updateDefer"
@@ -364,7 +364,7 @@ property. The following code works identically to the previous example:
       <div {{ init_live_component(this)>
           <input
               type="number"
-              value="{{ this.min }}"
+              value="{{ min }}"
     -         data-model="min"
     +         name="min"
               data-action="live#update"
@@ -1016,7 +1016,7 @@ rendered the ``content`` through a Markdown filter from the
     <div {{init_live_component(this)}}>
         <input
             type="text"
-            value="{{ this.post.title }}"
+            value="{{ post.title }}"
             data-model="post.title"
             data-action="live#update"
         >
@@ -1024,11 +1024,11 @@ rendered the ``content`` through a Markdown filter from the
            <textarea
                data-model="post.content"
                data-action="live#update"
-           >{{this.post.content}}</textarea>
+           >{{post.content}}</textarea>
 
             <div className="markdown-preview" data-loading="addClass(low-opacity)">
-                <h3>{{this.post.title}}</h3>
-                {{this.post.content | markdown_to_html}}
+                <h3>{{post.title}}</h3>
+                {{post.content | markdown_to_html}}
             </div>
     </div>
 
@@ -1142,7 +1142,7 @@ method:
         data-model="post.content"
         data-action="live#update"
         class="{{ this.getError('post.content') ? 'has-error' : '' }}"
-    >{{ this.post.content }}</textarea>
+    >{{ post.content }}</textarea>
 
 Once a component has been validated, the component will “rememeber” that
 it has been validated. This means that, if you edit a field and the
@@ -1162,7 +1162,7 @@ blur the field), update the model via the ``change`` event:
         data-model="post.content"
         data-action="change->live#update"
         class="{{ this.getError('post.content') ? 'has-error' : '' }}"
-    >{{ this.post.content }}</textarea>
+    >{{ post.content }}</textarea>
 
 When the component re-renders, it will signal to the server that this
 one field should be validated. Like with normal validation, once an
@@ -1399,13 +1399,13 @@ In the ``EditPostComponent`` template, you render the
             type="text"
             name="post[title]"
             data-action="live#update"
-            value="{{ this.post.title }}"
+            value="{{ post.title }}"
         >
 
         {{ component('markdown_textarea', {
             name: 'post[content]',
             label: 'Content',
-            value: this.post.content
+            value: post.content
         }) }}
 
         <button
@@ -1418,13 +1418,13 @@ In the ``EditPostComponent`` template, you render the
 
     <div {{ init_live_component(this) }} class="mb-3">
         <textarea
-            name="{{ this.name }}"
+            name="{{ name }}"
             data-model="value"
             data-action="live#update"
-        >{{ this.value }}</textarea>
+        >{{ value }}</textarea>
 
         <div class="markdown-preview">
-            {{ this.value|markdown_to_html }}
+            {{ value|markdown_to_html }}
         </div>
     </div>
 
diff --git a/src/TwigComponent/CHANGELOG.md b/src/TwigComponent/CHANGELOG.md
index f13087658dd..de6b45dd568 100644
--- a/src/TwigComponent/CHANGELOG.md
+++ b/src/TwigComponent/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+# 2.1
+
+-   Make public component properties available directly in the template (`{{ prop }}` vs `{{ this.prop }}`).
+
 ## 2.0.0
 
 -   Support for `stimulus` version 2 was removed and support for `@hotwired/stimulus`
diff --git a/src/TwigComponent/src/ComponentRenderer.php b/src/TwigComponent/src/ComponentRenderer.php
index 53886c49e00..c442cd7a1df 100644
--- a/src/TwigComponent/src/ComponentRenderer.php
+++ b/src/TwigComponent/src/ComponentRenderer.php
@@ -30,6 +30,6 @@ public function __construct(Environment $twig)
     public function render(object $component, string $template): string
     {
         // TODO: Self-Rendering components?
-        return $this->twig->render($template, ['this' => $component]);
+        return $this->twig->render($template, array_merge(['this' => $component], get_object_vars($component)));
     }
 }
diff --git a/src/TwigComponent/src/Resources/doc/index.rst b/src/TwigComponent/src/Resources/doc/index.rst
index 64aa8c877c2..ff855b76271 100644
--- a/src/TwigComponent/src/Resources/doc/index.rst
+++ b/src/TwigComponent/src/Resources/doc/index.rst
@@ -27,8 +27,8 @@ And (2) a corresponding template:
 .. code-block:: twig
 
     {# templates/components/alert.html.twig #}
-    <div class="alert alert-{{ this.type }}">
-        {{ this.message }}
+    <div class="alert alert-{{ type }}">
+        {{ message }}
     </div>
 
 Done! Now render it wherever you want:
@@ -130,12 +130,16 @@ public property for each:
           // ...
       }
 
-In the template, the ``AlertComponent`` instance is available via the
-``this`` variable. Use it to render the two new properties:
+In the template, the ``AlertComponent`` instance is available via
+the ``this`` variable and public properties are available directly.
+Use them to render the two new properties:
 
 .. code-block:: twig
 
-    <div class="alert alert-{{ this.type }}">
+    <div class="alert alert-{{ type }}">
+        {{ message }}
+
+        {# Same as above, but using "this", which is the component object #}
         {{ this.message }}
     </div>
 
diff --git a/src/TwigComponent/tests/Fixture/templates/components/component_a.html.twig b/src/TwigComponent/tests/Fixture/templates/components/component_a.html.twig
index 82050e8871f..09b16225697 100644
--- a/src/TwigComponent/tests/Fixture/templates/components/component_a.html.twig
+++ b/src/TwigComponent/tests/Fixture/templates/components/component_a.html.twig
@@ -1,3 +1,3 @@
-propA: {{ this.propA }}
+propA: {{ propA }}
 propB: {{ this.propB }}
 service: {{ this.service.value }}
diff --git a/src/TwigComponent/tests/Fixture/templates/components/custom1.html.twig b/src/TwigComponent/tests/Fixture/templates/components/custom1.html.twig
index 1806be7f4ed..ef9cde1ea56 100644
--- a/src/TwigComponent/tests/Fixture/templates/components/custom1.html.twig
+++ b/src/TwigComponent/tests/Fixture/templates/components/custom1.html.twig
@@ -1,2 +1,2 @@
 Custom template 1
-b value: {{ this.value }}
+b value: {{ value }}