diff --git a/packages/kittik-deck/spec/Deck.spec.ts b/packages/kittik-deck/spec/Deck.spec.ts index ba390c6..cf7c94f 100644 --- a/packages/kittik-deck/spec/Deck.spec.ts +++ b/packages/kittik-deck/spec/Deck.spec.ts @@ -1,12 +1,10 @@ import { Deck, DeckDeclaration } from '../src/Deck'; import { Shape, ShapeRenderable } from 'kittik-shape-basic'; import { Animationable } from 'kittik-animation-basic'; -import { Canvas } from 'terminal-canvas'; import { Print } from 'kittik-animation-print'; import { Slide } from 'kittik-slide'; const DECK_DECLARATION: DeckDeclaration = { - canvas: Canvas.create(), shapes: [ { name: 'Global Shape', @@ -143,7 +141,6 @@ describe('deck', () => { expect.hasAssertions(); const deck = new Deck({ - canvas: DECK_DECLARATION.canvas, slides: [ { name: 'Test', @@ -175,7 +172,6 @@ describe('deck', () => { expect.hasAssertions(); const deck = new Deck({ - canvas: DECK_DECLARATION.canvas, slides: [{ name: 'Test', shapes: [], order: [] }] }); @@ -200,7 +196,6 @@ describe('deck', () => { const shape: ShapeRenderable = new Shape(); const deck = new Deck({ - canvas: DECK_DECLARATION.canvas, slides: [ { name: 'Test', @@ -225,7 +220,6 @@ describe('deck', () => { const shape: ShapeRenderable = new Shape(); const deck = new Deck({ - canvas: DECK_DECLARATION.canvas, slides: [ { name: 'Test', @@ -250,7 +244,6 @@ describe('deck', () => { const animation: Animationable = new Print(); const deck = new Deck({ - canvas: DECK_DECLARATION.canvas, slides: [ { name: 'Test', @@ -276,7 +269,6 @@ describe('deck', () => { const animation: Animationable = new Print(); const deck = new Deck({ - canvas: DECK_DECLARATION.canvas, slides: [ { name: 'Test', @@ -301,7 +293,6 @@ describe('deck', () => { expect.hasAssertions(); const deck = new Deck({ - canvas: DECK_DECLARATION.canvas, slides: [ { name: 'Slide #1', diff --git a/packages/kittik-deck/src/Deck.ts b/packages/kittik-deck/src/Deck.ts index c8d16ac..e31478c 100644 --- a/packages/kittik-deck/src/Deck.ts +++ b/packages/kittik-deck/src/Deck.ts @@ -24,11 +24,11 @@ export class Deck extends EventEmitter { private isRendering = false; private currentSlideIndex = 0; - public constructor (declaration?: DeckDeclaration) { + public constructor (declaration?: DeckDeclaration, canvas?: Canvas) { super(); - if (typeof declaration?.canvas !== 'undefined') { - this.canvas = declaration.canvas; + if (typeof canvas !== 'undefined') { + this.canvas = canvas; } if (typeof declaration !== 'undefined') { diff --git a/packages/kittik-deck/src/DeckDeclaration.ts b/packages/kittik-deck/src/DeckDeclaration.ts index 5807ba7..b35ea3b 100644 --- a/packages/kittik-deck/src/DeckDeclaration.ts +++ b/packages/kittik-deck/src/DeckDeclaration.ts @@ -1,8 +1,6 @@ import { AnimationDeclaration, ShapeDeclaration, SlideDeclaration } from 'kittik-slide'; -import { Canvas } from 'terminal-canvas'; export interface DeckDeclaration { - canvas?: Canvas shapes?: ShapeDeclaration[] animations?: AnimationDeclaration[] slides: SlideDeclaration[]