on anchor clicked contract change (#1924)

* Honour preexpandSingleShowCardAction and weight of fact title from HostConfig * Addressed comments * change contract on onAnchorClicked Currently, adaptiveCard instance is passed to handle anchor click. Change here is to pass text block element from which adaptiveCard instance can be derived * interface contract change * update one more interface * resolve comments * resolve comments * resolve comment and make modifications at designer as well * container changes in visualizer * resolve comments
microsoft · Sep 19, 2018 · bf3f838 · bf3f838
1 parent 101b34a
commit bf3f838
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/source/nodejs/adaptivecards-designer/src/containers/host-container.ts b/source/nodejs/adaptivecards-designer/src/containers/host-container.ts
@@ -65,7 +65,7 @@ export abstract class HostContainer {
         // Do nothing in base implementation
     }
 
-    public anchorClicked(rootCard: Adaptive.AdaptiveCard, anchor: HTMLAnchorElement): boolean {
+    public anchorClicked(element: Adaptive.CardElement, anchor: HTMLAnchorElement): boolean {
         // Not handled by the host container by default
         return false;
     }

diff --git a/source/nodejs/adaptivecards-designer/src/containers/outlook-container.ts b/source/nodejs/adaptivecards-designer/src/containers/outlook-container.ts
@@ -116,9 +116,9 @@ export class OutlookContainer extends HostContainer {
         }
     }
 
-    public anchorClicked(rootCard: Adaptive.AdaptiveCard, anchor: HTMLAnchorElement): boolean {
+    public anchorClicked(element: Adaptive.CardElement, anchor: HTMLAnchorElement): boolean {
         var regEx = /^action:([a-z0-9]+)$/ig;
-
+        var rootCard = element.getRootElement() as Adaptive.AdaptiveCard; 
         var matches = regEx.exec(anchor.href);
 
         if (matches) {

diff --git a/source/nodejs/adaptivecards-visualizer/src/app.ts b/source/nodejs/adaptivecards-visualizer/src/app.ts
@@ -384,8 +384,8 @@ function monacoEditorLoaded() {
         getSelectedHostContainer().parseElement(element, json);
     }
 
-    AdaptiveCards.AdaptiveCard.onAnchorClicked = (rootCard: AdaptiveCards.AdaptiveCard, anchor: HTMLAnchorElement) => {
-        return getSelectedHostContainer().anchorClicked(rootCard, anchor);
+    AdaptiveCards.AdaptiveCard.onAnchorClicked = (element: AdaptiveCards.CardElement, anchor: HTMLAnchorElement) => {
+        return getSelectedHostContainer().anchorClicked(element, anchor);
     }
 
     currentConfigPayload = Constants.defaultConfigPayload;

diff --git a/source/nodejs/adaptivecards-visualizer/src/containers/host-container.ts b/source/nodejs/adaptivecards-visualizer/src/containers/host-container.ts
@@ -119,7 +119,7 @@ export abstract class HostContainer {
         // Do nothing in base implementation
     }
 
-    public anchorClicked(rootCard: AdaptiveCard, anchor: HTMLAnchorElement): boolean {
+    public anchorClicked(element: CardElement, anchor: HTMLAnchorElement): boolean {
         // Not handled by the host container by default
         return false;
     }

diff --git a/source/nodejs/adaptivecards-visualizer/src/containers/outlook.ts b/source/nodejs/adaptivecards-visualizer/src/containers/outlook.ts
@@ -120,8 +120,9 @@ export class OutlookContainer extends HostContainer {
         }
     }
 
-    public anchorClicked(rootCard: Adaptive.AdaptiveCard, anchor: HTMLAnchorElement): boolean {
+    public anchorClicked(element: Adaptive.CardElement, anchor: HTMLAnchorElement): boolean {
         var regEx = /^action:([a-z0-9]+)$/ig;
+        var rootCard = element.getRootElement() as Adaptive.AdaptiveCard;
 
         var matches = regEx.exec(anchor.href);
 

diff --git a/source/nodejs/adaptivecards/src/card-elements.ts b/source/nodejs/adaptivecards/src/card-elements.ts
@@ -5018,7 +5018,7 @@ function raiseAnchorClickedEvent(element: CardElement, anchor: HTMLAnchorElement
     let card = element.getRootElement() as AdaptiveCard;
     let onAnchorClickedHandler = (card && card.onAnchorClicked) ? card.onAnchorClicked : AdaptiveCard.onAnchorClicked;
 
-    return onAnchorClickedHandler != null ? onAnchorClickedHandler(card, anchor) : false;
+    return onAnchorClickedHandler != null ? onAnchorClickedHandler(element, anchor) : false;
 }
 
 function raiseExecuteActionEvent(action: Action) {
@@ -5325,7 +5325,7 @@ export class AdaptiveCard extends ContainerWithActions {
     static readonly elementTypeRegistry = new ElementTypeRegistry();
     static readonly actionTypeRegistry = new ActionTypeRegistry();
 
-    static onAnchorClicked: (rootCard: AdaptiveCard, anchor: HTMLAnchorElement) => boolean = null;
+    static onAnchorClicked: (element: CardElement, anchor: HTMLAnchorElement) => boolean = null;
     static onExecuteAction: (action: Action) => void = null;
     static onElementVisibilityChanged: (element: CardElement) => void = null;
     static onImageLoaded: (image: Image) => void = null;
@@ -5417,7 +5417,7 @@ export class AdaptiveCard extends ContainerWithActions {
         return true;
     }
 
-    onAnchorClicked: (rootCard: AdaptiveCard, anchor: HTMLAnchorElement) => boolean = null;
+    onAnchorClicked: (element: CardElement, anchor: HTMLAnchorElement) => boolean = null;
     onExecuteAction: (action: Action) => void = null;
     onElementVisibilityChanged: (element: CardElement) => void = null;
     onImageLoaded: (image: Image) => void = null;