Fix loadUrl type hint in RegisterClientScript::class.

yii2-extensions · Nov 22, 2023 · 5823b30 · 5823b30
1 parent 9d9e7f0
commit 5823b30
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 9 deletions.
diff --git a/src/RegisterClientScript.php b/src/RegisterClientScript.php
@@ -15,17 +15,26 @@ trait RegisterClientScript
      * @phpstan-var array<array-key, mixed>
      */
     public array $clientOptions = [];
-    public string $loadUrl = '';
+    public array $loadUrl = [];
     public string $queryParam = 'query';
 
     public function registerClientScript(): void
     {
         $id = $this->options['id'];
 
-        if ($this->loadUrl !== '') {
+        if ($this->loadUrl !== []) {
             $url = Url::to($this->loadUrl);
             $this->clientOptions['load'] = new JsExpression(
-                "function (query, callback) { if (!query.length) return callback(); $.getJSON('$url', { {$this->queryParam}: query }, function (data) { callback(data); }).fail(function () { callback(); }); }"
+                $loadFunction = <<<JS
+                function (query, callback) {
+                    if (!query.length) return callback();
+                    $.getJSON('$url', { {$this->queryParam}: query }, function (data) {
+                        callback(data);
+                    }).fail(function () {
+                        callback();
+                    });
+                }
+                JS
             );
         }
 
@@ -34,6 +43,10 @@ public function registerClientScript(): void
 
         SelectizeAsset::register($view);
 
-        $view->registerJs("jQuery('#$id').selectize($options);");
+        $view->registerJs(
+            <<<JS
+            jQuery('#$id').selectize($options);
+            JS
+        );
     }
 }
diff --git a/tests/SelectizeTest.php b/tests/SelectizeTest.php
@@ -140,7 +140,7 @@ public function testLoadUrl(): void
         $selectize = Selectize::widget(
             [
                 'attribute' => 'tags',
-                'loadUrl' => '/tags',
+                'loadUrl' => ['/tags'],
                 'model' => new SelectizeModel(),
             ],
         );
@@ -158,8 +158,14 @@ public function testLoadUrl(): void
 
         $this->assertStringContainsString(
             <<<JS
-            <script>jQuery(function ($) {
-            jQuery('#selectizemodel-tags').selectize({"load":function (query, callback) { if (!query.length) return callback(); $.getJSON('/tags', { query: query }, function (data) { callback(data); }).fail(function () { callback(); }); }});
+            jQuery('#selectizemodel-tags').selectize({"load":function (query, callback) {
+                if (!query.length) return callback();
+                $.getJSON('/index.php?r=tags', { query: query }, function (data) {
+                    callback(data);
+                }).fail(function () {
+                    callback();
+                });
+            }});
             });</script>
             JS,
             $render,
@@ -171,7 +177,7 @@ public function testLoadUrlWithTypeTextInput(): void
         $selectize = Selectize::widget(
             [
                 'attribute' => 'tags',
-                'loadUrl' => '/tags',
+                'loadUrl' => ['/tags'],
                 'model' => new SelectizeModel(),
                 'type' => Selectize::TYPE_TEXT,
             ],
@@ -187,7 +193,14 @@ public function testLoadUrlWithTypeTextInput(): void
         $this->assertStringContainsString(
             <<<JS
             <script>jQuery(function ($) {
-            jQuery('#selectizemodel-tags').selectize({"load":function (query, callback) { if (!query.length) return callback(); $.getJSON('/tags', { query: query }, function (data) { callback(data); }).fail(function () { callback(); }); }});
+            jQuery('#selectizemodel-tags').selectize({"load":function (query, callback) {
+                if (!query.length) return callback();
+                $.getJSON('/index.php?r=tags', { query: query }, function (data) {
+                    callback(data);
+                }).fail(function () {
+                    callback();
+                });
+            }});
             });</script>
             JS,
             $render,