From 69e691e25a2f96edc565d65974eced9e2ace7a8b Mon Sep 17 00:00:00 2001
From: IRRDC <jk@oneassist.de>
Date: Wed, 17 Jan 2024 06:34:23 +0100
Subject: [PATCH 1/2] Restoring changes removed by merge

(cherry picked from commit 76bc8fdce4421bd66d7b4ef4d658c7bd80c5e74d)
---
 src/controls/dynamicForm/DynamicForm.tsx | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/controls/dynamicForm/DynamicForm.tsx b/src/controls/dynamicForm/DynamicForm.tsx
index bc7235453..72d1bd9d9 100644
--- a/src/controls/dynamicForm/DynamicForm.tsx
+++ b/src/controls/dynamicForm/DynamicForm.tsx
@@ -597,17 +597,8 @@ export class DynamicForm extends React.Component<
             hiddenName = response.value;
             termSetId = field.TermSetId;
             anchorId = field.AnchorId;
-            if (item && item[field.InternalName] && item[field.InternalName].results) {
-              item[field.InternalName].results.forEach((element) => {
-                selectedTags.push({
-                  key: element.TermGuid,
-                  name: element.Label,
-                });
-              });
-
-              defaultValue = selectedTags;
-            } else if (defaultValue && defaultValue.results) {
-              defaultValue.results.forEach((element) => {
+            if (item && item[field.InternalName]) {
+              item[field.InternalName].forEach((element) => {
                 selectedTags.push({
                   key: element.TermGuid,
                   name: element.Label,

From 8893c3c8c0e857eb1e2deab45444b942bdc754c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Maillot?= <battosaimykle@gmail.com>
Date: Thu, 18 Jan 2024 16:33:00 +0100
Subject: [PATCH 2/2] Upgrade patch version 3.16.2 with bug fix raised in
 3.16.1

---
 CHANGELOG.json                                 | 11 +++++++++++
 CHANGELOG.md                                   | 10 ++++++++++
 docs/documentation/docs/about/release-notes.md | 10 ++++++++++
 package-lock.json                              |  4 ++--
 package.json                                   |  2 +-
 src/common/telemetry/version.ts                |  2 +-
 6 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.json b/CHANGELOG.json
index 48d8585b4..b2aa8d808 100644
--- a/CHANGELOG.json
+++ b/CHANGELOG.json
@@ -1,5 +1,16 @@
 {
   "versions": [
+    {
+      "version": "3.16.2",
+      "changes": {
+        "fixes": [
+          "`DynamicForm`: Fixing the previous version's issue [#1736](https://github.com/pnp/sp-dev-fx-controls-react/pull/1736) (introduced in [#1718](https://github.com/pnp/sp-dev-fx-controls-react/pull/1718))"
+        ]
+      },
+      "contributions": [
+        "[IRRDC](https://github.com/IRRDC)"
+      ]
+    },
     {
       "version": "3.16.1",
       "changes": {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5bd9d09a9..0ce6ea1dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Releases
 
+## 3.16.2
+
+### Fixes
+
+- `DynamicForm`: Fixing the previous version's issue [#1736](https://github.com/pnp/sp-dev-fx-controls-react/pull/1736) (introduced in [#1718](https://github.com/pnp/sp-dev-fx-controls-react/pull/1718))
+
+### Contributors
+
+Special thanks to our contributor: [IRRDC](https://github.com/IRRDC).
+
 ## 3.16.1
 
 ### Fixes
diff --git a/docs/documentation/docs/about/release-notes.md b/docs/documentation/docs/about/release-notes.md
index 5bd9d09a9..0ce6ea1dd 100644
--- a/docs/documentation/docs/about/release-notes.md
+++ b/docs/documentation/docs/about/release-notes.md
@@ -1,5 +1,15 @@
 # Releases
 
+## 3.16.2
+
+### Fixes
+
+- `DynamicForm`: Fixing the previous version's issue [#1736](https://github.com/pnp/sp-dev-fx-controls-react/pull/1736) (introduced in [#1718](https://github.com/pnp/sp-dev-fx-controls-react/pull/1718))
+
+### Contributors
+
+Special thanks to our contributor: [IRRDC](https://github.com/IRRDC).
+
 ## 3.16.1
 
 ### Fixes
diff --git a/package-lock.json b/package-lock.json
index 8459cea7f..226aba494 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@pnp/spfx-controls-react",
-  "version": "3.16.1",
+  "version": "3.16.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@pnp/spfx-controls-react",
-      "version": "3.16.1",
+      "version": "3.16.2",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 6a088d447..8c9557521 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@pnp/spfx-controls-react",
   "description": "Reusable React controls for SharePoint Framework solutions",
-  "version": "3.16.1",
+  "version": "3.16.2",
   "node": ">=16.13.0 <17.0.0 || >=18.17.1 <19.0.0",
   "scripts": {
     "build": "gulp build",
diff --git a/src/common/telemetry/version.ts b/src/common/telemetry/version.ts
index 69997e705..9dfa023c5 100644
--- a/src/common/telemetry/version.ts
+++ b/src/common/telemetry/version.ts
@@ -1 +1 @@
-export const version: string = "3.16.1";
\ No newline at end of file
+export const version: string = "3.16.2";
\ No newline at end of file