From f4abba477c382021d814ead8841a281e7bb95fc6 Mon Sep 17 00:00:00 2001
From: Piotr Nowak <piotr.nowak.25.02.1978@gmail.com>
Date: Thu, 6 Jun 2019 16:27:30 +0200
Subject: [PATCH] Remove check in validateChanges and add additional check for
 cell validator to finishEditing in baseEditor #5893

---
 src/core.js                | 3 +--
 src/editors/_baseEditor.js | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/core.js b/src/core.js
index 2407b3f5981..70eb9da6f57 100644
--- a/src/core.js
+++ b/src/core.js
@@ -927,8 +927,7 @@ export default function Core(rootElement, userSettings, rootInstanceSymbol = fal
     if (isFunction(beforeChangeResult)) {
       warn('Your beforeChange callback returns a function. It\'s not supported since Handsontable 0.12.1 (and the returned function will not be executed).');
 
-    } else if (beforeChangeResult === false || Array.isArray(beforeChangeResult) &&
-    (!beforeChangeResult.length || (beforeChangeResult.length === 1 && beforeChangeResult[0] === null))) {
+    } else if (beforeChangeResult === false) {
       const activeEditor = instance.getActiveEditor();
 
       if (activeEditor) {
diff --git a/src/editors/_baseEditor.js b/src/editors/_baseEditor.js
index ea15d5887ef..a26ecf6bd6b 100644
--- a/src/editors/_baseEditor.js
+++ b/src/editors/_baseEditor.js
@@ -289,7 +289,7 @@ class BaseEditor {
       this.state = EditorState.WAITING;
       this.saveValue(val, ctrlDown);
 
-      if (this.hot.getCellValidator(this.cellProperties)) {
+      if (this.hot.getCellValidator(this.cellProperties) && !this.hot.getSettings().beforeChange) {
         this.hot.addHookOnce('postAfterValidate', (result) => {
           this.state = EditorState.FINISHED;
           this.discardEditor(result);