From 41144252288df9464d2b8db72ecbbb6475b6ee84 Mon Sep 17 00:00:00 2001
From: Alain Dumesny <alaind831+github@gmail.com>
Date: Thu, 13 Jun 2024 17:23:27 +0200
Subject: [PATCH] prevent 'r' rotation to items that can't resize (2) * fix
 #2694

---
 src/dd-draggable.ts | 2 +-
 src/gridstack.ts    | 2 +-
 src/utils.ts        | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/dd-draggable.ts b/src/dd-draggable.ts
index 733df0b3d..2e73a48bc 100644
--- a/src/dd-draggable.ts
+++ b/src/dd-draggable.ts
@@ -291,7 +291,7 @@ export class DDDraggable extends DDBaseImplement implements HTMLElementExtendOpt
       grid.engine.restoreInitial();
       this._mouseUp(this.mouseDownEvent);
     } else if (e.key === 'r' || e.key === 'R') {
-      if (n.w === n.h) return;
+      if (!Utils.canBeRotated(n)) return;
       n._origRotate = n._origRotate || {...n._orig}; // store the real orig size in case we Esc after doing rotation
       delete n._moving; // force rotate to happen (move waits for >50% coverage otherwise)
       grid.setAnimation(false) // immediate rotate so _getDragOffset() gets the right dom size below
diff --git a/src/gridstack.ts b/src/gridstack.ts
index adc6de8bc..0b3b042c3 100644
--- a/src/gridstack.ts
+++ b/src/gridstack.ts
@@ -1450,7 +1450,7 @@ export class GridStack {
   public rotate(els: GridStackElement, relative?: Position): GridStack {
     GridStack.getElements(els).forEach(el => {
       let n = el.gridstackNode;
-      if (!n || n.w === n.h || n.locked || n.noResize || n.grid?.opts.disableResize || (n.minW && n.minW === n.maxW) || (n.minH && n.minH === n.maxH)) return;
+      if (!Utils.canBeRotated(n)) return;
       const rot: GridStackWidget = { w: n.h, h: n.w, minH: n.minW, minW: n.minH, maxH: n.maxW, maxW: n.maxH };
       // if given an offset, adjust x/y by column/row bounds when user presses 'r' during dragging
       if (relative) {
diff --git a/src/utils.ts b/src/utils.ts
index aa73f2415..638c40993 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -604,4 +604,9 @@ export class Utils {
   //   }
   //   return el.contains(target);
   // }
-}
+
+  /** true if the item can be rotated (checking for prop, not space available) */
+  public static canBeRotated(n: GridStackNode): boolean {
+    return !(!n || n.w === n.h || n.locked || n.noResize || n.grid?.opts.disableResize || (n.minW && n.minW === n.maxW) || (n.minH && n.minH === n.maxH));
+  }
+}
\ No newline at end of file