diff --git a/src/components/adaptive-cards/AdaptiveCard/__snapshots__/AdaptiveCard.stories.storyshot b/src/components/adaptive-cards/AdaptiveCard/__snapshots__/AdaptiveCard.stories.storyshot index ca054cc8f..af6246101 100644 --- a/src/components/adaptive-cards/AdaptiveCard/__snapshots__/AdaptiveCard.stories.storyshot +++ b/src/components/adaptive-cards/AdaptiveCard/__snapshots__/AdaptiveCard.stories.storyshot @@ -6,15 +6,15 @@ Array [ className="wxc-adaptive-card wxc-ac-container--has-padding wxc-ac-container--vertical" >
Cisco Webex Teams
Buttons and Cards Release
Release Date:
Product:
OS:
Aug 6, 2019
Webex Teams
Mac, Windows, Web
We're making it easier for you to interact with bots and integrations in Webex Teams. When your bot sends information in a space that includes a card with buttons, you can now easily interact with it.
Buttons and Cards Resources:
Column 1
Column 2
Column 3
You can even repeat the background image...
Horizontal repeat...
Vertical repeat...
Bleed left
Column 1
Column 2
Column 3
Bleed center
Column 1
Column 2
Column 3
Bleed right
Column 1
Column 2
Column 3
Bleed all
Column 1
Column 2
Column 3
@@ -551,7 +551,7 @@ Array [
@@ -568,18 +568,18 @@ Array [
This is a column
The columnset has a minHeight of 100px while this column has a minHeight of 200px so it should override
The middle column is set to rtl
Column One
العمود الثاني
Column three
Final
7 - 40
Try clicking a column!
Column 1
Column 2
Column 3
No Style
Default Style
Emphasis Style
Container no style
Container default style
Container emphasis style
@@ -894,17 +894,17 @@ Array [
Hi,
MasterHip
Column 1
(auto)
(auto)
Pick up where you left off?
Silver Star Mountain
Maps
Kitchen Remodel
With EMPHASIS
The Witcher
Netflix
@@ -1152,7 +1152,7 @@ Array [ className="wxc-adaptive-card wxc-ac-container--has-padding wxc-ac-container--vertical" >
This is some text
This container has the default style
color: default
color: accent
color: good
color: warning
color: attention
color: light
color: dark
This container has the accent style
color: default
color: accent
color: good
color: warning
color: attention
color: light
color: dark
Contained container - no style
Contained container - emphasis
Contained container - default
Contained container - good
Contained container - warning
Contained container - attention
Contained container - accent
@@ -1442,7 +1442,7 @@ Array [ className="wxc-adaptive-card wxc-ac-container--has-padding wxc-ac-container--vertical" >
@@ -1781,7 +1781,7 @@ Array [
@@ -1798,7 +1798,7 @@ Array [
@@ -1815,7 +1815,7 @@ Array [
@@ -1832,7 +1832,7 @@ Array [
,
isSubtle:false
isSubtle:true
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
size:default
size:small
size:default
size:medium
size:large
size:extraLarge
weight: lighter
weight: default
weight: bolder
**wrap: false** Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat
**wrap: true** Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
Style set to heading
Style set to heading, color set to good
Style set to default
Style unset
diff --git a/src/components/adaptive-cards/Column/Column.jsx b/src/components/adaptive-cards/Column/Column.jsx index eb4051c1a..d46e5fc5f 100644 --- a/src/components/adaptive-cards/Column/Column.jsx +++ b/src/components/adaptive-cards/Column/Column.jsx @@ -49,4 +49,8 @@ Column.acPropTypes = { verticalContentAlignment: acPropTypes.verticalContentAlignment, }; +Column.acDefaultProps = { + verticalContentAlignment: 'top', +}; + registerComponent('Column', Column, 'vertical'); diff --git a/src/components/adaptive-cards/ColumnSet/ColumnSet.jsx b/src/components/adaptive-cards/ColumnSet/ColumnSet.jsx index 61d07b442..b068cd7e5 100644 --- a/src/components/adaptive-cards/ColumnSet/ColumnSet.jsx +++ b/src/components/adaptive-cards/ColumnSet/ColumnSet.jsx @@ -55,4 +55,8 @@ ColumnSet.acPropTypes = { type: acPropTypes.type, }; +ColumnSet.acDefaultProps = { + horizontalAlignment: 'left', +}; + registerComponent('ColumnSet', ColumnSet, 'horizontal'); diff --git a/src/components/adaptive-cards/Component/Component.jsx b/src/components/adaptive-cards/Component/Component.jsx index b5d888a63..dc9025215 100644 --- a/src/components/adaptive-cards/Component/Component.jsx +++ b/src/components/adaptive-cards/Component/Component.jsx @@ -81,7 +81,9 @@ export default function Component({data}) { const getClass = (propType, value) => `wxc-ac-${propType}--${value}`; const style = {}; - for (const [prop, value] of Object.entries(data)) { + const dataWithDefaults = {...C.acDefaultProps, ...data}; + + for (const [prop, value] of Object.entries(dataWithDefaults)) { const propType = (C.acPropTypes && C.acPropTypes[prop]) || undefined; switch (propType) { diff --git a/src/components/adaptive-cards/Container/Container.jsx b/src/components/adaptive-cards/Container/Container.jsx index 9f4095e25..202e0828d 100644 --- a/src/components/adaptive-cards/Container/Container.jsx +++ b/src/components/adaptive-cards/Container/Container.jsx @@ -52,4 +52,8 @@ Container.acPropTypes = { verticalContentAlignment: acPropTypes.verticalContentAlignment, }; +Container.acDefaultProps = { + verticalContentAlignment: 'top', +}; + registerComponent('Container', Container, 'vertical'); diff --git a/src/components/adaptive-cards/Image/Image.jsx b/src/components/adaptive-cards/Image/Image.jsx index 0a3ad3105..81e492383 100644 --- a/src/components/adaptive-cards/Image/Image.jsx +++ b/src/components/adaptive-cards/Image/Image.jsx @@ -53,4 +53,9 @@ Image.acPropTypes = { style: acPropTypes.imageStyle, }; +Image.acDefaultProps = { + horizontalAlignment: 'left', + size: 'medium', +}; + registerComponent('Image', Image); diff --git a/src/components/adaptive-cards/ImageSet/ImageSet.jsx b/src/components/adaptive-cards/ImageSet/ImageSet.jsx index fc5fd96d8..385f062a6 100644 --- a/src/components/adaptive-cards/ImageSet/ImageSet.jsx +++ b/src/components/adaptive-cards/ImageSet/ImageSet.jsx @@ -18,8 +18,8 @@ export default function ImageSet({data, className}) { return (
{/* eslint-disable react/no-array-index-key */} - {data.images.map((item, index) => { - const itemData = {size: item.size || data.imageSize || 'medium', ...item}; + {data.images.map((image, index) => { + const itemData = {size: data.imageSize, ...image}; return ( diff --git a/src/components/adaptive-cards/RichTextBlock/RichTextBlock.jsx b/src/components/adaptive-cards/RichTextBlock/RichTextBlock.jsx index f93fd887b..b60110219 100644 --- a/src/components/adaptive-cards/RichTextBlock/RichTextBlock.jsx +++ b/src/components/adaptive-cards/RichTextBlock/RichTextBlock.jsx @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import webexComponentClasses from '../../helpers'; -import Component, {registerComponent} from '../Component/Component'; +import Component, {acPropTypes, registerComponent} from '../Component/Component'; /** * Adaptive Cards RichTextBlock component @@ -40,4 +40,18 @@ RichTextBlock.defaultProps = { className: '', }; +RichTextBlock.acPropTypes = { + horizontalAlignment: acPropTypes.horizontalAlignment, + id: acPropTypes.id, + inlines: acPropTypes.children, + isVisible: acPropTypes.isVisible, + separator: acPropTypes.separator, + spacing: acPropTypes.spacing, + type: acPropTypes.type, +}; + +RichTextBlock.acDefaultProps = { + horizontalAlignment: 'left', +}; + registerComponent('RichTextBlock', RichTextBlock); diff --git a/src/components/adaptive-cards/TextBlock/TextBlock.jsx b/src/components/adaptive-cards/TextBlock/TextBlock.jsx index e3964ec8a..35b87ff8c 100644 --- a/src/components/adaptive-cards/TextBlock/TextBlock.jsx +++ b/src/components/adaptive-cards/TextBlock/TextBlock.jsx @@ -52,4 +52,8 @@ TextBlock.acPropTypes = { wrap: acPropTypes.wrap, }; +TextBlock.acDefaultProps = { + horizontalAlignment: 'left', +}; + registerComponent('TextBlock', TextBlock);