ux v1.38.1: tap-action cleanup + right-click more-info

- per-device action: Device card (default) / more-info / Toggle; 'as
  card default' removed, card editor's global tap_action field deleted
  and ignored; RU: 'по нажатию'
- right click on an icon in View opens more-info (native menu in
  editors; virtual w/o entity -> device card)
- smoke_tap_ctx.mjs; TESTING/CHANGELOG same-commit

custom_components/houseplan/const.py

@@ -11,7 +11,7 @@ PLANS_DIR = "houseplan/plans"  # relative to the HA configuration directory
 FILES_URL = "/houseplan_files/files"
 FILES_DIR = "houseplan/files"
 CONF_ADMIN_ONLY = "admin_only"
-VERSION = "1.38.0"
+VERSION = "1.38.1"
 
 DEFAULT_CONFIG: dict = {
     "spaces": [],

custom_components/houseplan/manifest.json

@@ -16,5 +16,5 @@
   "issue_tracker": "https://github.com/Matysh/houseplan-card/issues",
   "requirements": [],
   "single_config_entry": true,
-  "version": "1.38.0"
+  "version": "1.38.1"
 }

demo/smoke_tap_ctx.mjs

@@ -0,0 +1,54 @@
+import { launch } from './serve.mjs';
+const { page, browser } = await launch();
+const res = await page.evaluate(async () => {
+  const out = {};
+  const c = window.__card;
+  const sr = () => c.shadowRoot || c.renderRoot;
+  // 1) в селекте действий 3 опции, дефолт «Карточка устройства»
+  c._setMode('devices'); await c.updateComplete;
+  const dev = c._devices.find((d) => !d.virtual && d.primary);
+  c._openMarkerDialog(dev); await c.updateComplete;
+  const sel = [...sr().querySelectorAll('.dialog select')].find((s) =>
+    [...s.options].some((o) => o.textContent === c._t('tap.toggle')));
+  out.threeOptions = sel && sel.options.length === 3;
+  out.noAutoOption = sel && ![...sel.options].some((o) => o.value === '');
+  out.defaultInfo = sel && sel.value === 'info';
+  c._markerDialog = null; await c.updateComplete;
+  // 2) правый клик в Просмотре открывает more-info
+  c._setMode('view'); await c.updateComplete;
+  let moreInfo = null;
+  c._openMoreInfo = (eid) => { moreInfo = eid; };
+  const ev = new MouseEvent('contextmenu', { bubbles: true, cancelable: true });
+  c._ctxDevice(ev, dev);
+  out.ctxMoreInfo = moreInfo === dev.primary;
+  out.ctxPrevented = ev.defaultPrevented;
+  // 3) в редакторах правый клик не перехватывается
+  c._setMode('devices'); await c.updateComplete;
+  moreInfo = null;
+  const ev2 = new MouseEvent('contextmenu', { bubbles: true, cancelable: true });
+  c._ctxDevice(ev2, dev);
+  out.editorNative = moreInfo === null && !ev2.defaultPrevented;
+  // 4) виртуальное без primary → инфо-карточка
+  c._setMode('view'); await c.updateComplete;
+  const virt = c._devices.find((d) => d.virtual && !d.primary) || null;
+  if (virt) {
+    c._ctxDevice(new MouseEvent('contextmenu', { cancelable: true }), virt);
+    out.virtInfo = c._infoCard === virt;
+    c._infoCard = null;
+  } else out.virtInfo = 'no-virt';
+  // 5) card-wide tap_action игнорируется: без явного действия клик = инфо
+  c._config = { ...c._config, tap_action: 'toggle' };
+  const calls = [];
+  c.hass = { ...c.hass, callService: (d2, s2, data) => { calls.push([d2, s2, data]); return Promise.resolve(); } };
+  await c.updateComplete;
+  const plain = c._devices.find((d) => !d.virtual && d.primary?.startsWith('light.') && !d.tapAction);
+  if (plain) {
+    c._infoCard = null;
+    c._clickDevice(new MouseEvent('click'), plain);
+    out.cardTapIgnored = calls.length === 0 && !!c._infoCard;
+    c._infoCard = null;
+  } else out.cardTapIgnored = 'no-plain-light';
+  return out;
+});
+console.log(JSON.stringify(res, null, 1));
+await browser.close();

