Fix HasOne field not working on initial page load (#79)

dcasia · Nov 14, 2023 · c1ce61b · c1ce61b
1 parent 29efad7
commit c1ce61b
Show file tree

Hide file tree

Showing 6 changed files with 645 additions and 616 deletions.
diff --git a/dist/css/card.css b/dist/css/card.css
diff --git a/nova.mix.js b/nova.mix.js
@@ -3,31 +3,28 @@ const webpack = require('webpack')
 const path = require('path')
 
 class NovaExtension {
-  name() {
-    return 'nova-extension'
-  }
-
-  register(name) {
-    this.name = name
-  }
-
-  webpackConfig(webpackConfig) {
-    webpackConfig.externals = {
-      vue: 'Vue',
+    name() {
+        return 'nova-extension'
     }
 
-    webpackConfig.resolve.alias = {
-      ...(webpackConfig.resolve.alias || {}),
-      'laravel-nova': path.join(
-        __dirname,
-        '../../vendor/laravel/nova/resources/js/mixins/packages.js'
-      ),
+    register(name) {
+        this.name = name
     }
 
-    webpackConfig.output = {
-      uniqueName: this.name,
+    webpackConfig(webpackConfig) {
+        webpackConfig.externals = {
+            vue: 'Vue',
+        }
+
+        webpackConfig.resolve.alias = {
+            ...(webpackConfig.resolve.alias || {}),
+            'laravel-nova': path.join(__dirname, '../../vendor/laravel/nova/resources/js/mixins/packages.js'),
+        }
+
+        webpackConfig.output = {
+            uniqueName: this.name,
+        }
     }
-  }
 }
 
 mix.extend('nova', new NovaExtension())
diff --git a/package.json b/package.json
@@ -6,11 +6,11 @@
         "nova:install": "npm --prefix='../../vendor/laravel/nova' ci"
     },
     "devDependencies": {
-        "@vue/compiler-sfc": "^3.3.4",
+        "@vue/compiler-sfc": "^3.3.8",
         "laravel-mix": "^6.0.49",
         "mix-tailwindcss": "^1.3.0",
         "postcss": "^8.4.31",
-        "tailwindcss": "^3.3.3",
-        "vue-loader": "^17.3.0"
+        "tailwindcss": "^3.3.5",
+        "vue-loader": "^17.3.1"
     }
 }
diff --git a/src/ResourceNavigationField.php b/src/ResourceNavigationField.php
@@ -46,6 +46,10 @@ public function isActive(): bool
             $activeSlug = static::$active = $this->getSlug();
         }
 
+        if (is_null($activeSlug) && !is_null(static::$active)) {
+            $activeSlug = static::$active;
+        }
+
         if ($activeSlug === $this->getSlug()) {
             return true;
         }

diff --git a/tailwind.config.js b/tailwind.config.js
@@ -1,5 +1,4 @@
 module.exports = {
-    mode: 'jit',
-    content: [ './resources/**/*.vue' ],
-    important: '.resource-navigation-card'
+    ...require('../../vendor/laravel/nova/tailwind.config'),
+    important: '.resource-navigation-card',
 }