Skip to content

Commit b17cbea

Browse files
committed
fix incompatibility issue with eminiarts/nova-tabs package
1 parent 6605eba commit b17cbea

File tree

1 file changed

+26
-8
lines changed

1 file changed

+26
-8
lines changed

src/HasConditionalContainer.php

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -297,21 +297,39 @@ private function findAllActiveContainers(Collection $fields, $resource): Collect
297297

298298
private function findAllContainers($fields): Collection
299299
{
300-
return collect($fields)->flatMap(function ($field) {
300+
return collect($fields)
301+
->flatMap(function ($field) {
301302

302-
if ($field instanceof ConditionalContainer) {
303+
if ($field instanceof ConditionalContainer) {
303304

304-
return $this->findAllContainers($field->fields)->concat([ $field ]);
305+
return $this->findAllContainers($field->fields)->concat([ $field ]);
305306

306-
}
307+
}
307308

308-
if ($field instanceof MergeValue) {
309+
if ($field instanceof MergeValue) {
309310

310-
return $this->findAllContainers($field->data);
311+
return $this->findAllContainers($field->data);
311312

312-
}
313+
}
313314

314-
})->filter();
315+
})
316+
->filter()
317+
/**
318+
* Pass all meta to it's $fields
319+
*/
320+
->each(function (ConditionalContainer $conditionalContainer) {
321+
322+
$conditionalContainer->fields->each(function ($field) use ($conditionalContainer) {
323+
324+
if (method_exists($field, 'withMeta')) {
325+
326+
$field->withMeta($conditionalContainer->meta());
327+
328+
}
329+
330+
});
331+
332+
});
315333
}
316334

317335
}

0 commit comments

Comments
 (0)