Merge pull request #1 from protonemedia/default-table-props

Default Table.vue props
protonemedia · Apr 2, 2021 · e14467d · e14467d
2 parents f892302 + 3044826
commit e14467d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/js/Components/Table.vue b/js/Components/Table.vue
@@ -3,31 +3,39 @@ export default {
   props: {
     meta: {
       type: Object,
-      default: () => {},
+      default: () => {
+        return {};
+      },
       required: false,
     },
 
     columns: {
       type: Object,
-      default: () => {},
+      default: () => {
+        return {};
+      },
       required: false,
     },
 
     filters: {
       type: Object,
-      default: () => {},
+      default: () => {
+        return {};
+      },
       required: false,
     },
 
     search: {
       type: Object,
-      default: () => {},
+      default: () => {
+        return {};
+      },
       required: false,
     },
 
     onUpdate: {
       type: Function,
-      required: true,
+      required: false,
     },
   },
 
@@ -96,7 +104,9 @@ export default {
     queryBuilderData: {
       deep: true,
       handler() {
-        this.onUpdate(this.queryBuilderData);
+        if (this.onUpdate) {
+          this.onUpdate(this.queryBuilderData);
+        }
       },
     },
   },

diff --git a/php/InertiaTableServiceProvider.php b/php/InertiaTableServiceProvider.php
@@ -10,17 +10,13 @@ class InertiaTableServiceProvider extends ServiceProvider
     public function boot()
     {
         Response::macro('table', function (callable $withTableBuilder = null) {
-            $request = request();
-
-            $response = $this;
+            $tableBuilder = new InertiaTable(request());
 
             if ($withTableBuilder) {
-                $tableBuilder = new InertiaTable($request);
                 $withTableBuilder($tableBuilder);
-                $tableBuilder->applyTo($response);
             }
 
-            return $response;
+            return $tableBuilder->applyTo($this);
         });
     }
 }