@ulu/frontend 0.1.0-beta.10 → 0.1.0-beta.100

package/js/ui/slider.js

@@ -5,19 +5,22 @@
 // Slider
 // =============================================================================
 
-// Version:                   1.0.10
+// Version:                   1.0.11
 
 // Changes:   
+//                            1.0.11 | Updates for ComponentInitializer
 //                            1.0.10 | Fix bug when two and going in reverse
-//                            1.0.9 | Fix bug when there are only 2 slides (not sliding correctly [revesers because of switchSlide])
-//                                    this is addressed now and should slide infinitly between two slides
-//                            1.0.8 | Change API, to elements object (from individaul arguments),
+//                            1.0.9 | Fix bug when there are only 2 slides (not sliding correctly [reverse because of switchSlide])
+//                                    this is addressed now and should slide infinity between two slides
+//                            1.0.8 | Change API, to elements object (from individual arguments),
 //                                    Add the ability to specify the element to append controls within
 //                            1.0.6 | Add transition class for changes during transition, 
 //                                    add will-change to the transition
-//                            1.0.5 | Fix transtion event difference on windows, convert all 
+//                            1.0.5 | Fix transition event difference on windows, convert all 
 //                                    async stuff to promises and simplify
-//                            1.0.4 | Remove live region annoucement (only used if auto rotate)
+//                            1.0.4 | Remove live region announcement (only used if auto rotate)
+
+// Todo:                      - Create destroy method to cleanup listeners
 
 // Reference:                 https://www.w3.org/WAI/tutorials/carousels/working-example/
 //                            https://www.w3.org/TR/wai-aria-practices/examples/carousel/carousel-1.html#
@@ -27,16 +30,29 @@
 //                            https://dev.opera.com/articles/css-will-change-property/
 //                              * Will Change use
 
+import { ComponentInitializer } from "../utils/system.js";
+import { wrapSettingString } from "../settings.js";
 import maintain from 'ally.js/maintain/_maintain';
 import { hasRequiredProps } from '@ulu/utils/object.js';
 import { trimWhitespace } from "@ulu/utils/string.js";
 import { debounce } from "@ulu/utils/performance.js";
 import { log, logError, logWarning } from "../utils/class-logger.js";
-import { getDatasetOptionalJson } from "../utils/dom.js";
-import { createPager } from "./overflow-scroller-pager.js";
-import { getName } from "../events/index.js";
+import setupSwipeListener from "swipe-listener";
+
+/**
+ * Slider Component Initializer
+ */
+export const initializer = new ComponentInitializer({ 
+  type: "slider", 
+  baseAttribute: "data-ulu-slider"
+});
 
-const debugMode = false; // Global dev debug
+const attrSelectorTrack = initializer.attributeSelector("track");
+const attrSelectorTrackContainer = initializer.attributeSelector("track-container");
+const attrSelectorControlContext = initializer.attributeSelector("control-context");
+const attrSelectorSlide = initializer.attributeSelector("slide");
+
+const instances = [];
 const reduceMotion = matchMedia('(prefers-reduced-motion: reduce)').matches;
 const eventOnce = { once: true };
 const cssDuration = d => `${ d }ms`;
@@ -56,52 +72,34 @@ const requiredElements = [
 ];
 
 /**
- * Default data attributes
+ * Initialize all sliders based on data attribute selectors
  */
-export const attrs = {
-  init: "data-ulu-slider-init",
-  slider: "data-ulu-slider",
-  track: "data-ulu-slider-track",
-  trackContainer: "data-ulu-slider-track-container",
-  controls: "data-ulu-slider-control-context"
-};
-
-// Utils for selecting things based on attributes
-const attrSelector = key => `[${ attrs[key] }]`;
-const attrSelectorInitial = key => `${ attrSelector(key) }:not([${ attrs.init }])`;
-
-const defaults = {
-  amount: createPager()
-};
-
-const instances = [];
-
 export function init() {
-  document.addEventListener(getName("pageModified"), setup);
-  setup();
-}
-
-export function setup() {
-  const builders = document.querySelectorAll(attrSelectorInitial("slider"));
-  builders.forEach(setupSlider);
+  initializer.init({
+    withData: true,
+    events: ["pageModified"],
+    setup({ element, data, initialize }) {
+      setupSlider(element, data);
+      initialize();
+    }
+  });
 }
 
