Merge pull request #191 from TAMULib/sprint9-staging-fixes

Sprint9 staging fixes

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [1.3.0] - 08-13-20
+### Resolves
+
+Weaver Components should have an element query strategy. (#27)
+Icons should be integrated into weaver buttons. (#128)
+Weaver Components should support lists with expanding and collapsing sections. (#163)
+The Wvr Icon component should support animation. (#164)
+Weaver Components should have a list component. (#165)
+Coveralls not providing the coverage notification. (#167)
+Observable subscriptions should be unsubscribed from or converted to promises. (#168)
+
 ## [0.0.5] - 05-14-2020
 ### Resolves
 

defaults.env

@@ -4,4 +4,4 @@
 #
 
 BASE_URL=https://labs.library.tamu.edu/wvr-components/latest
-ASSET_URL=https://labs.library.tamu.edu/wvr-components/latest/assets
+ASSETS_URL=https://labs.library.tamu.edu/wvr-components/latest/assets

package.json

@@ -4,7 +4,7 @@
     "type": "git",
     "url": "git+https://github.com/TAMULib/weaver-components.git"
   },
-  "version": "1.3.0-rc",
+  "version": "1.3.0",
   "private": false,
   "license": "MIT",
   "bin": {

projects/wvr-elements/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wvr/elements",
-  "version": "1.3.0-rc2",
+  "version": "1.3.0",
   "description": "Collection of angular components for Weaver's Custom Web Component UI",
   "author": "Texas A&M University Libraries",
   "private": false,

projects/wvr-elements/src/lib/core/app-config.ts

@@ -2,7 +2,7 @@ import { InjectionToken } from '@angular/core';
 
 export interface AppConfig {
   baseUrl?: string;
-  assetUrl?: string;
+  assetsUrl?: string;
 }
 
 export const blankConfig: AppConfig = {};

projects/wvr-elements/src/lib/core/icon.service.ts

@@ -28,7 +28,7 @@ export class IconService {
 
   private fetchIcon(set: IconSet, name: string): Observable<string> {
 
-    return this.http.get(`${this.appConfig.assetUrl}/icons/${set.name}/${name}.svg`, { responseType: 'text' })
+    return this.http.get(`${this.appConfig.assetsUrl}/icons/${set.name}/${name}.svg`, { responseType: 'text' })
       .pipe(share());
   }
 

projects/wvr-elements/src/lib/core/wvr-animation.service.ts

@@ -16,7 +16,7 @@ export class WvrAnimationService {
 
   constructor(private readonly builder: AnimationBuilder) { }
 
-  registerAnimationReciever(recieverName: string, component: WvrBaseComponent): void {
+  registerAnimationTargets(recieverName: string, component: WvrBaseComponent): void {
     let recievers = this.recieversRegistry.get(recieverName);
     if (!recievers) {
       recievers = new Array<WvrBaseComponent>();
@@ -30,7 +30,6 @@ export class WvrAnimationService {
     this.animationStates.set(id, new Map<string, boolean>());
 
     return id;
-
   }
 
   triggerAnimationReciever(recieverName: string): void {
@@ -54,37 +53,7 @@ export class WvrAnimationService {
       });
   }
 
-  compileAnimation(stateId, animationName, value): AnimationMetadata | Array<AnimationMetadata> {
-
-    const a = wvrAnimations[animationName];
-
-    if (!a) {
-      console.warn(`${animationName} not a known animation.`);
-
-      return undefined;
-    }
-
-    return a(this.animationStates.get(stateId), value);
-  }
-
-  selectAnimation(stateId: number, animationName: string, timing: string,
-                  to: string, from: string, animationRoot: HTMLElement): AnimationReferenceMetadata {
-
-    const animationInput: AnimationMetadata | Array<AnimationMetadata> =
-    this.compileAnimation(stateId, animationName, animationRoot);
-
-    if (animationInput) {
-      return useAnimation(animation(animationInput), {
-        params: {
-            timing,
-            to,
-            from
-          }
-      });
-    }
-  }
-
-  playAnimation(stateId: number, animationName: string, animationConfig: {}, animationRoot: HTMLElement): void {
+  playAnimation(stateId: number, animationName: string, animationConfig: {}, animationRoot: HTMLElement): AnimationPlayer {
 
     const timing = animationConfig[animationName] ?
                    animationConfig[animationName].timing :
@@ -102,7 +71,37 @@ export class WvrAnimationService {
       .build(a);
       const player: AnimationPlayer = animationFactory.create(animationRoot);
       player.play();
+
+      return player;
     }
   }
 
+  private selectAnimation(stateId: number, animationName: string, timing: string,
+                          to: string, from: string, animationRoot: HTMLElement): AnimationReferenceMetadata {
+
+    const animationInput: AnimationMetadata | Array<AnimationMetadata> =
+    this.compileAnimation(stateId, animationName, animationRoot);
+
+    return useAnimation(animation(animationInput), {
+      params: {
+          timing,
+          to,
+          from
+        }
+    });
+  }
+
+  private compileAnimation(stateId, animationName, value): AnimationMetadata | Array<AnimationMetadata> {
+
+    const a = wvrAnimations[animationName];
+
+    if (!a) {
+      console.warn(`${animationName} not a known animation.`);
+
+      return [];
+    }
+
+    return a(this.animationStates.get(stateId), value);
+  }
+
 }

projects/wvr-elements/src/lib/shared/wvr-base.component.ts

@@ -64,7 +64,7 @@ export abstract class WvrBaseComponent implements AfterContentInit, OnInit {
     const animationEvents = Object.keys(this._animationSettings);
     if (animationEvents.length) {
       if (this.animateId) {
-        this._animationService.registerAnimationReciever(this.animateId, this);
+        this._animationService.registerAnimationTargets(this.animateId, this);
       }
       this.animationStateId = this._animationService.registerAnimationStates();
       animationEvents.forEach(eventName => {

projects/wvr-elements/src/public-api.ts

@@ -4,6 +4,7 @@
 
 export * from './lib/shared/wvr-base.component';
 export * from './lib/shared/alignment.enum';
+export * from './lib/core/app-config';
 export * from './lib/wvr-button/wvr-button.component';
 export * from './lib/wvr-dropdown/wvr-dropdown.component';
 export * from './lib/wvr-footer/wvr-footer.component';