wip

Power-Components · Aug 21, 2024 · 02c6357 · 02c6357
1 parent 5084fa1
commit 02c6357
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 38 deletions.
diff --git a/dist/bootstrap5.css b/dist/bootstrap5.css
diff --git a/dist/mix-manifest.json b/dist/mix-manifest.json
@@ -1,7 +1,7 @@
 {
     "/powergrid.js": "/powergrid.js?id=abadfd5261368378c9a092e58c07156e",
-    "/bootstrap5.css": "/bootstrap5.css?id=ebd9853ab6704f4a2335e83a4310bb2b",
-    "/tailwind.css": "/tailwind.css?id=01ab1b7207e6bfcf473c14f0818e9d5f",
+    "/bootstrap5.css": "/bootstrap5.css?id=a27af22343149104b2aa3283d8fd502b",
+    "/tailwind.css": "/tailwind.css?id=924477e2afcb2cb56aa392e266ee56ca",
     "/tom-select.css": "/tom-select.css?id=7feeb634924554f9e57ce1e09edcabcb",
-    "/powergrid.css": "/powergrid.css?id=ccf9e99db3929ffc436445d5befaf2ac"
+    "/powergrid.css": "/powergrid.css?id=c2648f9d0d2b90371db3b914ef05450e"
 }
diff --git a/dist/powergrid.css b/dist/powergrid.css
diff --git a/dist/tailwind.css b/dist/tailwind.css
diff --git a/src/Concerns/ToggleDetail.php b/src/Concerns/ToggleDetail.php
@@ -18,7 +18,7 @@ public function mountToggleDetail(): void
 
     private function resolveDetailRow(mixed $results): void
     {
-        if (!isset($this->setUp['detail'])) {
+        if (!isset($this->setUp['detail']) && !isset($this->setUp['lazy'])) {
             return;
         }
 

diff --git a/src/DataSource/Processors/DataSourceBase.php b/src/DataSource/Processors/DataSourceBase.php
@@ -164,14 +164,22 @@ private static function processRows(BaseCollection $results, PowerGridComponent
         $loopInstance = app(ManageLoops::class);
         $loopInstance->addLoop($results);
 
-        return $results->map(function ($row, $index) use ($component, $fields, $loopInstance) {
+        $renderActions = false;
+
+        if (method_exists($component, 'actions')) {
+            $renderActions = true;
+        }
+
+        return $results->map(function ($row, $index) use ($component, $fields, $loopInstance, $renderActions) {
             $data = $fields->map(fn ($field) => $field((object) $row, $index));
 
             $loopInstance->incrementLoopIndices();
 
-            $hasCookieActionsForRow = isset($_COOKIE['pg_cookie_' . $component->tableName . '_row_' . data_get($row, $component->realPrimaryKey)]);
+            $rowId = data_get($row, $component->realPrimaryKey);
+
+            $hasCookieActionsForRow = isset($_COOKIE['pg_cookie_' . $component->tableName . '_row_' . $rowId]);
 
-            if (method_exists($component, 'actions') && !$hasCookieActionsForRow) {
+            if ($renderActions && !$hasCookieActionsForRow) {
                 $actions = collect($component->actions((object) $row)) // @phpstan-ignore-line
                     ->transform(function (Button|array $action) use ($row, $component) {
                         return [
@@ -184,7 +192,7 @@ private static function processRows(BaseCollection $results, PowerGridComponent
                         ];
                     });
 
-                static::$actionsHtml[data_get($row, $component->realPrimaryKey)] = $actions->toArray();
+                static::$actionsHtml[$rowId] = $actions->toArray();
             }
 
             $mergedData = $data->merge([
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ public function mountToggleDetail(): void @@
         private function resolveDetailRow(mixed $results): void
         {
-            if (!isset($this->setUp['detail'])) {
+            if (!isset($this->setUp['detail']) && !isset($this->setUp['lazy'])) {
                 return;
             }
@@ Expand Down @@