Merge main to 22.09 branch and remove searchAndRemoveForbiddenElements (#7873)

licanhua · rahulamlekar · RahulAmlekar · web-flow · commit 68a5492117fa · 2022-09-15T18:10:12.000Z
* Merge website march22 to main branch (#7857) * Updating Bot Framework links (#6686) Co-authored-by: RahulAmlekar <raamleka@microsoft.com> * Scenario cards + Website indentation fix (#6733) * Changed teams target version to 1.4 * added RTL scenario card * Added scenario card for tooltip and isEnabled * Added order confirmation scenario * Added flight update table scenario * Added restaurant order scenario card * Added app login scenario * Fixed indentation in schema explorer * Testing application login on the samples page * Added extended 1.5 scenario cards * Fixed boolean and duplicate id on cards * added flightupdatetable and restaurant order to ignored cards for .NET tests Co-authored-by: Canhua Li <licanhua@live.com> * Removing "Preview" from Viva Connections (#6791) Co-authored-by: Paul Campbell <paulcam@microsoft.com> * Added blog posts for oct and nov (#6873) * Changed teams target version to 1.4 * Added october and november blog posts * fixed emojis * testing font weights for emoji * removed bold from emojis as not required to render Co-authored-by: Canhua Li <licanhua@live.com> Co-authored-by: almedina-ms <35784165+almedina-ms@users.noreply.github.com> * make columnsets clickable (#7042) Co-authored-by: Canhua Li <licanhua@live.com> * fix merge conflicts with berlin containers in adaptivecards-designer.ts * Convey Ctrl+M shortcut key to move out of code editor (#7072) * provide hint about ctrl+m toggling tab behavior * rephrase Co-authored-by: Pankaj Bhojwani <pabhojwa@microsoft.com> Co-authored-by: Canhua Li <licanhua@live.com> * fixed same merge conflict in another commit * color fix (#7081) Co-authored-by: Pankaj Bhojwani <pabhojwa@microsoft.com> * update headers (#7082) * Add title to iframe component in December 2019 blog post (#7083) * add title * spacing Co-authored-by: Pankaj Bhojwani <pabhojwa@microsoft.com> * change text color (#7091) Co-authored-by: Pankaj Bhojwani <pabhojwa@microsoft.com> * add aria label (#7090) Co-authored-by: Pankaj Bhojwani <pabhojwa@microsoft.com> * update tab indices accordingly (#7119) Co-authored-by: Vsevolod <sevkorobot@gmail.com> * Adjust contrast on designer peer buttons (#7110) * Update role of 'Select Host App' combobox (#7118) Co-authored-by: root <root@PC-cazamor.redmond.corp.microsoft.com> Co-authored-by: Vsevolod <sevkorobot@gmail.com> * Delete old samples that don't have latest features (causing accessibility issues) (#7106) * updates to samples * phone number regex * delete files instead Co-authored-by: Pankaj Bhojwani <pabhojwa@microsoft.com> Co-authored-by: Vsevolod <sevkorobot@gmail.com> * removed carousel samples * fixed merge conflict line 8 of package.json * fix titles (#7130) Co-authored-by: Pankaj Bhojwani <pabhojwa@microsoft.com> * fixed merge conflict in ADCIOSVisualizerUITests * add tooltip on initialization (#7126) * more titles to iframes (#7135) Co-authored-by: Pankaj Bhojwani <pabhojwa@microsoft.com> * add alt text (#7131) Co-authored-by: Pankaj Bhojwani <pabhojwa@microsoft.com> * use active border instead of white (#7122) * add landmark (#7145) * Use HTML lists for hyperlinks (#7127) * Use HTML lists for hyperlinks * consistent spacing in css file Co-authored-by: root <root@PC-cazamor.redmond.corp.microsoft.com> Co-authored-by: Vsevolod <sevkorobot@gmail.com> Co-authored-by: PankajBhojwani <pankaj.d.bhoj@gmail.com> * Add a caption to the table present in the 'help' dialog (#7149) * move keyboard shortcut text to caption * use innerText instead * don't let focus fall on card designer surface (#7153) * add 1 px left margin (#7142) * Add underline styling to hyperlinks (#7157) Co-authored-by: root <root@PC-cazamor.redmond.corp.microsoft.com> Co-authored-by: Vsevolod <sevkorobot@gmail.com> * Allow footer hyperlinks to wrap (#7147) Co-authored-by: PankajBhojwani <pankaj.d.bhoj@gmail.com> * Website updates (#7163) * Changed teams target version to 1.4 * Added october and november blog posts * fixed emojis * testing font weights for emoji * removed bold from emojis as not required to render * added blogs posts * fixed video titles * updated roadmap links * removed repeated sentence Co-authored-by: Canhua Li <licanhua@live.com> * [JS] Remove `role='menubar'` and `role='menuitem'` from `ActionCollection` (#6763) Fixes #6425 Fixes #6019 Related #4859 * sync loc file * more package-locks * cherry pick 646503b * return focus after closing (#7155) * final cherry picks for 5e0f39f and 67187d0 * update designer * revert package-lock.json changes Co-authored-by: Rahul Amlekar <rahul.amlekar@mail.mcgill.ca> Co-authored-by: RahulAmlekar <raamleka@microsoft.com> Co-authored-by: J.P. Roca <jproca@microsoft.com> Co-authored-by: Siddharth Gulati <62313299+SidGulatiMsft@users.noreply.github.com> Co-authored-by: Paul Campbell <paulcam@microsoft.com> Co-authored-by: almedina-ms <35784165+almedina-ms@users.noreply.github.com> Co-authored-by: Roy Nehoran <rnehoran@gmail.com> Co-authored-by: naramaka <65971640+naramaka@users.noreply.github.com> Co-authored-by: PankajBhojwani <pankaj.d.bhoj@gmail.com> Co-authored-by: Pankaj Bhojwani <pabhojwa@microsoft.com> Co-authored-by: Will Shown <thure@users.noreply.github.com> Co-authored-by: Vsevolod <sevkorobot@gmail.com> Co-authored-by: Carlos Zamora <carlos.zamora@microsoft.com> Co-authored-by: root <root@PC-cazamor.redmond.corp.microsoft.com> * prefix adaptivecards# for ttpolicy (#7860) * remove dead code searchAndRemoveForbiddenElements * Revert "use active border instead of white (#7122)" (#7874) This reverts commit 68d88fe. Co-authored-by: Rahul Amlekar <rahul.amlekar@mail.mcgill.ca> Co-authored-by: RahulAmlekar <raamleka@microsoft.com> Co-authored-by: J.P. Roca <jproca@microsoft.com> Co-authored-by: Siddharth Gulati <62313299+SidGulatiMsft@users.noreply.github.com> Co-authored-by: Paul Campbell <paulcam@microsoft.com> Co-authored-by: almedina-ms <35784165+almedina-ms@users.noreply.github.com> Co-authored-by: Roy Nehoran <rnehoran@gmail.com> Co-authored-by: naramaka <65971640+naramaka@users.noreply.github.com> Co-authored-by: PankajBhojwani <pankaj.d.bhoj@gmail.com> Co-authored-by: Pankaj Bhojwani <pabhojwa@microsoft.com> Co-authored-by: Will Shown <thure@users.noreply.github.com> Co-authored-by: Vsevolod <sevkorobot@gmail.com> Co-authored-by: Carlos Zamora <carlos.zamora@microsoft.com> Co-authored-by: root <root@PC-cazamor.redmond.corp.microsoft.com>
diff --git a/source/nodejs/adaptivecards-designer/src/card-designer-surface.ts b/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;
     }
diff --git a/source/nodejs/adaptivecards/src/card-elements.ts b/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 }
     );
 
diff --git a/source/nodejs/adaptivecards/src/utils.ts b/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
 });
 
