Merge branch 'feature/htmlable' into develop

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 3.1.6
+
+-   Add htmlable
+-   Fixed chart background
+-   Update docs
+
 ## 3.1.5
 
 ### Changed

README.md

@@ -148,14 +148,15 @@ protected static ?string $heading = 'Blog Posts Chart';
 
 Optionally, you can use the `getHeading()` method.
 
-## Hiding header content
+## Setting a widget subheading
 
-You can hide header content by **NOT** providing these
+You may set a widget subheading:
 
--   $heading
--   getHeading()
--   getFormSchema()
--   getOptions()
+```php
+protected static ?string $subheading = 'This is a subheading';
+```
+
+Optionally, you can use the `getSubheading()` method.
 
 ## Setting a chart id
 
@@ -195,8 +196,10 @@ You can also use the `getFooter()` method:
 Custom view:
 
 ```php
+use Illuminate\Contracts\Support\Htmlable;
 use Illuminate\Contracts\View\View;
-protected function getFooter(): string|View
+
+protected function getFooter(): null|string|Htmlable|View
 {
     return view('custom-footer', ['text' => 'Lorem Ipsum is simply dummy text of the printing and typesetting industry.']);
 }
@@ -212,13 +215,25 @@ protected function getFooter(): string|View
 Html string:
 
 ```php
-use Illuminate\Support\HtmlString;
-protected function getFooter(): string|View
+use Illuminate\Contracts\Support\Htmlable;
+use Illuminate\Contracts\View\View;
+protected function getFooter(): null|string|Htmlable|View
 {
     return new HtmlString('<p class="text-danger-500">Lorem Ipsum is simply dummy text of the printing and typesetting industry.</p>');
 }
 ```
 
+## Hiding header content
+
+You can hide header content by **NOT** providing these
+
+-   $heading
+-   getHeading()
+-   $subheading
+-   getSubheading()
+-   getFormSchema()
+-   getOptions()
+
 ## Filtering chart data
 
 You can set up chart filters to change the data shown on chart. Commonly, this is used to change the time period that chart data is rendered for.
@@ -283,6 +298,15 @@ protected function getFormSchema(): array
 }
 ```
 
+### Changing the filter form width
+
+You can change the filter form width by setting the `$filterFormWidth` property:
+
+```php
+use Filament\Support\Enums\MaxWidth;
+protected static MaxWidth|string $filterFormWidth = MaxWidth::Medium;
+```
+
 ### Single select
 
 To set a default filter value, set the `$filter` property:

apexcharts.js

@@ -34,7 +34,7 @@ export default function apexcharts({
                         this.updateChart({
                             theme: { mode: theme },
                             chart: {
-                                background: 'inherit'
+                                background: this.options.chart.background || 'inherit'
                             }
                         })
                     }
@@ -44,7 +44,7 @@ export default function apexcharts({
         initChart: function () {
 
             this.options.theme = { mode: this.theme }
-            this.options.chart.background = 'inherit'
+            this.options.chart.background = this.options.chart.background || 'inherit'
 
             this.options = merge(this.options, this.extraJsOptions)
 
@@ -55,4 +55,4 @@ export default function apexcharts({
             this.chart.updateOptions(options, false, true, true)
         },
     }
-}
+}

src/Concerns/HasFooter.php

@@ -2,16 +2,14 @@
 
 namespace Leandrocfe\FilamentApexCharts\Concerns;
 
+use Illuminate\Contracts\Support\Htmlable;
+use Illuminate\Contracts\View\View;
+
 trait HasFooter
 {
     protected static ?string $footer = null;
 
-    /**
-     * Retrieves the footer string or view object.
-     *
-     * @return null|string|\Illuminate\Contracts\View\View The footer value.
-     */
-    protected function getFooter(): null|string|\Illuminate\Contracts\View\View
+    protected function getFooter(): null|string|Htmlable|View
     {
         return static::$footer;
     }

src/Concerns/HasHeader.php

@@ -2,6 +2,9 @@
 
 namespace Leandrocfe\FilamentApexCharts\Concerns;
 
+use Illuminate\Contracts\Support\Htmlable;
+use Illuminate\Contracts\View\View;
+
 trait HasHeader
 {
     protected static ?string $heading = null;
@@ -11,15 +14,15 @@ trait HasHeader
     /**
      * Retrieves the heading used in the class.
      */
-    protected function getHeading(): ?string
+    protected function getHeading(): null|string|Htmlable|View
     {
         return static::$heading;
     }
 
     /**
      * Retrieves the subheading used in the class.
      */
-    protected function getSubheading(): ?string
+    protected function getSubheading(): null|string|Htmlable|View
     {
         return static::$subheading;
     }