From 524f01a03f3c49a8bd719963acf297727bcd5603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20Fie=C3=9Finger?= <41627893+bfiessinger@users.noreply.github.com> Date: Fri, 27 Aug 2021 18:41:39 +0200 Subject: [PATCH] update single asset naming conventions e.g. use livewire-select instead of livewireSelect and add ssetType parameter to renderAssets method --- src/LivewireSelect.php | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/LivewireSelect.php b/src/LivewireSelect.php index 15f4ed7..32712da 100755 --- a/src/LivewireSelect.php +++ b/src/LivewireSelect.php @@ -237,14 +237,14 @@ public function css($options = null) { 'tailwindcss' => '', ]; - return $this->renderAssets($assets, $options); + return $this->renderAssets('css', $assets, $options); } public function js($options = null) { $assets = [ 'livewire' => Livewire::scripts(), 'alpine' => '', - 'livewireSelect' => '', - 'livewireSelectMultiple' => '' ]; - return $this->renderAssets($assets, $options); + return $this->renderAssets('js', $assets, $options); } public function render() @@ -390,12 +390,20 @@ public function render() * * @return string */ - private function renderAssets($assets = [], $options = null) { + private function renderAssets($assetType = 'js', $assets = [], $options = null) { if ($options) { $options = explode(',', $options); $options = array_map('trim', $options); - if (!in_array('livewireSelect', $options)) { - $options[] = 'livewireSelect'; + + // include mandatory assets + switch ($assetType) { + case 'js': + if (!in_array('livewire-select', $options)) { + $options[] = 'livewire-select'; + } + break; + default: + break; } $assetArray = [];