Merge pull request #934 from 3YOURMIND/fix-scoped-slots-in-table

fix(KtTable): reinstate $scopedSlot as they are needed in [email protected]
3YOURMIND · Jun 6, 2024 · 4316184 · 4316184
2 parents 82f1009 + 575f61c
commit 4316184
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/packages/eslint-config/source/index.ts b/packages/eslint-config/source/index.ts
@@ -459,7 +459,7 @@ export default {
 				'vue/jsx-uses-vars': 'error',
 				'vue/no-deprecated-data-object-declaration': 'error',
 				'vue/no-deprecated-destroyed-lifecycle': 'error',
-				'vue/no-deprecated-dollar-scopedslots-api': 'error',
+				// 'vue/no-deprecated-dollar-scopedslots-api': 'error', -- FIXME: reactivate with Vue@3
 				'vue/no-deprecated-events-api': 'error',
 				'vue/no-deprecated-filter': 'error',
 				'vue/no-deprecated-functional-template': 'error',

diff --git a/packages/kotti-ui/source/kotti-table/KtTable.vue b/packages/kotti-ui/source/kotti-table/KtTable.vue
@@ -205,25 +205,27 @@ export default {
 			return colSpan
 		},
 		isExpandable() {
-			return Boolean(this.$slots.expand || this.renderExpand)
+			return Boolean(this.$scopedSlots.expand || this.renderExpand)
 		},
 		hasActions() {
-			return Boolean(this.$slots.actions || this.renderActions)
+			return Boolean(this.$scopedSlots.actions || this.renderActions)
 		},
 		_renderExpand() {
 			return (h: CreateElement, rowData: any) => {
 				if (this.renderExpand) return this.renderExpand(h, rowData)
 
 				// @ts-expect-error $slots will exist at runtime
-				return this.$slots.expand(rowData)
+
+				return this.$scopedSlots.expand(rowData)
 			}
 		},
 		_renderActions() {
 			return (h: CreateElement, rowData: any) => {
 				if (this.renderActions) return this.renderActions(h, rowData)
 
 				// @ts-expect-error $slots will exist at runtime
-				return this.$slots.actions(rowData)
+
+				return this.$scopedSlots.actions(rowData)
 			}
 		},
 		_renderLoading() {