Skip to content

Commit

Permalink
fix: remove Card circular dependencies (microsoft#4121)
Browse files Browse the repository at this point in the history
Co-authored-by: nicholasrice <nicholasrice@users.noreply.github.com>
  • Loading branch information
nicholasrice and nicholasrice authored Nov 16, 2020
1 parent bd9ef7b commit c7059b3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
5 changes: 2 additions & 3 deletions packages/web-components/fast-components/docs/api-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import { BreadcrumbItem } from '@microsoft/fast-foundation';
import { Button } from '@microsoft/fast-foundation';
import { Checkbox } from '@microsoft/fast-foundation';
import { ColorRGBA64 } from '@microsoft/fast-colors';
import { DesignSystem } from '@microsoft/fast-components-styles-msft';
import { DesignSystemProvider } from '@microsoft/fast-foundation';
import { Dialog } from '@microsoft/fast-foundation';
import { Direction } from '@microsoft/fast-web-utilities';
Expand Down Expand Up @@ -270,14 +269,14 @@ export class FASTButton extends Button {
}

// @public
export class FASTCard extends DesignSystemProvider implements Pick<DesignSystem, "backgroundColor" | "neutralPalette"> {
export class FASTCard extends DesignSystemProvider implements Pick<FASTDesignSystem, "backgroundColor" | "neutralPalette"> {
// @internal (undocumented)
backgroundColor: string;
cardBackgroundColor: string;
// (undocumented)
connectedCallback(): void;
// @internal (undocumented)
handleChange(source: DesignSystem, name: string): void;
handleChange(source: FASTDesignSystem, name: string): void;
// @internal
neutralPalette: string[];
}
Expand Down
9 changes: 4 additions & 5 deletions packages/web-components/fast-components/src/card/index.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import { customElement } from "@microsoft/fast-element";
import { attr, Notifier, Observable } from "@microsoft/fast-element";
import { parseColorHexRGB } from "@microsoft/fast-colors";
import { attr, customElement, Notifier, Observable } from "@microsoft/fast-element";
import {
designSystemProperty,
DesignSystemProvider,
Card,
CardTemplate as template,
} from "@microsoft/fast-foundation";
import { FASTDesignSystem } from "../fast-design-system";
import { createColorPalette, neutralFillCard } from "../color";
import { CardStyles as styles } from "./card.styles";
import { parseColorHexRGB } from "@microsoft/fast-colors";
import { createColorPalette, FASTDesignSystem, neutralFillCard } from "../index";

const paletteCache = new Map();

Expand Down

0 comments on commit c7059b3

Please sign in to comment.