docs/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## v1.38.1 — 2026-07-23 (tap action cleanup, right-click more-info)
+- The per-device action is now one of three: **Device card** (renamed from
+  "Info card", the default), HA more-info, Toggle. The confusing "As the card
+  default" option is gone — along with the card editor's global tap setting
+  (it is ignored if present in old configs). Explicit per-device choices are
+  untouched. RU wording: «по нажатию» instead of «по тапу».
+- **Right click** on a device icon in View mode always opens HA's more-info
+  dialog (editors keep the native browser menu; a virtual marker without an
+  entity opens its device card).
+
 ## v1.38.0 — 2026-07-23 (binding section redesign)
 - The device dialog's binding section is compact now: two radio buttons —
   **Virtual device** and **Pick from the HA list** — with a **Show entities**

docs/TESTING.md

@@ -140,6 +140,11 @@ Run the *core flows* (marked ★ below) in each environment at least once per mi
       (explicit ripple color still wins); off/white lights unchanged [auto]
 - [ ] Alarm pulse (v1.27.0): leak/smoke/gas/CO/siren in 'on' pulse a red ring over any
       display mode; clears on 'off'; unavailable never alarms [auto]; reduced-motion static
+- [ ] Tap action cleanup + right click (v1.38.1): the per-device action list
+      has three options (Device card / HA more-info / Toggle), no "card
+      default" — the card editor's global tap option is gone and ignored;
+      right click on an icon in VIEW opens HA more-info (native menu kept in
+      editors; virtual w/o entity → device card) [auto]
 - [ ] Binding section redesign (v1.38.0): two radios — Virtual / Pick from
       the HA list — with a "Show entities" checkbox (tooltip) next to the
       second; the dropdown (search inside) appears only in HA mode, opens

package.json

@@ -1,6 +1,6 @@
 {
   "name": "houseplan-card",
-  "version": "1.38.0",
+  "version": "1.38.1",
   "description": "Interactive house plan Lovelace card for Home Assistant",
   "license": "MIT",
   "type": "module",

src/editor.ts

@@ -63,19 +63,6 @@ class HouseplanCardEditor extends LitElement {
           },
         },
       },
-      {
-        name: 'tap_action',
-        selector: {
-          select: {
-            mode: 'dropdown',
-            options: [
-              { value: 'info', label: t(L, 'tap.info') },
-              { value: 'more-info', label: t(L, 'tap.more_info') },
-              { value: 'toggle', label: t(L, 'tap.toggle') },
-            ],
-          },
-        },
-      },
       { name: 'icon_size', selector: { number: { min: 1, max: 6, step: 0.1, mode: 'box' } } },
       { name: 'show_temperature', selector: { boolean: {} } },
       { name: 'live_states', selector: { boolean: {} } },
