fix(mail): issue with overriding mail template

Markdown class is a singleton so we have to use `loadComponentsFrom` to update paths to load views from

Author: gaetan-hexadog

src/Theme.php

@@ -9,6 +9,7 @@
 use Hexadog\ThemesManager\Traits\ComposerTrait;
 use Illuminate\Container\Container;
 use Illuminate\Filesystem\Filesystem;
+use Illuminate\Mail\Markdown;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Log;
@@ -230,7 +231,7 @@ public function disable(bool $withEvent = true): Theme
     /**
      * Enable the current theme.
      */
-    public function enable(bool $withEvent = true): Theme
+    public function enable(bool $withEvent = true, $defaultViewPaths = null, $defaultMailViewPaths = null): Theme
     {
         // Check if current is active and currently disabled
         if ($this->isActive() && $this->disabled()) {
@@ -239,7 +240,7 @@ public function enable(bool $withEvent = true): Theme
             }
 
             $this->setStatus(true);
-            $this->registerViews();
+            $this->registerViews($defaultViewPaths, $defaultMailViewPaths);
 
             if ($withEvent) {
                 event(new ThemeEnabled($this->getName()));
@@ -364,7 +365,7 @@ protected function createPublicAssetsStructure()
     /**
      * Register theme's views in ViewFinder.
      */
-    protected function registerViews()
+    protected function registerViews($defaultViewPaths, $defaultMailViewPaths)
     {
         // Create symlink for public resources if not existing yet
         $assetsPath = $this->getPath('public');
@@ -390,8 +391,8 @@ protected function registerViews()
         }, $paths);
 
         // Update config view.paths to work with errors views
-        if (is_array(Config::get('view.paths'))) {
-            Config::set('view.paths', array_merge($paths, Config::get('view.paths')));
+        if (is_array($this->defaultViewPaths)) {
+            Config::set('view.paths', array_merge($paths, $defaultViewPaths));
         } else {
             Config::set('view.paths', $paths);
         }
@@ -416,13 +417,15 @@ protected function registerViews()
         // Update config mail.markdown.paths to work with mail views
         $mailViewsPath = $this->getPath('resources/views/vendor/mail');
         if (File::exists($vendorViewsPath) && is_dir($mailViewsPath)) {
-            if (is_array(Config::get('mail.markdown.paths'))) {
+            if (is_array($defaultMailViewPaths)) {
                 Config::set('mail.markdown.paths', array_merge([
                     $mailViewsPath,
-                ], Config::get('mail.markdown.paths')));
+                ], $defaultMailViewPaths));
             } else {
-                Config::set('mail.markdown.paths', $mailViewsPath);
+                Config::set('mail.markdown.paths', [$mailViewsPath]);
             }
+
+            app()->make(Markdown::class)->loadComponentsFrom(Config::get('mail.markdown.paths'));
         }
     }
 }

src/ThemesManager.php

@@ -45,6 +45,20 @@ class ThemesManager
      */
     private $view;
 
+    /**
+     * Laravel default view paths
+     *
+     * @var [type]
+     */
+    protected $defaultViewPaths;
+
+    /**
+     * Laravel default Mail view paths
+     *
+     * @var [type]
+     */
+    protected $defaultMailViewPaths;
+
     /**
      * The constructor.
      *
@@ -56,6 +70,11 @@ public function __construct(Factory $view, Translator $lang)
         $this->view = $view;
         $this->lang = $lang;
 
+        // Save default Laravel View Paths
+        $this->defaultViewPaths = Config::get('view.paths');
+        // Save default Laravel Mail View Paths
+        $this->defaultMailViewPaths = Config::get('mail.markdown.paths');
+
         if (Config::get('themes-manager.cache.enabled', false)) {
             $this->themes = $this->getCache();
         } else {
@@ -172,7 +191,7 @@ public function enable(string $name, bool $withEvent = true): ThemesManager
                 throw new ThemeNotActiveException($name);
             }
 
-            $theme->enable($withEvent);
+            $theme->enable($withEvent, $this->defaultViewPaths, $this->defaultMailViewPaths);
 
             // Add Theme language files
             $this->lang->addNamespace('theme', $theme->getPath('lang'));