Merge pull request #1 from wamesk/5.x

5.x

Author: wamesro

README.md

@@ -6,7 +6,7 @@
 
 ## Requirements
 
-- `laravel/nova: ^4.0`
+- `laravel/nova: ^5.0`
 
 
 ## Installation

composer.json

@@ -1,22 +1,24 @@
 {
 	"name": "wamesk/laravel-nova-address-field",
-	"description": "Laravel Nova 4 Address field",
+	"description": "Laravel Nova Address field",
 	"type": "library",
-	"version": "1.4.3",
+	"version": "5.0.0",
 	"license": "proprietary",
 	"require": {
-        "wamesk/laravel-nova-country": "^1.1|^2.0"
-    },
+		"interaction-design-foundation/nova-html-card": "^3.4",
+		"laravel/nova": "^4.0|^5.0",
+		"rinvex/countries": "^9.0"
+	},
 	"autoload": {
 		"psr-4": {
-			"Wame\\Address\\": "src/"
+			"Wame\\LaravelNovaAddressField\\": "src/"
 		}
 	},
 	"minimum-stability": "stable",
 	"extra": {
 		"laravel": {
 			"providers": [
-				"Wame\\Address\\Providers\\LaravelNovaAddressFieldServiceProvider"
+				"Wame\\LaravelNovaAddressField\\Providers\\LaravelNovaAddressFieldServiceProvider"
 			]
 		}
 	}

dist/js/field.js

@@ -134,7 +134,7 @@
                 <div class="flex relative w-full component-select-control select-wrapper">
                     <select
                         :id="currentField.attribute + '-country'"
-                        class="relative flex items-center form-control form-input form-control-bordered form-select pr-6 form-select-bordered"
+                        class="w-full block form-control form-control-bordered form-input"
                         :class="errorClasses"
                         v-model="formData.country"
                         :required="isRequired('country')"
@@ -158,7 +158,7 @@
                         </option>
                     </select>
 
-                    <svg class="shrink-0 pointer-events-none form-select-arrow component-icon-arrow" xmlns="http://www.w3.org/2000/svg" width="10" height="6" viewBox="0 0 10 6"><path class="fill-current" d="M8.292893.292893c.390525-.390524 1.023689-.390524 1.414214 0 .390524.390525.390524 1.023689 0 1.414214l-4 4c-.390525.390524-1.023689.390524-1.414214 0l-4-4c-.390524-.390525-.390524-1.023689 0-1.414214.390525-.390524 1.023689-.390524 1.414214 0L5 3.585786 8.292893.292893z"></path></svg>
+                    <span class="pointer-events-none absolute inset-y-0 right-[11px] flex items-center"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true" data-slot="icon" class="w-5 h-5 shrink-0 text-gray-700 dark:text-gray-400"><path fill-rule="evenodd" d="M5.22 8.22a.75.75 0 0 1 1.06 0L10 11.94l3.72-3.72a.75.75 0 1 1 1.06 1.06l-4.25 4.25a.75.75 0 0 1-1.06 0L5.22 9.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd"></path></svg></span>
                 </div>
 
                 <div v-show="showCompany" class="company-data">

resources/js/components/FormField.vue

@@ -3,7 +3,7 @@
 namespace Wame\Address\Cards;
 
 use InteractionDesignFoundation\HtmlCard\HtmlCard;
-use Wame\Address\Casts\AddressCast;
+use Wame\LaravelNovaAddressField\Casts\AddressCast;
 
 class AddressCard
 {

src/Cards/AddressCard.php

@@ -2,15 +2,15 @@
 
 declare(strict_types = 1);
 
-namespace Wame\Address\Casts;
+namespace Wame\LaravelNovaAddressField\Casts;
 
 use Illuminate\Contracts\Database\Eloquent\Castable;
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 use Illuminate\Contracts\Database\Eloquent\SerializesCastableAttributes;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Database\Eloquent\Model;
 use Rinvex\Country\Country;
-use Wame\Address\Enums\IsCompanyEnum;
+use Wame\LaravelNovaAddressField\Enums\IsCompanyEnum;
 
 class AddressCast implements Arrayable, Castable
 {

src/Casts/AddressCast.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wame\Address\Enums;
+namespace Wame\LaravelNovaAddressField\Enums;
 
 enum IsCompanyEnum: string
 {

src/Enums/IsCompanyEnum.php

@@ -2,15 +2,14 @@
 
 declare(strict_types = 1);
 
-namespace Wame\Address\Fields;
+namespace Wame\LaravelNovaAddressField\Fields;
 
 use Exception;
 use Illuminate\Support\Str;
 use Laravel\Nova\Fields\Field;
 use Laravel\Nova\Fields\SupportsDependentFields;
-use Wame\Address\Casts\AddressCast;
-use Wame\LaravelNovaCountry\Enums\CountryStatusEnum;
-use Wame\LaravelNovaCountry\Models\Country;
+use Rinvex\Country\CountryLoader;
+use Wame\LaravelNovaAddressField\Casts\AddressCast;
 
 class Address extends Field
 {
@@ -23,7 +22,7 @@ class Address extends Field
      */
     public $component = 'address';
 
-    protected $dependentShouldEmitChangesEvent = true;
+    protected ?bool $dependentShouldEmitChangesEvent = true;
 
     public function __construct($name, $attribute = null, callable $resolveCallback = null)
     {
@@ -129,37 +128,20 @@ public function withPhone(): Address
     }
 
     /**
-     * @return array|mixed|mixed[]
-     * @throws \JsonException
+     * @return array
+     * @throws \Rinvex\Country\CountryLoaderException
      */
-    private function getCountryList(): mixed
+    private function getCountryList(): array
     {
-        $version = $this->getCountryPackageVersion();
+        $return = [];
 
-        if (Str::startsWith($version, '2.')) {
-            return Country::query()->where(['status' => CountryStatusEnum::ENABLED])->orderBy('title')->pluck('title', 'id')->toArray();
+        $list = CountryLoader::countries();
+        foreach ($list as $item) {
+            $country = country($item['iso_3166_1_alpha2']);
+            
+            $return[$country->getIsoAlpha2()] = $country->getName();
         }
 
-        return Country::query()->where(['status' => Country::STATUS_ENABLED])->orderBy('title')->pluck('title', 'code')->toArray();
-    }
-
-    /**
-     * @return mixed
-     * @throws \JsonException
-     * @throws Exception
-     */
-    public function getCountryPackageVersion(): mixed
-    {
-        $composerLockFile = base_path('composer.lock');
-        $packageName = 'wamesk/laravel-nova-country';
-        $composerData = json_decode(file_get_contents($composerLockFile), true, 512, JSON_THROW_ON_ERROR);
-
-        foreach ($composerData['packages'] as $package) {
-            if ($package['name'] === $packageName) {
-                return $package['version'];
-            }
-        }
-
-        throw new Exception('Package' . $packageName . 'not found');
+        return $return;
     }
 }

src/Fields/Address.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wame\Address\Fields;
+namespace Wame\LaravelNovaAddressField\Fields;
 
 use Laravel\Nova\Fields\Repeater\Repeatable;
 use Laravel\Nova\Http\Requests\NovaRequest;

src/Fields/AddressRepeater.php

@@ -2,7 +2,7 @@
 
 declare(strict_types = 1);
 
-namespace Wame\Address\Providers;
+namespace Wame\LaravelNovaAddressField\Providers;
 
 use Illuminate\Support\ServiceProvider;
 use Laravel\Nova\Events\ServingNova;