Merge branch 'master' into feat/megamenu-web-component

carbon-design-system · Nov 9, 2020 · 27d6da0 · 27d6da0
2 parents f45b22d + 6d5431f
commit 27d6da0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 72 deletions.
diff --git a/packages/web-components/src/components/callout-with-media/callout-with-media-image.ts b/packages/web-components/src/components/callout-with-media/callout-with-media-image.ts
@@ -7,10 +7,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { customElement } from 'lit-element';
+import { property, customElement } from 'lit-element';
 import ddsSettings from '@carbon/ibmdotcom-utilities/es/utilities/settings/settings.js';
 import styles from './callout-with-media.scss';
-import DDSContentBlockSimpleMediaImage from '../content-block-simple/content-block-simple__media-image';
+import DDSImageWithCaption from '../image-with-caption/image-with-caption';
 
 const { stablePrefix: ddsPrefix } = ddsSettings;
 
@@ -20,7 +20,13 @@ const { stablePrefix: ddsPrefix } = ddsSettings;
  * @element dds-callout-with-media-image
  */
 @customElement(`${ddsPrefix}-callout-with-media-image`)
-class DDSCalloutWithMediaImage extends DDSContentBlockSimpleMediaImage {
+class DDSCalloutWithMediaImage extends DDSImageWithCaption {
+  /**
+   * The shadow slot this video container should be in.
+   */
+  @property({ reflect: true })
+  slot = 'media';
+
   static styles = styles;
 }
 

diff --git a/packages/web-components/src/components/callout-with-media/callout-with-media-video.ts b/packages/web-components/src/components/callout-with-media/callout-with-media-video.ts
@@ -7,10 +7,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { customElement } from 'lit-element';
+import { property, customElement } from 'lit-element';
 import ddsSettings from '@carbon/ibmdotcom-utilities/es/utilities/settings/settings.js';
 import styles from './callout-with-media.scss';
-import DDSContentBlockSimpleMediaVideo from '../content-block-simple/content-block-simple__media-video';
+import DDSVideoPlayerContainer from '../video-player/video-player-container';
 
 const { stablePrefix: ddsPrefix } = ddsSettings;
 
@@ -20,7 +20,13 @@ const { stablePrefix: ddsPrefix } = ddsSettings;
  * @element dds-callout-with-media-video
  */
 @customElement(`${ddsPrefix}-callout-with-media-video`)
-class DDSCalloutWithMediaVideo extends DDSContentBlockSimpleMediaVideo {
+class DDSCalloutWithMediaVideo extends DDSVideoPlayerContainer {
+  /**
+   * The shadow slot this video container should be in.
+   */
+  @property({ reflect: true })
+  slot = 'media';
+
   static styles = styles;
 }
 

diff --git a/...s/web-components/src/components/content-block-simple/content-block-simple__media-image.ts b/...s/web-components/src/components/content-block-simple/content-block-simple__media-image.ts
diff --git a/...s/web-components/src/components/content-block-simple/content-block-simple__media-video.ts b/...s/web-components/src/components/content-block-simple/content-block-simple__media-video.ts