-export function setupSlider(container) {
-  container.setAttribute(attrs.init, "");
-  const options = getDatasetOptionalJson(container, "uluScrollSlider");
-  const config = Object.assign({}, defaults, options);
+/**
+ * Setup single slider instance from querying via data attribute selectors
+ * @param {Node} container The slide container to query children from
+ * @param {Object} options Options for slider class
+ */
+export function setupSlider(container, options) {
+  const config = Object.assign({}, options);
   const elements = {
     container,
-    track: container.querySelector("[data-ulu-slider-track]"),
-    trackContainer: container.querySelector("[data-ulu-slider-track-container]"),
-    controlContext: container.querySelector("[data-ulu-slider-control-context]"),
-    slides: container.querySelectorAll("[data-ulu-slider-slide]")
+    track: container.querySelector(attrSelectorTrack),
+    trackContainer: container.querySelector(attrSelectorTrackContainer),
+    controlContext: container.querySelector(attrSelectorControlContext),
+    slides: container.querySelectorAll(attrSelectorSlide)
   };
-  // Add in any global settings
-  // Object.assign(config, {
-  //   callbacks: {}
-  // });
-  // /
+
   // This was added because there was an issue on the new windows, need to test this
   // config.transitionFade = true;
   if (elements.slides.length) {
@@ -109,8 +107,14 @@ export function setupSlider(container) {
   }
 }
 
+/**
+ * Class that controls slider
+ */
 export class Slider {
   static instances = [];
+  /**
+   * Default options for slider
+   */
   static defaults = {
     classAccessiblyHidden: "hidden-visually",
     namespace: "Slider",
@@ -120,18 +124,22 @@ export class Slider {
     transitionDuration: 700,
     transitionDurationExit: 400,
     transitionTimingFunction: "ease-in-out",
-    buttonClasses: ["Slider__control-icon", "button", "button--icon"],
-    iconClassesPrevious: ["css-icon", "css-icon--angle-left"],
-    iconClassesNext: ["css-icon", "css-icon--angle-right"]
-    // transition: true
+    buttonClasses: ["button", "button--icon"],
+    iconClassPrevious: wrapSettingString("iconClassPrevious"),
+    iconClassNext: wrapSettingString("iconClassNext"),
+    swipeEnabled: true,
+    swipeOptions: {
+      preventScroll: true
+    }
   }
-  // constructor(container, title, trackContainer, track, slides, config, debug = false) {
-  constructor(elements, config, debug = false) {
+  constructor(elements, config) {
     const options = Object.assign({}, Slider.defaults, config);
-    this.debug = debugMode || debug;
     this.options = options;
     this.slide = null;
     this.index = null;
+    this.swipeInstance = null;
+    this.swipeListener = null;
+    this.swipeImageListener = null;
     this.transitioning = false;
 
     if (!hasRequiredProps(requiredElements)) {
@@ -399,13 +407,50 @@ export class Slider {
     const trackCss = trimWhitespace(this.trackCss());
     const trackContainerStyles = trimWhitespace(this.trackContainerStyles());
     const slideCss = trimWhitespace(this.slideCss());
+
     track.setAttribute("style", trackCss);
     trackContainer.setAttribute("style", trackContainerStyles);
+
     this.slides.forEach(slide => {
       slide.element.setAttribute("style", slideCss);
       slide.element.setAttribute('tabindex', '-1');
     });
+    
     container.classList.add(this.getClass());
+
+    if (this.options.swipeEnabled) {
+      this.setupSwipe();
+    }
+  }
+  setupSwipe() {
+    const images = this.elements.track.querySelectorAll("img");
+    
+    // Cache for future destroy
+    // this.swipeInstance = setupSwipeListener(track, {
+    //   preventScroll: true
+    // });
+    this.swipeListener = (event) => {
+      this.onSwipe(event);
+    }
+    this.swipeImageListener = (event) => {
+      event.preventDefault(); // Allow swiping on images
+    };
+    this.slides.forEach(slide => {
+      const { element } = slide;
+      slide.swipeInstance = setupSwipeListener(element, this.options.swipeOptions);
+      element.addEventListener("swipe", this.swipeListener);
+    });
+    
+    images.forEach(image => {
+      image.addEventListener('dragstart', this.swipeImageListener);
+    });
+  }
+  onSwipe(event) {
+    const { directions } = event.detail;
+    const method = directions.left ? "next" : directions.right ? "previous" : null;
+    if (method) {
+      this[method](event);
+    }
   }
   trackContainerStyles() {
     // Crop translated track
@@ -454,6 +499,7 @@ export class Slider {
     const button = document.createElement("button");
     button.classList.add(this.getClass("control-button"));
     button.classList.add(this.getClass(`control-button--${ action }`));
+    
     button.classList.add(...this.options.buttonClasses);
     button.setAttribute("data-slider-control", action);
     button.setAttribute("type", "button");
@@ -509,21 +555,20 @@ export class Slider {
     const button = document.createElement("button");
     button.classList.add(this.getClass("nav-button"));
     button.setAttribute("type", "button");
-    button.innerHTML = this.getNavContent(slide.number);
+    button.innerHTML = this.getNavContent(slide);
     slide.navButton = button; // Add reference to slide object
     button.addEventListener("click", this.goto.bind(this, index));
     return button;
   }
-  // change to css-icon 
   getControlContent(action) {
-    const classes = this.options[action === "next" ? "iconClassesNext" : "iconClassesPrevious"];
+    const classes = this.options[action === "next" ? "iconClassNext" : "iconClassPrevious"];
     return `
-      <span class="hidden-visually">${ action }</span>
-      <span class="${ classes.join(' ') }" aria-hidden="true"></span>
+      <span class="${ this.options.classAccessiblyHidden }">${ action }</span>
+      <span class="${ this.getClass("control-icon") } ${ classes }" aria-hidden="true"></span>
     `;
   }
-  getNavContent(number) {
-    return `<span class="hidden-visually">Item ${ number }</span>`;
+  getNavContent(slide) {
+    return `<span class="${ this.options.classAccessiblyHidden }">Item ${ slide.number }</span>`;
   }
   emit(name, args) {
     if (this.options.events[name]) {

package/js/ui/tabs.js

@@ -9,9 +9,7 @@
 //   setting this up to destroy tab interface when ui layout changes?
 
 import AriaTablist from "aria-tablist";
-
-const initAttr = "data-ulu-tablist-init";
-const errorHeader = "[data-ulu-tablist] error:";
+import { ComponentInitializer } from "../utils/system.js";
 
 /**
  * Array of current tab instances (exported if you need to interact with them)
@@ -19,13 +17,28 @@ const errorHeader = "[data-ulu-tablist] error:";
  */
 export const instances = [];
 
+/**
+ * Tabs Component Initializer
+ */
+export const initializer = new ComponentInitializer({ 
+  type: "tabs", 
+  baseAttribute: "data-ulu-tablist"
+});
+
 /**
  * Init all instances currently in document
- * @param {Object} options Options to serve as defaults
  */
-export function init(options = {}) {
+export function init() {
   const initial = () => {
-    initWithin(document, options);
+    initializer.init({
+      events: ["pageModified"],
+      withData: true,
+      setup({ element, data, initialize }) {
+        setup(element, data);
+        initialize();
+      }
+    });
+    
     // Run this on page load, optionally exported for use when page is running
     instances.forEach(openByCurrentHash);
   };
@@ -35,22 +48,6 @@ export function init(options = {}) {
   } else {
     window.addEventListener("load", initial);
   }
-  // Initialize when page updates/changes
-  document.addEventListener("pageModified", e => initWithin(e.target, options));
-}
-
-/**
- * Init all tabs within a certain context
- * @param {Node} context Element to init within
- * @param {Object} options Options to serve as defaults
- */
-export function initWithin(context, options = {}) {
-  if (!context) {
-    console.warn("Missing context to initWithin, skipping init of tabs");
-    return;
-  }
-  const tablists = context.querySelectorAll(`[data-ulu-tablist]:not([${ initAttr }])`);
-  tablists.forEach(element => setup(element, options));
 }
 
 /**
@@ -60,17 +57,7 @@ export function initWithin(context, options = {}) {
  * @return {Object} Instance object
  */
 export function setup(element, options = {}) {
-  let elementOptions = {};
-  
-  if (element.dataset.uluTablist) {
-    try {
-      elementOptions = JSON.parse(element.dataset.uluTablist);
-    } catch(e) {
-      console.error(errorHeader, "(JSON Parse for options)", element);
-    }
-  }
-
-  const config = Object.assign({}, options, elementOptions);
+  const config = Object.assign({}, options);
 
   if (config.vertical) {
     config.allArrows = true;
@@ -91,8 +78,6 @@ export function setup(element, options = {}) {
   if (config.equalHeights) {
     setHeights(element);
   }
-
-  element.setAttribute(initAttr, "");
   
   return instance;
 }
@@ -150,7 +135,9 @@ function setHeights(element) {
       if (panel.hidden) {
         panel.hidden = false;
         panelHeight = panel.offsetHeight;
-        panel.hidden = true;
+        // This explicity needs "hidden" for aria-tablist (it checks this string value)
+        // Will break the initial window push state when using openWithUrlHash
+        panel.setAttribute("hidden", "hidden"); 
       }
       return panelHeight;
     });