From e07f032f9ea119c583894b462507d729e580c01c Mon Sep 17 00:00:00 2001
From: Mikkel Ricky <rimi@aarhus.dk>
Date: Thu, 9 Feb 2023 14:58:10 +0100
Subject: [PATCH] FORMS-724: Added more recipient field types

---
 CHANGELOG.md                                       |  4 ++++
 src/Plugin/WebformHandler/WebformHandlerSF1601.php | 11 +++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d437b6c..6bc1b1a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,10 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+### Changed
+
+- Added more recipient field types
+
 ## [1.1.0]
 
 ### Added
diff --git a/src/Plugin/WebformHandler/WebformHandlerSF1601.php b/src/Plugin/WebformHandler/WebformHandlerSF1601.php
index 850d368..1c99e09 100644
--- a/src/Plugin/WebformHandler/WebformHandlerSF1601.php
+++ b/src/Plugin/WebformHandler/WebformHandlerSF1601.php
@@ -241,10 +241,17 @@ public function buildConfigurationForm(array $form, FormStateInterface $formStat
   private function getRecipientElements(): array {
     $elements = $this->getWebform()->getElementsDecodedAndFlattened();
 
+    $elementTypes = [
+      'textfield',
+      'cpr_element',
+      'cpr_value_element',
+      'cvr_element',
+      'cvr_value_element',
+    ];
     $elements = array_filter(
       $elements,
-      static function (array $element) {
-        return in_array($element['#type'], ['textfield'], TRUE);
+      static function (array $element) use ($elementTypes) {
+        return in_array($element['#type'], $elementTypes, TRUE);
       }
     );