merge: from master

Author: peterpeterparker

CHANGELOG.md

@@ -1,3 +1,10 @@
+<a name="1.0.0-beta.51-1"></a>
+# [1.0.0-beta.51-1](https://github.com/deckgo/deckdeckgo/compare/v1.0.0-beta.51...v1.0.0-beta.51-1) (2019-07-18)
+
+### Web Components
+
+* core: v1.0.0-beta.42 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/core/CHANGELOG.md))
+
 <a name="1.0.0-beta.51"></a>
 # [1.0.0-beta.51](https://github.com/deckgo/deckdeckgo/compare/v1.0.0-beta.50...v1.0.0-beta.51) (2019-07-17)
 

webcomponents/core/CHANGELOG.md

@@ -1,3 +1,10 @@
+<a name="1.0.0-beta.42"></a>
+# 1.0.0-beta.42 (2019-06-18)
+
+### Features
+
+* add a new function to query the slide definitions which could be used to update the remote connection
+
 <a name="1.0.0-beta.41"></a>
 # 1.0.0-beta.41 (2019-06-13)
 

webcomponents/core/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@deckdeckgo/core",
-  "version": "1.0.0-beta.41",
+  "version": "1.0.0-beta.42",
   "description": "Add a presentation to your web application using HTML and Web Components",
   "module": "dist/index.mjs",
   "main": "dist/index.js",

webcomponents/core/package.json

@@ -6,6 +6,9 @@
 
 
 import { HTMLStencilElement, JSXBase } from '@stencil/core/internal';
+import {
+  DeckdeckgoSlideDefinition,
+} from '@deckdeckgo/types';
 
 
 export namespace Components {
@@ -17,6 +20,7 @@ export namespace Components {
     'embedded': boolean;
     'getActiveIndex': () => Promise<number>;
     'getLength': () => Promise<number>;
+    'getSlidesDefinition': () => Promise<DeckdeckgoSlideDefinition[]>;
     'initSlideSize': () => Promise<void>;
     'isBeginning': () => Promise<boolean>;
     'isEnd': () => Promise<boolean>;

webcomponents/core/src/components.d.ts

@@ -402,39 +402,68 @@ export class DeckdeckgoDeck {
   }
 
   private afterSlidesDidLoad(): Promise<void> {
+    return new Promise<void>(async (resolve) => {
+      const slidesDefinition: DeckdeckgoSlideDefinition[] = await this.getSlidesDefinition();
+
+      if (slidesDefinition && slidesDefinition.length > 0) {
+        this.slidesDidLoad.emit(slidesDefinition);
+
+        await this.onAllSlidesDidLoadLazyAndClone();
+      }
+
+      resolve();
+    });
+  }
+
+  private onAllSlidesDidLoadLazyAndClone(): Promise<void> {
     return new Promise<void>(async (resolve) => {
       const filteredSlides: HTMLElement[] = await this.getDefinedFilteredSlides();
 
+      const promises: Promise<void>[] = [];
+      promises.push(this.lazyLoadFirstSlides());
+      promises.push(DeckdeckgoDeckBackgroundUtils.cloneSlots(this.el, filteredSlides, 'actions'));
+      promises.push(DeckdeckgoDeckBackgroundUtils.cloneAndLoadBackground(this.el, filteredSlides, this.cloneBackground));
+
+      await Promise.all(promises);
+
+      resolve();
+    });
+  }
+
+  @Method()
+  getSlidesDefinition(): Promise<DeckdeckgoSlideDefinition[]> {
+    return new Promise<DeckdeckgoSlideDefinition[] | null>(async (resolve) => {
       const loadedSlides: NodeListOf<HTMLElement> = this.el.querySelectorAll('.deckgo-slide-container');
 
+      if (!loadedSlides || loadedSlides.length <= 0) {
+        resolve(null);
+        return;
+      }
+
+      const filteredSlides: HTMLElement[] = await this.getDefinedFilteredSlides();
+
       const definedSlidesLength: number = filteredSlides ? filteredSlides.length : 0;
 
       // Are all slides loaded?
-      if (filteredSlides && loadedSlides && loadedSlides.length === definedSlidesLength && definedSlidesLength === this.length) {
-        const orderedSlidesTagNames: DeckdeckgoSlideDefinition[] = [];
-
-        Array.from(loadedSlides).forEach((slide: HTMLElement) => {
-          const notes: HTMLElement = slide.querySelector('[slot=\'notes\']');
-          const title: HTMLElement = slide.querySelector('[slot=\'title\']');
-
-          orderedSlidesTagNames.push({
-            name: slide.tagName,
-            title: title ? title.innerHTML : null,
-            notes: notes ? notes.innerHTML : null
-          });
-        });
+      if (loadedSlides.length !== definedSlidesLength) {
+        resolve(null);
+        return;
+      }
 
-        this.slidesDidLoad.emit(orderedSlidesTagNames);
+      const orderedSlidesTagNames: DeckdeckgoSlideDefinition[] = [];
 
-        const promises: Promise<void>[] = [];
-        promises.push(this.lazyLoadFirstSlides());
-        promises.push(DeckdeckgoDeckBackgroundUtils.cloneSlots(this.el, filteredSlides, 'actions'));
-        promises.push(DeckdeckgoDeckBackgroundUtils.cloneAndLoadBackground(this.el, filteredSlides, this.cloneBackground));
+      Array.from(loadedSlides).forEach((slide: HTMLElement) => {
+        const notes: HTMLElement = slide.querySelector('[slot=\'notes\']');
+        const title: HTMLElement = slide.querySelector('[slot=\'title\']');
 
-        await Promise.all(promises);
-      }
+        orderedSlidesTagNames.push({
+          name: slide.tagName,
+          title: title ? title.innerHTML : null,
+          notes: notes ? notes.innerHTML : null
+        });
+      });
 
-      resolve();
+      resolve(orderedSlidesTagNames);
     });
   }