chuijs 4.0.2 → 4.0.4

package/framework/components/chui_kanban/kanban.js

@@ -1,5 +1,5 @@
-const {setStyles, optionOr} = require('../../modules/chui_functions');
-const {I18n} = require('../../modules/chui_i18n/chui_i18n');
+const { setStyles, optionOr } = require("../../modules/chui_functions");
+const { I18n } = require("../../modules/chui_i18n/chui_i18n");
 
 /**
  * Канбан-доска: колонки со карточками и переносом между ними.
@@ -37,25 +37,27 @@ class Kanban {
     static #counter = 0;
 
     #root = document.createElement("chui_kanban");
-    #columns_box = document.createElement("kanban_columns");
+    #columnsBox = document.createElement("kanban_columns");
     #status = document.createElement("kanban_status");
     #id = undefined;
     #columns = [];
     #draggable = true;
     #label = I18n.t("graphics.kanbanBoard");
-    #on_card_move = undefined;
-    #on_card_click = undefined;
-    #drag_card = undefined;
-    #drag_column = undefined;
-
-    constructor(options = {
-        id: String(),
-        columns: [],
-        draggable: Boolean(),
-        label: String(),
-        onCardMove: undefined,
-        onCardClick: undefined
-    }) {
+    #onCardMove = undefined;
+    #onCardClick = undefined;
+    #dragCard = undefined;
+    #dragColumn = undefined;
+
+    constructor(
+        options = {
+            id: String(),
+            columns: [],
+            draggable: Boolean(),
+            label: String(),
+            onCardMove: undefined,
+            onCardClick: undefined,
+        }
+    ) {
         setStyles(__dirname + "/styles.css", "chUiJS_Kanban");
         Kanban.#counter += 1;
         this.#id = options.id === undefined ? `chui_kanban_${Kanban.#counter}` : options.id;
@@ -63,14 +65,14 @@ class Kanban {
         this.#root.setAttribute("role", "region");
         this.#draggable = options.draggable !== false;
         this.#root.classList.toggle("kanban_disabled", !this.#draggable);
-        this.#on_card_move = options.onCardMove;
-        this.#on_card_click = options.onCardClick;
+        this.#onCardMove = options.onCardMove;
+        this.#onCardClick = options.onCardClick;
         this.setLabel(optionOr(options.label, this.#label));
         this.#columns = Kanban.#normalize(options.columns);
         this.#status.classList.add("chui_visually_hidden");
         this.#status.setAttribute("role", "status");
         this.#status.setAttribute("aria-live", "polite");
-        this.#root.appendChild(this.#columns_box);
+        this.#root.appendChild(this.#columnsBox);
         this.#root.appendChild(this.#status);
         this.#root.addEventListener("click", this.#onClick);
         this.#root.addEventListener("keydown", this.#onKeyDown);
@@ -90,7 +92,7 @@ class Kanban {
 
     /** Колонки с карточками (копия данных) */
     getColumns() {
-        return this.#columns.map((column) => ({...column, cards: column.cards.map((card) => ({...card}))}));
+        return this.#columns.map((column) => ({ ...column, cards: column.cards.map((card) => ({ ...card })) }));
     }
 
     getColumn(id = String()) {
@@ -99,13 +101,13 @@ class Kanban {
 
     getCards(columnId = String()) {
         const column = this.getColumn(columnId);
-        return column === undefined ? [] : column.cards.map((card) => ({...card}));
+        return column === undefined ? [] : column.cards.map((card) => ({ ...card }));
     }
 
     getCard(id = undefined) {
         for (const column of this.#columns) {
             const card = column.cards.find((item) => String(item.id) === String(id));
-            if (card !== undefined) return {...card};
+            if (card !== undefined) return { ...card };
         }
         return undefined;
     }
@@ -146,7 +148,7 @@ class Kanban {
         const column = this.getColumn(columnId);
         if (column === undefined) return this;
         const position = index === undefined ? column.cards.length : Math.max(0, Math.min(index, column.cards.length));
-        column.cards.splice(position, 0, {...card});
+        column.cards.splice(position, 0, { ...card });
         this.#render();
         return this;
     }
@@ -182,19 +184,19 @@ class Kanban {
         if (!Array.isArray(columns)) return [];
         return columns.map((column, index) => ({
             id: column.id === undefined ? `column_${index}` : column.id,
-            title: column.title === undefined ? I18n.t("graphics.kanbanColumn", {index: index + 1}) : column.title,
+            title: column.title === undefined ? I18n.t("graphics.kanbanColumn", { index: index + 1 }) : column.title,
             limit: column.limit,
             cards: (column.cards === undefined ? [] : column.cards).map((card, position) => ({
                 id: card.id === undefined ? `card_${index}_${position}` : card.id,
-                ...card
-            }))
+                ...card,
+            })),
         }));
     }
 
     #findCard(cardId = undefined) {
         for (const column of this.#columns) {
             const index = column.cards.findIndex((card) => String(card.id) === String(cardId));
-            if (index !== -1) return {column: column, index: index, card: column.cards[index]};
+            if (index !== -1) return { column: column, index: index, card: column.cards[index] };
         }
         return undefined;
     }
