[DRAFT] Move Adaptive Cards from component to bundle

packages/bundle/.babelrc

@@ -1,5 +1,6 @@
 {
   "plugins": [
+    "@babel/proposal-class-properties",
     "@babel/proposal-object-rest-spread",
     "babel-plugin-version-transform"
   ],

packages/bundle/package.json

@@ -50,6 +50,7 @@
   "devDependencies": {
     "@babel/cli": "^7.1.2",
     "@babel/core": "^7.1.2",
+    "@babel/plugin-proposal-class-properties": "^7.1.0",
     "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
     "@babel/plugin-transform-runtime": "^7.1.0",
     "@babel/preset-env": "^7.1.0",

packages/bundle/src/FullReactWebChat.js

@@ -2,8 +2,9 @@ import * as adaptiveCards from 'adaptivecards';
 import memoize from 'memoize-one';
 import React from 'react';
 
-import BasicWebChat, { createAdaptiveCardsAttachmentMiddleware, concatMiddleware } from 'botframework-webchat-component';
+import BasicWebChat, { concatMiddleware } from 'botframework-webchat-component';
 
+import createAdaptiveCardsAttachmentMiddleware from './adaptiveCards/createAdaptiveCardMiddleware';
 import renderMarkdown from './renderMarkdown';
 
 // Add additional props to <WebChat>, so it support additional features

packages/component/src/Attachment/AdaptiveCardAttachment.js → packages/bundle/src/adaptiveCards/Attachment/AdaptiveCardAttachment.js

@@ -1,10 +1,9 @@
+import { AdaptiveCard } from 'adaptivecards';
 import memoize from 'memoize-one';
 import React from 'react';
 
 import AdaptiveCardRenderer from './AdaptiveCardRenderer';
 
-import { AdaptiveCard } from 'adaptivecards';
-
 function stripSubmitAction(card) {
   if (!card.actions) {
     return card;

packages/component/src/Attachment/AdaptiveCardRenderer.js → packages/bundle/src/adaptiveCards/Attachment/AdaptiveCardRenderer.js

@@ -1,9 +1,18 @@
+import { HostConfig } from 'adaptivecards';
 import React from 'react';
 
-import { localize } from '../Localization/Localize';
-import connectToWebChat from '../connectToWebChat';
-import ErrorBox from '../ErrorBox';
-import getTabIndex from '../Utils/TypeFocusSink/getTabIndex';
+import {
+  Components,
+  connectToWebChat,
+  getTabIndex,
+  localize
+} from 'botframework-webchat-component';
+
+const { ErrorBox } = Components;
+
+function isPlainObject(obj) {
+  return obj.__proto__ === Object.prototype;
+}
 
 class AdaptiveCardRenderer extends React.PureComponent {
   constructor(props) {
@@ -90,9 +99,12 @@ class AdaptiveCardRenderer extends React.PureComponent {
       //       Because there could be timing difference between .parse and .render, we could be using wrong Markdown engine
 
       adaptiveCard.constructor.processMarkdown = renderMarkdown || (text => text);
-      adaptiveCard.hostConfig = adaptiveCardHostConfig;
       adaptiveCard.onExecuteAction = this.handleExecuteAction;
 
+      if (adaptiveCardHostConfig) {
+        adaptiveCard.hostConfig = isPlainObject(adaptiveCardHostConfig) ? new HostConfig(adaptiveCardHostConfig) : adaptiveCardHostConfig;
+      }
+
       const errors = adaptiveCard.validate();
 
       if (errors.length) {

packages/component/src/Attachment/AnimationCardAttachment.js → packages/bundle/src/adaptiveCards/Attachment/AnimationCardAttachment.js

@@ -1,11 +1,12 @@
 import memoize from 'memoize-one';
 import React from 'react';
 
-import { AdaptiveCardBuilder } from '../Utils/AdaptiveCardBuilder';
+import { Components, connectToWebChat } from 'botframework-webchat-component';
+
+import { AdaptiveCardBuilder } from '../AdaptiveCardBuilder';
 import CommonCard from './CommonCard';
-import connectToWebChat from '../connectToWebChat';
-import ImageContent from './ImageContent';
-import VideoContent from './VideoContent';
+
+const { ImageContent, VideoContent } = Components;
 
 class AnimationCardAttachment extends React.Component {
   constructor(props) {

packages/component/src/Attachment/AudioCardAttachment.js → packages/bundle/src/adaptiveCards/Attachment/AudioCardAttachment.js

@@ -1,8 +1,10 @@
 import React from 'react';
 
-import AudioContent from './AudioContent';
+import { Components, connectToWebChat } from 'botframework-webchat-component';
+
 import CommonCard from './CommonCard';
-import connectToWebChat from '../connectToWebChat';
+
+const { AudioContent } = Components;
 
 export default connectToWebChat(
   ({ styleSet }) => ({ styleSet })

packages/component/src/Attachment/CommonCard.js → packages/bundle/src/adaptiveCards/Attachment/CommonCard.js

@@ -1,7 +1,7 @@
 import memoize from 'memoize-one';
 import React from 'react';
 
-import { AdaptiveCardBuilder } from '../Utils/AdaptiveCardBuilder';
+import { AdaptiveCardBuilder } from '../AdaptiveCardBuilder';
 import AdaptiveCardRenderer from './AdaptiveCardRenderer';
 
 export default class extends React.Component {

packages/component/src/Attachment/HeroCardAttachment.js → packages/bundle/src/adaptiveCards/Attachment/HeroCardAttachment.js

@@ -1,7 +1,7 @@
 import memoize from 'memoize-one';
 import React from 'react';
 
-import { AdaptiveCardBuilder } from '../Utils/AdaptiveCardBuilder';
+import { AdaptiveCardBuilder } from '../AdaptiveCardBuilder';
 import AdaptiveCardRenderer from './AdaptiveCardRenderer';
 
 export default class extends React.Component {

packages/component/src/Attachment/OAuthCardAttachment.js → packages/bundle/src/adaptiveCards/Attachment/OAuthCardAttachment.js

@@ -1,7 +1,7 @@
 import memoize from 'memoize-one';
 import React from 'react';
 
-import { AdaptiveCardBuilder } from '../Utils/AdaptiveCardBuilder';
+import { AdaptiveCardBuilder } from '../AdaptiveCardBuilder';
 import AdaptiveCardRenderer from './AdaptiveCardRenderer';
 
 export default class extends React.Component {

packages/component/src/Attachment/ReceiptCardAttachment.js → packages/bundle/src/adaptiveCards/Attachment/ReceiptCardAttachment.js

@@ -1,10 +1,10 @@
 import memoize from 'memoize-one';
 import React from 'react';
 
-import { AdaptiveCardBuilder } from '../Utils/AdaptiveCardBuilder';
-import { localize } from '../Localization/Localize';
+import { connectToWebChat, localize } from 'botframework-webchat-component';
+
+import { AdaptiveCardBuilder } from '../AdaptiveCardBuilder';
 import AdaptiveCardRenderer from './AdaptiveCardRenderer';
-import connectToWebChat from '../connectToWebChat';
 
 function nullOrUndefined(obj) {
   return obj === null || typeof obj === 'undefined';

packages/component/src/Attachment/SignInCardAttachment.js → packages/bundle/src/adaptiveCards/Attachment/SignInCardAttachment.js

@@ -1,7 +1,8 @@
 import React from 'react';
 
+import { connectToWebChat } from 'botframework-webchat-component';
+
 import CommonCard from './CommonCard';
-import connectToWebChat from '../connectToWebChat';
 
 export default connectToWebChat(
   ({ styleSet }) => ({ styleSet })

packages/component/src/Attachment/ThumbnailCardAttachment.js → packages/bundle/src/adaptiveCards/Attachment/ThumbnailCardAttachment.js

@@ -1,7 +1,7 @@
 import memoize from 'memoize-one';
 import React from 'react';
 
-import { AdaptiveCardBuilder } from '../Utils/AdaptiveCardBuilder';
+import { AdaptiveCardBuilder } from '../AdaptiveCardBuilder';
 import AdaptiveCardRenderer from './AdaptiveCardRenderer';
 
 export default class extends React.Component {

packages/component/src/Attachment/VideoCardAttachment.js → packages/bundle/src/adaptiveCards/Attachment/VideoCardAttachment.js

@@ -1,8 +1,10 @@
 import React from 'react';
 
+import { Components, connectToWebChat } from 'botframework-webchat-component';
+
 import CommonCard from './CommonCard';
-import connectToWebChat from '../connectToWebChat';
-import VideoContent from './VideoContent';
+
+const { VideoContent } = Components;
 
 export default connectToWebChat(
   ({ styleSet }) => ({ styleSet })

packages/component/src/Middleware/Attachment/createAdaptiveCardMiddleware.js → packages/bundle/src/adaptiveCards/createAdaptiveCardMiddleware.js

@@ -1,14 +1,14 @@
 import React from 'react';
 
-import AdaptiveCardAttachment from '../../Attachment/AdaptiveCardAttachment';
-import AnimationCardAttachment from '../../Attachment/AnimationCardAttachment';
-import AudioCardAttachment from '../../Attachment/AudioCardAttachment';
-import HeroCardAttachment from '../../Attachment/HeroCardAttachment';
-import OAuthCardAttachment from '../../Attachment/OAuthCardAttachment';
-import ReceiptCardAttachment from '../../Attachment/ReceiptCardAttachment';
-import SignInCardAttachment from '../../Attachment/SignInCardAttachment';
-import ThumbnailCardAttachment from '../../Attachment/ThumbnailCardAttachment';
-import VideoCardAttachment from '../../Attachment/VideoCardAttachment';
+import AdaptiveCardAttachment from './Attachment/AdaptiveCardAttachment';
+import AnimationCardAttachment from './Attachment/AnimationCardAttachment';
+import AudioCardAttachment from './Attachment/AudioCardAttachment';
+import HeroCardAttachment from './Attachment/HeroCardAttachment';
+import OAuthCardAttachment from './Attachment/OAuthCardAttachment';
+import ReceiptCardAttachment from './Attachment/ReceiptCardAttachment';
+import SignInCardAttachment from './Attachment/SignInCardAttachment';
+import ThumbnailCardAttachment from './Attachment/ThumbnailCardAttachment';
+import VideoCardAttachment from './Attachment/VideoCardAttachment';
 
 // TODO: [P4] Rename this file or the whole middleware, it looks either too simple or too comprehensive now
 export default function (props) {

packages/component/.babelrc

@@ -1,6 +1,5 @@
 {
   "plugins": [
-    "@babel/proposal-class-properties",
     "@babel/proposal-object-rest-spread",
     "babel-plugin-version-transform"
   ],