Initial Commit

Author: lrljoe

src/Traits/Configuration/ColumnConfiguration.php

@@ -8,7 +8,10 @@ trait ColumnConfiguration
 {
     public function setPrependedColumns(array $prependedColumns): void
     {
-        $this->prependedColumns = collect($prependedColumns)
+        $this->prependedColumns = collect($prependedColumns);
+        $this->hasRunColumnSetup = false;
+        /*
+        
             ->filter(fn ($column) => $column instanceof Column)
             ->map(function (Column $column) {
                 $column->setTheme($this->getTheme());
@@ -24,12 +27,15 @@ public function setPrependedColumns(array $prependedColumns): void
                 }
 
                 return $column;
-            });
+            });*/
     }
 
     public function setAppendedColumns(array $appendedColumns): void
     {
-        $this->appendedColumns = collect($appendedColumns)
+        $this->appendedColumns = collect($appendedColumns);
+        $this->hasRunColumnSetup = false;
+        /*
+        
             ->filter(fn ($column) => $column instanceof Column)
             ->map(function (Column $column) {
                 $column->setTheme($this->getTheme());
@@ -45,7 +51,7 @@ public function setAppendedColumns(array $appendedColumns): void
                 }
 
                 return $column;
-            });
+            });*/
     }
 
     public function unsetCollapsedStatuses(): void

src/Traits/Helpers/ColumnHelpers.php

@@ -13,14 +13,21 @@ trait ColumnHelpers
      */
     public function setColumns(): void
     {
-        $this->prependedColumns = $this->getPrependedColumns();
+        $this->columns = collect($this->getPrependedColumns())->concat($this->columns())->concat(collect($this->getAppendedColumns()));
 
-        $columns = collect($this->columns())
+    }
+    
+    protected function setupColumns(): void
+    {
+        if(!$this->hasRunColumnSetup)
+        {
+            $this->columns = $this->columns
             ->filter(fn ($column) => $column instanceof Column)
             ->map(function (Column $column) {
-                $column->setTheme($this->getTheme());
-                $column->setHasTableRowUrl($this->hasTableRowUrl());
-                $column->setIsReorderColumn($this->getDefaultReorderColumn() == $column->getField());
+                $column->setTheme($this->getTheme())
+                ->setHasTableRowUrl($this->hasTableRowUrl())
+                ->setIsReorderColumn($this->getDefaultReorderColumn() == $column->getField());
+
                 if ($column instanceof AggregateColumn) {
                     if ($column->getAggregateMethod() == 'count' && $column->hasDataSource()) {
                         $this->addExtraWithCount($column->getDataSource());
@@ -42,13 +49,16 @@ public function setColumns(): void
                 return $column;
             });
 
-        $this->appendedColumns = $this->getAppendedColumns();
-
-        $this->columns = collect([...$this->prependedColumns, ...$columns, ...$this->appendedColumns]);
+            $this->hasRunColumnSetup = true;
+        }
     }
 
     public function getColumns(): Collection
     {
+        if(!$this->hasRunColumnSetup)
+        {
+            $this->setupColumns();
+        }
         return $this->columns;
     }
 
@@ -206,7 +216,8 @@ public function getColspanCount(): int
 
     public function getPrependedColumns(): Collection
     {
-        return collect($this->prependedColumns ?? $this->prependColumns())
+        return collect($this->prependedColumns ?? $this->prependColumns());
+        /*return collect($this->prependedColumns ?? $this->prependColumns())
             ->filter(fn ($column) => $column instanceof Column)
             ->map(function (Column $column) {
                 $column->setTheme($this->getTheme());
@@ -231,13 +242,13 @@ public function getPrependedColumns(): Collection
                 }
 
                 return $column;
-            });
+            });*/
     }
 
     public function getAppendedColumns(): Collection
     {
-        return collect($this->appendedColumns ?? $this->appendColumns())
-            ->filter(fn ($column) => $column instanceof Column)
+        return collect($this->appendedColumns ?? $this->appendColumns());
+            /*->filter(fn ($column) => $column instanceof Column)
             ->map(function (Column $column) {
                 $column->setTheme($this->getTheme());
                 $column->setHasTableRowUrl($this->hasTableRowUrl());
@@ -261,7 +272,7 @@ public function getAppendedColumns(): Collection
                 }
 
                 return $column;
-            });
+            });*/
 
     }
 

src/Traits/WithColumns.php

@@ -25,6 +25,8 @@ trait WithColumns
 
     protected ?bool $shouldTabletCollapse;
 
+    protected bool $hasRunColumnSetup = false;
+
     /**
      * Sets up Columns
      */
@@ -39,7 +41,7 @@ public function bootedWithColumns(): void
 
         // Set Columns
         $this->setColumns();
-
+        
         // Fire Lifecycle Hooks for columnsSet
         $this->callHook('columnsSet');
         $this->callTraitHook('columnsSet');