feat(card): use core tokens

adobe · Jun 30, 2023 · 9cccd26 · 9cccd26
1 parent 738dfc8
commit 9cccd26
Show file tree

Hide file tree

Showing 7 changed files with 657 additions and 684 deletions.
diff --git a/packages/card/package.json b/packages/card/package.json
@@ -66,7 +66,7 @@
         "@spectrum-web-components/styles": "^0.33.2"
     },
     "devDependencies": {
-        "@spectrum-css/card": "^5.0.40"
+        "@spectrum-css/card": "^6.0.0"
     },
     "types": "./src/index.d.ts",
     "customElements": "custom-elements.json",

diff --git a/packages/card/src/Card.ts b/packages/card/src/Card.ts
@@ -31,6 +31,7 @@ import '@spectrum-web-components/asset/sp-asset.js';
 import { Checkbox } from '@spectrum-web-components/checkbox/src/Checkbox';
 import '@spectrum-web-components/checkbox/sp-checkbox.js';
 import '@spectrum-web-components/quick-actions/sp-quick-actions.js';
+import '@spectrum-web-components/divider/sp-divider.js';
 import cardStyles from './card.css.js';
 import headingStyles from '@spectrum-web-components/styles/heading.js';
 import detailStyles from '@spectrum-web-components/styles/detail.js';
@@ -220,6 +221,11 @@ export class Card extends LikeAnchor(
             <sp-asset id="preview" variant=${ifDefined(this.asset)}>
                 <slot name="preview"></slot>
             </sp-asset>
+            ${this.variant !== 'quiet' && !this.horizontal
+                ? html`
+                      <sp-divider size="s"></sp-divider>
+                  `
+                : html``}
         `;
     }
 
@@ -228,6 +234,11 @@ export class Card extends LikeAnchor(
             <sp-asset id="cover-photo" variant=${ifDefined(this.asset)}>
                 <slot name="cover-photo"></slot>
             </sp-asset>
+            ${this.variant !== 'quiet' && !this.horizontal
+                ? html`
+                      <sp-divider size="s"></sp-divider>
+                  `
+                : html``}
         `;
     }
 
@@ -259,6 +270,7 @@ export class Card extends LikeAnchor(
 
     protected override render(): TemplateResult {
         return html`
+            ${this.renderImage()}
             <div class="body">
                 <div class="header">
                     ${this.renderHeading}
@@ -295,7 +307,6 @@ export class Card extends LikeAnchor(
                       <slot name="footer"></slot>
                   `
                 : html``}
-            ${this.renderImage()}
             ${this.toggles
                 ? html`
                       <sp-quick-actions

diff --git a/packages/card/src/card.css b/packages/card/src/card.css
@@ -43,18 +43,12 @@ slot[name='description'] {
     );
 }
 
-#preview,
-#cover-photo {
-    overflow: hidden;
-    order: -1;
-}
-
 #preview + #cover-photo {
     display: none;
 }
 
-#preview ::slotted(*),
-#cover-photo ::slotted(*) {
+#cover-photo ::slotted(*),
+:host(:not([variant='quiet'])) #preview ::slotted(*) {
     width: 100%;
     display: block;
 
@@ -88,3 +82,8 @@ sp-quick-actions {
     /* Override until https://github.com/adobe/spectrum-css/issues/1054 is fixed */
     text-transform: none;
 }
+
+:host:before,
+:host:after {
+    pointer-events: none;
+}