diff --git a/src/StimulusBundle/src/Form/Extension/FormTypeExtension.php b/src/StimulusBundle/src/Form/Extension/FormTypeExtension.php index f528a05b9a9..5797592cf13 100644 --- a/src/StimulusBundle/src/Form/Extension/FormTypeExtension.php +++ b/src/StimulusBundle/src/Form/Extension/FormTypeExtension.php @@ -1,7 +1,5 @@ stimulusAttributes = new StimulusAttributes(new Environment(new ArrayLoader())); - $this->stimulusAttributes = new StimulusAttributes(new Environment(new ArrayLoader())); + if (isset($options['stimulus_controller'])) { + $this->handleController($options['stimulus_controller']); + } - if (true === \array_key_exists('stimulus_controller', $options)) { - $this->handleController($options['stimulus_controller']); - } + if (isset($options['stimulus_target'])) { + $this->handleTarget($options['stimulus_target']); + } - if (true === \array_key_exists('stimulus_target', $options)) { - $this->handleTarget($options['stimulus_target']); - } + if (isset($options['stimulus_action'])) { + $this->handleAction($options['stimulus_action']); + } - if (true === \array_key_exists('stimulus_action', $options)) { - $this->handleAction($options['stimulus_action']); + $attributes = \array_merge($view->vars['attr'], $this->stimulusAttributes->toArray()); + $view->vars['attr'] = $attributes; } - $attributes = array_merge($view->vars['attr'], $this->stimulusAttributes->toArray()); + foreach (['row_attr', 'choice_attr'] as $index) { + if ( + isset($options[$index]) + && ( + isset($options[$index]['stimulus_controller']) + || isset($options[$index]['stimulus_target']) + || isset($options[$index]['stimulus_action']) + ) + ) { + $this->stimulusAttributes = new StimulusAttributes(new Environment(new ArrayLoader())); + + if (isset($options[$index]['stimulus_controller'])) { + $this->handleController($options[$index]['stimulus_controller']); + unset($options[$index]['stimulus_controller']); + } + + if (isset($options[$index]['stimulus_target'])) { + $this->handleTarget($options[$index]['stimulus_target']); + unset($options[$index]['stimulus_target']); + } - $view->vars['attr'] = $attributes; + if (isset($options[$index]['stimulus_action'])) { + $this->handleAction($options[$index]['stimulus_action']); + unset($options[$index]['stimulus_action']); + } + + $attributes = \array_merge($options[$index], $this->stimulusAttributes->toArray()); + $view->vars[$index] = $attributes; + } + } } private function handleController(string|array $controllers): void { if (\is_string($controllers)) { - $controllers = [$controllcers]; + $controllers = [$controllers]; } foreach ($controllers as $controllerName => $controller) { @@ -78,7 +104,7 @@ private function handleController(string|array $controllers): void private function handleTarget(array $targets): void { foreach ($targets as $controllerName => $target) { - $this->stimulusAttributes->addTarget($controllerName, \is_array($target) ? implode(' ', $target) : $target); + $this->stimulusAttributes->addTarget($controllerName, \is_array($target) ? \implode(' ', $target) : $target); } } @@ -86,16 +112,16 @@ private function handleAction(string|array $actions): void { // 'stimulus_action' => 'controllerName#actionName' // 'stimulus_action' => 'eventName->controllerName#actionName' - if (\is_string($actions) && str_contains($actions, '#')) { + if (\is_string($actions) && \str_contains($actions, '#')) { $eventName = null; - if (str_contains($actions, '->')) { - [$eventName, $rest] = explode('->', $actions, 2); + if (\str_contains($actions, '->')) { + [$eventName, $rest] = \explode('->', $actions, 2); } else { $rest = $actions; } - [$controllerName, $actionName] = explode('#', $rest, 2); + [$controllerName, $actionName] = \explode('#', $rest, 2); $this->stimulusAttributes->addAction($controllerName, $actionName, $eventName); @@ -129,8 +155,8 @@ public function configureOptions(OptionsResolver $resolver): void 'stimulus_target' => null, ]); - $resolver->setAllowedTypes('stimulus_action', ['string', 'array', 'null']); - $resolver->setAllowedTypes('stimulus_controller', ['string', 'array', 'null']); - $resolver->setAllowedTypes('stimulus_target', ['string', 'array', 'null']); + $resolver->setAllowedTypes('stimulus_action', ['string', 'array', 'callable', 'null']); + $resolver->setAllowedTypes('stimulus_controller', ['string', 'array', 'callable', 'null']); + $resolver->setAllowedTypes('stimulus_target', ['string', 'array', 'callable', 'null']); } }