IImplement new blockRenderer and childRenderer arguments

Author: jissereitsma

view/adminhtml/templates/form.phtml

@@ -22,15 +22,14 @@ if (!isset($viewModel)) {
 ?>
 <div class="loki-form form">
     <?= /* @noEscape */ $blockRenderer->html(
-        $block,
         'loki-admin.form.actions',
         ['view_model' => $viewModel]
     ) ?>
 
     <div class="page-columns">
         <div class="main-col">
-            <?= /* @noEscape */ $blockRenderer->html($block, 'loki-admin.form.spinner') ?>
-            <?= /* @noEscape */ $blockRenderer->html($block, 'loki-admin.form.inner') ?>
+            <?= /* @noEscape */ $childRenderer->html( 'loki-admin.form.spinner') ?>
+            <?= /* @noEscape */ $childRenderer->html( 'loki-admin.form.inner') ?>
 
             <div class="entry-edit form-inline">
                 <div class="fieldset-wrapper">

view/adminhtml/templates/grid.phtml

@@ -17,37 +17,37 @@ if (!isset($viewModel)) {
 ?>
 <div class="loki-grid grid">
     <?php if ($viewModel->allowActions()): ?>
-    <?= /* @noEscape */ $blockRenderer->html($block, 'loki-admin.grid.actions') ?>
+    <?= /* @noEscape */ $childRenderer->html( 'loki-admin.grid.actions') ?>
     <?php endif; ?>
 
     <div class="page-columns">
         <div class="main-col">
             <div class="admin__data-grid-outer-wrap">
-                <?= /* @noEscape */ $blockRenderer->html($block, 'loki-admin.grid.spinner') ?>
+                <?= /* @noEscape */ $childRenderer->html( 'loki-admin.grid.spinner') ?>
 
                 <div class="admin__data-grid-header">
                     <div class="admin__data-grid-header-row">
-                        <?= /* @noEscape */ $blockRenderer->html($block, 'loki-admin.grid.filters') ?>
+                        <?= /* @noEscape */ $childRenderer->html( 'loki-admin.grid.filters') ?>
                     </div>
                     <div class="admin__data-grid-header-row">
-                        <?= /* @noEscape */ $blockRenderer->html($block, 'loki-admin.grid.search') ?>
+                        <?= /* @noEscape */ $childRenderer->html( 'loki-admin.grid.search') ?>
                     </div>
                     <div class="admin__data-grid-header-row row row-gutter">
-                        <?= /* @noEscape */ $blockRenderer->html($block, 'loki-admin.grid.massactions') ?>
-                        <?= /* @noEscape */ $blockRenderer->html($block, 'loki-admin.grid.pager') ?>
-                        <?= /* @noEscape */ $blockRenderer->html($block, 'loki-admin.grid.records') ?>
+                        <?= /* @noEscape */ $childRenderer->html( 'loki-admin.grid.massactions') ?>
+                        <?= /* @noEscape */ $childRenderer->html( 'loki-admin.grid.pager') ?>
+                        <?= /* @noEscape */ $childRenderer->html( 'loki-admin.grid.records') ?>
                     </div>
                 </div>
 
                 <div class="admin__data-grid-header-row row row-gutter">
                     <div class="col-xs-2">
                         <div class="action-select-wrap">
-                            <?= /* @noEscape */ $blockRenderer->html($block, 'loki-admin.grid.row-actions') ?>
+                            <?= /* @noEscape */ $childRenderer->html( 'loki-admin.grid.row-actions') ?>
                         </div>
                     </div>
                 </div>
 
-                <?= /* @noEscape */ $blockRenderer->html($block, 'loki-admin.grid.table') ?>
+                <?= /* @noEscape */ $childRenderer->html( 'loki-admin.grid.table') ?>
             </div>
         </div>
     </div>

view/adminhtml/templates/grid/pager.phtml

@@ -13,6 +13,6 @@ use Loki\Components\Util\Block\ChildRenderer;
 $viewModel = $block->getViewModel();
 ?>
 <div class="admin__data-grid-pager-wrap">
-    <?= /* @noEscape */ $childRenderer->html($block, 'limit') ?>
-    <?= /* @noEscape */ $childRenderer->html($block, 'pagination') ?>
+    <?= /* @noEscape */ $childRenderer->html('limit') ?>
+    <?= /* @noEscape */ $childRenderer->html('pagination') ?>
 </div>