Merge pull request #11 from gioppy/fix/title

Fix empty title on some cases
gioppy · Oct 11, 2023 · fa6a888 · fa6a888
2 parents 5fa9296 + e1bc091
commit fa6a888
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/resources/views/metatags.antlers.html b/resources/views/metatags.antlers.html
@@ -9,6 +9,12 @@
 <link rel="canonical" href="{{ advanced_canonical ?? extras.permalink }}">
 {{ /if }}
 
+{{ unless settings | in_array:basic }}
+{{ fields }}
+<title>{{ basic_title }} {{ extras.site_name_separator}} {{ extras.site_name}}</title>
+{{ /fields }}
+{{ /unless }}
+
 {{ if settings | in_array:advanced }}
 <!-- ADVANCED METATAGS -->
 {{ fields }}

diff --git a/src/Tags/MetatagsTags.php b/src/Tags/MetatagsTags.php
@@ -8,6 +8,7 @@
 use Gioppy\StatamicMetatags\Settings;
 use Illuminate\Support\Str;
 use Statamic\Fields\Value;
+use Statamic\Fieldtypes\Text;
 use Statamic\Support\Arr;
 use Statamic\Tags\Tags;
 
@@ -45,9 +46,15 @@ public function index() {
       ->merge($pageFields);
 
     // Check if fields have title, otherwise load default title
+    if (array_key_exists('basic_title', $fields->all()) && !is_string($fields->only('basic_title')->all()['basic_title'])) {
+      $defaultTitle = $page->only('title')->all();
+      $fields->prepend(new Value($defaultTitle['title'] ?? ' '), 'basic_title');
+    }
+
+    // If there is no basic_title, load page title
     if (!array_key_exists('basic_title', $fields->all())) {
       $defaultTitle = $page->only('title')->all();
-      $fields->prepend(new Value($defaultTitle['title']), 'basic_title');
+      $fields->prepend(new Value($defaultTitle['title'] ?? ' ', 'basic_title', new Text()), 'basic_title');
     }
 
     return view('statamic-metatags::metatags', [