material 0.8.3 → 0.8.5

package/index.js

@@ -30,12 +30,12 @@ import Textfield from './src/textfield'
 import Toolbar from './src/toolbar'
 import Tooltip from './src/tooltip'
 import View from './src/view'
-import events from './src/module/events'
 import attributes from './src/module/attributes'
 import build from './src/module/build'
 import dataset from './src/module/dataset'
+import device from './src/module/device'
 import display from './src/mixin/display'
-import events from './src/module/attach'
+import events from './src/module/events'
 import emitter from './src/module/emitter'
 import jsonToHTML from './src/module/jsontohtml'
 import mediator from './src/module/mediator'
@@ -46,6 +46,6 @@ export {
   AppBar, Button, Card, Checkbox, Component, DateHour, Dialog, Drawer, Element,
   File, Form, Image, Layout, List, Loading, Menu, Navigation, Progress, Select,
   Selecter, Slider, Snackbar, Switch, Switcher, Tabs, TabView, Text, Textfield, Toolbar, Tooltip,
-  View, events, attributes, build, dataset, display, events, emitter, jsonToHTML, mediator,
+  View, attributes, build, dataset, device, display, events, emitter, jsonToHTML, mediator,
   observer, smoothscroll
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "material",
-  "version": "0.8.3",
+  "version": "0.8.5",
   "description": "A lightweight implementation of Material Design Components for the web - ES6",
   "main": "index.js",
   "type": "module",

package/src/module/device.js

@@ -4,6 +4,9 @@
 const previousDevice = window.device
 
 const device = {}
+const os = ['ios', 'iphone', 'ipad', 'ipod', 'android', 'blackberry', 'macos', 'windows', 'fxos', 'meego', 'television']
+const type = ['mobile', 'tablet', 'desktop']
+const television = ['googletv', 'viera', 'smarttv', 'internet.tv', 'netcast', 'nettv', 'appletv', 'boxee', 'kylo', 'roku', 'dlnadoc', 'pov_tv', 'hbbtv', 'ce-html']
 
 const changeOrientationList = []
 
@@ -18,22 +21,6 @@ const documentElement = window.document.documentElement
 let userAgent = window.navigator.userAgent.toLowerCase()
 
 // Detectable television devices.
-const television = [
-  'googletv',
-  'viera',
-  'smarttv',
-  'internet.tv',
-  'netcast',
-  'nettv',
-  'appletv',
-  'boxee',
-  'kylo',
-  'roku',
-  'dlnadoc',
-  'pov_tv',
-  'hbbtv',
-  'ce-html'
-]
 
 // Main functions
 // --------------
@@ -237,7 +224,7 @@ function removeClass (className) {
 }
 
 function cleanClasses () {
-  const classes = ['mobile', 'tablet', 'desktop', 'ios', 'iphone', 'ipad', 'ipod', 'android', 'blackberry', 'macos', 'windows', 'fxos', 'meego', 'television']
+  const classes = [...os, ...type]
   for (let i = 0; i < classes.length; i++) {
     removeClass(classes[i])
   }
@@ -362,20 +349,8 @@ function findMatch (arr) {
   return 'unknown'
 }
 
-device.type = findMatch(['mobile', 'tablet', 'desktop'])
-device.os = findMatch([
-  'ios',
-  'iphone',
-  'ipad',
-  'ipod',
-  'android',
-  'blackberry',
-  'macos',
-  'windows',
-  'fxos',
-  'meego',
-  'television'
-])
+device.type = findMatch(type)
+device.os = findMatch(os)
 
 function setOrientationCache () {
   device.orientation = findMatch(['portrait', 'landscape'])
@@ -388,9 +363,8 @@ device.onDeviceChange = null
 
 function updateDeviceDetection () {
   userAgent = window.navigator.userAgent.toLowerCase()
-  console.log('UA', userAgent)
-  device.type = findMatch(['mobile', 'tablet', 'desktop'])
-  device.os = findMatch(['ios', 'iphone', 'ipad', 'ipod', 'android', 'blackberry', 'macos', 'windows', 'fxos', 'meego', 'television'])
+  device.type = findMatch(type)
+  device.os = findMatch(os)
   setOrientationCache()
   applyClass()
   checkAndHandleDeviceChange()

package/src/module/events.js

@@ -2,11 +2,17 @@ import extract from './extract'
 import last from './last'
 
 const events = {
-  eventHandlers: [], // Utiliser un tableau pour stocker les événements et les gestionnaires
+  eventHandlers: {}, // Utiliser un tableau pour stocker les événements et les gestionnaires
 
   attach (eventsArray, context) {
     if (!eventsArray) return
 
+    // Ensure each context has a unique UID
+    const uid = context._uid || (context._uid = context.options.class + Math.random().toString(36).substr(2, 9))
+
+    // Initialize storage for this context if it doesn't already exist
+    this.eventHandlers[uid] = this.eventHandlers[uid] || {}
+
     eventsArray.forEach(([eventDef, funcDef, option]) => {
       const e = extract.e(context, eventDef)
       const isFunction = typeof funcDef === 'function'
@@ -20,7 +26,6 @@ const events = {
       }
 
       const bound = last(keys.join('.'), context)
-
       let handler = null
 
       if (isFunction) {
@@ -28,18 +33,17 @@ const events = {
       } else if (f && bound) {
         handler = f.bind(bound)
       } else {
-        // console.error(`Can't bind function for ${eventDef}`)
-        return
+        return // Cannot bind function for eventDef
       }
 
-      if (handler && e && e.element && e.element.addEventListener) {
-        e.element.addEventListener(e.name, handler, option)
-        this.eventHandlers.push({ eventDef, element: e.element, handler })
-      } else if (e && e.element && e.element.on && handler) {
-        e.element.on(e.name, handler)
-        this.eventHandlers.push({ eventDef, element: e.element, handler })
-      } else {
-        // console.error(`Can't attach ${eventDef}`)
+      if (!this.eventHandlers[uid][eventDef]) {
+        if (handler && e && e.element?.addEventListener) {
+          e.element.addEventListener(e.name, handler, option)
+          this.eventHandlers[uid][eventDef] = handler
+        } else if (e && e.element?.on && handler) {
+          e.element.on(e.name, handler)
+          this.eventHandlers[uid][eventDef] = handler
+        }
       }
     })
 
@@ -47,20 +51,26 @@ const events = {
   },
 
   detach (eventsArray, context) {
-    (eventsArray || []).forEach(([eventDef]) => {
-      this.eventHandlers.forEach((handlerObj, index) => {
-        if (handlerObj.eventDef === eventDef) {
-          const { element, handler } = handlerObj
-          if (element.removeEventListener) {
-            element.removeEventListener(eventDef, handler)
-          } else if (element.off) {
-            element.off(eventDef, handler)
-          }
-          delete this.eventHandlers[index]
-        }
-      })
-      this.eventHandlers = this.eventHandlers.filter(Boolean) // Nettoyer les entrées supprimées
-    })
+    const uid = context._uid
+    if (!this.eventHandlers[uid]) return
+
+    eventsArray.forEach(([eventDef, funcDef, option]) => {
+      const e = extract.e(context, eventDef)
+      const handler = this.eventHandlers[uid][eventDef]
+      if (handler) {
+        e.element.removeEventListener(e.name, handler)
+      } else if (e.element.off) {
+        e.element.off(e.name, handler)
+      }
+
+      delete this.eventHandlers[uid][eventDef]
+    }
+    )
+  },
+
+  list (context) {
+    const uid = context?._uid
+    return uid ? this.eventHandlers[uid] || {} : this.eventHandlers
   }
 }
 

package/src/switcher.js

@@ -66,7 +66,7 @@ class Switcher extends EventEmitter {
   }
 
   setup () {
-    console.log('events.attach', this.options.events)
+    // console.log('events.attach', this.options.events)
     events.attach(this.options.events, this)
 
     if (this.options.default) {
@@ -75,7 +75,7 @@ class Switcher extends EventEmitter {
   }
 
   click (event) {
-    console.log('click', event)
+    // console.log('click', event)
     if (!event.target.dataset.switcher) return
     this.select(event.target)
   }