From 2ad38933eec6240ccf20f39d559bae2156c89247 Mon Sep 17 00:00:00 2001
From: Justin Schroeder <justin@wearebraid.com>
Date: Sun, 29 Mar 2020 00:32:07 -0400
Subject: [PATCH] Initial support for public scoped slot api

---
 package-lock.json                    |  6 ++++++
 package.json                         |  1 +
 src/FormulateInput.vue               |  2 +-
 src/libs/context.js                  |  2 +-
 test/unit/FormulateInputText.test.js | 21 +++++++++++++++++++++
 5 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 056a537..c4382d4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20304,6 +20304,12 @@
         "is-typedarray": "^1.0.0"
       }
     },
+    "typescript": {
+      "version": "3.8.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz",
+      "integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==",
+      "dev": true
+    },
     "uglify-js": {
       "version": "3.4.10",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
diff --git a/package.json b/package.json
index 2a75db3..ebadc94 100644
--- a/package.json
+++ b/package.json
@@ -82,6 +82,7 @@
     "rollup-plugin-terser": "^5.2.0",
     "rollup-plugin-vue": "^5.1.6",
     "sass-loader": "^8.0.2",
+    "typescript": "^3.8.3",
     "vue": "^2.6.11",
     "vue-jest": "^3.0.5",
     "vue-runtime-helpers": "^1.1.2",
diff --git a/src/FormulateInput.vue b/src/FormulateInput.vue
index c6adf6f..99fa31f 100644
--- a/src/FormulateInput.vue
+++ b/src/FormulateInput.vue
@@ -32,7 +32,7 @@
       <slot
         v-if="context.hasLabel && context.labelPosition === 'after'"
         name="label"
-        v-bind="context.label"
+        v-bind="context"
       >
         <label
           class="formulate-input-label formulate-input-label--after"
diff --git a/src/libs/context.js b/src/libs/context.js
index a0db122..1d4c3c4 100644
--- a/src/libs/context.js
+++ b/src/libs/context.js
@@ -26,7 +26,7 @@ export default {
       uploader: this.uploader || this.$formulate.getUploader(),
       uploadBehavior: this.uploadBehavior,
       preventWindowDrops: this.preventWindowDrops,
-      hasValidationErrors: this.hasValidationErrors,
+      hasValidationErrors: this.hasValidationErrors.bind(this),
       getValidationErrors: this.getValidationErrors.bind(this),
       validationErrors: this.validationErrors,
       errors: this.explicitErrors,
diff --git a/test/unit/FormulateInputText.test.js b/test/unit/FormulateInputText.test.js
index 8603092..a9d6361 100644
--- a/test/unit/FormulateInputText.test.js
+++ b/test/unit/FormulateInputText.test.js
@@ -241,4 +241,25 @@ describe('FormulateInputText', () => {
     await flushPromises()
     expect(wrapper.find('[data-has-errors]').exists()).toBe(true)
   })
+
+
+  it('allows label-before override with scoped slot', async () => {
+    const wrapper = mount(FormulateInput, {
+      propsData: { type: 'text', label: 'flavor' },
+      scopedSlots: {
+        label: '<label>{{ props.label }} town</label>'
+      }
+    })
+    expect(wrapper.find('label').text()).toBe('flavor town')
+  })
+
+  it('allows label-after override with scoped slot', async () => {
+    const wrapper = mount(FormulateInput, {
+      propsData: { type: 'text', label: 'flavor', labelPosition: 'after' },
+      scopedSlots: {
+        label: '<label>{{ props.label }} town</label>'
+      }
+    })
+    expect(wrapper.find('label').text()).toBe('flavor town')
+  })
 })