canvasframework 0.7.0 → 0.7.1

package/components/BottomSheet.js

@@ -1,156 +1,185 @@
 import Component from '../core/Component.js';
+import { roundRect, roundRectTop } from '../core/CanvasUtils.js';
 
 /**
- * BottomSheet avec styles Material et Cupertino
- * @class
- * @extends Component
+ * BottomSheet — Material et Cupertino.
+ *
+ * Corrections :
+ *  - roundRect / roundRectTop viennent de CanvasUtils
+ *  - Guard _destroyed dans les boucles RAF
+ *  - destroy() nettoie les ressources
  */
 class BottomSheet extends Component {
+  /**
+   * @param {CanvasFramework} framework
+   * @param {Object} [options={}]
+   * @param {number}  [options.height]           - Hauteur de la feuille (défaut : 60% de l'écran)
+   * @param {boolean} [options.dragHandle=true]
+   * @param {boolean} [options.closeOnOverlayClick=true]
+   * @param {string}  [options.bgColor]
+   * @param {number}  [options.borderRadius]
+   */
   constructor(framework, options = {}) {
     super(framework, {
       x: 0,
       y: framework.height,
       width: framework.width,
       height: options.height || framework.height * 0.6,
-      visible: false
+      visible: false,
     });
 
-    this.platform = framework.platform; // material / cupertino
-
-    this.children = [];
-    this.dragHandle = options.dragHandle !== false;
+    this.platform            = framework.platform;
+    this.children            = [];
+    this.dragHandle          = options.dragHandle !== false;
     this.closeOnOverlayClick = options.closeOnOverlayClick !== false;
 
-    // Styles plateforme
+    // Styles selon la plateforme
     if (this.platform === 'material') {
-      this.bgColor = options.bgColor || '#FFFFFF';
-      this.overlayColor = 'rgba(0,0,0,0.5)';
-      this.shadowBlur = 20;
+      this.bgColor       = options.bgColor || '#FFFFFF';
+      this.overlayColor  = 'rgba(0,0,0,0.5)';
+      this.shadowBlur    = 20;
       this.shadowOffsetY = -5;
-      this.borderRadius = 11;
-    } else { // cupertino
-      this.bgColor = options.bgColor || 'rgba(255,255,255,0.95)';
-      this.overlayColor = 'rgba(0,0,0,0.2)';
-      this.shadowBlur = 0;
+      this.borderRadius  = 11;
+    } else {
+      this.bgColor       = options.bgColor || 'rgba(255,255,255,0.95)';
+      this.overlayColor  = 'rgba(0,0,0,0.2)';
+      this.shadowBlur    = 0;
       this.shadowOffsetY = 0;
-      this.borderRadius = options.borderRadius || 20;
+      this.borderRadius  = options.borderRadius || 20;
     }
 
-    this.targetY = framework.height;
-    this.isOpen = false;
-    this.animating = false;
-    this.dragging = false;
-    this.dragStartY = 0;
-    this.dragOffset = 0;
+    this.targetY       = framework.height;
+    this.isOpen        = false;
+    this._animating    = false;
+    this._rafId        = null;
+    this.dragging      = false;
+    this.dragStartY    = 0;
+    this.dragOffset    = 0;
     this.lastClickTime = 0;
 
-    this.onPress = this.handlePress.bind(this);
-    this.onMove = this.handleMove.bind(this);
-    this.onRelease = this.handleRelease.bind(this);
+    this.onPress   = this._handlePress.bind(this);
+    this.onMove    = this._handleMove.bind(this);
+    this.onRelease = this._handleRelease.bind(this);
   }
 
+  // ─────────────────────────────────────────
+  // ENFANTS
+  // ─────────────────────────────────────────
+
   add(child) {
     this.children.push(child);
     return child;
   }
 
+  // ─────────────────────────────────────────
+  // OPEN / CLOSE
+  // ─────────────────────────────────────────
+
   open() {
     this.visible = true;
-    this.isOpen = true;
+    this.isOpen  = true;
     this.targetY = this.framework.height - this.height;
-    this.animate();
+    this._animate();
   }
 
   close() {
-    this.isOpen = false;
+    this.isOpen  = false;
     this.targetY = this.framework.height;
-    this.animate(() => {
-      this.visible = false;
-    });
+    this._animate(() => { this.visible = false; });
   }
 
-  animate(callback) {
-    if (this.animating) return;
-    this.animating = true;
+  /** @private */
+  _animate(callback) {
+    if (this._animating) return;
+    this._animating = true;
+
+    if (this._rafId) cancelAnimationFrame(this._rafId);
 
     const step = () => {
-      let diff = this.targetY - this.y;
+      if (this._destroyed) { this._rafId = null; this._animating = false; return; }
+
+      const diff = this.targetY - this.y;
 
       if (Math.abs(diff) < 1) {
-        this.y = this.targetY;
-        this.animating = false;
-        if (callback) callback();
+        this.y          = this.targetY;
+        this._animating = false;
+        this._rafId     = null;
+        callback?.();
         return;
       }
 
-      // Animation type spring pour iOS, easing pour Material
-      if (this.platform === 'cupertino') {
-        diff *= 0.15; // spring
-      } else {
-        diff *= 0.2; // easing
-      }
-
-      this.y += diff;
-
-      requestAnimationFrame(step);
+      // Spring iOS, easing Material
+      this.y      += diff * (this.platform === 'cupertino' ? 0.15 : 0.2);
+      this._rafId  = requestAnimationFrame(step);
     };
 
-    step();
+    this._rafId = requestAnimationFrame(step);
   }
 
-  handlePress(x, y) {
+  // ─────────────────────────────────────────
+  // INTERACTIONS
+  // ─────────────────────────────────────────
+
+  /** @private */
+  _handlePress(x, y) {
     const now = Date.now();
     if (now - this.lastClickTime < 300) return;
     this.lastClickTime = now;
 
+    // Clic sur l'overlay
     if (y < this.y && this.closeOnOverlayClick) {
       this.close();
       return;
     }
 
-    // Clic sur la poignée
-	if (this.dragHandle && y >= this.y && y <= this.y + 40) {
-	  // ✅ Fermer le bottom sheet immédiatement
-	  this.close();
-	  return;
-	}
+    // Clic sur la poignée → fermeture
+    if (this.dragHandle && y >= this.y && y <= this.y + 40) {
+      this.close();
+      return;
+    }
 
-    // Gestion clic enfants
+    // Déléguer aux enfants
     const contentY = this.y + (this.dragHandle ? 40 : 16);
     for (let i = this.children.length - 1; i >= 0; i--) {
       const child = this.children[i];
       if (!child.visible) continue;
 
-      const childAbsX = this.x + 16 + child.x;
-      const childAbsY = contentY + child.y;
+      const absX = this.x + 16 + child.x;
+      const absY = contentY + child.y;
 
-      if (x >= childAbsX && x <= childAbsX + child.width &&
-          y >= childAbsY && y <= childAbsY + child.height) {
-        if (child.onClick) child.onClick();
+      if (x >= absX && x <= absX + child.width && y >= absY && y <= absY + child.height) {
+        child.onClick?.();
         return;
       }
     }
   }
 
-  handleMove(x, y) {
+  /** @private */
+  _handleMove(x, y) {
     if (!this.dragging) return;
     this.dragOffset = y - this.dragStartY;
-    let newY = (this.framework.height - this.height) + this.dragOffset;
+    const newY      = (this.framework.height - this.height) + this.dragOffset;
     if (newY >= this.framework.height - this.height) this.y = newY;
   }
 
-  handleRelease() {
+  /** @private */
+  _handleRelease() {
     if (!this.dragging) return;
-    this.dragging = false;
+    this.dragging                  = false;
     this.framework.activeComponent = null;
 
-    if (this.dragOffset > this.height * 0.3) this.close();
-    else {
+    if (this.dragOffset > this.height * 0.3) {
+      this.close();
+    } else {
       this.targetY = this.framework.height - this.height;
-      this.animate();
+      this._animate();
     }
   }
 
+  // ─────────────────────────────────────────
+  // DESSIN
+  // ─────────────────────────────────────────
+
   draw(ctx) {
     if (!this.visible) return;
     ctx.save();
@@ -159,27 +188,27 @@ class BottomSheet extends Component {
     ctx.fillStyle = this.overlayColor;
     ctx.fillRect(0, 0, this.framework.width, this.framework.height);
 
-    // Sheet
-    ctx.fillStyle = this.bgColor;
-    ctx.shadowColor = this.platform === 'material' ? 'rgba(0,0,0,0.3)' : 'transparent';
-    ctx.shadowBlur = this.shadowBlur;
-    ctx.shadowOffsetY = this.shadowOffsetY;
+    // Feuille
+    ctx.fillStyle       = this.bgColor;
+    ctx.shadowColor     = this.platform === 'material' ? 'rgba(0,0,0,0.3)' : 'transparent';
+    ctx.shadowBlur      = this.shadowBlur;
+    ctx.shadowOffsetY   = this.shadowOffsetY;
 
     ctx.beginPath();
-    this.roundRectTop(ctx, this.x, this.y, this.width, this.height, this.borderRadius);
+    roundRectTop(ctx, this.x, this.y, this.width, this.height, this.borderRadius);
     ctx.fill();
     ctx.shadowColor = 'transparent';
 
-    // Drag handle
+    // Poignée
     if (this.dragHandle) {
       ctx.fillStyle = this.platform === 'material' ? '#CCCCCC' : '#E0E0E0';
       ctx.beginPath();
-      this.roundRect(ctx, this.width / 2 - 20, this.y + 12, 40, 4, 2);
+      roundRect(ctx, this.width / 2 - 20, this.y + 12, 40, 4, 2);
       ctx.fill();
     }
 
-    // Enfants
-    const contentY = this.y + (this.dragHandle ? 40 : 16);
+    // Clip pour les enfants
+    const contentY      = this.y + (this.dragHandle ? 40 : 16);
     const contentHeight = this.height - (this.dragHandle ? 40 : 16);
 
     ctx.save();
@@ -187,7 +216,7 @@ class BottomSheet extends Component {
     ctx.rect(this.x, contentY, this.width, contentHeight);
     ctx.clip();
 
-    for (let child of this.children) {
+    for (const child of this.children) {
       if (!child.visible) continue;
       const origX = child.x;
       const origY = child.y;
@@ -202,33 +231,22 @@ class BottomSheet extends Component {
     ctx.restore();
   }
 
-  roundRectTop(ctx, x, y, width, height, radius) {
-    ctx.moveTo(x + radius, y);
-    ctx.lineTo(x + width - radius, y);
-    ctx.quadraticCurveTo(x + width, y, x + width, y + radius);
-    ctx.lineTo(x + width, y + height);
-    ctx.lineTo(x, y + height);
-    ctx.lineTo(x, y + radius);
-    ctx.quadraticCurveTo(x, y, x + radius, y);
+  isPointInside(x, y) {
+    return this.visible;
   }
 
-  roundRect(ctx, x, y, width, height, radius) {
-    if (radius === 0) return ctx.rect(x, y, width, height);
-    ctx.moveTo(x + radius, y);
-    ctx.lineTo(x + width - radius, y);
-    ctx.quadraticCurveTo(x + width, y, x + width, y + radius);
-    ctx.lineTo(x + width, y + height - radius);
-    ctx.quadraticCurveTo(x + width, y + height, x + width - radius, y + height);
-    ctx.lineTo(x + radius, y + height);
-    ctx.quadraticCurveTo(x, y + height, x, y + height - radius);
-    ctx.lineTo(x, y + radius);
-    ctx.quadraticCurveTo(x, y, x + radius, y);
-    ctx.closePath();
-  }
+  // ─────────────────────────────────────────
+  // DESTROY
+  // ─────────────────────────────────────────
 
-  isPointInside(x, y) {
-    return this.visible;
+  destroy() {
+    if (this._rafId) {
+      cancelAnimationFrame(this._rafId);
+      this._rafId = null;
+    }
+    this.children = [];
+    super.destroy();
   }
 }
 
-export default BottomSheet;
+export default BottomSheet;