Revert "fix: further improve user supplied prop fucntion detection"

jacobmllr95 · jacobmllr95 · commit e49047fceef0 · 2020-12-01T02:34:02.000+01:00
This reverts commit 86bbb7f.
diff --git a/src/components/calendar/calendar.js b/src/components/calendar/calendar.js
@@ -342,12 +342,14 @@ export const BCalendar = Vue.extend({
     },
     computedDateDisabledFn() {
       const { dateDisabledFn } = this
-      return dateDisabledFn !== props.dateDisabledFn.default ? dateDisabledFn : () => false
+      return dateDisabledFn.name !== props.dateDisabledFn.default.name
+        ? dateDisabledFn
+        : () => false
     },
     // TODO: Change `dateInfoFn` to handle events and notes as well as classes
     computedDateInfoFn() {
       const { dateInfoFn } = this
-      return dateInfoFn !== props.dateInfoFn.default ? dateInfoFn : () => ({})
+      return dateInfoFn.name !== props.dateInfoFn.default.name ? dateInfoFn : () => ({})
     },
     calendarLocale() {
       // This locale enforces the gregorian calendar (for use in formatter functions)
diff --git a/src/components/form-file/form-file.js b/src/components/form-file/form-file.js
@@ -273,7 +273,7 @@ export const BFormFile = /*#__PURE__*/ Vue.extend({
     },
     computedFileNameFormatter() {
       const { fileNameFormatter } = this
-      return fileNameFormatter !== props.fileNameFormatter.default
+      return fileNameFormatter.name !== props.fileNameFormatter.default.name
         ? fileNameFormatter
         : this.defaultFileNameFormatter
     },
diff --git a/src/components/form-spinbutton/form-spinbutton.js b/src/components/form-spinbutton/form-spinbutton.js
@@ -223,7 +223,9 @@ export const BFormSpinbutton = /*#__PURE__*/ Vue.extend({
     },
     computedFormatter() {
       const { formatterFn } = this
-      return formatterFn !== props.formatterFn.default ? formatterFn : this.defaultFormatter
+      return formatterFn.name !== props.formatterFn.default.name
+        ? formatterFn
+        : this.defaultFormatter
     },
     computedAttrs() {
       return {
diff --git a/src/components/form-tags/form-tags.js b/src/components/form-tags/form-tags.js
@@ -535,7 +535,7 @@ export const BFormTags = /*#__PURE__*/ Vue.extend({
     },
     validateTag(tag) {
       const { tagValidator } = this
-      return tagValidator !== props.tagValidator.default ? tagValidator(tag) : true
+      return tagValidator.name !== props.tagValidator.default.name ? tagValidator(tag) : true
     },
     getInput() {
       // Returns the input element reference (or null if not found)
diff --git a/src/components/table/helpers/mixin-filtering.js b/src/components/table/helpers/mixin-filtering.js
@@ -91,7 +91,7 @@ export default {
     localFilterFn() {
       // Return `null` to signal to use internal filter function
       const { filterFunction } = this
-      return filterFunction !== props.filterFunction.default ? filterFunction : null
+      return filterFunction.name !== props.filterFunction.default.name ? filterFunction : null
     },
     // Returns the records in `localItems` that match the filter criteria
     // Returns the original `localItems` array if not sorting
diff --git a/src/mixins/form-text.js b/src/mixins/form-text.js
@@ -100,7 +100,7 @@ export default {
       return mathMax(toInteger(this.debounce, 0), 0)
     },
     hasFormatter() {
-      return this.formatter !== props.formatter.default
+      return this.formatter.name !== props.formatter.default.name
     }
   },
   watch: {

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ export default {`
`100`	`100`	`return mathMax(toInteger(this.debounce, 0), 0)`
`101`	`101`	`},`
`102`	`102`	`hasFormatter() {`
`103`		`- return this.formatter !== props.formatter.default`
	`103`	`+ return this.formatter.name !== props.formatter.default.name`
`104`	`104`	`}`
`105`	`105`	`},`
`106`	`106`	`watch: {`