Merge main to 22.09 branch and remove searchAndRemoveForbiddenElements

source/nodejs/adaptivecards-designer/src/card-designer-surface.ts

@@ -965,25 +965,6 @@ export class CardDesignerSurface {
         }
     }
 
-    private searchAndRemoveForbiddenElements(peerToSearch: DesignerPeers.DesignerPeer, forbiddenElements: any) {
-        if (peerToSearch.children) {
-            // Remove forbidden elements
-            peerToSearch.children.filter((child) => 
-                (forbiddenElements.includes(child.getCardObject().getJsonTypeName())))
-                .forEach((e) => {
-                    e.remove(false, true);
-                });
-            // If a peer is a container, we should see if it contains forbidden elements as well
-            peerToSearch.children.filter((child) => 
-                (child instanceof DesignerPeers.CardElementPeer 
-                && (child.cardElement instanceof Adaptive.Container || child.cardElement instanceof Adaptive.StylableCardElementContainer)))
-                .forEach((e) => {
-                    this.searchAndRemoveForbiddenElements(e, forbiddenElements);
-                });
-        }
-
-    }
-
     get rootPeer(): DesignerPeers.DesignerPeer {
         return this._rootPeer;
     }

source/nodejs/adaptivecards/src/card-elements.ts

@@ -1108,7 +1108,7 @@ export class TextBlock extends BaseTextBlock {
     // Markdown processing is handled outside of Adaptive Cards. It's up to the host to ensure that markdown is safely
     // processed.
     private static readonly _ttMarkdownPolicy = window.trustedTypes?.createPolicy(
-        "markdownPassthroughPolicy",
+        "adaptivecards#markdownPassthroughPolicy",
         { createHTML: (value) => value }
     );
 
@@ -1117,7 +1117,7 @@ export class TextBlock extends BaseTextBlock {
     // _originalInnerHtml so that we can restore/recalculate truncation later if space availability has changed (see
     // TextBlock.restoreOriginalContent())
     private static readonly _ttRoundtripPolicy = window.trustedTypes?.createPolicy(
-        "restoreContentsPolicy",
+        "adaptivecards#restoreContentsPolicy",
         { createHTML: (value) => value }
     );
 

source/nodejs/adaptivecards/src/utils.ts

@@ -190,7 +190,7 @@ export function truncateText(element: HTMLElement, maxHeight: number, lineHeight
  * TextBlock.truncateIfSupported}), but had a bug where it might actually pass through an element
  * for which innerHTML yielded actual HTML (since fixed).
  */
-const ttDeprecatedPolicy = window.trustedTypes?.createPolicy("deprecatedExportedFunctionPolicy", {
+const ttDeprecatedPolicy = window.trustedTypes?.createPolicy("adaptivecards#deprecatedExportedFunctionPolicy", {
     createHTML: (value) => value
 });