chuijs 4.0.3 → 4.0.4

package/framework/components/chui_json_viewer/json_viewer.js

@@ -58,8 +58,8 @@ class JsonViewer {
     #title = document.createElement("json_viewer_title");
     #head = document.createElement("json_viewer_head");
     #search = document.createElement("input");
-    #search_box = document.createElement("json_viewer_search_box");
-    #search_clear = document.createElement("button");
+    #searchBox = document.createElement("json_viewer_search_box");
+    #searchClear = document.createElement("button");
     #expand = document.createElement("button");
     #collapse = document.createElement("button");
     #tree = document.createElement("json_viewer_tree");
@@ -68,17 +68,17 @@ class JsonViewer {
     #status = document.createElement("json_viewer_status");
     #id = undefined;
     #value = undefined;
-    #has_value = false;
+    #hasValue = false;
     #expanded = new Set();
-    #search_text = "";
+    #searchText = "";
     #searchable = true;
     #height = "320px";
-    #title_text = undefined;
-    #label_text = undefined;
-    #empty_text = undefined;
-    #error_object = undefined;
-    #active_path = undefined;
-    #focus_path = undefined;
+    #titleText = undefined;
+    #labelText = undefined;
+    #emptyText = undefined;
+    #errorObject = undefined;
+    #activePath = undefined;
+    #focusedPath = undefined;
 
     constructor(
         options = {
@@ -100,10 +100,10 @@ class JsonViewer {
         this.#id = options.id === undefined ? `chui_json_viewer_${JsonViewer.#counter}` : options.id;
         this.#root.id = this.#id;
         this.#root.setAttribute("role", "group");
-        this.#label_text = options.label;
+        this.#labelText = options.label;
         this.#searchable = options.searchable !== false;
-        if (options.emptyText !== undefined) this.#empty_text = String(options.emptyText);
-        else this.#empty_text = I18n.t("jsonViewer.empty");
+        if (options.emptyText !== undefined) this.#emptyText = String(options.emptyText);
+        else this.#emptyText = I18n.t("jsonViewer.empty");
         this.#title.className = "json_viewer_title";
         this.#title.id = `${this.#id}_title`;
         this.#head.className = "json_viewer_head";
@@ -130,20 +130,20 @@ class JsonViewer {
         this.#status.setAttribute("role", "status");
         this.#status.setAttribute("aria-live", "polite");
         // Кнопка очистки — своя: системная кнопка очистки у `input[type=search]` скрыта (см. стили)
-        this.#search_box.className = "json_viewer_search_box";
-        this.#search_clear.type = "button";
-        this.#search_clear.className = "json_viewer_search_clear";
-        this.#search_clear.setAttribute("aria-label", I18n.t("jsonViewer.clearSearch"));
-        const clear_glyph = new Icon(Icons.NAVIGATION.CLOSE, "16px").set();
-        clear_glyph.setAttribute("aria-hidden", "true");
-        this.#search_clear.appendChild(clear_glyph);
-        this.#search_clear.addEventListener("click", () => {
+        this.#searchBox.className = "json_viewer_search_box";
+        this.#searchClear.type = "button";
+        this.#searchClear.className = "json_viewer_search_clear";
+        this.#searchClear.setAttribute("aria-label", I18n.t("jsonViewer.clearSearch"));
+        const clearGlyph = new Icon(Icons.NAVIGATION.CLOSE, "16px").set();
+        clearGlyph.setAttribute("aria-hidden", "true");
+        this.#searchClear.appendChild(clearGlyph);
+        this.#searchClear.addEventListener("click", () => {
             this.setSearch("");
             this.#search.focus();
         });
-        this.#search_box.appendChild(this.#search);
-        this.#search_box.appendChild(this.#search_clear);
-        if (this.#searchable) this.#head.appendChild(this.#search_box);
+        this.#searchBox.appendChild(this.#search);
+        this.#searchBox.appendChild(this.#searchClear);
+        if (this.#searchable) this.#head.appendChild(this.#searchBox);
         this.#syncClear();
         this.#head.appendChild(this.#expand);
         this.#head.appendChild(this.#collapse);
@@ -155,7 +155,7 @@ class JsonViewer {
         this.#root.appendChild(this.#status);
         if (options.title !== undefined) this.setTitle(options.title);
         else this.#title.hidden = true;
-        this.setLabel(this.#label_text === undefined ? I18n.t("jsonViewer.title") : this.#label_text);
+        this.setLabel(this.#labelText === undefined ? I18n.t("jsonViewer.title") : this.#labelText);
         // Высота из опций: без неё остаётся своя по умолчанию (320px, дерево прокручивается)
         this.setHeight(options.height === undefined ? this.#height : options.height);
         if (options.text !== undefined) this.setText(options.text);
@@ -177,11 +177,11 @@ class JsonViewer {
     }
 
     getTitle() {
-        return this.#title_text;
+        return this.#titleText;
     }
 
     getLabel() {
-        return this.#label_text;
+        return this.#labelText;
     }
 
     /** Данные как есть (без разбора и сериализации) */
@@ -191,11 +191,11 @@ class JsonViewer {
 
     /** Компактный JSON текущих данных */
     getText() {
-        return this.#has_value ? Json.minify(this.#value) : "";
+        return this.#hasValue ? Json.minify(this.#value) : "";
     }
 
     hasValue() {
-        return this.#has_value;
+        return this.#hasValue;
     }
 
     /** Путь верхнего узла: `$`, дальше `$.ключ`, `$[0]` */
@@ -205,20 +205,20 @@ class JsonViewer {
 
     /** Ошибка разбора текста (`text`): `{message, line?, column?, offset?}` или `undefined` */
     getError() {
-        return this.#error_object;
+        return this.#errorObject;
     }
 
     /** Текст ошибки разбора словами (пустая строка, если разбор прошёл) */
     getErrorText() {
-        return Json.errorText(this.#error_object);
+        return Json.errorText(this.#errorObject);
     }
 
     getSearch() {
-        return this.#search_text;
+        return this.#searchText;
     }
 
     isSearching() {
-        return this.#search_text.trim() !== "";
+        return this.#searchText.trim() !== "";
     }
 
     isSearchable() {
@@ -232,14 +232,14 @@ class JsonViewer {
 
     /** Пути совпадений поиска по всему документу */
     getMatches() {
-        const query = this.#search_text.trim().toLowerCase();
+        const query = this.#searchText.trim().toLowerCase();
         if (query === "") return [];
         const matches = [];
         const walk = (node) => {
             if (this.#matchesNode(node, query)) matches.push(node.path);
             for (const child of JsonViewer.#childrenOf(node)) walk(child);
         };
-        if (this.#has_value) walk(this.#rootNode());
+        if (this.#hasValue) walk(this.#rootNode());
         return matches;
     }
 
@@ -256,13 +256,13 @@ class JsonViewer {
     }
 
     getEmptyText() {
-        return this.#empty_text;
+        return this.#emptyText;
     }
 
     /** Значение по пути (`$.a.b[2]`) или `undefined`, если такого узла нет */
     getValueAt(path = String()) {
         const segments = JsonViewer.#readPath(path);
-        if (segments === undefined || !this.#has_value) return undefined;
+        if (segments === undefined || !this.#hasValue) return undefined;
         let current = this.#value;
         for (const segment of segments) {
             if (current === null || current === undefined || typeof current !== "object") return undefined;
@@ -281,7 +281,7 @@ class JsonViewer {
     }
 
     setTitle(text = undefined) {
-        this.#title_text = text;
+        this.#titleText = text;
         if (text === undefined || text === "") {
             this.#title.hidden = true;
             this.#title.innerText = "";
@@ -295,7 +295,7 @@ class JsonViewer {
     }
 
     setLabel(text = undefined) {
-        this.#label_text = text;
+        this.#labelText = text;
         this.#syncLabel();
         return this;
     }
@@ -303,8 +303,8 @@ class JsonViewer {
     /** Данные для показа: любой JSON-совместимый набор (без разбора текста) */
     setValue(value = undefined) {
         this.#value = value;
-        this.#has_value = value !== undefined;
-        this.#error_object = undefined;
+        this.#hasValue = value !== undefined;
+        this.#errorObject = undefined;
         this.#error.hidden = true;
         this.#expanded = new Set([...this.#expanded].filter((path) => this.#hasPath(path)));
         this.#render();
@@ -317,15 +317,15 @@ class JsonViewer {
         const result = Json.parse(text === undefined || text === null ? "" : text);
         if (!result.ok) {
             this.#value = undefined;
-            this.#has_value = false;
-            this.#error_object = result.error;
+            this.#hasValue = false;
+            this.#errorObject = result.error;
             this.#error.innerText = Json.errorText(result.error);
             this.#error.hidden = false;
             this.#render();
             this.#announce();
             return this;
         }
-        this.#error_object = undefined;
+        this.#errorObject = undefined;
         this.#error.hidden = true;
         return this.setValue(result.value);
     }
@@ -334,7 +334,7 @@ class JsonViewer {
     expandDepth(depth = Number()) {
         const limit = Number.isFinite(Number(depth)) ? Math.max(0, Math.floor(Number(depth))) : Infinity;
         this.#expanded = new Set();
-        if (this.#has_value) {
+        if (this.#hasValue) {
             const walk = (node, level) => {
                 if (level >= limit) return;
                 if (!JsonViewer.#isContainer(node.value)) return;
@@ -363,7 +363,7 @@ class JsonViewer {
 
     expandAll() {
         this.#expanded = new Set();
-        if (this.#has_value) {
+        if (this.#hasValue) {
             const walk = (node) => {
                 if (!JsonViewer.#isContainer(node.value)) return;
                 this.#expanded.add(node.path);
@@ -390,8 +390,8 @@ class JsonViewer {
 
     /** Поиск по ключам и значениям; пустая строка снимает поиск */
     setSearch(query = String()) {
-        this.#search_text = query === undefined || query === null ? "" : String(query);
-        if (this.#search.value !== this.#search_text) this.#search.value = this.#search_text;
+        this.#searchText = query === undefined || query === null ? "" : String(query);
+        if (this.#search.value !== this.#searchText) this.#search.value = this.#searchText;
         this.#syncClear();
         this.#render();
         this.#announce();
@@ -400,7 +400,7 @@ class JsonViewer {
 
     /** Кнопка очистки видна, только когда есть что очищать */
     #syncClear() {
-        this.#search_clear.hidden = this.#search_text === "";
+        this.#searchClear.hidden = this.#searchText === "";
         return this;
     }
 
@@ -422,7 +422,7 @@ class JsonViewer {
     }
 
     setEmptyText(text = String()) {
-        this.#empty_text = text === undefined ? "" : String(text);
+        this.#emptyText = text === undefined ? "" : String(text);
         this.#render();
         return this;
     }
@@ -527,7 +527,7 @@ class JsonViewer {
 
     /** Есть ли такой путь в текущих данных (для чистки раскрытых путей после setValue) */
     #hasPath(path = String()) {
-        if (path === this.getRootPath()) return this.#has_value;
+        if (path === this.getRootPath()) return this.#hasValue;
         const segments = JsonViewer.#readPath(path);
         return segments !== undefined && this.#valueAt(segments) !== undefined;
     }
@@ -561,9 +561,9 @@ class JsonViewer {
 
     /** Видимые узлы деревом: при поиске — совпадения с предками, без поиска — раскрытые ветки */
     #visibleNodes() {
-        if (!this.#has_value) return [];
+        if (!this.#hasValue) return [];
         const list = [];
-        const query = this.#search_text.trim().toLowerCase();
+        const query = this.#searchText.trim().toLowerCase();
         const walk = (node, level) => {
             if (query !== "" && !this.#matchesTree(node, query)) return;
             list.push({ node: node, level: level });
@@ -582,13 +582,13 @@ class JsonViewer {
     }
 
     #accessibleName() {
-        if (this.#title_text !== undefined && this.#title_text !== "") return this.#title_text;
-        if (this.#label_text !== undefined && this.#label_text !== "") return this.#label_text;
+        if (this.#titleText !== undefined && this.#titleText !== "") return this.#titleText;
+        if (this.#labelText !== undefined && this.#labelText !== "") return this.#labelText;
         return I18n.t("jsonViewer.title");
     }
 
     #syncLabel() {
-        if (this.#title_text !== undefined && this.#title_text !== "") {
+        if (this.#titleText !== undefined && this.#titleText !== "") {
             this.#root.setAttribute("aria-labelledby", this.#title.id);
             this.#root.removeAttribute("aria-label");
         } else {
@@ -626,7 +626,7 @@ class JsonViewer {
     #rowNode(entry = Object()) {
         const node = entry.node;
         const container = JsonViewer.#isContainer(node.value);
-        const query = this.#search_text.trim().toLowerCase();
+        const query = this.#searchText.trim().toLowerCase();
         const open = this.#isOpen(node, query);
         const row = document.createElement("div");
         row.className = "json_viewer_row";
@@ -666,18 +666,18 @@ class JsonViewer {
         if (type === TYPE.OBJECT || type === TYPE.ARRAY) {
             const wrap = document.createElement("span");
             wrap.className = "json_viewer_container";
-            const [open_brace, close_brace] = type === TYPE.ARRAY ? ["[", "]"] : ["{", "}"];
+            const [openBrace, closeBrace] = type === TYPE.ARRAY ? ["[", "]"] : ["{", "}"];
             const left = document.createElement("span");
             left.className = "json_viewer_brace code_token_operator";
             left.setAttribute("aria-hidden", "true");
-            left.innerText = open_brace;
+            left.innerText = openBrace;
             const summary = document.createElement("span");
             summary.className = "json_viewer_summary";
             summary.innerText = this.#summaryText(node.value);
             const right = document.createElement("span");
             right.className = "json_viewer_brace code_token_operator";
             right.setAttribute("aria-hidden", "true");
-            right.innerText = close_brace;
+            right.innerText = closeBrace;
             wrap.appendChild(left);
             wrap.appendChild(summary);
             wrap.appendChild(right);
@@ -712,19 +712,19 @@ class JsonViewer {
     }
 
     #announce() {
-        const query = this.#search_text.trim();
+        const query = this.#searchText.trim();
         if (query !== "") {
             const matches = this.getMatches().length;
             this.#status.innerText =
                 matches === 0 ? I18n.t("common.nothingFound") : I18n.t("jsonViewer.found", { count: matches });
             return this;
         }
-        if (this.#error_object !== undefined) {
-            this.#status.innerText = Json.errorText(this.#error_object);
+        if (this.#errorObject !== undefined) {
+            this.#status.innerText = Json.errorText(this.#errorObject);
             return this;
         }
-        if (!this.#has_value) {
-            this.#status.innerText = this.#empty_text;
+        if (!this.#hasValue) {
+            this.#status.innerText = this.#emptyText;
             return this;
         }
         this.#status.innerText = I18n.t("jsonViewer.visible", { count: this.#visibleNodes().length });
@@ -735,15 +735,15 @@ class JsonViewer {
         // Узлы пересобираются, а фокус живёт на строке: запоминаем путь до перерисовки
         const active = document.activeElement;
         const focused = active === null || !this.#tree.contains(active) ? null : active.closest(".json_viewer_row");
-        if (focused !== null && focused.dataset.path !== undefined) this.#focus_path = focused.dataset.path;
+        if (focused !== null && focused.dataset.path !== undefined) this.#focusedPath = focused.dataset.path;
         this.#tree.innerHTML = "";
         const list = this.#visibleNodes();
         for (const entry of list) this.#tree.appendChild(this.#rowNode(entry));
         // Пояснение вместо дерева: пустые данные, ничего не найдено или ошибка разбора
-        const searching = this.#search_text.trim() !== "";
+        const searching = this.#searchText.trim() !== "";
         this.#tree.hidden = list.length === 0;
-        this.#empty.innerText = searching ? I18n.t("common.nothingFound") : this.#empty_text;
-        this.#empty.hidden = list.length > 0 || this.#error_object !== undefined;
+        this.#empty.innerText = searching ? I18n.t("common.nothingFound") : this.#emptyText;
+        this.#empty.hidden = list.length > 0 || this.#errorObject !== undefined;
         this.#applyStop();
         return this;
     }
@@ -753,13 +753,13 @@ class JsonViewer {
         const list = [...this.#tree.querySelectorAll(".json_viewer_row")];
         if (list.length === 0) return;
         const stop =
-            list.find((row) => row.dataset.path === this.#active_path) ??
-            list.find((row) => row.dataset.path === this.#focus_path) ??
+            list.find((row) => row.dataset.path === this.#activePath) ??
+            list.find((row) => row.dataset.path === this.#focusedPath) ??
             list[0];
-        this.#active_path = stop.dataset.path;
+        this.#activePath = stop.dataset.path;
         for (const row of list) row.setAttribute("tabindex", row === stop ? "0" : "-1");
-        if (this.#focus_path !== undefined && stop.dataset.path === this.#focus_path) {
-            this.#focus_path = undefined;
+        if (this.#focusedPath !== undefined && stop.dataset.path === this.#focusedPath) {
+            this.#focusedPath = undefined;
             stop.focus();
         }
         return this;
@@ -767,7 +767,7 @@ class JsonViewer {
 
     #focusRow(row = undefined) {
         if (row === undefined || row === null) return this;
-        this.#active_path = row.dataset.path;
+        this.#activePath = row.dataset.path;
         for (const other of this.#tree.querySelectorAll(".json_viewer_row")) {
             other.setAttribute("tabindex", other === row ? "0" : "-1");
         }
@@ -808,7 +808,7 @@ class JsonViewer {
     #onFocusIn = (event) => {
         const row = event.target instanceof Element ? event.target.closest(".json_viewer_row") : null;
         if (row === null || row.dataset.path === undefined) return;
-        this.#active_path = row.dataset.path;
+        this.#activePath = row.dataset.path;
     };
 
     #onSearch = () => {
@@ -825,7 +825,7 @@ class JsonViewer {
         const list = this.#tree.querySelectorAll(".json_viewer_row");
         if (list.length === 0) return;
         // Нажатия на самой стрелке (настоящая кнопка) не перехватываем
-        const from_button = event.target instanceof Element && event.target.closest("button") !== null;
+        const fromButton = event.target instanceof Element && event.target.closest("button") !== null;
         const row = this.#currentRow(event.target instanceof Element ? event.target : undefined);
         const path = row === null ? undefined : row.dataset.path;
         const segments = path === undefined ? undefined : JsonViewer.#readPath(path);
@@ -849,14 +849,14 @@ class JsonViewer {
                 this.#focusRow(list[list.length - 1]);
                 return;
             case "ArrowRight": {
-                if (from_button || !container) return;
+                if (fromButton || !container) return;
                 event.preventDefault();
                 if (!this.#expanded.has(path)) this.expand(path);
                 else this.#step(row, 1);
                 return;
             }
             case "ArrowLeft": {
-                if (from_button || path === undefined) return;
+                if (fromButton || path === undefined) return;
                 event.preventDefault();
                 if (container && this.#expanded.has(path)) {
                     this.collapse(path);
@@ -868,7 +868,7 @@ class JsonViewer {
             }
             case "Enter":
             case " ": {
-                if (from_button || !container) return;
+                if (fromButton || !container) return;
                 event.preventDefault();
                 this.toggle(path);
                 return;

package/framework/components/chui_json_viewer/styles.css

@@ -7,10 +7,10 @@ chui_json_viewer {
     width: -webkit-fill-available;
     max-width: 100%;
     height: max-content;
-    margin: var(--margin);
+    margin: var(--block_margin);
     overflow: hidden;
     border: 1px solid var(--border_color);
-    border-radius: var(--border_radius);
+    border-radius: var(--radius_sm);
     background: var(--element_background_2);
     color: var(--text_color);
 }
@@ -18,7 +18,7 @@ chui_json_viewer {
 .json_viewer_title {
     display: block;
     width: max-content;
-    margin: var(--margin);
+    margin: var(--block_margin);
     font-size: var(--font_labels_size);
     font-weight: 500;
 }
@@ -37,7 +37,7 @@ chui_json_viewer {
     border-bottom: 1px solid var(--border_color);
 }
 
-/* Строка поиска — как остальные поля: 35 px, --border_radius; кнопки рядом — той же высоты */
+/* Строка поиска — как остальные поля: 35 px, --radius_sm; кнопки рядом — той же высоты */
 .json_viewer_search_box {
     position: relative;
     display: flex;
@@ -56,7 +56,7 @@ chui_json_viewer {
     padding-block: 0 0;
     padding-inline: 12px 40px;
     border: 1px solid var(--border_color);
-    border-radius: var(--border_radius);
+    border-radius: var(--radius_sm);
     background: var(--element_background);
     color: var(--text_color);
     font-family: inherit;
@@ -120,7 +120,7 @@ chui_json_viewer {
     margin: 0;
     padding: 0 12px;
     border: 1px solid var(--border_color);
-    border-radius: var(--border_radius);
+    border-radius: var(--radius_sm);
     background: var(--element_background);
     color: var(--text_color);
     font-family: inherit;

package/framework/components/chui_kanban/kanban.js

@@ -37,16 +37,16 @@ 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;
+    #onCardMove = undefined;
+    #onCardClick = undefined;
+    #dragCard = undefined;
+    #dragColumn = undefined;
 
     constructor(
         options = {
@@ -65,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);
@@ -219,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()) {
@@ -243,9 +243,9 @@ class Kanban {
     }
 
     #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));
         }
     }
 
@@ -309,7 +309,7 @@ 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;
+        if (node === null || !this.#columnsBox.contains(node)) return undefined;
         return { node: node, column: this.getColumn(node.dataset.column) };
     }
 
@@ -318,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;
     }
 
@@ -336,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";
@@ -345,10 +345,10 @@ 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 &&
@@ -371,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();
@@ -391,11 +391,11 @@ class Kanban {
     };
 
     #finishDrag() {
-        const card = this.#drag_card;
-        const from = this.#drag_column;
-        this.#drag_card = undefined;
-        this.#drag_column = undefined;
-        this.#columns_box
+        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;
@@ -427,7 +427,7 @@ class Kanban {
     #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) => {