Fixes

src/Branding/Branding.php

@@ -9,6 +9,7 @@
 
 use function array_merge;
 use function collect;
+use function config;
 
 class Branding
 {
@@ -44,10 +45,21 @@ class Branding
 
     public function __construct()
     {
-        $this->baseFont = config('powerpoint.baseBranding.font', 'Calibri');
-        $this->creatorCompanyName = config('powerpoint.baseBranding.creatorCompanyName', '');
-        $this->websiteUrl = config('powerpoint.baseBranding.websiteUrl', '#');
-        $this->defaultChartColors = config('powerpoint.baseBranding.chartColors', 'ff000000');
+        if (empty($this->baseFont)) {
+            $this->baseFont = config('powerpoint.baseBranding.font', 'Calibri');
+        }
+
+        if (empty($this->creatorCompanyName)) {
+            $this->creatorCompanyName = config('powerpoint.baseBranding.creatorCompanyName', '');
+        }
+
+        if (empty($this->websiteUrl)) {
+            $this->websiteUrl = config('powerpoint.baseBranding.websiteUrl', '#');
+        }
+
+        if (empty($this->chartColors)) {
+            $this->defaultChartColors = config('powerpoint.baseBranding.chartColors', 'ff000000');
+        }
     }
 
     /**

src/Branding/SlideTheme.php

@@ -51,15 +51,15 @@ public function customMasterSlide(string $className): self
      */
     public function applyToSlide(BaseSlide $slide): void
     {
-        if ($this->backgroundColor && ! $slide->backgroundColor) {
+        if ($this->backgroundColor && $slide->backgroundColor === null) {
             $slide->backgroundColor($this->backgroundColor);
         }
 
-        if ($this->backgroundImage && ! $slide->backgroundImage) {
+        if ($this->backgroundImage && $slide->backgroundImage === null) {
             $slide->backgroundImage($this->backgroundImage, true);
         }
 
-        if ($this->chartBackgroundColor && ! $slide->chartBackgroundColor) {
+        if ($this->chartBackgroundColor && $slide->chartBackgroundColor === null) {
             $slide->chartBackgroundColor($this->chartBackgroundColor);
         }
 

src/Components/ChartShape.php

@@ -69,7 +69,7 @@ public function render(): static
             $this->backgroundColor = $this->slide->chartBackgroundColor;
         }
 
-        if ($this->backgroundColor) {
+        if (!empty($this->backgroundColor)) {
             $this->shape->getFill()
                 ->setFillType(Fill::FILL_SOLID)
                 ->setStartColor(new Color($this->backgroundColor));

src/Components/Image.php

@@ -17,7 +17,9 @@ class Image extends Component
     public function __construct(
         protected string $path
     ) {
-        $this->shape = (new File())->setPath($path);
+        $this->shape = (new File())
+            ->setPath($path)
+            ->setName(str()->random());
     }
 
     public function render(): static

src/Components/Table/Table.php

@@ -5,11 +5,12 @@
 use BernskioldMedia\LaravelPpt\Components\Component;
 use BernskioldMedia\LaravelPpt\Concerns\Slides\WithFontSettings;
 use BernskioldMedia\LaravelPpt\Concerns\Slides\WithShape;
+use BernskioldMedia\LaravelPpt\Presentation\BaseSlide;
 use PhpOffice\PhpPresentation\Style\Color;
 use PhpOffice\PhpPresentation\Style\Font;
 
 /**
- * @method static static make(int $columns = 1, array $rows = [])
+ * @method static static make(BaseSlide $slide, int $columns = 1, array $rows = [])
  */
 class Table extends Component
 {

src/Concerns/Slides/WithEdgeImages.php

@@ -38,6 +38,10 @@ trait WithEdgeImages
 
     public function bottomLeftImage(string $path, int $width, int $height, ?int $x = null, ?int $y = null, ?string $url = null): self
     {
+        if($this->bottomLeftImagePath) {
+            return $this;
+        }
+
         $this->bottomLeftImagePath = $path;
         $this->bottomLeftImageDimensions = ['width' => $width, 'height' => $height];
 
@@ -58,6 +62,10 @@ public function bottomLeftImage(string $path, int $width, int $height, ?int $x =
 
     public function bottomRightImage(string $path, int $width, int $height, ?int $x = null, ?int $y = null, ?string $url = null): self
     {
+        if($this->bottomRightImagePath) {
+            return $this;
+        }
+
         $this->bottomRightImagePath = $path;
         $this->bottomRightImageDimensions = ['width' => $width, 'height' => $height];
 
@@ -78,6 +86,10 @@ public function bottomRightImage(string $path, int $width, int $height, ?int $x
 
     public function topLeftImage(string $path, int $width, int $height, ?int $x = null, ?int $y = null, ?string $url = null): self
     {
+        if($this->topLeftImagePath) {
+            return $this;
+        }
+
         $this->topLeftImagePath = $path;
         $this->topLeftImageDimensions = ['width' => $width, 'height' => $height];
 
@@ -98,6 +110,10 @@ public function topLeftImage(string $path, int $width, int $height, ?int $x = nu
 
     public function topRightImage(string $path, int $width, int $height, ?int $x = null, ?int $y = null, ?string $url = null): self
     {
+        if($this->topRightImagePath) {
+            return $this;
+        }
+
         $this->topRightImagePath = $path;
         $this->topRightImageDimensions = ['width' => $width, 'height' => $height];
 

src/Presentation/BaseSlide.php

@@ -241,7 +241,8 @@ protected function applyEdgeImage(string $key): void
         $shape->setPath($imagePath)
             ->setWidthAndHeight($imageDimensions['width'], $imageDimensions['height'])
             ->setOffsetX($x)
-            ->setOffsetY($y);
+            ->setOffsetY($y)
+            ->setName(str()->random());
 
         if ($url) {
             $shape->getHyperlink()->setUrl($url);

src/SlideMasters/ChartTitles.php

@@ -26,9 +26,12 @@ protected function render(): void
     {
         $title = $this->renderTitle();
 
+        $width = $this->chart->width ?? $this->presentation->width;
+        $height = $this->chart->height ?? $this->presentation->height;
+
         ChartShape::make($this, $this->chart->slide($this)->get())
-            ->height($this->presentation->height - $title->height - $this->verticalPadding * 2 - 20)
-            ->width($this->presentation->width - $this->horizontalPadding * 2)
+            ->height($height - $title->height - $this->verticalPadding * 2 - 20)
+            ->width($width - $this->horizontalPadding * 2)
             ->centerHorizontally()
             ->y($title->height + $this->verticalPadding + 20)
             ->backgroundColor($this->chartBackgroundColor)