@@ -217,7 +219,7 @@ class Kanban {
     }
 
     #emitMove(card = Object(), from = String(), to = String(), index = Number()) {
-        if (this.#on_card_move !== undefined) this.#on_card_move(card, {from: from, to: to, index: index});
+        if (this.#onCardMove !== undefined) this.#onCardMove(card, { from: from, to: to, index: index });
     }
 
     #announce(text = String()) {
@@ -227,22 +229,23 @@ class Kanban {
     #cardLabel(column = Object(), card = Object()) {
         const parts = [card.title === undefined ? I18n.t("graphics.kanbanCard") : String(card.title)];
         if (card.description !== undefined) parts.push(String(card.description));
-        if (Array.isArray(card.tags) && card.tags.length > 0) parts.push(I18n.t("graphics.kanbanTags", {value: card.tags.join(", ")}));
-        parts.push(I18n.t("graphics.kanbanColumnOf", {value: column.title}));
+        if (Array.isArray(card.tags) && card.tags.length > 0)
+            parts.push(I18n.t("graphics.kanbanTags", { value: card.tags.join(", ") }));
+        parts.push(I18n.t("graphics.kanbanColumnOf", { value: column.title }));
         return parts.join(", ");
     }
 
     #columnLabel(column = Object()) {
         const count = column.cards.length;
         return column.limit === undefined
-            ? I18n.t("graphics.kanbanColumnCount", {title: column.title, count: count})
-            : I18n.t("graphics.kanbanColumnCountLimit", {title: column.title, count: count, limit: column.limit});
+            ? I18n.t("graphics.kanbanColumnCount", { title: column.title, count: count })
+            : I18n.t("graphics.kanbanColumnCountLimit", { title: column.title, count: count, limit: column.limit });
     }
 
     #render() {
-        this.#columns_box.innerHTML = "";
+        this.#columnsBox.innerHTML = "";
         for (const column of this.#columns) {
-            this.#columns_box.appendChild(this.#createColumn(column));
+            this.#columnsBox.appendChild(this.#createColumn(column));
         }
     }
 
