@itrocks/table 0.1.2 → 0.1.3

package/link.d.ts

@@ -1,30 +1,28 @@
 import { Plugin } from '../plugin/plugin.js';
 import { PluginOptions } from '../plugin/plugin.js';
 import { Table } from './table.js';
-type ValueCallback = (element: Element) => ({
+type AttributeValue = string | string[] | ValueCallback;
+type ElementValue = {
     element: Element;
     value: string;
-} | undefined);
+};
+type ValueCallback = (element: Element) => (ElementValue | undefined);
 declare class Options extends PluginOptions {
     call: (url: string) => void;
-    href: string | ValueCallback;
-    id: string | ValueCallback;
+    href: AttributeValue;
+    id: AttributeValue;
     link: (href: string, id?: string) => string;
 }
 export declare class TableLink extends Plugin<Table, Options> {
     constructor(options?: Partial<Options>);
     defaultOptions(): Options;
     protected getCell(row: HTMLTableRowElement, columnIndex: number): HTMLTableCellElement | undefined;
+    protected getClosestElement(target: Element, attributes: string[]): Element | undefined;
     protected getCol(columnIndex: number): HTMLElement | undefined;
+    protected getElementValue(element: Element | undefined, attributes: string[]): ElementValue | undefined;
     protected getHeadCell(columnIndex: number): HTMLElement | undefined;
-    protected getHref(target: Element, attribute: string, cell: HTMLTableCellElement, idElement?: Element): {
-        element: Element;
-        value: string;
-    } | undefined;
-    protected getId(target: Element, attribute: string): {
-        element: Element;
-        value: string;
-    } | undefined;
+    protected getHref(target: Element, attributes: string | string[], cell: HTMLTableCellElement, idElement?: Element): ElementValue | undefined;
+    protected getId(target: Element, attributes: string | string[]): ElementValue | undefined;
     init(): void;
     onClick(event: MouseEvent): void;
 }

package/link.js

@@ -2,7 +2,7 @@ import { Plugin } from '../plugin/plugin.js';
 import { PluginOptions } from '../plugin/plugin.js';
 class Options extends PluginOptions {
     call = function (url) { window.location.href = url; };
-    href = 'data-href';
+    href = ['data-href', 'data-link'];
     id = 'data-id';
     link = function (href, id) {
         return id ? (href + (href.endsWith('/') ? '' : '/') + id) : href;
@@ -26,31 +26,45 @@ export class TableLink extends Plugin {
             current = end;
         }
     }
+    getClosestElement(target, attributes) {
+        return target.closest('[' + attributes.join('],[') + ']') ?? undefined;
+    }
     getCol(columnIndex) {
         return this.of.element.querySelector('colgroup')?.querySelectorAll('col')?.[columnIndex];
     }
+    getElementValue(element, attributes) {
+        if (!element)
+            return;
+        for (const attribute of attributes) {
+            if (element?.hasAttribute(attribute)) {
+                return { element, value: element.getAttribute(attribute) ?? '' };
+            }
+        }
+    }
     getHeadCell(columnIndex) {
         const row = this.of.element.tHead?.rows[0];
         return row ? this.getCell(row, columnIndex) : undefined;
     }
-    getHref(target, attribute, cell, idElement) {
-        let element = target.closest('[' + attribute + ']') ?? undefined;
+    getHref(target, attributes, cell, idElement) {
+        if (typeof attributes === 'string')
+            attributes = [attributes];
+        let element = this.getClosestElement(target, attributes);
         if (element && idElement?.contains(element))
             element = undefined;
-        if (!element)
-            for (const getFunc of [this.getHeadCell, this.getCol]) {
-                element = getFunc.call(this, cell.cellIndex);
-                if (element?.hasAttribute(attribute))
-                    break;
-            }
         if (element)
-            return { element, value: element.getAttribute(attribute) ?? '' };
+            return this.getElementValue(element, attributes);
+        for (const getFunc of [this.getHeadCell, this.getCol]) {
+            element = getFunc.call(this, cell.cellIndex);
+            const value = this.getElementValue(element, attributes);
+            if (value)
+                return value;
+        }
     }
-    getId(target, attribute) {
-        const element = target.closest('[' + attribute + ']');
-        const value = element?.getAttribute(attribute);
-        if (element && value)
-            return { element, value };
+    getId(target, attributes) {
+        if (typeof attributes === 'string')
+            attributes = [attributes];
+        const element = this.getClosestElement(target, attributes);
+        return this.getElementValue(element, attributes);
     }
     init() {
         for (const tBody of Array.from(this.of.element.tBodies)) {

package/package.json

@@ -56,5 +56,5 @@
 	},
 	"type": "module",
 	"types": "./table.d.ts",
-	"version": "0.1.2"
+	"version": "0.1.3"
 }