canvasframework 0.5.36 → 0.5.38

package/components/Card.js

@@ -40,43 +40,28 @@ class Card extends Component {
     this.elevation = options.elevation || 0;
     this.autoLayout = options.autoLayout !== undefined ? options.autoLayout : true;
     
-    // 🔴 IMPORTANT : Activer la gestion des clics pour les enfants
-    this.clickableChildren = true;
-    
-    // 🔴 Détecter la plateforme
-    this.isCapacitor = typeof window !== 'undefined' && (window.Capacitor || window.cordova);
-    
     // Stocker les positions relatives des enfants
     this.childPositions = new Map();
   }
 
   /**
-   * Ajoute un enfant
+   * Ajoute un enfant (position relative convertie en absolue)
    * @param {Component} child - Composant enfant
    * @returns {Component} L'enfant ajouté
    */
   add(child) {
     this.children.push(child);
     
-    if (this.isCapacitor) {
-      // CAPACITOR : Convertir en positions absolues
-      const relativeX = child.x;
-      const relativeY = child.y;
-      
-      child.x = this.x + relativeX;
-      child.y = this.y + relativeY;
-      
-      this.childPositions.set(child, { 
-        x: relativeX, 
-        y: relativeY 
-      });
-    } else {
-      // WEB : Garder les positions relatives
-      this.childPositions.set(child, { 
-        x: child.x, 
-        y: child.y 
-      });
-    }
+    // CONVERTIR les positions relatives en positions absolues
+    // Les x, y passés sont relatifs à la Card
+    child.x = this.x + child.x;
+    child.y = this.y + child.y;
+    
+    // Stocker la position relative originale
+    this.childPositions.set(child, { 
+      x: child.x - this.x, 
+      y: child.y - this.y 
+    });
     
     // Si autoLayout est activé, organiser automatiquement
     if (this.autoLayout) {
@@ -134,15 +119,9 @@ class Card extends Component {
           child.width = this.width - (this.padding * 2);
         }
         
-        if (this.isCapacitor) {
-          // CAPACITOR : Positions absolues
-          child.x = this.x + childX;
-          child.y = this.y + currentY;
-        } else {
-          // WEB : Positions relatives
-          child.x = childX;
-          child.y = currentY;
-        }
+        // Positionner l'enfant RELATIVEMENT à la Card
+        child.x = this.x + childX;
+        child.y = this.y + currentY;
         
         // Stocker la position relative
         this.childPositions.set(child, { x: childX, y: currentY });
@@ -173,15 +152,9 @@ class Card extends Component {
           child.height = this.height - (this.padding * 2);
         }
         
-        if (this.isCapacitor) {
-          // CAPACITOR : Positions absolues
-          child.x = this.x + currentX;
-          child.y = this.y + childY;
-        } else {
-          // WEB : Positions relatives
-          child.x = currentX;
-          child.y = childY;
-        }
+        // Positionner l'enfant RELATIVEMENT à la Card
+        child.x = this.x + currentX;
+        child.y = this.y + childY;
         
         // Stocker la position relative
         this.childPositions.set(child, { x: currentX, y: childY });
@@ -203,20 +176,15 @@ class Card extends Component {
    * @param {number} y - Nouvelle position Y
    */
   setPosition(x, y) {
-    if (this.isCapacitor) {
-      // CAPACITOR : Déplacer les enfants avec la carte
-      const deltaX = x - this.x;
-      const deltaY = y - this.y;
-      
-      super.setPosition(x, y);
-      
-      for (let child of this.children) {
-        child.x += deltaX;
-        child.y += deltaY;
-      }
-    } else {
-      // WEB : Les enfants sont en relatif, pas besoin de les déplacer
-      super.setPosition(x, y);
+    const deltaX = x - this.x;
+    const deltaY = y - this.y;
+    
+    super.setPosition(x, y);
+    
+    // Déplacer tous les enfants avec la carte
+    for (let child of this.children) {
+      child.x += deltaX;
+      child.y += deltaY;
     }
   }
 
@@ -228,13 +196,8 @@ class Card extends Component {
    */
   setChildPosition(child, relativeX, relativeY) {
     if (this.children.includes(child)) {
-      if (this.isCapacitor) {
-        child.x = this.x + relativeX;
-        child.y = this.y + relativeY;
-      } else {
-        child.x = relativeX;
-        child.y = relativeY;
-      }
+      child.x = this.x + relativeX;
+      child.y = this.y + relativeY;
       this.childPositions.set(child, { x: relativeX, y: relativeY });
     }
   }
@@ -329,21 +292,8 @@ class Card extends Component {
     }
     
     // Dessiner les enfants
-    if (this.isCapacitor) {
-      // CAPACITOR : Dessiner directement (positions absolues)
-      for (let child of this.children) {
-        if (child.visible) child.draw(ctx);
-      }
-    } else {
-      // WEB : Dessiner avec translate (positions relatives)
-      ctx.save();
-      ctx.translate(this.x, this.y);
-      
-      for (let child of this.children) {
-        if (child.visible) child.draw(ctx);
-      }
-      
-      ctx.restore();
+    for (let child of this.children) {
+      if (child.visible) child.draw(ctx);
     }
     
     ctx.restore();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "canvasframework",
-  "version": "0.5.36",
+  "version": "0.5.38",
   "repository": {
     "type": "git",
     "url": "https://github.com/beyons/CanvasFramework.git"