@@ -91,7 +78,6 @@ class HouseplanCardEditor extends LitElement {
       title: t(L, 'editor.title'),
       default_floor: t(L, 'editor.default_floor'),
       language: t(L, 'editor.language'),
-      tap_action: t(L, 'editor.tap_action'),
       icon_size: t(L, 'editor.icon_size'),
       show_temperature: t(L, 'editor.show_temperature'),
       live_states: t(L, 'editor.live_states'),

src/houseplan-card.ts

@@ -32,7 +32,7 @@ import './space-card';
 import { cardStyles } from './styles';
 import { langOf, t, type I18nKey } from './i18n';
 
-const CARD_VERSION = '1.38.0';
+const CARD_VERSION = '1.38.1';
 const LS_KEY = 'houseplan_card_layout_v1';
 const LS_CFG = 'houseplan_card_cfg_v1'; // cache of the server config+layout for instant rendering
 const LS_ZOOM = 'houseplan_card_zoom_v1';
@@ -829,6 +829,15 @@ class HouseplanCard extends LitElement {
     fireEvent(this, 'hass-more-info', { entityId });
   }
 
+  /** Right click in VIEW mode always opens HA's more-info (owner's decision). */
+  private _ctxDevice(ev: MouseEvent, d: DevItem): void {
+    if (this._mode !== 'view') return; // editors keep the native context menu
+    ev.preventDefault();
+    ev.stopPropagation();
+    if (d.primary) this._openMoreInfo(d.primary);
+    else this._infoCard = d;
+  }
+
   private _clickDevice(ev: MouseEvent, d: DevItem): void {
     ev.stopPropagation();
     if (this._drag?.moved || this._suppressClick || this._holdFired) return;
@@ -849,7 +858,7 @@ class HouseplanCard extends LitElement {
         .catch((e: any) => this._showToast(this._t('toast.error', { err: this._errText(e) })));
       return;
     }
-    const action = resolveTapAction(d.tapAction, this._config?.tap_action, domain);
+    const action = resolveTapAction(d.tapAction, undefined, domain);
     if (action === 'toggle' && d.primary) {
       this.hass
         .callService('homeassistant', 'toggle', { entity_id: d.primary })
@@ -3297,6 +3306,7 @@ class HouseplanCard extends LitElement {
       class="dev ${cls} ${this._selId === d.id ? 'sel' : ''} ${d.virtual ? 'virtual' : ''} ${disp === 'ripple' ? 'noicon' : ''} ${valText != null ? 'valonly' : ''} ${lightC ? 'rgb' : ''} ${alarm ? 'alarm' : ''}"
       style="${st.join(';')}"
       @click=${(e: MouseEvent) => this._clickDevice(e, d)}
+      @contextmenu=${(e: MouseEvent) => this._ctxDevice(e, d)}
       @mousemove=${(e: MouseEvent) =>
         this._showTip(e, d.name,
           d.model + (temp != null ? ' · ' + temp + '°' : '') + (hum != null ? ' · ' + hum + '%' : '') + (lqi != null ? ' · LQI ' + lqi : ''))}
@@ -3977,8 +3987,8 @@ class HouseplanCard extends LitElement {
           <label>${this._t('marker.tap_label')}</label>
           <select class="areasel"
             @change=${(e: Event) => (this._markerDialog = { ...d, tapAction: (e.target as HTMLSelectElement).value })}>
-            ${[['', 'tap.auto'], ['info', 'tap.info'], ['more-info', 'tap.more_info'], ['toggle', 'tap.toggle']].map(
-              ([v, k]) => html`<option value=${v} ?selected=${(d.tapAction || '') === v}>${this._t(k as any)}</option>`,
+            ${[['info', 'tap.info'], ['more-info', 'tap.more_info'], ['toggle', 'tap.toggle']].map(
+              ([v, k]) => html`<option value=${v} ?selected=${(d.tapAction || 'info') === v}>${this._t(k as any)}</option>`,
             )}
           </select>
 

src/i18n/en.json

@@ -176,11 +176,9 @@
   "rules.saved": "Icon rules saved",
   "btn.up": "Up",
   "btn.down": "Down",
-  "editor.tap_action": "Tap on a device",
-  "tap.info": "Info card",
+  "tap.info": "Device card",
   "tap.more_info": "HA more-info dialog",
   "tap.toggle": "Toggle (lights/switches)",
-  "tap.auto": "As the card default",
   "marker.tap_label": "Tap action for this device",
   "tap.toggle_note": "Toggle never applies to locks and alarms; hold the icon to open the info card.",
   "import.title": "Create spaces from HA floors",

src/i18n/ru.json

@@ -176,12 +176,10 @@
   "rules.saved": "Правила иконок сохранены",
   "btn.up": "Вверх",
   "btn.down": "Вниз",
-  "editor.tap_action": "Тап по устройству",
-  "tap.info": "Инфо-карточка",
+  "tap.info": "Карточка устройства",
   "tap.more_info": "Диалог HA (more-info)",
   "tap.toggle": "Переключить (свет/розетки)",
-  "tap.auto": "Как в настройках карточки",
-  "marker.tap_label": "Действие по тапу для этого устройства",
+  "marker.tap_label": "Действие по нажатию для этого устройства",
   "tap.toggle_note": "Toggle никогда не применяется к замкам и сигнализациям; долгое нажатие всегда открывает инфо-карточку.",
   "import.title": "Создать пространства из этажей HA",
   "import.hint": "Home Assistant уже знает эти этажи. Отметьте, какие превратить в пространства плана — далее для каждого попросим картинку плана. Комнаты затем обводятся вручную по плану.",