From 77d24f4129bbc636a7e127299434507c2dde6cce Mon Sep 17 00:00:00 2001
From: Paul Bottein <paul.bottein@gmail.com>
Date: Thu, 29 Jun 2023 11:27:49 +0200
Subject: [PATCH] Show position on sidebar card and hide arrow on panel card
 (#17092)

---
 .../lovelace/components/hui-card-options.ts   | 62 ++++++++++---------
 src/panels/lovelace/views/hui-masonry-view.ts |  1 -
 src/panels/lovelace/views/hui-panel-view.ts   |  1 +
 3 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/src/panels/lovelace/components/hui-card-options.ts b/src/panels/lovelace/components/hui-card-options.ts
index f91d5218f4..ec04f21acd 100644
--- a/src/panels/lovelace/components/hui-card-options.ts
+++ b/src/panels/lovelace/components/hui-card-options.ts
@@ -46,7 +46,7 @@ export class HuiCardOptions extends LitElement {
 
   @queryAssignedNodes() private _assignedNodes?: NodeListOf<LovelaceCard>;
 
-  @property({ type: Boolean }) public showPosition = false;
+  @property({ type: Boolean }) public hidePosition = false;
 
   @storage({
     key: "lovelaceClipboard",
@@ -82,36 +82,38 @@ export class HuiCardOptions extends LitElement {
           >
           <div class="right">
             <slot name="buttons"></slot>
-            <ha-icon-button
-              .label=${this.hass!.localize(
-                "ui.panel.lovelace.editor.edit_card.move_down"
-              )}
-              .path=${mdiArrowDown}
-              class="move-arrow"
-              @click=${this._cardDown}
-              .disabled=${this.lovelace!.config.views[this.path![0]].cards!
-                .length ===
-              this.path![1] + 1}
-            ></ha-icon-button>
-            ${this.showPosition
-              ? html`<ha-icon-button
-                  @click=${this._changeCardPosition}
-                  .label=${this.hass!.localize(
-                    "ui.panel.lovelace.editor.edit_card.change_position"
-                  )}
-                >
-                  <div class="position-badge">${this.path![1] + 1}</div>
-                </ha-icon-button>`
+            ${!this.hidePosition
+              ? html`
+                  <ha-icon-button
+                    .label=${this.hass!.localize(
+                      "ui.panel.lovelace.editor.edit_card.move_down"
+                    )}
+                    .path=${mdiArrowDown}
+                    class="move-arrow"
+                    @click=${this._cardDown}
+                    .disabled=${this.lovelace!.config.views[this.path![0]]
+                      .cards!.length ===
+                    this.path![1] + 1}
+                  ></ha-icon-button>
+                  <ha-icon-button
+                    @click=${this._changeCardPosition}
+                    .label=${this.hass!.localize(
+                      "ui.panel.lovelace.editor.edit_card.change_position"
+                    )}
+                  >
+                    <div class="position-badge">${this.path![1] + 1}</div>
+                  </ha-icon-button>
+                  <ha-icon-button
+                    .label=${this.hass!.localize(
+                      "ui.panel.lovelace.editor.edit_card.move_up"
+                    )}
+                    .path=${mdiArrowUp}
+                    class="move-arrow"
+                    @click=${this._cardUp}
+                    ?disabled=${this.path![1] === 0}
+                  ></ha-icon-button>
+                `
               : nothing}
-            <ha-icon-button
-              .label=${this.hass!.localize(
-                "ui.panel.lovelace.editor.edit_card.move_up"
-              )}
-              .path=${mdiArrowUp}
-              class="move-arrow"
-              @click=${this._cardUp}
-              ?disabled=${this.path![1] === 0}
-            ></ha-icon-button>
             <ha-button-menu @action=${this._handleAction}>
               <ha-icon-button
                 slot="trigger"
diff --git a/src/panels/lovelace/views/hui-masonry-view.ts b/src/panels/lovelace/views/hui-masonry-view.ts
index 45d3d3f1a0..b4ab615472 100644
--- a/src/panels/lovelace/views/hui-masonry-view.ts
+++ b/src/panels/lovelace/views/hui-masonry-view.ts
@@ -272,7 +272,6 @@ export class MasonryView extends LitElement implements LovelaceViewElement {
       wrapper.hass = this.hass;
       wrapper.lovelace = this.lovelace;
       wrapper.path = [this.index!, index];
-      wrapper.showPosition = true;
       card.editMode = true;
       wrapper.appendChild(card);
       columnEl.appendChild(wrapper);
diff --git a/src/panels/lovelace/views/hui-panel-view.ts b/src/panels/lovelace/views/hui-panel-view.ts
index 33ae765228..6f382d83c5 100644
--- a/src/panels/lovelace/views/hui-panel-view.ts
+++ b/src/panels/lovelace/views/hui-panel-view.ts
@@ -121,6 +121,7 @@ export class PanelView extends LitElement implements LovelaceViewElement {
     wrapper.hass = this.hass;
     wrapper.lovelace = this.lovelace;
     wrapper.path = [this.index!, 0];
+    wrapper.hidePosition = true;
     card.editMode = true;
     wrapper.appendChild(card);
     this._card = wrapper;