From 34872197a33641bd1bd109e7e6836c52ef460831 Mon Sep 17 00:00:00 2001
From: bald-cat <babaiev.ihor@gmail.com>
Date: Wed, 22 Jan 2025 14:26:23 +0200
Subject: [PATCH 1/4] Added activeAccordion method to Accordion.php

---
 resources/views/layouts/accordion.blade.php | 14 +++++++-------
 src/Screen/Layouts/Accordion.php            | 14 ++++++++++++++
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/resources/views/layouts/accordion.blade.php b/resources/views/layouts/accordion.blade.php
index 51c8b5ec3..23e94efcb 100644
--- a/resources/views/layouts/accordion.blade.php
+++ b/resources/views/layouts/accordion.blade.php
@@ -1,10 +1,10 @@
 <div id="accordion-{{$templateSlug}}" class="accordion mb-3">
     @foreach($manyForms as $name => $forms)
-        <div class="accordion-heading @if ($loop->index) collapsed @endif"
+        <div class="accordion-heading @if (!isset($activeAccordion) && $loop->index || (isset($activeAccordion) && $activeAccordion !== $name)) collapsed @endif"
              id="heading-{{\Illuminate\Support\Str::slug($name)}}"
              data-bs-toggle="collapse"
              data-bs-target="#collapse-{{\Illuminate\Support\Str::slug($name)}}"
-             aria-expanded="true"
+             aria-expanded="{{ isset($activeAccordion) ? ($activeAccordion === $name ? 'true' : 'false') : (!$loop->index ? 'true' : 'false') }}"
              aria-controls="collapse-{{\Illuminate\Support\Str::slug($name)}}">
             <h6 class="btn btn-link btn-group-justified pt-2 pb-2 mb-0 pe-0 ps-0 d-flex align-items-center">
                 <x-orchid-icon path="bs.chevron-right" class="small me-2"/> {!! $name !!}
@@ -12,15 +12,15 @@
         </div>
 
         <div id="collapse-{{\Illuminate\Support\Str::slug($name)}}"
-             class="mt-2 collapse @if (!$loop->index) show @endif"
+             class="mt-2 collapse @if ((isset($activeAccordion) && $activeAccordion === $name) || (!isset($activeAccordion) && !$loop->index)) show @endif"
              aria-labelledby="heading-{{\Illuminate\Support\Str::slug($name)}}"
              @if (!$stayOpen)
                  data-bs-parent="#accordion-{{$templateSlug}}"
-            @endif
+                @endif
         >
-                @foreach($forms as $form)
-                    {!! $form !!}
-                @endforeach
+            @foreach($forms as $form)
+                {!! $form !!}
+            @endforeach
         </div>
     @endforeach
 </div>
diff --git a/src/Screen/Layouts/Accordion.php b/src/Screen/Layouts/Accordion.php
index 2263924c1..759a76c5c 100644
--- a/src/Screen/Layouts/Accordion.php
+++ b/src/Screen/Layouts/Accordion.php
@@ -55,4 +55,18 @@ public function stayOpen(bool $stayOpen = true): self
 
         return $this;
     }
+
+    /**
+     * Specifies the accordion that should be opened by default.
+     *
+     * @param string $activeAccordion
+     *
+     * @return $this
+     */
+    public function activeAccordion(string $activeAccordion): self
+    {
+        $this->variables['activeAccordion'] = $activeAccordion;
+
+        return $this;
+    }
 }

From 6bb278d1f0106ffa58ce2ed7bc18acfc829b73fb Mon Sep 17 00:00:00 2001
From: bald-cat <babaiev.ihor@gmail.com>
Date: Thu, 23 Jan 2025 10:05:39 +0200
Subject: [PATCH 2/4] Change activeAccordion method to Accordion.php

---
 resources/views/layouts/accordion.blade.php |  6 +++---
 src/Screen/Layouts/Accordion.php            | 21 +++++++++++++++++----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/resources/views/layouts/accordion.blade.php b/resources/views/layouts/accordion.blade.php
index 23e94efcb..a8791bc75 100644
--- a/resources/views/layouts/accordion.blade.php
+++ b/resources/views/layouts/accordion.blade.php
@@ -1,10 +1,10 @@
 <div id="accordion-{{$templateSlug}}" class="accordion mb-3">
     @foreach($manyForms as $name => $forms)
-        <div class="accordion-heading @if (!isset($activeAccordion) && $loop->index || (isset($activeAccordion) && $activeAccordion !== $name)) collapsed @endif"
+        <div class="accordion-heading @if (!in_array($name, $open)) collapsed @endif"
              id="heading-{{\Illuminate\Support\Str::slug($name)}}"
              data-bs-toggle="collapse"
              data-bs-target="#collapse-{{\Illuminate\Support\Str::slug($name)}}"
-             aria-expanded="{{ isset($activeAccordion) ? ($activeAccordion === $name ? 'true' : 'false') : (!$loop->index ? 'true' : 'false') }}"
+             aria-expanded="{{ in_array($name, $open) ? 'true' : 'false' }}"
              aria-controls="collapse-{{\Illuminate\Support\Str::slug($name)}}">
             <h6 class="btn btn-link btn-group-justified pt-2 pb-2 mb-0 pe-0 ps-0 d-flex align-items-center">
                 <x-orchid-icon path="bs.chevron-right" class="small me-2"/> {!! $name !!}
