fix: full class being visible for section

Author: GigaGiorgadze

src/Components/Forms/Actions/SelectBlockAction.php

@@ -10,10 +10,12 @@
 use Redberry\PageBuilderPlugin\Components\Forms\PageBuilder;
 use Redberry\PageBuilderPlugin\Components\Forms\RadioButtonImage;
 use Redberry\PageBuilderPlugin\Traits\CanRenderWithThumbnails;
+use Redberry\PageBuilderPlugin\Traits\FormatsBlockCategories;
 
 class SelectBlockAction extends Action
 {
     use CanRenderWithThumbnails;
+    use FormatsBlockCategories;
 
     public ?Closure $modifySelectionFieldUsing = null;
 
@@ -86,7 +88,7 @@ protected function setUp(): void
         });
     }
 
-    private function formatBlocksForSelect(PageBuilder $component): array
+    private function formatBlocksForRadio(PageBuilder $component): array
     {
         $blocks = $component->getBlocks();
 
@@ -100,4 +102,19 @@ private function formatBlocksForSelect(PageBuilder $component): array
 
         return $formatted;
     }
+
+    private function formatBlocksForSelect(PageBuilder $component): array
+    {
+        $blocks = $component->getBlocks();
+
+        $formatted = [];
+
+        foreach ($blocks as $block) {
+            $category = $this->getCategoryTitle($block::getCategory());
+
+            $formatted[$category][$block] = $block::getBlockName();
+        }
+
+        return $formatted;
+    }
 }

src/Components/Forms/RadioButtonImage.php

@@ -11,14 +11,15 @@
 use Illuminate\Contracts\Support\Htmlable;
 use Illuminate\View\ComponentAttributeBag;
 use Redberry\PageBuilderPlugin\Abstracts\BaseBlock;
-use Redberry\PageBuilderPlugin\Abstracts\BaseBlockCategory;
+use Redberry\PageBuilderPlugin\Traits\FormatsBlockCategories;
 
 class RadioButtonImage extends Field
 {
     use CanDisableOptions;
     use HasExtraInputAttributes;
     use HasGridDirection;
     use HasOptions;
+    use FormatsBlockCategories;
 
     public string $view = 'page-builder-plugin::forms.radio-button-image';
 
@@ -50,18 +51,6 @@ public function getAllTabAttributes(): ComponentAttributeBag
         return $this->evaluate($this->allTabAttributes) ?? new ComponentAttributeBag();
     }
 
-    public function isCategoryClass(string $category): bool
-    {
-        return class_exists($category) && is_subclass_of($category, BaseBlockCategory::class);
-    }
-
-    public function getCategoryTitle(string $category): string
-    {
-        return class_exists($category) && method_exists($category, 'getCategoryName')
-            ? (string) $this->evaluate(Closure::fromCallable([$category, 'getCategoryName']))
-            : $category;
-    }
-
     public function getFormattedOptions(): array
     {
         $options = $this->getOptions();

src/Traits/FormatsBlockCategories.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Redberry\PageBuilderPlugin\Traits;
+
+use Closure;
+use Redberry\PageBuilderPlugin\Abstracts\BaseBlockCategory;
+
+trait FormatsBlockCategories
+{
+    public function isCategoryClass(string $category): bool
+    {
+        return class_exists($category) && is_subclass_of($category, BaseBlockCategory::class);
+    }
+
+    public function getCategoryTitle(string $category): string
+    {
+        return class_exists($category) && method_exists($category, 'getCategoryName')
+            ? (string) $this->evaluate(Closure::fromCallable([$category, 'getCategoryName']))
+            : $category;
+    }
+
+}