rytm-webflow 2.0.5 → 2.0.7

package/README.md

@@ -1,7 +1,8 @@
 # rytm-webflow
 Rytm webflow pack is used to make websites rendered on the server (using a PHP or other back-end) more dynamic.  
-A static website can be transformed into something we call a *pseudo single page application* (SPA). The pack includes  **[ASwap](#markdown-header-aswap)** - a framework programmed by Rytm Digital arround 2016 which uses *AJAX* to first load and then *swap* the page's content in user's browser.  
-Another future rytm-webflow includes is **[ShowUp](#markdown-header-showup)** - a ScrollMagic.js wrapper which can be integrated with ASwap. 
+A static website can be transformed into something we call a *pseudo single page application* (SPA). The pack includes  [ASwap](#aswap) - a framework under developement by Rytm.Digital since 2016 which uses *AJAX* / *fetch* to first load and then *swap* the page's content in user's browser.  
+This package comes with a handy [WebflowView](#webflowview).  
+Another future rytm-webflow includes is [ShowUp](#showup) - a ScrollMagic.js wrapper which can be integrated with ASwap. 
 
   
 **Install using NPM:**
@@ -14,7 +15,7 @@ $ npm install rytm-webflow --save
 - scrollmagic
 - scrollmagic-plugin-gsap
 
-## ASwap
+## <a name="aswap">ASwap</a>
 ### Basic usage example  
 In your HTML for each request you neeed a wrapper (default wrapper selector: ```#stage```)  
 Inside a wrapper you can have multiple view instances. Each view uses a name defined in ```data-as-view``` and an unique id defined in ```data-as-id```
@@ -217,9 +218,62 @@ RytmWebflow.aswap.init(params, {
   },
 })
 ```
+## <a name="webflowview">WebflowView</a> ##
+WebflowView is an universal ASwap View which can be used with the **Webflow syntax** - a minified way to describe an animation, it's duration (time), easing, delay or the trigger. Eg. `y:100,o:0` will animate an element from: `y:100px` and `opacity: 0` to it's current state. Go to [Webflow syntax](#webflowsyntax) for more.
+### Basic usage example  
+Define the route:
+```js
+import RytmWebflow from 'rytm-webflow'
+
+RytmWebflow.aswap.init({
+  routes: {
+    "webflow" : {
+      controller: RytmWebflow.Controller,
+      view: RytmWebflow.WebflowView
+    }
+  }
+})
+```
+Add data attributes to the cointainer element:
+```html
+<div id="stage">
+  <div data-as-view="webflow" data-as-id="uid">
+    ...
+  </div>
+</div>
+```
+Animate any element within the *WebflowView* container using the **Webflow syntax** inside the `webview` attributes (initial, show, hide):
+```html
+<div data-webview-initial="o:0" data-webview-show="o:1,t:.5" data-webview-hide="o:0,t:.4">
+  ...
+</div>
+```
+or (more complex example):
+```html
+<div data-webview-initial="x:-10,y:50" data-webview-show="x:0,y:0,t:.5,d:.15,e:Power2.easeOut" data-webview-hide="x:10,y:-25,t:.4,d:.2,e:Power2.easeIn">
+  ...
+</div>
+```
+### Stagger - animate any list of items
+Animate elements nested under the WebflowView container when scrolled into viewport by using `stagger` data attributes (initial, show, hide) and the `data-webset` attribute:
+```html
+<ul data-stagger-initial="o:0" data-stagger-show="o:1,t:.5,stagger:.1" data-stagger-hide="o:0,t:.4,stagger:.1" data-webset="selector:li">
+  <li>...</li>
+  <li>...</li>
+</ul>
+```
+### Scrollmagic - animate elements when scrolled into viewport
+Scroll-triggered-animations of any element inside the *WebflowView* container. Use the `webscroll` data attributes (initial, show, hide):
+```html
+<div data-webscroll-initial="y:100" data-webscroll-show="y:0,t:.5" data-webscroll-hide="o:0,t:.4">
+  ...
+</div>
+```
+
+
 
-## ShowUp ##
-ShowUp makes creating gsap scroll-triggered-animations much faster. It can be used to show content while user scrolls down the page. It can also be used for parallax like animations. ShowUp comes with the **Webflow syntax** - a minified way to describe an animation, it's duration (time), easing, delay or the trigger. Eg. `y:100,o:0` will animate an element from: `y:100px` and `opacity: 0` to it's current state. Go to [Webflow syntax](#markdown-header-webflow-syntax) for more.
+## <a name="showup">ShowUp</a> ##
+ShowUp makes creating gsap scroll-triggered-animations much faster. It can be used to show content while user scrolls down the page. It can also be used for parallax like animations. ShowUp comes with the **Webflow syntax**. Go to [Webflow syntax](#webflowsyntax) for more.
 ### Webflow usage example  
 To enable ShowUp call the init method in your JS:
 ```js
@@ -315,11 +369,11 @@ When moving elements in the Y axis you can use the `parent` trigger hook:
   <div data-webpara="y:-100" data-webset="duration:100%,trigger:parent"></div>
 </div>
 ```
-### Webflow syntax ##
+### <a name="webflowsyntax">Webflow syntax</a> ##
 | short code  | prameter  | example |
 |---|---|---|
 | ```d```  | delay | ```"d:.4"``` |
-| ```e```  | ease | ```"e:Bounce:easeOut"``` |
+| ```e```  | ease | ```"e:Bounce.easeOut"``` |
 | ```h```  | height | ```"h:10"``` |
 | ```o```  | opacity | ```"o:0"``` |
 | ```r```  | rotation | ```"r:180"``` |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rytm-webflow",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "description": "rytm webflow pack - ASwap, ShowUp",
   "main": "scripts/index.js",
   "scripts": {

package/scripts/aswap/Controller.js

@@ -99,6 +99,9 @@ class Controller {
     if (container) {
       container.classList.remove("as-hide")
     }
+    if (this.view) {
+      this.view.hidden(container);
+    }
   }
 
   /**
@@ -144,6 +147,9 @@ class Controller {
     if (container) {
       container.classList.remove("as-show")
     }
+    if (this.view) {
+      this.view.shown(container);
+    }
   }
 
   

package/scripts/aswap/View.js

@@ -19,6 +19,11 @@ class View {
     this.active = false;
   }
   /**
+  * view is hidden
+  **/
+  hidden(container) {
+  }
+  /**
   * prepare (before show)
   **/
   prepare(container) {
@@ -29,6 +34,11 @@ class View {
   show(container) {
     this.active = true;
   }
+  /**
+  * view is shown
+  **/
+  shown(container) {
+  }
   /**
    * images loading start
    * fired only if ControllerImgLoad is used

package/scripts/index.js

@@ -7,7 +7,7 @@ import bootsrap5 from './bootstrap/v5/Bootstrap5'
 // showup
 import scrollController from './showup/ScrollController'
 import showUp from './showup/ShowUp'
-import { getWebflowProps, getParallaxProps } from './lib/dataTweenParser'
+import { getWebflowAnimationProps, getWebflowProps, getParallaxProps, parseProps } from './lib/dataTweenParser'
 import { getScrollMagicSceneProps } from './lib/dataScrollMagicParser'
 
 export default {
@@ -21,7 +21,9 @@ export default {
   scrollController,
   showUp,
   // lib
+  getWebflowAnimationProps,
   getWebflowProps,
   getParallaxProps,
+  parseProps,
   getScrollMagicSceneProps
 }

package/scripts/lib/dataTweenParser.js

@@ -55,7 +55,7 @@ export const getWebflowProps = (dataStr) => {
  * @param {string} gstr (eg. y:100,o:0)
  * @return {Object}
  */
-const getWebflowAnimationProps = (gstr) => {
+export const getWebflowAnimationProps = (gstr) => {
   let propsFromData = parseProps(gstr)
   return getValidWebflowAnimationProps(propsFromData)
 }

package/scripts/showup/ShowUp.js

@@ -74,7 +74,7 @@ class ShowUp {
     if (wfp.show) {
       const smsp = getScrollMagicSceneProps(el, setup)
       const scene = new ScrollMagic.Scene(smsp)
-      scene.setTween(TweenMax.from(el, wfp.show.time, wfp.show.tween))
+      scene.setTween(TweenMax.from(el, { duration: wfp.show.time, ...wfp.show.tween}))
       scene.addTo(scrollController.get())
       this.scenes.push(scene)
     }
@@ -92,7 +92,7 @@ class ShowUp {
     if (pp) {
       const smsp = getScrollMagicSceneProps(el, setup)
       const scene = new ScrollMagic.Scene(smsp)
-      scene.setTween(TweenMax.to(el, 1, pp.parallax.tween))
+      scene.setTween(TweenMax.to(el, {duration: 1, ...pp.parallax.tween}))
       scene.addTo(scrollController.get())
       this.scenes.push(scene)
     }