@fkui/vue 5.45.0 → 5.45.1

package/dist/esm/index.esm.js

@@ -9815,7 +9815,16 @@ const _sfc_main$J = defineComponent({
     }
   },
   setup() {
-    return FTableInjected();
+    const {
+      renderColumns,
+      setVisibilityColumn: setVisibilityColumn2,
+      addColumn: addColumn2
+    } = FTableInjected();
+    return {
+      renderColumns,
+      setVisibilityColumn: setVisibilityColumn2,
+      addColumn: addColumn2
+    };
   },
   computed: {
     classes() {
@@ -13719,10 +13728,6 @@ function useExpandableTable(expandableAttribute, keyAttribute, describedby, emit
     const expanded = isExpanded(row) ? [] : ["table__expandable-row--collapsed"];
     return ["table__expandable-row", ...border, ...expanded];
   }
-  function expandableColumnClasses(column, index) {
-    const indented = index === 0 ? ["table__column--indented"] : [];
-    return ["table__column", `table__column--${column.type}`, column.size, ...indented];
-  }
   function getExpandableDescribedby(row) {
     if (!isExpandableTable) {
       return void 0;
@@ -13756,7 +13761,6 @@ function useExpandableTable(expandableAttribute, keyAttribute, describedby, emit
     isExpanded,
     rowAriaExpanded,
     expandableRowClasses,
-    expandableColumnClasses,
     getExpandableDescribedby,
     expandableRows,
     hasExpandableContent
@@ -13866,6 +13870,22 @@ const _sfc_main$g = defineComponent({
       type: Array,
       required: false,
       default: void 0
+    },
+    /**
+     * Enable showing the active row.
+     */
+    showActive: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    /**
+     * V-model will bind to value containing the current active row.
+     */
+    active: {
+      type: Object,
+      required: false,
+      default: () => void 0
     }
   },
   emits: [
@@ -13874,6 +13894,7 @@ const _sfc_main$g = defineComponent({
     "update",
     "unselect",
     "update:modelValue",
+    "update:active",
     "select",
     /**
      * Emitted when row is expanded.
@@ -13908,7 +13929,8 @@ const _sfc_main$g = defineComponent({
       activeRow: void 0,
       columns: [],
       selectedRows: [],
-      tr: []
+      tr: [],
+      tbodyKey: 0
     };
   },
   computed: {
@@ -13946,7 +13968,7 @@ const _sfc_main$g = defineComponent({
       return tableScrollClasses(this.scroll);
     },
     nbOfColumns() {
-      let columnCount = this.columns.length;
+      let columnCount = this.visibleColumns.length;
       if (this.selectable) {
         columnCount++;
       }
@@ -13967,6 +13989,20 @@ const _sfc_main$g = defineComponent({
           });
         }
       }
+    },
+    active: {
+      immediate: true,
+      handler: function() {
+        this.updateActiveRowFromVModel();
+      }
+    },
+    showActive: {
+      immediate: true,
+      handler: function(val) {
+        if (!val) {
+          this.tbodyKey ^= 1;
+        }
+      }
     }
   },
   updated() {
@@ -13985,6 +14021,9 @@ const _sfc_main$g = defineComponent({
   },
   methods: {
     isActive(row) {
+      if (!this.showActive) {
+        return false;
+      }
       return itemEquals(row, this.activeRow, this.keyAttribute);
     },
     isSelected(row) {
@@ -14017,7 +14056,7 @@ const _sfc_main$g = defineComponent({
       }
       if (!itemEquals(row, this.activeRow, this.keyAttribute)) {
         this.$emit("change", row);
-        this.activeRow = row;
+        this.setActiveRow(row);
         if (tr) {
           tr.focus();
           const td = tr.children[0];
@@ -14108,6 +14147,17 @@ const _sfc_main$g = defineComponent({
     },
     escapeNewlines(value) {
       return value.replace(/\n/g, "<br/>");
+    },
+    updateActiveRowFromVModel() {
+      if (this.active === void 0) {
+        this.setActiveRow(void 0);
+      } else if (!itemEquals(this.active, this.activeRow, this.keyAttribute)) {
+        this.setActiveRow(this.active);
+      }
+    },
+    setActiveRow(row) {
+      this.activeRow = row;
+      this.$emit("update:active", this.activeRow);
     }
   }
 });
@@ -14145,40 +14195,37 @@ const _hoisted_11$1 = {
   key: 1,
   class: "table__column__description"
 };
-const _hoisted_12$1 = {
-  ref: "tbodyElement"
-};
-const _hoisted_13 = ["aria-label", "aria-expanded", "aria-level", "aria-describedby", "onKeydown", "onClick"];
-const _hoisted_14 = {
+const _hoisted_12$1 = ["aria-label", "aria-expanded", "aria-level", "aria-describedby", "onKeydown", "onClick"];
+const _hoisted_13 = {
   key: 0
 };
-const _hoisted_15 = {
+const _hoisted_14 = {
   key: 0,
   class: "table__expand-icon"
 };
-const _hoisted_16 = {
+const _hoisted_15 = {
   key: 1,
   class: "table__column--selectable"
 };
-const _hoisted_17 = {
+const _hoisted_16 = {
   class: "table__input"
 };
-const _hoisted_18 = {
+const _hoisted_17 = {
   key: 0,
   class: "sr-only"
 };
-const _hoisted_19 = {
+const _hoisted_18 = {
   key: 0,
-  class: "table__column--selectable"
+  class: "table__column--placeholder"
 };
-const _hoisted_20 = ["colspan"];
-const _hoisted_21 = {
+const _hoisted_19 = ["colspan"];
+const _hoisted_20 = {
   key: 0
 };
-const _hoisted_22 = {
+const _hoisted_21 = {
   key: 1
 };
-const _hoisted_23 = ["colspan"];
+const _hoisted_22 = ["colspan"];
 function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_f_icon = resolveComponent("f-icon");
   const _component_f_checkbox_field = resolveComponent("f-checkbox-field");
@@ -14187,12 +14234,12 @@ function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
   }, [createElementVNode("table", mergeProps({
     class: ["table", _ctx.tableClasses],
     role: _ctx.tableRole
-  }, _ctx.$attrs), [_ctx.hasCaption ? (openBlock(), createElementBlock("caption", _hoisted_2$d, [renderSlot(_ctx.$slots, "caption")])) : createCommentVNode("", true), _cache[14] || (_cache[14] = createTextVNode()), createElementVNode("colgroup", null, [_ctx.isExpandableTable ? (openBlock(), createElementBlock("col", _hoisted_3$9)) : createCommentVNode("", true), _cache[0] || (_cache[0] = createTextVNode()), _ctx.selectable ? (openBlock(), createElementBlock("col", _hoisted_4$8)) : createCommentVNode("", true), _cache[1] || (_cache[1] = createTextVNode()), (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.columns, (column) => {
+  }, _ctx.$attrs), [_ctx.hasCaption ? (openBlock(), createElementBlock("caption", _hoisted_2$d, [renderSlot(_ctx.$slots, "caption")])) : createCommentVNode("", true), _cache[15] || (_cache[15] = createTextVNode()), createElementVNode("colgroup", null, [_ctx.isExpandableTable ? (openBlock(), createElementBlock("col", _hoisted_3$9)) : createCommentVNode("", true), _cache[0] || (_cache[0] = createTextVNode()), _ctx.selectable ? (openBlock(), createElementBlock("col", _hoisted_4$8)) : createCommentVNode("", true), _cache[1] || (_cache[1] = createTextVNode()), (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.columns, (column) => {
     return openBlock(), createElementBlock("col", {
       key: column.id,
       class: normalizeClass(column.size)
     }, null, 2);
-  }), 128))]), _cache[15] || (_cache[15] = createTextVNode()), createElementVNode("thead", null, [createElementVNode("tr", _hoisted_5$6, [_ctx.isExpandableTable ? (openBlock(), createElementBlock("th", _hoisted_6$4, [createElementVNode("span", _hoisted_7$4, toDisplayString(_ctx.$t("fkui.interactive-table.select", "Expandera")), 1)])) : createCommentVNode("", true), _cache[4] || (_cache[4] = createTextVNode()), _ctx.selectable ? (openBlock(), createElementBlock("th", _hoisted_8$4, [createElementVNode("span", _hoisted_9$3, toDisplayString(_ctx.$t("fkui.interactive-table.select", "Markera")), 1)])) : createCommentVNode("", true), _cache[5] || (_cache[5] = createTextVNode()), (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.visibleColumns, (column) => {
+  }), 128))]), _cache[16] || (_cache[16] = createTextVNode()), createElementVNode("thead", null, [createElementVNode("tr", _hoisted_5$6, [_ctx.isExpandableTable ? (openBlock(), createElementBlock("th", _hoisted_6$4, [createElementVNode("span", _hoisted_7$4, toDisplayString(_ctx.$t("fkui.interactive-table.select", "Expandera")), 1)])) : createCommentVNode("", true), _cache[4] || (_cache[4] = createTextVNode()), _ctx.selectable ? (openBlock(), createElementBlock("th", _hoisted_8$4, [createElementVNode("span", _hoisted_9$3, toDisplayString(_ctx.$t("fkui.interactive-table.select", "Markera")), 1)])) : createCommentVNode("", true), _cache[5] || (_cache[5] = createTextVNode()), (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.visibleColumns, (column) => {
     return openBlock(), createElementBlock("th", mergeProps({
       key: column.id,
       scope: "col",
@@ -14206,7 +14253,10 @@ function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
       class: normalizeClass(_ctx.iconClasses(column)),
       name: _ctx.iconName(column)
     }, null, 8, ["class", "name"])) : createCommentVNode("", true), _cache[3] || (_cache[3] = createTextVNode()), column.description ? (openBlock(), createElementBlock("span", _hoisted_11$1, toDisplayString(column.description), 1)) : createCommentVNode("", true)], 16);
-  }), 128))])]), _cache[16] || (_cache[16] = createTextVNode()), createElementVNode("tbody", _hoisted_12$1, [(openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.rows, (row, index) => {
+  }), 128))])]), _cache[17] || (_cache[17] = createTextVNode()), (openBlock(), createElementBlock("tbody", {
+    ref: "tbodyElement",
+    key: _ctx.tbodyKey
+  }, [(openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.rows, (row, index) => {
     return openBlock(), createElementBlock(Fragment, {
       key: _ctx.rowKey(row)
     }, [createElementVNode("tr", {
@@ -14218,15 +14268,15 @@ function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
       tabindex: "0",
       onKeydown: withModifiers(($event) => _ctx.onKeydown($event, index), ["self"]),
       onClick: ($event) => _ctx.onClick($event, row, index)
-    }, [_ctx.isExpandableTable ? (openBlock(), createElementBlock("td", _hoisted_14, [_ctx.hasExpandableContent(row) ? (openBlock(), createElementBlock("div", _hoisted_15, [createVNode(_component_f_icon, {
+    }, [_ctx.isExpandableTable ? (openBlock(), createElementBlock("td", _hoisted_13, [_ctx.hasExpandableContent(row) ? (openBlock(), createElementBlock("div", _hoisted_14, [createVNode(_component_f_icon, {
       name: "arrow-right",
       rotate: _ctx.isExpanded(row) ? "270" : "90"
-    }, null, 8, ["rotate"])])) : createCommentVNode("", true)])) : createCommentVNode("", true), _cache[6] || (_cache[6] = createTextVNode()), _ctx.selectable ? (openBlock(), createElementBlock("td", _hoisted_16, [createElementVNode("div", _hoisted_17, [createVNode(_component_f_checkbox_field, {
+    }, null, 8, ["rotate"])])) : createCommentVNode("", true)])) : createCommentVNode("", true), _cache[6] || (_cache[6] = createTextVNode()), _ctx.selectable ? (openBlock(), createElementBlock("td", _hoisted_15, [createElementVNode("div", _hoisted_16, [createVNode(_component_f_checkbox_field, {
       value: true,
       "model-value": _ctx.isSelected(row),
       onClick: withModifiers(($event) => _ctx.onSelect(row), ["self"])
     }, {
-      default: withCtx(() => [_ctx.hasCheckboxDescription ? (openBlock(), createElementBlock("span", _hoisted_18, [renderSlot(_ctx.$slots, "checkbox-description", mergeProps({
+      default: withCtx(() => [_ctx.hasCheckboxDescription ? (openBlock(), createElementBlock("span", _hoisted_17, [renderSlot(_ctx.$slots, "checkbox-description", mergeProps({
         ref_for: true
       }, {
         row
@@ -14236,21 +14286,21 @@ function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
       ref_for: true
     }, {
       row
-    }))], 42, _hoisted_13), _cache[11] || (_cache[11] = createTextVNode()), _ctx.isExpandableTable && _ctx.hasExpandableContent(row) ? (openBlock(true), createElementBlock(Fragment, {
+    }))], 42, _hoisted_12$1), _cache[11] || (_cache[11] = createTextVNode()), _ctx.isExpandableTable && _ctx.hasExpandableContent(row) ? (openBlock(true), createElementBlock(Fragment, {
       key: 0
     }, renderList(_ctx.expandableRows(row), (expandableRow, expandableIndex) => {
       return openBlock(), createElementBlock("tr", {
         key: _ctx.rowKey(expandableRow),
         "aria-level": "2",
         class: normalizeClass(_ctx.expandableRowClasses(row, expandableIndex))
-      }, [_cache[8] || (_cache[8] = createElementVNode("td", null, null, -1)), _cache[9] || (_cache[9] = createTextVNode()), _ctx.selectable ? (openBlock(), createElementBlock("td", _hoisted_19)) : createCommentVNode("", true), _cache[10] || (_cache[10] = createTextVNode()), !_ctx.hasExpandableSlot ? (openBlock(true), createElementBlock(Fragment, {
-        key: 1
-      }, renderList(_ctx.columns, (column, columnIndex) => {
-        return openBlock(), createElementBlock("td", {
-          key: `${_ctx.rowKey(expandableRow)}${column.name}`,
-          class: normalizeClass(_ctx.expandableColumnClasses(column, columnIndex))
-        }, toDisplayString(expandableRow[column.name]), 3);
-      }), 128)) : (openBlock(), createElementBlock("td", {
+      }, [_cache[8] || (_cache[8] = createElementVNode("td", {
+        class: "table__column--placeholder"
+      }, null, -1)), _cache[9] || (_cache[9] = createTextVNode()), _ctx.selectable ? (openBlock(), createElementBlock("td", _hoisted_18)) : createCommentVNode("", true), _cache[10] || (_cache[10] = createTextVNode()), !_ctx.hasExpandableSlot ? renderSlot(_ctx.$slots, "default", mergeProps({
+        key: 1,
+        ref_for: true
+      }, {
+        row: expandableRow
+      })) : (openBlock(), createElementBlock("td", {
         key: 2,
         class: "table__column table__column--indented",
         colspan: _ctx.columns.length
@@ -14259,14 +14309,16 @@ function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
       }, {
         expandableRow,
         parentRow: row
-      }))], 8, _hoisted_20))], 2);
+      }))], 8, _hoisted_19))], 2);
     }), 128)) : createCommentVNode("", true)], 64);
-  }), 128)), _cache[12] || (_cache[12] = createTextVNode()), _ctx.isEmpty && _ctx.columns.length === 0 ? (openBlock(), createElementBlock("tr", _hoisted_21, [renderSlot(_ctx.$slots, "default", normalizeProps(guardReactiveProps({
+  }), 128)), _cache[13] || (_cache[13] = createTextVNode()), _ctx.isEmpty && _ctx.columns.length === 0 ? (openBlock(), createElementBlock("tr", _hoisted_20, [renderSlot(_ctx.$slots, "default", normalizeProps(guardReactiveProps({
     row: {}
-  })))])) : createCommentVNode("", true), _cache[13] || (_cache[13] = createTextVNode()), _ctx.isEmpty ? (openBlock(), createElementBlock("tr", _hoisted_22, [createElementVNode("td", {
+  })))])) : createCommentVNode("", true), _cache[14] || (_cache[14] = createTextVNode()), _ctx.isEmpty ? (openBlock(), createElementBlock("tr", _hoisted_21, [createElementVNode("td", {
     class: "table__column table__column--action",
     colspan: _ctx.nbOfColumns
-  }, [renderSlot(_ctx.$slots, "empty", {}, () => [createTextVNode(toDisplayString(_ctx.$t("fkui.interactive-table.empty", "Tabellen är tom")), 1)])], 8, _hoisted_23)])) : createCommentVNode("", true)], 512)], 16, _hoisted_1$f)], 2);
+  }, [renderSlot(_ctx.$slots, "empty", {}, () => [createTextVNode(toDisplayString(_ctx.$t("fkui.interactive-table.empty", "Tabellen är tom")), 1)])], 8, _hoisted_22), _cache[12] || (_cache[12] = createTextVNode()), renderSlot(_ctx.$slots, "default", normalizeProps(guardReactiveProps({
+    row: {}
+  })))])) : createCommentVNode("", true)]))], 16, _hoisted_1$f)], 2);
 }
 const FInteractiveTable = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["render", _sfc_render$g]]);
 const _sfc_main$f = defineComponent({