@@ -256,7 +259,8 @@ class Kanban {
         const title = document.createElement("kanban_column_title");
         title.innerText = column.title;
         const count = document.createElement("kanban_column_count");
-        count.innerText = column.limit === undefined ? String(column.cards.length) : `${column.cards.length} / ${column.limit}`;
+        count.innerText =
+            column.limit === undefined ? String(column.cards.length) : `${column.cards.length} / ${column.limit}`;
         head.appendChild(title);
         head.appendChild(count);
         node.appendChild(head);
@@ -305,8 +309,8 @@ class Kanban {
         const target = event.target instanceof Element ? event.target : null;
         if (target === null) return undefined;
         const node = target.closest("kanban_column");
-        if (node === null || !this.#columns_box.contains(node)) return undefined;
-        return {node: node, column: this.getColumn(node.dataset.column)};
+        if (node === null || !this.#columnsBox.contains(node)) return undefined;
+        return { node: node, column: this.getColumn(node.dataset.column) };
     }
 
     /** Карточка под элементом */
@@ -314,7 +318,7 @@ class Kanban {
         const target = event.target instanceof Element ? event.target : null;
         if (target === null) return undefined;
         const node = target.closest(".kanban_card");
-        if (node === null || !this.#columns_box.contains(node)) return undefined;
+        if (node === null || !this.#columnsBox.contains(node)) return undefined;
         return node;
     }
 
@@ -332,8 +336,8 @@ class Kanban {
     #onDragStart = (event) => {
         const node = this.#cardFromEvent(event);
         if (node === null || node === undefined) return;
-        this.#drag_card = node;
-        this.#drag_column = node.dataset.column;
+        this.#dragCard = node;
+        this.#dragColumn = node.dataset.column;
         node.classList.add("kanban_card_dragging");
         if (event.dataTransfer === null) return;
         event.dataTransfer.effectAllowed = "move";
@@ -341,12 +345,16 @@ class Kanban {
     };
 
     #onDragOver = (event) => {
-        if (this.#drag_card === undefined) return;
+        if (this.#dragCard === undefined) return;
         const target = this.#columnFromEvent(event);
         if (target === undefined) return;
-        const source = this.getColumn(this.#drag_column);
+        const source = this.getColumn(this.#dragColumn);
         // Лимит: карточку из другой колонки в полную колонку не пускаем
-        if (target.column.limit !== undefined && source !== target.column && target.column.cards.length >= target.column.limit) {
+        if (
+            target.column.limit !== undefined &&
+            source !== target.column &&
+            target.column.cards.length >= target.column.limit
+        ) {
             target.node.classList.add("kanban_column_reject");
             if (event.dataTransfer !== null) event.dataTransfer.dropEffect = "none";
             return;
@@ -363,15 +371,15 @@ class Kanban {
      */
     #moveToPoint(columnNode = new HTMLElement(), event = Object()) {
         const body = columnNode.querySelector("kanban_column_body");
-        const reference = this.#referenceFor(body, event, this.#drag_card);
+        const reference = this.#referenceFor(body, event, this.#dragCard);
         const empty = body.querySelector("kanban_empty");
         if (empty !== null) empty.remove();
-        if (reference === null) body.appendChild(this.#drag_card);
-        else body.insertBefore(this.#drag_card, reference);
+        if (reference === null) body.appendChild(this.#dragCard);
+        else body.insertBefore(this.#dragCard, reference);
     }
 
     #onDropEvent = (event) => {
-        if (this.#drag_card === undefined) return;
+        if (this.#dragCard === undefined) return;
         const target = this.#columnFromEvent(event);
         if (target === undefined) return;
         event.preventDefault();
@@ -383,11 +391,13 @@ class Kanban {
     };
 
     #finishDrag() {
-        const card = this.#drag_card;
-        const from = this.#drag_column;
-        this.#drag_card = undefined;
-        this.#drag_column = undefined;
-        this.#columns_box.querySelectorAll(".kanban_column_reject").forEach((node) => node.classList.remove("kanban_column_reject"));
+        const card = this.#dragCard;
+        const from = this.#dragColumn;
+        this.#dragCard = undefined;
+        this.#dragColumn = undefined;
+        this.#columnsBox
+            .querySelectorAll(".kanban_column_reject")
+            .forEach((node) => node.classList.remove("kanban_column_reject"));
         if (card === undefined) return;
         card.classList.remove("kanban_card_dragging");
         const columnNode = card.closest("kanban_column");
@@ -396,22 +406,28 @@ class Kanban {
         const cards = [...columnNode.querySelectorAll(".kanban_card")];
         const index = cards.indexOf(card);
         const cardId = card.dataset.id;
-        if (String(from) === String(to) && this.getColumn(to).cards.findIndex((item) => String(item.id) === String(cardId)) === index) return;
+        if (
+            String(from) === String(to) &&
+            this.getColumn(to).cards.findIndex((item) => String(item.id) === String(cardId)) === index
+        )
+            return;
         // Лимит уже проверен при наведении, поэтому модель приводим к тому, что видно в DOM
         this.#applyMove(cardId, to, index);
-        this.#announce(I18n.t("graphics.kanbanMovedTo", {card: this.#titleOf(cardId), column: this.getColumn(to).title}));
+        this.#announce(
+            I18n.t("graphics.kanbanMovedTo", { card: this.#titleOf(cardId), column: this.getColumn(to).title })
+        );
     }
 
     #titleOf(cardId = undefined) {
         const card = this.getCard(cardId);
-        return card === undefined ? "" : I18n.t("graphics.quotedName", {name: card.title});
+        return card === undefined ? "" : I18n.t("graphics.quotedName", { name: card.title });
     }
 
     // === КЛИК И КЛАВИАТУРА ===
     #onClick = (event) => {
         const node = this.#cardFromEvent(event);
         if (node === null || node === undefined) return;
-        if (this.#on_card_click !== undefined) this.#on_card_click(this.getCard(node.dataset.id), node);
+        if (this.#onCardClick !== undefined) this.#onCardClick(this.getCard(node.dataset.id), node);
     };
 
     #onKeyDown = (event) => {
@@ -425,7 +441,9 @@ class Kanban {
         const before = this.#findCard(node.dataset.id);
         if (before === undefined) return;
         if (vertical) {
-            const index = forward ? Math.min(before.index + 1, before.column.cards.length - 1) : Math.max(before.index - 1, 0);
+            const index = forward
+                ? Math.min(before.index + 1, before.column.cards.length - 1)
+                : Math.max(before.index - 1, 0);
             if (index === before.index) return;
             this.moveCard(node.dataset.id, before.column.id, index);
         } else {
@@ -437,13 +455,13 @@ class Kanban {
         const after = this.#findCard(node.dataset.id);
         // Единственная причина отказа — предел колонки: тогда ничего не объявляем о переносе
         if (after.column === before.column && after.index === before.index) {
-            this.#announce(I18n.t("graphics.kanbanMoveRefused", {card: this.#titleOf(node.dataset.id)}));
+            this.#announce(I18n.t("graphics.kanbanMoveRefused", { card: this.#titleOf(node.dataset.id) }));
             return;
         }
         const moved = this.#root.querySelector(`.kanban_card[data-id="${String(node.dataset.id)}"]`);
         if (moved !== null) moved.focus();
-        this.#announce(I18n.t("graphics.kanbanMoved", {card: this.#titleOf(node.dataset.id)}));
+        this.#announce(I18n.t("graphics.kanbanMoved", { card: this.#titleOf(node.dataset.id) }));
     };
 }
 
-exports.Kanban = Kanban
+exports.Kanban = Kanban;

package/framework/components/chui_kanban/styles.css

@@ -3,7 +3,7 @@ chui_kanban {
     display: block;
     width: -webkit-fill-available;
     box-sizing: border-box;
-    margin: var(--margin);
+    margin: var(--block_margin);
     color: var(--text_color);
     font-size: var(--font_default_size);
 }
@@ -24,7 +24,7 @@ kanban_column {
     min-width: 0;
     background: var(--element_background);
     border: 1px solid var(--border_color);
-    border-radius: var(--border_radius);
+    border-radius: var(--radius_sm);
     box-sizing: border-box;
 }
 
@@ -74,7 +74,7 @@ kanban_column.kanban_column_reject {
 }
 
 kanban_column.kanban_column_reject kanban_column_body {
-    background: var(--badge_error_back);
+    background: var(--badge_error_background);
 }
 
 button.kanban_card {
@@ -84,7 +84,7 @@ button.kanban_card {
     padding: 8px 10px;
     border: 1px solid var(--border_color);
     border-inline-start: 3px solid var(--kanban_card_color, var(--blue_prime_background));
-    border-radius: var(--border_radius);
+    border-radius: var(--radius_sm);
     background: var(--element_background_2);
     color: var(--text_color);
     font-family: inherit;
@@ -105,6 +105,10 @@ button.kanban_card:focus-visible {
 button.kanban_card.kanban_card_dragging {
     opacity: 0.5;
     cursor: grabbing;
+    /* Карточка чуть приподнята и наклонена: взятая в руку вещь, а не просто поблёкшая
+       строка. Тень — та же, что у поднятых слоёв */
+    transform: scale(1.02) rotate(1deg);
+    box-shadow: var(--box_shadow_drop);
 }
 
 kanban_card_title {

package/framework/components/chui_kbd/kbd.js

@@ -1,4 +1,4 @@
-const {setStyles} = require("../../modules/chui_functions");
+const { setStyles } = require("../../modules/chui_functions");
 
 /**
  * Обозначение горячей клавиши: одна или несколько клавиш в «кнопках», между ними разделитель.
@@ -21,7 +21,7 @@ const {setStyles} = require("../../modules/chui_functions");
 class Kbd {
     static SIZE = {
         SMALL: "small",
-        DEFAULT: "default"
+        DEFAULT: "default",
     };
     static #counter = 0;
 
@@ -30,13 +30,15 @@ class Kbd {
     #keys = [];
     #separator = "+";
 
-    constructor(options = {
-        id: String(),
-        keys: [],
-        separator: String(),
-        size: String(),
-        label: String()
-    }) {
+    constructor(
+        options = {
+            id: String(),
+            keys: [],
+            separator: String(),
+            size: String(),
+            label: String(),
+        }
+    ) {
         setStyles(__dirname + "/styles.css", "chUiJS_Kbd");
         Kbd.#counter += 1;
         this.#id = options.id === undefined ? `chui_kbd_${Kbd.#counter}` : options.id;
@@ -123,4 +125,4 @@ class Kbd {
     }
 }
 
-exports.Kbd = Kbd
+exports.Kbd = Kbd;

package/framework/components/chui_kbd/styles.css

@@ -5,7 +5,7 @@ chui_kbd {
     gap: 4px;
     width: max-content;
     height: max-content;
-    margin: var(--margin);
+    margin: var(--block_margin);
     font-size: var(--font_default_size);
     color: var(--text_color);
 }

package/framework/components/chui_label/label.js

@@ -1,57 +1,59 @@
-const {setStyles, htmlToMarkdown, markdownToHtml, optionOr} = require('../../modules/chui_functions');
+const { setStyles, htmlToMarkdown, markdownToHtml, optionOr } = require("../../modules/chui_functions");
 
 class Label {
-    #chui_label = document.createElement(`chui_label`);
-    constructor(options = {
-        id: String(),
-        text: String(),
-        markdownText: String(),
-        textAlign: String(),
-        wordBreak: String(),
-        width: String(),
-        fontSize: String(),
-    }) {
-        setStyles(__dirname + "/styles.css", 'chUiJS_Label');
+    #chuiLabel = document.createElement(`chui_label`);
+    constructor(
+        options = {
+            id: String(),
+            text: String(),
+            markdownText: String(),
+            textAlign: String(),
+            wordBreak: String(),
+            width: String(),
+            fontSize: String(),
+        }
+    ) {
+        setStyles(__dirname + "/styles.css", "chUiJS_Label");
         // Стили текста лейбла: пустая заготовка опции равносильна отсутствующей
         const text = optionOr(options.text, undefined);
-        const markdown_text = optionOr(options.markdownText, undefined);
-        if (text !== undefined && markdown_text !== undefined) {
+        const markdownText = optionOr(options.markdownText, undefined);
+        if (text !== undefined && markdownText !== undefined) {
             throw new Error("Должна быть установлена одна опция text или markdownText");
         } else {
-            if (text !== undefined) this.#chui_label.innerText = text;
-            if (markdown_text !== undefined) this.#chui_label.innerHTML = markdownToHtml(markdown_text);
+            if (text !== undefined) this.#chuiLabel.innerText = text;
+            if (markdownText !== undefined) this.#chuiLabel.innerHTML = markdownToHtml(markdownText);
         }
         //
-        if (options.id !== undefined) this.#chui_label.id = options.id;
-        if (options.textAlign !== undefined) this.#chui_label.style.textAlign = options.textAlign;
-        if (options.wordBreak !== undefined) this.#chui_label.style.wordBreak = options.wordBreak;
-        if (options.width !== undefined) this.#chui_label.style.width = options.width;
-        if (options.fontSize !== undefined) this.#chui_label.style.fontSize = options.fontSize;
+        if (options.id !== undefined) this.#chuiLabel.id = options.id;
+        if (options.textAlign !== undefined) this.#chuiLabel.style.textAlign = options.textAlign;
+        if (options.wordBreak !== undefined) this.#chuiLabel.style.wordBreak = options.wordBreak;
+        if (options.width !== undefined) this.#chuiLabel.style.width = options.width;
+        if (options.fontSize !== undefined) this.#chuiLabel.style.fontSize = options.fontSize;
     }
     // GET
     getId() {
-        return this.#chui_label.id;
+        return this.#chuiLabel.id;
     }
     getText() {
-        return this.#chui_label.innerText;
+        return this.#chuiLabel.innerText;
     }
     getMarkdownText() {
-        return htmlToMarkdown(this.#chui_label.innerHTML);
+        return htmlToMarkdown(this.#chuiLabel.innerHTML);
     }
     // SET
     setId(id = String()) {
-        this.#chui_label.id = id;
+        this.#chuiLabel.id = id;
     }
     setText(text = String()) {
-        this.#chui_label.innerText = text;
+        this.#chuiLabel.innerText = text;
     }
     setMarkdownText(text = String()) {
-        this.#chui_label.innerHTML = markdownToHtml(text);
+        this.#chuiLabel.innerHTML = markdownToHtml(text);
     }
     // RENDER
     set() {
-        return this.#chui_label;
+        return this.#chuiLabel;
     }
 }
 
-exports.Label = Label
+exports.Label = Label;

package/framework/components/chui_label/styles.css

@@ -1,12 +1,12 @@
 chui_label {
     height: max-content;
     width: max-content;
-    margin: var(--margin);
+    margin: var(--block_margin);
     font-size: var(--font_default_size);
-    font-weight:500;
+    font-weight: 500;
     color: var(--text_color);
 }
 
 chui_label p {
     margin: 0;
-}
+}

package/framework/components/chui_link/link.js

@@ -1,6 +1,6 @@
-const {setStyles} = require('../../modules/chui_functions');
-const {Desktop} = require('../../modules/chui_services/desktop');
-const {Icon} = require('../chui_icons/icons');
+const { setStyles } = require("../../modules/chui_functions");
+const { Desktop } = require("../../modules/chui_services/desktop");
+const { Icon } = require("../chui_icons/icons");
 
 /**
  * Ссылка: текст, который открывает адрес во внешнем браузере или вызывает свой обработчик.
@@ -29,37 +29,39 @@ class Link {
     #icon = undefined;
     #id = undefined;
     #href = undefined;
-    #click_event = undefined;
-    #click_listeners = [];
+    #clickEvent = undefined;
+    #clickListeners = [];
     #disabled = false;
     #external = undefined;
 
-    constructor(options = {
-        id: String(),
-        text: String(),
-        href: String(),
-        icon: String(),
-        external: Boolean(),
-        disabled: Boolean(),
-        width: String(),
-        title: String(),
-        clickEvent: undefined,
-        clickListener: undefined
-    }) {
+    constructor(
+        options = {
+            id: String(),
+            text: String(),
+            href: String(),
+            icon: String(),
+            external: Boolean(),
+            disabled: Boolean(),
+            width: String(),
+            title: String(),
+            clickEvent: undefined,
+            clickListener: undefined,
+        }
+    ) {
         setStyles(__dirname + "/styles.css", "chUiJS_Link");
         Link.#counter += 1;
         this.#id = options.id === undefined ? `chui_link_${Link.#counter}` : options.id;
         this.#root.id = this.#id;
         this.#root.classList.add("chui_link");
         this.#external = options.external;
-        this.#click_event = options.clickEvent;
+        this.#clickEvent = options.clickEvent;
         this.#root.addEventListener("click", this.#onClick);
         this.#root.innerText = options.text === undefined ? "" : options.text;
         if (options.title !== undefined) this.#root.setAttribute("title", options.title);
         if (options.width !== undefined) this.setWidth(options.width);
         if (options.href !== undefined) this.setHref(options.href);
         if (options.icon !== undefined) this.setIcon(options.icon);
-        if (this.#href === undefined && this.#click_event !== undefined) this.#applyLinkRole();
+        if (this.#href === undefined && this.#clickEvent !== undefined) this.#applyLinkRole();
         if (options.disabled === true) this.setDisabled(true);
         if (options.clickListener !== undefined) this.addClickListener(options.clickListener);
     }
@@ -120,9 +122,12 @@ class Link {
         if (this.#icon !== undefined) this.#icon.remove();
         this.#icon = undefined;
         if (icon === undefined) return this;
-        this.#icon = typeof icon === "string"
-            ? new Icon(icon, "14px").set()
-            : (typeof icon.set === "function" ? icon.set() : icon);
+        this.#icon =
+            typeof icon === "string"
+                ? new Icon(icon, "14px").set()
+                : typeof icon.set === "function"
+                  ? icon.set()
+                  : icon;
         this.#icon.setAttribute("aria-hidden", "true");
         this.#root.appendChild(this.#icon);
         return this;
@@ -143,13 +148,13 @@ class Link {
 
     /** Свой обработчик клика; вызывается вместо открытия адреса */
     setClickEvent(listener = () => {}) {
-        this.#click_event = listener;
+        this.#clickEvent = listener;
         if (this.#href === undefined) this.#applyLinkRole();
         return this;
     }
 
     addClickListener(listener = () => {}) {
-        this.#click_listeners.push(listener);
+        this.#clickListeners.push(listener);
         return this;
     }
 
@@ -182,19 +187,21 @@ class Link {
             event.preventDefault();
             return;
         }
-        for (const listener of [...this.#click_listeners]) listener(event);
-        if (this.#click_event !== undefined) {
+        for (const listener of [...this.#clickListeners]) listener(event);
+        if (this.#clickEvent !== undefined) {
             event.preventDefault();
-            this.#click_event(event);
+            this.#clickEvent(event);
             return;
         }
         if (!this.isExternal()) return;
         // Своё окно Electron для внешней ссылки не открываем: отдаём адрес системе
         event.preventDefault();
         Desktop.shell.openExternal(this.#href).catch((error) => {
-            require('../../modules/chui_logger/chui_logger').Log.error(`Link: не удалось открыть «${this.#href}»: ${error}`);
+            require("../../modules/chui_logger/chui_logger").Log.error(
+                `Link: не удалось открыть «${this.#href}»: ${error}`
+            );
         });
     };
 }
 
-exports.Link = Link
+exports.Link = Link;