@fkui/vue 5.45.0 → 5.46.0

package/dist/cjs/index.cjs.js

@@ -5532,6 +5532,9 @@ const _sfc_main$12 = vue.defineComponent({
     };
   },
   computed: {
+    ariaLabel() {
+      return `${this.value.monthName} ${this.value.year}`;
+    },
     totalCols() {
       return this.hideWeekNumbers ? 7 : 8;
     },
@@ -5573,50 +5576,43 @@ const _sfc_main$12 = vue.defineComponent({
     }
   }
 });
-const _hoisted_1$O = {
+const _hoisted_1$O = ["aria-label"];
+const _hoisted_2$A = {
   key: 0,
   class: "calendar-month__col--week"
 };
-const _hoisted_2$A = {
-  role: "presentation"
-};
 const _hoisted_3$s = {
-  role: "presentation"
-};
-const _hoisted_4$n = {
   key: 0,
   scope: "col",
   "aria-hidden": "true",
   class: "calendar-month__header-cell"
 };
-const _hoisted_5$i = ["title"];
-const _hoisted_6$e = {
-  role: "presentation"
-};
-const _hoisted_7$d = {
+const _hoisted_4$n = ["title"];
+const _hoisted_5$i = {
   key: 0,
   class: "calendar-month__cell calendar-month__cell--week-number",
   "aria-hidden": "true"
 };
-const _hoisted_8$8 = ["colspan"];
-const _hoisted_9$5 = ["colspan"];
-const _hoisted_10$3 = {
+const _hoisted_6$e = ["colspan"];
+const _hoisted_7$d = ["colspan"];
+const _hoisted_8$8 = {
   key: 0,
   "aria-hidden": "true"
 };
-const _hoisted_11$2 = ["colspan"];
-const _hoisted_12$2 = {
+const _hoisted_9$5 = ["colspan"];
+const _hoisted_10$3 = {
   key: 1,
   "aria-hidden": "true"
 };
-const _hoisted_13$1 = ["colspan"];
+const _hoisted_11$2 = ["colspan"];
 function _sfc_render$Q(_ctx, _cache, $props, $setup, $data, $options) {
   return vue.openBlock(), vue.createElementBlock("table", {
     class: "calendar-month__table",
-    role: "application",
+    role: "grid",
+    "aria-label": _ctx.ariaLabel,
     onFocusin: _cache[0] || (_cache[0] = (...args) => _ctx.onFocusin && _ctx.onFocusin(...args)),
     onFocusout: _cache[1] || (_cache[1] = (...args) => _ctx.onFocusout && _ctx.onFocusout(...args))
-  }, [vue.createElementVNode("colgroup", null, [!_ctx.internalHideWeekNumbers ? (vue.openBlock(), vue.createElementBlock("col", _hoisted_1$O)) : vue.createCommentVNode("", true), _cache[2] || (_cache[2] = vue.createTextVNode()), _cache[3] || (_cache[3] = vue.createElementVNode("col", {
+  }, [vue.createElementVNode("colgroup", null, [!_ctx.internalHideWeekNumbers ? (vue.openBlock(), vue.createElementBlock("col", _hoisted_2$A)) : vue.createCommentVNode("", true), _cache[2] || (_cache[2] = vue.createTextVNode()), _cache[3] || (_cache[3] = vue.createElementVNode("col", {
     class: "calendar-month__col--day"
   }, null, -1)), _cache[4] || (_cache[4] = vue.createTextVNode()), _cache[5] || (_cache[5] = vue.createElementVNode("col", {
     class: "calendar-month__col--day"
@@ -5630,26 +5626,23 @@ function _sfc_render$Q(_ctx, _cache, $props, $setup, $data, $options) {
     class: "calendar-month__col--day"
   }, null, -1)), _cache[14] || (_cache[14] = vue.createTextVNode()), _cache[15] || (_cache[15] = vue.createElementVNode("col", {
     class: "calendar-month__col--day"
-  }, null, -1))]), _cache[22] || (_cache[22] = vue.createTextVNode()), vue.createElementVNode("thead", _hoisted_2$A, [vue.createElementVNode("tr", _hoisted_3$s, [!_ctx.internalHideWeekNumbers ? (vue.openBlock(), vue.createElementBlock("th", _hoisted_4$n)) : vue.createCommentVNode("", true), _cache[16] || (_cache[16] = vue.createTextVNode()), (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.weekdays, (weekday) => {
+  }, null, -1))]), _cache[22] || (_cache[22] = vue.createTextVNode()), vue.createElementVNode("thead", null, [vue.createElementVNode("tr", null, [!_ctx.internalHideWeekNumbers ? (vue.openBlock(), vue.createElementBlock("th", _hoisted_3$s)) : vue.createCommentVNode("", true), _cache[16] || (_cache[16] = vue.createTextVNode()), (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.weekdays, (weekday) => {
     return vue.openBlock(), vue.createElementBlock("th", {
       key: weekday.name,
       scope: "col",
-      role: "presentation",
       class: "calendar-month__header-cell"
     }, [vue.createElementVNode("abbr", {
-      "aria-hidden": "true",
       title: weekday.name
-    }, vue.toDisplayString(_ctx.showShortWeekdays ? weekday.shortName : weekday.name), 9, _hoisted_5$i)]);
-  }), 128))])]), _cache[23] || (_cache[23] = vue.createTextVNode()), vue.createElementVNode("tbody", _hoisted_6$e, [(vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.weeks, (week) => {
+    }, vue.toDisplayString(_ctx.showShortWeekdays ? weekday.shortName : weekday.name), 9, _hoisted_4$n)]);
+  }), 128))])]), _cache[23] || (_cache[23] = vue.createTextVNode()), vue.createElementVNode("tbody", null, [(vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.weeks, (week) => {
     return vue.openBlock(), vue.createElementBlock("tr", {
-      key: week.week,
-      role: "presentation"
-    }, [!_ctx.internalHideWeekNumbers ? (vue.openBlock(), vue.createElementBlock("td", _hoisted_7$d, vue.toDisplayString(week.week), 1)) : vue.createCommentVNode("", true), _cache[17] || (_cache[17] = vue.createTextVNode()), _ctx.getDayStartOffset(week.days) ? (vue.openBlock(), vue.createElementBlock("td", {
+      key: week.week
+    }, [!_ctx.internalHideWeekNumbers ? (vue.openBlock(), vue.createElementBlock("td", _hoisted_5$i, vue.toDisplayString(week.week), 1)) : vue.createCommentVNode("", true), _cache[17] || (_cache[17] = vue.createTextVNode()), _ctx.getDayStartOffset(week.days) ? (vue.openBlock(), vue.createElementBlock("td", {
       key: 1,
       class: "calendar-month__cell",
       colspan: _ctx.getDayStartOffset(week.days),
       "aria-hidden": "true"
-    }, null, 8, _hoisted_8$8)) : vue.createCommentVNode("", true), _cache[18] || (_cache[18] = vue.createTextVNode()), (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(week.days, (day) => {
+    }, null, 8, _hoisted_6$e)) : vue.createCommentVNode("", true), _cache[18] || (_cache[18] = vue.createTextVNode()), (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(week.days, (day) => {
       return vue.openBlock(), vue.createElementBlock("td", {
         key: day.toString(),
         class: "calendar-month__cell",
@@ -5663,16 +5656,16 @@ function _sfc_render$Q(_ctx, _cache, $props, $setup, $data, $options) {
       class: "calendar-month__cell",
       colspan: _ctx.getDayEndOffset(week.days),
       "aria-hidden": "true"
-    }, null, 8, _hoisted_9$5)) : vue.createCommentVNode("", true)]);
-  }), 128)), _cache[20] || (_cache[20] = vue.createTextVNode()), _ctx.weeks.length < 5 ? (vue.openBlock(), vue.createElementBlock("tr", _hoisted_10$3, [vue.createElementVNode("td", {
+    }, null, 8, _hoisted_7$d)) : vue.createCommentVNode("", true)]);
+  }), 128)), _cache[20] || (_cache[20] = vue.createTextVNode()), _ctx.weeks.length < 5 ? (vue.openBlock(), vue.createElementBlock("tr", _hoisted_8$8, [vue.createElementVNode("td", {
     class: "calendar-month__cell",
     colspan: _ctx.totalCols,
     "aria-hidden": "true"
-  }, null, 8, _hoisted_11$2)])) : vue.createCommentVNode("", true), _cache[21] || (_cache[21] = vue.createTextVNode()), _ctx.weeks.length < 6 ? (vue.openBlock(), vue.createElementBlock("tr", _hoisted_12$2, [vue.createElementVNode("td", {
+  }, null, 8, _hoisted_9$5)])) : vue.createCommentVNode("", true), _cache[21] || (_cache[21] = vue.createTextVNode()), _ctx.weeks.length < 6 ? (vue.openBlock(), vue.createElementBlock("tr", _hoisted_10$3, [vue.createElementVNode("td", {
     class: "calendar-month__cell",
     colspan: _ctx.totalCols,
     "aria-hidden": "true"
-  }, null, 8, _hoisted_13$1)])) : vue.createCommentVNode("", true)])], 32);
+  }, null, 8, _hoisted_11$2)])) : vue.createCommentVNode("", true)])], 40, _hoisted_1$O);
 }
 const ICalendarMonthGrid = /* @__PURE__ */ _export_sfc(_sfc_main$12, [["render", _sfc_render$Q]]);
 const DayStep = {
@@ -5745,6 +5738,11 @@ const _sfc_main$11 = vue.defineComponent({
       this.$emit("click", date2);
     },
     async onKeydownDay(date2, event) {
+      if (event.code === "Enter" || event.code === "Space") {
+        event.preventDefault();
+        this.$emit("click", date2);
+        return;
+      }
       if (!isDayStepKey(event)) {
         return;
       }
@@ -5792,13 +5790,13 @@ function _sfc_render$P(_ctx, _cache, $props, $setup, $data, $options) {
   }, {
     default: vue.withCtx(({
       date: date2
-    }) => [vue.createElementVNode("button", {
+    }) => [vue.createElementVNode("div", {
       ref: date2.toString(),
+      role: "gridcell",
       class: "calendar-month__button",
       "data-test": "select-day-button",
       "data-date": date2.toString(),
       tabindex: _ctx.getTabindex(date2),
-      type: "button",
       onClick: vue.withModifiers(($event) => _ctx.onClickDay(date2), ["stop", "prevent"]),
       onKeydown: ($event) => _ctx.onKeydownDay(date2, $event)
     }, [vue.renderSlot(_ctx.$slots, "default", {
@@ -6006,9 +6004,7 @@ function useSlotUtils() {
     }
   };
 }
-const _hoisted_1$K = {
-  class: "card card--default"
-};
+const _hoisted_1$K = ["id"];
 const _hoisted_2$y = {
   key: 0,
   class: "card__header"
@@ -6022,16 +6018,91 @@ const _hoisted_4$m = {
 };
 const _sfc_main$_ = /* @__PURE__ */ vue.defineComponent({
   __name: "FCard",
+  props: {
+    /**
+     * Element to focus on when card is invalid. Set when using validation.
+     */
+    focusRef: {
+      type: Object,
+      required: false,
+      default: null
+    },
+    /**
+     * Optional id (generated by default).
+     */
+    id: {
+      type: String,
+      required: false,
+      default: () => logic.ElementIdService.generateElementId()
+    }
+  },
   setup(__props) {
     const {
       hasSlot: hasSlot2
     } = useSlotUtils();
+    const validationMessage = vue.ref("");
+    const hasError = vue.ref(false);
+    const isMounted = vue.ref(false);
     const hasHeaderSlot = vue.computed(() => hasSlot2("header"));
     const hasFooterSlot = vue.computed(() => hasSlot2("footer"));
+    const cardClass = vue.computed(() => `card card--${hasError.value ? "error" : "default"}`);
+    const props = __props;
+    vue.onMounted(() => isMounted.value = true);
+    async function onValidity({
+      detail
+    }) {
+      if (!isMounted.value) {
+        return;
+      }
+      if (!props.focusRef) {
+        throw new Error("Element to focus on when card is invalid (`focusRef`) is required when using card validation.");
+      }
+      const focusElementId = props.focusRef.id;
+      if (!focusElementId) {
+        throw new Error("An id must be set on the card's focus element.");
+      }
+      hasError.value = !detail.isValid;
+      validationMessage.value = detail.validationMessage;
+      dispatchComponentValidityEvent(props.focusRef, {
+        ...detail,
+        errorMessage: validationMessage.value,
+        focusElementId
+      });
+    }
     return (_ctx, _cache) => {
-      return vue.openBlock(), vue.createElementBlock("div", _hoisted_1$K, [hasHeaderSlot.value ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_2$y, [vue.renderSlot(_ctx.$slots, "header", vue.normalizeProps(vue.guardReactiveProps({
+      return vue.openBlock(), vue.createElementBlock("div", {
+        id: __props.id,
+        class: vue.normalizeClass(cardClass.value),
+        onValidity
+      }, [hasHeaderSlot.value ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_2$y, [vue.renderSlot(_ctx.$slots, "header", vue.normalizeProps(vue.guardReactiveProps({
         headingSlotClass: "card__header-label"
-      })))])) : vue.createCommentVNode("", true), _cache[0] || (_cache[0] = vue.createTextVNode()), vue.createElementVNode("div", _hoisted_3$r, [vue.renderSlot(_ctx.$slots, "default")]), _cache[1] || (_cache[1] = vue.createTextVNode()), hasFooterSlot.value ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_4$m, [vue.renderSlot(_ctx.$slots, "footer")])) : vue.createCommentVNode("", true)]);
+      })))])) : vue.createCommentVNode("", true), _cache[1] || (_cache[1] = vue.createTextVNode()), vue.renderSlot(_ctx.$slots, "error-message", vue.normalizeProps(vue.guardReactiveProps({
+        hasError: hasError.value,
+        validationMessage: validationMessage.value
+      })), () => [hasError.value ? (vue.openBlock(), vue.createBlock(vue.unref(IFlex), {
+        key: 0,
+        gap: "1x",
+        class: "card__error-message"
+      }, {
+        default: vue.withCtx(() => [vue.createVNode(vue.unref(IFlexItem), {
+          shrink: "",
+          align: "center"
+        }, {
+          default: vue.withCtx(() => [vue.createVNode(vue.unref(FIcon), {
+            name: "error"
+          })]),
+          _: 1
+        }), _cache[0] || (_cache[0] = vue.createTextVNode()), vue.createVNode(vue.unref(IFlexItem), {
+          grow: ""
+        }, {
+          default: vue.withCtx(() => [vue.createTextVNode(vue.toDisplayString(validationMessage.value), 1)]),
+          _: 1
+        })]),
+        _: 1
+      })) : vue.createCommentVNode("", true)]), _cache[2] || (_cache[2] = vue.createTextVNode()), vue.createElementVNode("div", _hoisted_3$r, [vue.renderSlot(_ctx.$slots, "default")]), _cache[3] || (_cache[3] = vue.createTextVNode()), hasFooterSlot.value ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_4$m, [vue.renderSlot(_ctx.$slots, "footer", vue.normalizeProps(vue.guardReactiveProps({
+        hasError: hasError.value,
+        validationMessage: validationMessage.value
+      })))])) : vue.createCommentVNode("", true)], 42, _hoisted_1$K);
     };
   }
 });
@@ -9817,7 +9888,16 @@ const _sfc_main$J = vue.defineComponent({
     }
   },
   setup() {
-    return FTableInjected();
+    const {
+      renderColumns,
+      setVisibilityColumn: setVisibilityColumn2,
+      addColumn: addColumn2
+    } = FTableInjected();
+    return {
+      renderColumns,
+      setVisibilityColumn: setVisibilityColumn2,
+      addColumn: addColumn2
+    };
   },
   computed: {
     classes() {
@@ -13721,10 +13801,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;
@@ -13758,7 +13834,6 @@ function useExpandableTable(expandableAttribute, keyAttribute, describedby, emit
     isExpanded,
     rowAriaExpanded,
     expandableRowClasses,
-    expandableColumnClasses,
     getExpandableDescribedby,
     expandableRows,
     hasExpandableContent
@@ -13868,6 +13943,22 @@ const _sfc_main$g = vue.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: [
@@ -13876,6 +13967,7 @@ const _sfc_main$g = vue.defineComponent({
     "update",
     "unselect",
     "update:modelValue",
+    "update:active",
     "select",
     /**
      * Emitted when row is expanded.
@@ -13910,7 +14002,8 @@ const _sfc_main$g = vue.defineComponent({
       activeRow: void 0,
       columns: [],
       selectedRows: [],
-      tr: []
+      tr: [],
+      tbodyKey: 0
     };
   },
   computed: {
@@ -13948,7 +14041,7 @@ const _sfc_main$g = vue.defineComponent({
       return tableScrollClasses(this.scroll);
     },
     nbOfColumns() {
-      let columnCount = this.columns.length;
+      let columnCount = this.visibleColumns.length;
       if (this.selectable) {
         columnCount++;
       }
@@ -13969,6 +14062,20 @@ const _sfc_main$g = vue.defineComponent({
           });
         }
       }
+    },
+    active: {
+      immediate: true,
+      handler: function() {
+        this.updateActiveRowFromVModel();
+      }
+    },
+    showActive: {
+      immediate: true,
+      handler: function(val) {
+        if (!val) {
+          this.tbodyKey ^= 1;
+        }
+      }
     }
   },
   updated() {
@@ -13987,6 +14094,9 @@ const _sfc_main$g = vue.defineComponent({
   },
   methods: {
     isActive(row) {
+      if (!this.showActive) {
+        return false;
+      }
       return itemEquals(row, this.activeRow, this.keyAttribute);
     },
     isSelected(row) {
@@ -14019,7 +14129,7 @@ const _sfc_main$g = vue.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];
@@ -14110,6 +14220,17 @@ const _sfc_main$g = vue.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);
     }
   }
 });
@@ -14147,40 +14268,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 = vue.resolveComponent("f-icon");
   const _component_f_checkbox_field = vue.resolveComponent("f-checkbox-field");
@@ -14189,12 +14307,12 @@ function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
   }, [vue.createElementVNode("table", vue.mergeProps({
     class: ["table", _ctx.tableClasses],
     role: _ctx.tableRole
-  }, _ctx.$attrs), [_ctx.hasCaption ? (vue.openBlock(), vue.createElementBlock("caption", _hoisted_2$d, [vue.renderSlot(_ctx.$slots, "caption")])) : vue.createCommentVNode("", true), _cache[14] || (_cache[14] = vue.createTextVNode()), vue.createElementVNode("colgroup", null, [_ctx.isExpandableTable ? (vue.openBlock(), vue.createElementBlock("col", _hoisted_3$9)) : vue.createCommentVNode("", true), _cache[0] || (_cache[0] = vue.createTextVNode()), _ctx.selectable ? (vue.openBlock(), vue.createElementBlock("col", _hoisted_4$8)) : vue.createCommentVNode("", true), _cache[1] || (_cache[1] = vue.createTextVNode()), (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.columns, (column) => {
+  }, _ctx.$attrs), [_ctx.hasCaption ? (vue.openBlock(), vue.createElementBlock("caption", _hoisted_2$d, [vue.renderSlot(_ctx.$slots, "caption")])) : vue.createCommentVNode("", true), _cache[15] || (_cache[15] = vue.createTextVNode()), vue.createElementVNode("colgroup", null, [_ctx.isExpandableTable ? (vue.openBlock(), vue.createElementBlock("col", _hoisted_3$9)) : vue.createCommentVNode("", true), _cache[0] || (_cache[0] = vue.createTextVNode()), _ctx.selectable ? (vue.openBlock(), vue.createElementBlock("col", _hoisted_4$8)) : vue.createCommentVNode("", true), _cache[1] || (_cache[1] = vue.createTextVNode()), (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.columns, (column) => {
     return vue.openBlock(), vue.createElementBlock("col", {
       key: column.id,
       class: vue.normalizeClass(column.size)
     }, null, 2);
-  }), 128))]), _cache[15] || (_cache[15] = vue.createTextVNode()), vue.createElementVNode("thead", null, [vue.createElementVNode("tr", _hoisted_5$6, [_ctx.isExpandableTable ? (vue.openBlock(), vue.createElementBlock("th", _hoisted_6$4, [vue.createElementVNode("span", _hoisted_7$4, vue.toDisplayString(_ctx.$t("fkui.interactive-table.select", "Expandera")), 1)])) : vue.createCommentVNode("", true), _cache[4] || (_cache[4] = vue.createTextVNode()), _ctx.selectable ? (vue.openBlock(), vue.createElementBlock("th", _hoisted_8$4, [vue.createElementVNode("span", _hoisted_9$3, vue.toDisplayString(_ctx.$t("fkui.interactive-table.select", "Markera")), 1)])) : vue.createCommentVNode("", true), _cache[5] || (_cache[5] = vue.createTextVNode()), (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.visibleColumns, (column) => {
+  }), 128))]), _cache[16] || (_cache[16] = vue.createTextVNode()), vue.createElementVNode("thead", null, [vue.createElementVNode("tr", _hoisted_5$6, [_ctx.isExpandableTable ? (vue.openBlock(), vue.createElementBlock("th", _hoisted_6$4, [vue.createElementVNode("span", _hoisted_7$4, vue.toDisplayString(_ctx.$t("fkui.interactive-table.select", "Expandera")), 1)])) : vue.createCommentVNode("", true), _cache[4] || (_cache[4] = vue.createTextVNode()), _ctx.selectable ? (vue.openBlock(), vue.createElementBlock("th", _hoisted_8$4, [vue.createElementVNode("span", _hoisted_9$3, vue.toDisplayString(_ctx.$t("fkui.interactive-table.select", "Markera")), 1)])) : vue.createCommentVNode("", true), _cache[5] || (_cache[5] = vue.createTextVNode()), (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.visibleColumns, (column) => {
     return vue.openBlock(), vue.createElementBlock("th", vue.mergeProps({
       key: column.id,
       scope: "col",
@@ -14208,7 +14326,10 @@ function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
       class: vue.normalizeClass(_ctx.iconClasses(column)),
       name: _ctx.iconName(column)
     }, null, 8, ["class", "name"])) : vue.createCommentVNode("", true), _cache[3] || (_cache[3] = vue.createTextVNode()), column.description ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_11$1, vue.toDisplayString(column.description), 1)) : vue.createCommentVNode("", true)], 16);
-  }), 128))])]), _cache[16] || (_cache[16] = vue.createTextVNode()), vue.createElementVNode("tbody", _hoisted_12$1, [(vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.rows, (row, index) => {
+  }), 128))])]), _cache[17] || (_cache[17] = vue.createTextVNode()), (vue.openBlock(), vue.createElementBlock("tbody", {
+    ref: "tbodyElement",
+    key: _ctx.tbodyKey
+  }, [(vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.rows, (row, index) => {
     return vue.openBlock(), vue.createElementBlock(vue.Fragment, {
       key: _ctx.rowKey(row)
     }, [vue.createElementVNode("tr", {
@@ -14220,15 +14341,15 @@ function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
       tabindex: "0",
       onKeydown: vue.withModifiers(($event) => _ctx.onKeydown($event, index), ["self"]),
       onClick: ($event) => _ctx.onClick($event, row, index)
-    }, [_ctx.isExpandableTable ? (vue.openBlock(), vue.createElementBlock("td", _hoisted_14, [_ctx.hasExpandableContent(row) ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_15, [vue.createVNode(_component_f_icon, {
+    }, [_ctx.isExpandableTable ? (vue.openBlock(), vue.createElementBlock("td", _hoisted_13, [_ctx.hasExpandableContent(row) ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_14, [vue.createVNode(_component_f_icon, {
       name: "arrow-right",
       rotate: _ctx.isExpanded(row) ? "270" : "90"
-    }, null, 8, ["rotate"])])) : vue.createCommentVNode("", true)])) : vue.createCommentVNode("", true), _cache[6] || (_cache[6] = vue.createTextVNode()), _ctx.selectable ? (vue.openBlock(), vue.createElementBlock("td", _hoisted_16, [vue.createElementVNode("div", _hoisted_17, [vue.createVNode(_component_f_checkbox_field, {
+    }, null, 8, ["rotate"])])) : vue.createCommentVNode("", true)])) : vue.createCommentVNode("", true), _cache[6] || (_cache[6] = vue.createTextVNode()), _ctx.selectable ? (vue.openBlock(), vue.createElementBlock("td", _hoisted_15, [vue.createElementVNode("div", _hoisted_16, [vue.createVNode(_component_f_checkbox_field, {
       value: true,
       "model-value": _ctx.isSelected(row),
       onClick: vue.withModifiers(($event) => _ctx.onSelect(row), ["self"])
     }, {
-      default: vue.withCtx(() => [_ctx.hasCheckboxDescription ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_18, [vue.renderSlot(_ctx.$slots, "checkbox-description", vue.mergeProps({
+      default: vue.withCtx(() => [_ctx.hasCheckboxDescription ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_17, [vue.renderSlot(_ctx.$slots, "checkbox-description", vue.mergeProps({
         ref_for: true
       }, {
         row
@@ -14238,21 +14359,21 @@ function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
       ref_for: true
     }, {
       row
-    }))], 42, _hoisted_13), _cache[11] || (_cache[11] = vue.createTextVNode()), _ctx.isExpandableTable && _ctx.hasExpandableContent(row) ? (vue.openBlock(true), vue.createElementBlock(vue.Fragment, {
+    }))], 42, _hoisted_12$1), _cache[11] || (_cache[11] = vue.createTextVNode()), _ctx.isExpandableTable && _ctx.hasExpandableContent(row) ? (vue.openBlock(true), vue.createElementBlock(vue.Fragment, {
       key: 0
     }, vue.renderList(_ctx.expandableRows(row), (expandableRow, expandableIndex) => {
       return vue.openBlock(), vue.createElementBlock("tr", {
         key: _ctx.rowKey(expandableRow),
         "aria-level": "2",
         class: vue.normalizeClass(_ctx.expandableRowClasses(row, expandableIndex))
-      }, [_cache[8] || (_cache[8] = vue.createElementVNode("td", null, null, -1)), _cache[9] || (_cache[9] = vue.createTextVNode()), _ctx.selectable ? (vue.openBlock(), vue.createElementBlock("td", _hoisted_19)) : vue.createCommentVNode("", true), _cache[10] || (_cache[10] = vue.createTextVNode()), !_ctx.hasExpandableSlot ? (vue.openBlock(true), vue.createElementBlock(vue.Fragment, {
-        key: 1
-      }, vue.renderList(_ctx.columns, (column, columnIndex) => {
-        return vue.openBlock(), vue.createElementBlock("td", {
-          key: `${_ctx.rowKey(expandableRow)}${column.name}`,
-          class: vue.normalizeClass(_ctx.expandableColumnClasses(column, columnIndex))
-        }, vue.toDisplayString(expandableRow[column.name]), 3);
-      }), 128)) : (vue.openBlock(), vue.createElementBlock("td", {
+      }, [_cache[8] || (_cache[8] = vue.createElementVNode("td", {
+        class: "table__column--placeholder"
+      }, null, -1)), _cache[9] || (_cache[9] = vue.createTextVNode()), _ctx.selectable ? (vue.openBlock(), vue.createElementBlock("td", _hoisted_18)) : vue.createCommentVNode("", true), _cache[10] || (_cache[10] = vue.createTextVNode()), !_ctx.hasExpandableSlot ? vue.renderSlot(_ctx.$slots, "default", vue.mergeProps({
+        key: 1,
+        ref_for: true
+      }, {
+        row: expandableRow
+      })) : (vue.openBlock(), vue.createElementBlock("td", {
         key: 2,
         class: "table__column table__column--indented",
         colspan: _ctx.columns.length
@@ -14261,14 +14382,16 @@ function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
       }, {
         expandableRow,
         parentRow: row
-      }))], 8, _hoisted_20))], 2);
+      }))], 8, _hoisted_19))], 2);
     }), 128)) : vue.createCommentVNode("", true)], 64);
-  }), 128)), _cache[12] || (_cache[12] = vue.createTextVNode()), _ctx.isEmpty && _ctx.columns.length === 0 ? (vue.openBlock(), vue.createElementBlock("tr", _hoisted_21, [vue.renderSlot(_ctx.$slots, "default", vue.normalizeProps(vue.guardReactiveProps({
+  }), 128)), _cache[13] || (_cache[13] = vue.createTextVNode()), _ctx.isEmpty && _ctx.columns.length === 0 ? (vue.openBlock(), vue.createElementBlock("tr", _hoisted_20, [vue.renderSlot(_ctx.$slots, "default", vue.normalizeProps(vue.guardReactiveProps({
     row: {}
-  })))])) : vue.createCommentVNode("", true), _cache[13] || (_cache[13] = vue.createTextVNode()), _ctx.isEmpty ? (vue.openBlock(), vue.createElementBlock("tr", _hoisted_22, [vue.createElementVNode("td", {
+  })))])) : vue.createCommentVNode("", true), _cache[14] || (_cache[14] = vue.createTextVNode()), _ctx.isEmpty ? (vue.openBlock(), vue.createElementBlock("tr", _hoisted_21, [vue.createElementVNode("td", {
     class: "table__column table__column--action",
     colspan: _ctx.nbOfColumns
-  }, [vue.renderSlot(_ctx.$slots, "empty", {}, () => [vue.createTextVNode(vue.toDisplayString(_ctx.$t("fkui.interactive-table.empty", "Tabellen är tom")), 1)])], 8, _hoisted_23)])) : vue.createCommentVNode("", true)], 512)], 16, _hoisted_1$f)], 2);
+  }, [vue.renderSlot(_ctx.$slots, "empty", {}, () => [vue.createTextVNode(vue.toDisplayString(_ctx.$t("fkui.interactive-table.empty", "Tabellen är tom")), 1)])], 8, _hoisted_22), _cache[12] || (_cache[12] = vue.createTextVNode()), vue.renderSlot(_ctx.$slots, "default", vue.normalizeProps(vue.guardReactiveProps({
+    row: {}
+  })))])) : vue.createCommentVNode("", true)]))], 16, _hoisted_1$f)], 2);
 }
 const FInteractiveTable = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["render", _sfc_render$g]]);
 const _sfc_main$f = vue.defineComponent({
@@ -17002,6 +17125,20 @@ const _sfc_main = vue.defineComponent({
         });
       }
       logic.DomUtils.focus(headerElement);
+    },
+    beforeNextWrapper() {
+      return this.beforeNext({
+        key: this.step.key,
+        stepNumber: this.stepNumber,
+        totalSteps: this.totalSteps
+      });
+    },
+    beforeValidationWrapper() {
+      return this.beforeValidation({
+        key: this.step.key,
+        stepNumber: this.stepNumber,
+        totalSteps: this.totalSteps
+      });
     }
   }
 });
@@ -17117,19 +17254,25 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   }, {
     default: vue.withCtx(() => [vue.createVNode(_component_f_validation_form, {
       id: _ctx.formId,
-      "before-submit": _ctx.beforeNext,
-      "before-validation": _ctx.beforeValidation,
+      "before-submit": _ctx.beforeNextWrapper,
+      "before-validation": _ctx.beforeValidationWrapper,
       "use-error-list": _ctx.useErrorList,
       class: "wizard-step-body",
       onSubmit: _ctx.onSubmit
     }, {
-      "error-message": vue.withCtx(() => [vue.renderSlot(_ctx.$slots, "error-message", {}, () => [vue.createTextVNode(vue.toDisplayString(_ctx.$t("fkui.wizard-step.errorlist.title", "Oj, du har glömt att fylla i något. Gå till:")), 1)])]),
+      "error-message": vue.withCtx(() => [vue.renderSlot(_ctx.$slots, "error-message", vue.normalizeProps(vue.guardReactiveProps({
+        stepNumber: _ctx.stepNumber,
+        totalSteps: _ctx.totalSteps
+      })), () => [vue.createTextVNode(vue.toDisplayString(_ctx.$t("fkui.wizard-step.errorlist.title", "Oj, du har glömt att fylla i något. Gå till:")), 1)])]),
       default: vue.withCtx(() => [vue.renderSlot(_ctx.$slots, "default"), _cache[14] || (_cache[14] = vue.createTextVNode()), vue.createElementVNode("div", _hoisted_10, [vue.createElementVNode("button", {
         "data-test": "submit-button",
         "data-disabled": _ctx.ignoreClick ? "true" : "false",
         type: "submit",
         class: "button button--primary button-group__item button--large"
-      }, [vue.renderSlot(_ctx.$slots, "next-button-text", {}, () => [_ctx.isFinalStep ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, {
+      }, [vue.renderSlot(_ctx.$slots, "next-button-text", vue.normalizeProps(vue.guardReactiveProps({
+        stepNumber: _ctx.stepNumber,
+        totalSteps: _ctx.totalSteps
+      })), () => [_ctx.isFinalStep ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, {
         key: 0
       }, [vue.createTextVNode(vue.toDisplayString(_ctx.$t("fkui.wizard-step.button.next.text-final", "Gå vidare och granska")), 1)], 64)) : (vue.openBlock(), vue.createElementBlock(vue.Fragment, {
         key: 1