Fassung 1.7.0: verlässliche Installation, übersichtliche Verwaltung und bedienbare Bewegung

src/Controller/PageController.php

@@ -50,10 +50,14 @@ final class PageController extends AbstractController
         $localFonts = [];
         // The page decides which header and footer it gets - including none.
         $areas = $this->areas($page);
+        $needsSlider = $needsMotion = false;
         if (null !== $page) {
             $theme = $this->theme->load();
             // Theme first, block styles after, so a block always wins over the site defaults.
             $sections = $this->sections($page['document'], $areas);
+            $documents = [$page['document'], ...array_values($areas), ...array_values($sections)];
+            $needsSlider = (bool) array_filter($documents, fn (array $doc): bool => $this->hasType($doc, 'slider'));
+            $needsMotion = (bool) array_filter($documents, fn (array $doc): bool => $this->hasEntrance($doc));
             $styles = $this->theme->css($theme).$this->scrollTopStyles($this->settings->load(), $theme).$this->styles->compileDocument($page['document']).$this->code->compileDocument($page['document']);
             foreach ([...array_values($areas), ...array_values($sections)] as $extra) {
                 $styles .= $this->styles->compileDocument($extra).$this->code->compileDocument($extra);
@@ -88,7 +92,8 @@ final class PageController extends AbstractController
                 'needsTabs' => $this->hasType($page['document'], 'tabs'),
                 // Ein Slider mit automatischem Weiterblättern ist der zweite Baustein, der
                 // dafür ein Skript braucht - nach demselben Muster wie die Tabs.
-                'needsSlider' => $this->hasAutoplaySlider($page['document']),
+                'needsSlider' => $needsSlider,
+                'needsMotion' => $needsMotion,
                 // Ein Bild, das sich vergroessern laesst, ist ohne Skript ein Verweis auf die
                 // grosse Fassung. Das Skript kommt nur dazu, wo es etwas zu tun hat.
                 'needsZoom' => $this->hasZoom($page['document']) || (bool) array_filter(array_values($areas), fn (array $area): bool => $this->hasZoom($area)),
@@ -124,7 +129,7 @@ final class PageController extends AbstractController
         // Die Pruefung braucht ein Skript von Cloudflare und einen Rahmen dafuer. Beides wird nur
         // dort erlaubt, wo tatsaechlich ein Formular steht - nicht auf jeder Seite der Website.
         $mitTurnstile = null !== $page && $this->turnstile->isActive() && $this->hasType($page['document'], 'form');
-        $wantsScript = null !== $page && ($mitTurnstile || $this->hasType($page['document'], 'tabs') || $this->hasAutoplaySlider($page['document']) || $this->hasZoom($page['document']) || [] !== $this->code->scriptsOf($page['document']));
+        $wantsScript = null !== $page && ($mitTurnstile || $this->hasType($page['document'], 'tabs') || $needsSlider || $needsMotion || $this->hasZoom($page['document']) || [] !== $this->code->scriptsOf($page['document']));
         $frames = null === $page ? [] : $this->frameHosts($request, $page['document'], ...array_values($areas), ...array_values($sections));
         if ($mitTurnstile) {
             $frames[] = 'challenges.cloudflare.com';
@@ -397,21 +402,19 @@ final class PageController extends AbstractController
         return $gefunden;
     }
 
-    /** True when a slider on this page asked to advance by itself. */
-    private function hasAutoplaySlider(array $document): bool
+    private function hasEntrance(array $document): bool
     {
-        $found = false;
-        $walk = function (array $blocks) use (&$walk, &$found): void {
+        $walk = function (array $blocks) use (&$walk): bool {
             foreach ($blocks as $block) {
-                if ('slider' === ($block['type'] ?? null) && ($block['props']['autoplay'] ?? 0) >= 3) {
-                    $found = true;
+                if ('none' !== ($block['layout']['effects']['entrance'] ?? 'none') || $walk($block['children'] ?? [])) {
+                    return true;
                 }
-                $walk($block['children'] ?? []);
             }
-        };
-        $walk($document['blocks'] ?? []);
 
-        return $found;
+            return false;
+        };
+
+        return $walk($document['blocks'] ?? []);
     }
 
     private function hasType(array $document, string $type): bool