@@ -12,7 +12,7 @@
         </div>
 
         <div id="collapse-{{\Illuminate\Support\Str::slug($name)}}"
-             class="mt-2 collapse @if ((isset($activeAccordion) && $activeAccordion === $name) || (!isset($activeAccordion) && !$loop->index)) show @endif"
+             class="mt-2 collapse @if (in_array($name, $open)) show @endif"
              aria-labelledby="heading-{{\Illuminate\Support\Str::slug($name)}}"
              @if (!$stayOpen)
                  data-bs-parent="#accordion-{{$templateSlug}}"
diff --git a/src/Screen/Layouts/Accordion.php b/src/Screen/Layouts/Accordion.php
index 759a76c5c..07b992824 100644
--- a/src/Screen/Layouts/Accordion.php
+++ b/src/Screen/Layouts/Accordion.php
@@ -4,6 +4,7 @@
 
 namespace Orchid\Screen\Layouts;
 
+use Illuminate\Support\Arr;
 use Orchid\Screen\Layout;
 use Orchid\Screen\Repository;
 
@@ -17,11 +18,17 @@ abstract class Accordion extends Layout
      */
     protected $template = 'platform::layouts.accordion';
 
+    /**
+     * @var bool
+     */
+    private $openSet = false;
+
     /**
      * @var array
      */
     protected $variables = [
         'stayOpen' => false,
+        'open' => [],
     ];
 
     /**
@@ -32,6 +39,7 @@ abstract class Accordion extends Layout
     public function __construct(array $layouts = [])
     {
         $this->layouts = $layouts;
+        $this->variables['open'] = [array_key_first($this->layouts)];
     }
 
     /**
@@ -57,16 +65,21 @@ public function stayOpen(bool $stayOpen = true): self
     }
 
     /**
-     * Specifies the accordion that should be opened by default.
+     * Set active accordion(s).
      *
-     * @param string $activeAccordion
+     * @param string|array $activeAccordion
      *
      * @return $this
      */
-    public function activeAccordion(string $activeAccordion): self
+    public function activeAccordion(string|array $activeAccordion): self
     {
-        $this->variables['activeAccordion'] = $activeAccordion;
+        $this->variables['open'] = $this->openSet
+            ? array_merge($this->variables['open'], Arr::wrap($activeAccordion))
+            : $activeAccordion;
+
+        $this->openSet = true;
 
         return $this;
     }
+
 }

From e5c2c36cfb7589ff55050f8fa4d02a948e9c932f Mon Sep 17 00:00:00 2001
From: bald-cat <babaiev.ihor@gmail.com>
Date: Thu, 23 Jan 2025 13:31:49 +0200
Subject: [PATCH 3/4] Fixed method

---
 src/Screen/Layouts/Accordion.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Screen/Layouts/Accordion.php b/src/Screen/Layouts/Accordion.php
index 07b992824..78787fe6d 100644
--- a/src/Screen/Layouts/Accordion.php
+++ b/src/Screen/Layouts/Accordion.php
@@ -71,10 +71,12 @@ public function stayOpen(bool $stayOpen = true): self
      *
      * @return $this
      */
-    public function activeAccordion(string|array $activeAccordion): self
+    public function open(string|array $activeAccordion): self
     {
+        $activeAccordion = Arr::wrap($activeAccordion);
+
         $this->variables['open'] = $this->openSet
-            ? array_merge($this->variables['open'], Arr::wrap($activeAccordion))
+            ? array_merge($this->variables['open'], $activeAccordion)
             : $activeAccordion;
 
         $this->openSet = true;

From 153b971c3a9b63afb7d6d1cf1829851326a2dee2 Mon Sep 17 00:00:00 2001
From: bald-cat <babaiev.ihor@gmail.com>
Date: Fri, 24 Jan 2025 14:08:14 +0200
Subject: [PATCH 4/4] change open() method

---
 src/Screen/Layouts/Accordion.php | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/Screen/Layouts/Accordion.php b/src/Screen/Layouts/Accordion.php
index 78787fe6d..952bf4b1f 100644
--- a/src/Screen/Layouts/Accordion.php
+++ b/src/Screen/Layouts/Accordion.php
@@ -18,11 +18,6 @@ abstract class Accordion extends Layout
      */
     protected $template = 'platform::layouts.accordion';
 
-    /**
-     * @var bool
-     */
-    private $openSet = false;
-
     /**
      * @var array
      */
@@ -73,13 +68,7 @@ public function stayOpen(bool $stayOpen = true): self
      */
     public function open(string|array $activeAccordion): self
     {
-        $activeAccordion = Arr::wrap($activeAccordion);
-
-        $this->variables['open'] = $this->openSet
-            ? array_merge($this->variables['open'], $activeAccordion)
-            : $activeAccordion;
-
-        $this->openSet = true;
+        $this->variables['open'] = Arr::wrap($activeAccordion);
 
         return $this;
     }