Skip to content

Commit a90d5e7

Browse files
committed
Simplify renderModule() functions, use controller data
1 parent 13fb1b1 commit a90d5e7

File tree

3 files changed

+8
-17
lines changed

3 files changed

+8
-17
lines changed

index.php

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,7 @@
2424
'pageMethods' => [
2525
'renderModules' => function (array $params = []) {
2626
foreach ($this->modules() as $module) {
27-
$moduleTemplate = new Template($module->intendedTemplate());
28-
echo $moduleTemplate->render([
29-
'page' => $this,
30-
'module' => $module,
31-
'site' => $this->site(),
32-
...$params
33-
]);
27+
echo $module->renderModule($params);
3428
}
3529
},
3630
'hasModules' => function () {

lib/collection.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,7 @@ public function toString(): string
1515
$html = '';
1616

1717
foreach ($this->data() as $module) {
18-
$moduleTemplate = new Template($module->intendedTemplate());
19-
$html .= $moduleTemplate->render([
20-
'page' => $module->parents()->first(),
21-
'module' => $module,
22-
'site' => site(),
23-
]);
18+
$html .= $module->renderModule();
2419
}
2520

2621
return $html;

lib/models.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,16 @@ public function render(
1818
): string {
1919
go($this->parent()->url() . '#' . $this->slug());
2020
}
21-
public function renderModule()
21+
public function renderModule(array $params = [])
2222
{
23+
$controllerData = $this->controller();
2324
$moduleTemplate = new Template($this->intendedTemplate());
24-
echo $moduleTemplate->render([
25+
echo $moduleTemplate->render(array_merge($controllerData, [
2526
'page' => $this->parents()->first() ?? $this->site(),
2627
'module' => $this,
27-
'site' => $this->site()
28-
]);
28+
'site' => $this->site(),
29+
...$params
30+
]));
2931
}
3032
public function moduleName()
3133
{

0 commit comments

Comments
 (0)