@progress/kendo-vue-editor 2.8.0-dev.202201111325 → 3.0.0-dev.202201161025

package/dist/es/Editor.js

@@ -33,7 +33,7 @@ import * as Vue from 'vue';
 var allVue = Vue;
 var gh = allVue.h;
 var markRaw = allVue.markRaw;
-import { ButtonGroup, Toolbar } from '@progress/kendo-vue-buttons';
+import { ButtonGroup, Toolbar, ToolbarSeparator } from '@progress/kendo-vue-buttons';
 import { classNames, validatePackage, getTemplate, getListeners, templateRendering, guid } from '@progress/kendo-vue-common';
 import { EditorState, Plugin, PluginKey, EditorView, Schema, baseKeymap, keymap, history, dropCursor, gapCursor, getMark, spacesFix, tableEditing } from '@progress/kendo-editor-common';
 import { marks, nodes } from './config/schema';
@@ -350,8 +350,8 @@ var EditorVue2 = {
         style = _a.style;
     var view = this.getView();
 
-    if (view) {
-      var editorProps = editorPropsKey.getState(view.state);
+    if (this.view) {
+      var editorProps = editorPropsKey.getState(this.view.state);
       editorProps.preserveWhitespace = preserveWhitespace;
     }
 
@@ -395,8 +395,14 @@ var EditorVue2 = {
         return h(this.v3 ? markRaw(allTools[currentTool].comp) : allTools[currentTool].comp, this.v3 ? toolProps : {
           props: toolProps
         });
+      } else if (ct === 'Separator') {
+        return (// @ts-ignore
+          h(ToolbarSeparator, {
+            key: index
+          })
+        );
       } else {
-        var tool = templateRendering.call(this, ct, getListeners.call(this));
+        var tool = templateRendering.call(this, ct.render, getListeners.call(this));
         return getTemplate.call(this, {
           h: h,
           template: tool,
@@ -405,11 +411,11 @@ var EditorVue2 = {
           additionalProps: {
             view: view,
             dir: this.$props.dir,
-            key: index
+            key: guid(),
+            settings: ct.props
           }
         });
-      } // return tool.type === ToolbarSeparator ? <Tool key={index} /> : tool;
-
+      }
     };
 
     var renderTools = function renderTools(item, index) {
@@ -598,8 +604,7 @@ var EditorVue2 = {
       var _b = this.$props,
           _c = _b.defaultContent,
           defaultContent = _c === void 0 ? '' : _c,
-          value = _b.value,
-          onMount = _b.onMount;
+          value = _b.value;
       var doc = value && typeof value !== 'string' ? value : EditorUtils.createDocument(new Schema({
         nodes: nodes,
         marks: marks

package/dist/es/config/toolsSettings.d.ts

@@ -154,6 +154,10 @@ export declare namespace EditorToolsSettings {
          * The name of the applied command.
          */
         commandName: string;
+        /**
+         * The dir of the applied command.
+         */
+        dir?: String;
     }
     /**
      * The setting of the IndentAction tool.

package/dist/es/dialogs/FindReplace.d.ts

@@ -7,7 +7,7 @@ import { EditorToolsSettings } from './../config/toolsSettings';
 import { TextSelection, EditorView } from '@progress/kendo-editor-common';
 interface FindAndReplaceDialogData {
     selectedTab: number;
-    matches?: TextSelection<any>[];
+    matches: TextSelection<any>[];
     nextMatch?: TextSelection<any>;
     searchText: string;
     replaceText: string;

package/dist/es/dialogs/FindReplace.js

@@ -32,7 +32,8 @@ var FindAndReplaceDialogVue2 = {
     }
   },
   created: function created() {
-    this.matches = undefined;
+    this._prevMatch = undefined;
+    this.nextMatch = undefined;
   },
   data: function data() {
     return {
@@ -43,24 +44,26 @@ var FindAndReplaceDialogVue2 = {
       matchWord: false,
       matchCyclic: false,
       useRegExp: false,
-      nextMatch: undefined
+      matches: [],
+      hasMounted: false
     };
   },
   mounted: function mounted() {
     if (this.$el) {
       document.body.append(this.$el);
     }
+
+    this.setNextState();
+    this.hasMounted = true;
   },
 
   /**
    * @hidden
    */
   updated: function updated() {
+    var matches = this.matches || [];
+    var nextMatch = this.nextMatch;
     var view = this.$props.view;
-    var _a = this.$data,
-        _b = _a.matches,
-        matches = _b === void 0 ? [] : _b,
-        nextMatch = _a.nextMatch;
 
     if (this._prevMatch !== nextMatch) {
       var state = view.state; // highlight selection
@@ -92,11 +95,6 @@ var FindAndReplaceDialogVue2 = {
       this.$el.remove();
     }
   },
-  watch: {
-    nextMatch: function nextMatch(_newNextMatch, oldMatch) {
-      this._prevMatch = oldMatch;
-    }
-  },
   // @ts-ignore
   setup: !gh ? undefined : function () {
     var v3 = !!gh;
@@ -138,7 +136,7 @@ var FindAndReplaceDialogVue2 = {
     var checkboxes = h("div", {
       "class": "k-search-options"
     }, [h("span", [h("input", {
-      "class": "k-checkbox",
+      "class": "k-checkbox k-checkbox-md k-rounded-md",
       type: "checkbox",
       attrs: this.v3 ? undefined : {
         type: "checkbox",
@@ -160,7 +158,7 @@ var FindAndReplaceDialogVue2 = {
       },
       "class": "k-checkbox-label"
     }, [localization.toLanguageString(findReplaceMatchCase, messages[findReplaceMatchCase])])]), h("span", [h("input", {
-      "class": "k-checkbox",
+      "class": "k-checkbox k-checkbox-md k-rounded-md",
       type: "checkbox",
       attrs: this.v3 ? undefined : {
         type: "checkbox",
@@ -182,7 +180,7 @@ var FindAndReplaceDialogVue2 = {
       },
       "class": "k-checkbox-label"
     }, [localization.toLanguageString(findReplaceMatchWord, messages[findReplaceMatchWord])])]), h("span", [h("input", {
-      "class": "k-checkbox",
+      "class": "k-checkbox k-checkbox-md k-rounded-md",
       type: "checkbox",
       attrs: this.v3 ? undefined : {
         type: "checkbox",
@@ -204,7 +202,7 @@ var FindAndReplaceDialogVue2 = {
       },
       "class": "k-checkbox-label"
     }, [localization.toLanguageString(findReplaceMatchCyclic, messages[findReplaceMatchCyclic])])]), h("span", [h("input", {
-      "class": "k-checkbox",
+      "class": "k-checkbox k-checkbox-md k-rounded-md",
       type: "checkbox",
       attrs: this.v3 ? undefined : {
         type: "checkbox",
@@ -226,78 +224,95 @@ var FindAndReplaceDialogVue2 = {
       },
       "class": "k-checkbox-label"
     }, [localization.toLanguageString(findReplaceUseRegExp, messages[findReplaceUseRegExp])])])]);
-    var navigation = h("div", {
-      "class": "k-matches-container"
-    }, [// @ts-ignore function children
-    h(Button, {
-      fillMode: 'flat',
-      attrs: this.v3 ? undefined : {
+
+    var navigation = function navigation(findWhatRef) {
+      var isRtl = this.$props.dir === 'rtl';
+      var prevButton = // @ts-ignore function children
+      h(Button, {
         fillMode: 'flat',
-        themeColor: 'primary'
-      },
-      themeColor: 'primary',
-      onClick: this.onFindPrev,
-      on: this.v3 ? undefined : {
-        "click": this.onFindPrev
-      }
-    }, this.v3 ? function () {
-      return [h("span", {
-        "class": "k-icon k-i-arrow-chevron-left"
-      }), localization.toLanguageString(findReplacePrevMatch, messages[findReplacePrevMatch])];
-    } : [h("span", {
-      "class": "k-icon k-i-arrow-chevron-left"
-    }), localization.toLanguageString(findReplacePrevMatch, messages[findReplacePrevMatch])]), h("span", [this.matchesMessage(localization.toLanguageString(findReplaceMatches, messages[findReplaceMatches]))]), // @ts-ignore function children
-    h(Button, {
-      fillMode: 'flat',
-      attrs: this.v3 ? undefined : {
+        attrs: this.v3 ? undefined : {
+          fillMode: 'flat',
+          themeColor: 'primary'
+        },
+        themeColor: 'primary',
+        onClick: this.onFindPrev,
+        on: this.v3 ? undefined : {
+          "click": this.onFindPrev
+        }
+      }, this.v3 ? function () {
+        return [h("span", {
+          "class": "k-icon k-i-arrow-chevron-" + (isRtl ? 'right' : 'left')
+        }), localization.toLanguageString(findReplacePrevMatch, messages[findReplacePrevMatch])];
+      } : [h("span", {
+        "class": "k-icon k-i-arrow-chevron-" + (isRtl ? 'right' : 'left')
+      }), localization.toLanguageString(findReplacePrevMatch, messages[findReplacePrevMatch])]);
+      var nextButton = // @ts-ignore function children
+      h(Button, {
         fillMode: 'flat',
-        themeColor: 'primary'
-      },
-      themeColor: 'primary',
-      onClick: this.onFindNext,
-      on: this.v3 ? undefined : {
-        "click": this.onFindNext
-      }
-    }, this.v3 ? function () {
-      return [localization.toLanguageString(findReplaceNextMatch, messages[findReplaceNextMatch]), h("span", {
-        "class": "k-icon k-i-arrow-chevron-right"
-      })];
-    } : [localization.toLanguageString(findReplaceNextMatch, messages[findReplaceNextMatch]), h("span", {
-      "class": "k-icon k-i-arrow-chevron-right"
-    })])]);
-    var findWhatLabel = h("div", {
-      "class": "k-edit-label"
-    }, [h("label", {
-      "for": "findWhat",
-      attrs: this.v3 ? undefined : {
-        "for": "findWhat"
-      }
-    }, [localization.toLanguageString(findReplaceFindWhat, messages[findReplaceFindWhat])])]);
-    var findWhat = h("div", {
-      "class": "k-edit-field"
-    }, [h("input", {
-      id: "findWhat",
-      attrs: this.v3 ? undefined : {
-        id: "findWhat",
+        attrs: this.v3 ? undefined : {
+          fillMode: 'flat',
+          themeColor: 'primary'
+        },
+        themeColor: 'primary',
+        onClick: this.onFindNext,
+        on: this.v3 ? undefined : {
+          "click": this.onFindNext
+        }
+      }, this.v3 ? function () {
+        return [localization.toLanguageString(findReplaceNextMatch, messages[findReplaceNextMatch]), h("span", {
+          "class": "k-icon k-i-arrow-chevron-" + (isRtl ? 'left' : 'right')
+        })];
+      } : [localization.toLanguageString(findReplaceNextMatch, messages[findReplaceNextMatch]), h("span", {
+        "class": "k-icon k-i-arrow-chevron-" + (isRtl ? 'left' : 'right')
+      })]);
+      return h("div", {
+        "class": "k-matches-container"
+      }, [prevButton, this.hasMounted && h("span", {
+        ref: findWhatRef
+      }, [this.matchesMessage(localization.toLanguageString(findReplaceMatches, messages[findReplaceMatches]))]), nextButton]);
+    };
+
+    var findWhatLabel = function findWhatLabel(findWhatId) {
+      return h("div", {
+        "class": "k-edit-label"
+      }, [h("label", {
+        ref: findWhatId,
+        "for": findWhatId,
+        attrs: this.v3 ? undefined : {
+          "for": findWhatId
+        }
+      }, [localization.toLanguageString(findReplaceFindWhat, messages[findReplaceFindWhat])])]);
+    };
+
+    var findWhat = function findWhat(findWhatId) {
+      return h("div", {
+        "class": "k-edit-field"
+      }, [h("span", {
+        "class": "k-textbox k-input k-input-md k-rounded-md k-input-solid"
+      }, [h("input", {
+        id: findWhatId,
+        attrs: this.v3 ? undefined : {
+          id: findWhatId,
+          type: "text"
+        },
+        ref: findWhatId,
         type: "text",
-        autoFocus: true
-      },
-      type: "text",
-      "class": "k-input",
-      value: this.v3 ? searchText : null,
-      domProps: this.v3 ? undefined : {
-        "value": searchText
-      },
-      onInput: this.onSearchChange,
-      on: this.v3 ? undefined : {
-        "input": this.onSearchChange,
-        "focus": this.onSearchChange,
-        "keydown": this.onKeyDown
-      },
-      onFocus: this.onSearchChange,
-      onKeydown: this.onKeyDown,
-      autoFocus: true
-    })]);
+        "class": "k-input-inner",
+        value: this.v3 ? searchText : null,
+        domProps: this.v3 ? undefined : {
+          "value": searchText
+        },
+        onInput: this.onSearchChange,
+        on: this.v3 ? undefined : {
+          "input": this.onSearchChange,
+          "focus": this.onSearchChange,
+          "keydown": this.onKeyDown
+        },
+        onFocus: this.onSearchChange,
+        onKeydown: this.onKeyDown
+      })])]);
+    };
+
     var replaceWithLabel = h("div", {
       "class": "k-edit-label"
     }, [h("label", {
@@ -308,13 +323,15 @@ var FindAndReplaceDialogVue2 = {
     }, [localization.toLanguageString(findReplaceReplaceWith, messages[findReplaceReplaceWith])])]);
     var replaceWith = h("div", {
       "class": "k-edit-field"
+    }, [h("span", {
+      "class": "k-textbox k-input k-input-md k-rounded-md k-input-solid"
     }, [h("input", {
       id: "replaceWith",
       attrs: this.v3 ? undefined : {
         id: "replaceWith",
         type: "text"
       },
-      "class": "k-input",
+      "class": "k-input-inner",
       type: "text",
       value: this.v3 ? replaceText : null,
       domProps: this.v3 ? undefined : {
@@ -324,7 +341,7 @@ var FindAndReplaceDialogVue2 = {
       on: this.v3 ? undefined : {
         "input": this.onReplaceChange
       }
-    })]);
+    })])]);
     return (// @ts-ignore function children
       h(Window, {
         title: localization.toLanguageString(findReplaceDialogTitle, messages[findReplaceDialogTitle]),
@@ -341,7 +358,8 @@ var FindAndReplaceDialogVue2 = {
           },
           maximizeButton: function maximizeButton() {
             return null;
-          }
+          },
+          dir: this.$props.dir
         },
         onClose: this.onClose,
         on: this.v3 ? undefined : {
@@ -358,15 +376,18 @@ var FindAndReplaceDialogVue2 = {
         },
         maximizeButton: function maximizeButton() {
           return null;
-        }
+        },
+        dir: this.$props.dir
       }, this.v3 ? function () {
         return [// @ts-ignore function children
         h(TabStrip, {
-          selected: _this.selectedTab,
+          dir: _this.$props.dir,
           attrs: _this.v3 ? undefined : {
+            dir: _this.$props.dir,
             selected: _this.selectedTab,
             animation: false
           },
+          selected: _this.selectedTab,
           "class": "k-editor-find-replace",
           onSelect: _this.onTabSelect,
           on: _this.v3 ? undefined : {
@@ -383,10 +404,10 @@ var FindAndReplaceDialogVue2 = {
           }, _this.v3 ? function () {
             return [h("div", {
               "class": "k-edit-form-container"
-            }, [findWhatLabel, findWhat]), checkboxes, navigation];
+            }, [findWhatLabel.call(_this, 'findWhatFind'), findWhat.call(_this, 'findWhatFind')]), checkboxes, navigation.call(_this, 'findWhatFind')];
           } : [h("div", {
             "class": "k-edit-form-container"
-          }, [findWhatLabel, findWhat]), checkboxes, navigation]), // @ts-ignore function children
+          }, [findWhatLabel.call(_this, 'findWhatFind'), findWhat.call(_this, 'findWhatFind')]), checkboxes, navigation.call(_this, 'findWhatFind')]), // @ts-ignore function children
           h(TabStripTab, {
             title: localization.toLanguageString(findReplaceTabReplace, messages[findReplaceTabReplace]),
             attrs: _this.v3 ? undefined : {
@@ -395,7 +416,7 @@ var FindAndReplaceDialogVue2 = {
           }, _this.v3 ? function () {
             return [h("div", {
               "class": "k-edit-form-container"
-            }, [findWhatLabel, findWhat, replaceWithLabel, replaceWith]), h("div", {
+            }, [findWhatLabel.call(_this, 'findWhatReplace'), findWhat.call(_this, 'findWhatReplace'), replaceWithLabel, replaceWith]), h("div", {
               "class": "k-actions k-hstack k-justify-content-end"
             }, [// @ts-ignore function children
             h(Button, {
@@ -421,10 +442,10 @@ var FindAndReplaceDialogVue2 = {
               }
             }, _this.v3 ? function () {
               return [localization.toLanguageString(findReplaceReplaceAll, messages[findReplaceReplaceAll])];
-            } : [localization.toLanguageString(findReplaceReplaceAll, messages[findReplaceReplaceAll])])]), checkboxes, navigation];
+            } : [localization.toLanguageString(findReplaceReplaceAll, messages[findReplaceReplaceAll])])]), checkboxes, navigation.call(_this, 'findWhatReplace')];
           } : [h("div", {
             "class": "k-edit-form-container"
-          }, [findWhatLabel, findWhat, replaceWithLabel, replaceWith]), h("div", {
+          }, [findWhatLabel.call(_this, 'findWhatReplace'), findWhat.call(_this, 'findWhatReplace'), replaceWithLabel, replaceWith]), h("div", {
             "class": "k-actions k-hstack k-justify-content-end"
           }, [h(Button, {
             disabled: !Boolean(nextMatch),
@@ -448,7 +469,7 @@ var FindAndReplaceDialogVue2 = {
             }
           }, _this.v3 ? function () {
             return [localization.toLanguageString(findReplaceReplaceAll, messages[findReplaceReplaceAll])];
-          } : [localization.toLanguageString(findReplaceReplaceAll, messages[findReplaceReplaceAll])])]), checkboxes, navigation])];
+          } : [localization.toLanguageString(findReplaceReplaceAll, messages[findReplaceReplaceAll])])]), checkboxes, navigation.call(_this, 'findWhatReplace')])];
         } : [h(TabStripTab, {
           title: localization.toLanguageString(findReplaceTabFind, messages[findReplaceTabFind]),
           attrs: _this.v3 ? undefined : {
@@ -457,10 +478,10 @@ var FindAndReplaceDialogVue2 = {
         }, _this.v3 ? function () {
           return [h("div", {
             "class": "k-edit-form-container"
-          }, [findWhatLabel, findWhat]), checkboxes, navigation];
+          }, [findWhatLabel.call(_this, 'findWhatFind'), findWhat.call(_this, 'findWhatFind')]), checkboxes, navigation.call(_this, 'findWhatFind')];
         } : [h("div", {
           "class": "k-edit-form-container"
-        }, [findWhatLabel, findWhat]), checkboxes, navigation]), h(TabStripTab, {
+        }, [findWhatLabel.call(_this, 'findWhatFind'), findWhat.call(_this, 'findWhatFind')]), checkboxes, navigation.call(_this, 'findWhatFind')]), h(TabStripTab, {
           title: localization.toLanguageString(findReplaceTabReplace, messages[findReplaceTabReplace]),
           attrs: _this.v3 ? undefined : {
             title: localization.toLanguageString(findReplaceTabReplace, messages[findReplaceTabReplace])
@@ -468,7 +489,7 @@ var FindAndReplaceDialogVue2 = {
         }, _this.v3 ? function () {
           return [h("div", {
             "class": "k-edit-form-container"
-          }, [findWhatLabel, findWhat, replaceWithLabel, replaceWith]), h("div", {
+          }, [findWhatLabel.call(_this, 'findWhatReplace'), findWhat.call(_this, 'findWhatReplace'), replaceWithLabel, replaceWith]), h("div", {
             "class": "k-actions k-hstack k-justify-content-end"
           }, [h(Button, {
             disabled: !Boolean(nextMatch),
@@ -492,10 +513,10 @@ var FindAndReplaceDialogVue2 = {
             }
           }, _this.v3 ? function () {
             return [localization.toLanguageString(findReplaceReplaceAll, messages[findReplaceReplaceAll])];
-          } : [localization.toLanguageString(findReplaceReplaceAll, messages[findReplaceReplaceAll])])]), checkboxes, navigation];
+          } : [localization.toLanguageString(findReplaceReplaceAll, messages[findReplaceReplaceAll])])]), checkboxes, navigation.call(_this, 'findWhatReplace')];
         } : [h("div", {
           "class": "k-edit-form-container"
-        }, [findWhatLabel, findWhat, replaceWithLabel, replaceWith]), h("div", {
+        }, [findWhatLabel.call(_this, 'findWhatReplace'), findWhat.call(_this, 'findWhatReplace'), replaceWithLabel, replaceWith]), h("div", {
           "class": "k-actions k-hstack k-justify-content-end"
         }, [h(Button, {
           disabled: !Boolean(nextMatch),
@@ -519,13 +540,15 @@ var FindAndReplaceDialogVue2 = {
           }
         }, _this.v3 ? function () {
           return [localization.toLanguageString(findReplaceReplaceAll, messages[findReplaceReplaceAll])];
-        } : [localization.toLanguageString(findReplaceReplaceAll, messages[findReplaceReplaceAll])])]), checkboxes, navigation])])];
+        } : [localization.toLanguageString(findReplaceReplaceAll, messages[findReplaceReplaceAll])])]), checkboxes, navigation.call(_this, 'findWhatReplace')])])];
       } : [h(TabStrip, {
-        selected: _this.selectedTab,
+        dir: _this.$props.dir,
         attrs: _this.v3 ? undefined : {
+          dir: _this.$props.dir,
           selected: _this.selectedTab,
           animation: false
         },
+        selected: _this.selectedTab,
         "class": "k-editor-find-replace",
         onSelect: _this.onTabSelect,
         on: _this.v3 ? undefined : {
@@ -541,10 +564,10 @@ var FindAndReplaceDialogVue2 = {
         }, _this.v3 ? function () {
           return [h("div", {
             "class": "k-edit-form-container"
-          }, [findWhatLabel, findWhat]), checkboxes, navigation];
+          }, [findWhatLabel.call(_this, 'findWhatFind'), findWhat.call(_this, 'findWhatFind')]), checkboxes, navigation.call(_this, 'findWhatFind')];
         } : [h("div", {
           "class": "k-edit-form-container"
-        }, [findWhatLabel, findWhat]), checkboxes, navigation]), h(TabStripTab, {
+        }, [findWhatLabel.call(_this, 'findWhatFind'), findWhat.call(_this, 'findWhatFind')]), checkboxes, navigation.call(_this, 'findWhatFind')]), h(TabStripTab, {
           title: localization.toLanguageString(findReplaceTabReplace, messages[findReplaceTabReplace]),
           attrs: _this.v3 ? undefined : {
             title: localization.toLanguageString(findReplaceTabReplace, messages[findReplaceTabReplace])
@@ -552,7 +575,7 @@ var FindAndReplaceDialogVue2 = {
         }, _this.v3 ? function () {
           return [h("div", {
             "class": "k-edit-form-container"
-          }, [findWhatLabel, findWhat, replaceWithLabel, replaceWith]), h("div", {
+          }, [findWhatLabel.call(_this, 'findWhatReplace'), findWhat.call(_this, 'findWhatReplace'), replaceWithLabel, replaceWith]), h("div", {
             "class": "k-actions k-hstack k-justify-content-end"
           }, [h(Button, {
             disabled: !Boolean(nextMatch),
@@ -576,10 +599,10 @@ var FindAndReplaceDialogVue2 = {
             }
           }, _this.v3 ? function () {
             return [localization.toLanguageString(findReplaceReplaceAll, messages[findReplaceReplaceAll])];
-          } : [localization.toLanguageString(findReplaceReplaceAll, messages[findReplaceReplaceAll])])]), checkboxes, navigation];
+          } : [localization.toLanguageString(findReplaceReplaceAll, messages[findReplaceReplaceAll])])]), checkboxes, navigation.call(_this, 'findWhatReplace')];
         } : [h("div", {
           "class": "k-edit-form-container"
-        }, [findWhatLabel, findWhat, replaceWithLabel, replaceWith]), h("div", {
+        }, [findWhatLabel.call(_this, 'findWhatReplace'), findWhat.call(_this, 'findWhatReplace'), replaceWithLabel, replaceWith]), h("div", {
           "class": "k-actions k-hstack k-justify-content-end"
         }, [h(Button, {
           disabled: !Boolean(nextMatch),
@@ -603,7 +626,7 @@ var FindAndReplaceDialogVue2 = {
           }
         }, _this.v3 ? function () {
           return [localization.toLanguageString(findReplaceReplaceAll, messages[findReplaceReplaceAll])];
-        } : [localization.toLanguageString(findReplaceReplaceAll, messages[findReplaceReplaceAll])])]), checkboxes, navigation])];
+        } : [localization.toLanguageString(findReplaceReplaceAll, messages[findReplaceReplaceAll])])]), checkboxes, navigation.call(_this, 'findWhatReplace')])];
       } : [h(TabStripTab, {
         title: localization.toLanguageString(findReplaceTabFind, messages[findReplaceTabFind]),
         attrs: _this.v3 ? undefined : {
@@ -612,10 +635,10 @@ var FindAndReplaceDialogVue2 = {
       }, _this.v3 ? function () {
         return [h("div", {
           "class": "k-edit-form-container"
-        }, [findWhatLabel, findWhat]), checkboxes, navigation];
+        }, [findWhatLabel.call(_this, 'findWhatFind'), findWhat.call(_this, 'findWhatFind')]), checkboxes, navigation.call(_this, 'findWhatFind')];
       } : [h("div", {
         "class": "k-edit-form-container"
-      }, [findWhatLabel, findWhat]), checkboxes, navigation]), h(TabStripTab, {
+      }, [findWhatLabel.call(_this, 'findWhatFind'), findWhat.call(_this, 'findWhatFind')]), checkboxes, navigation.call(_this, 'findWhatFind')]), h(TabStripTab, {
         title: localization.toLanguageString(findReplaceTabReplace, messages[findReplaceTabReplace]),
         attrs: _this.v3 ? undefined : {
           title: localization.toLanguageString(findReplaceTabReplace, messages[findReplaceTabReplace])
@@ -623,7 +646,7 @@ var FindAndReplaceDialogVue2 = {
       }, _this.v3 ? function () {
         return [h("div", {
           "class": "k-edit-form-container"
-        }, [findWhatLabel, findWhat, replaceWithLabel, replaceWith]), h("div", {
+        }, [findWhatLabel.call(_this, 'findWhatReplace'), findWhat.call(_this, 'findWhatReplace'), replaceWithLabel, replaceWith]), h("div", {
           "class": "k-actions k-hstack k-justify-content-end"
         }, [h(Button, {
           disabled: !Boolean(nextMatch),
@@ -647,10 +670,10 @@ var FindAndReplaceDialogVue2 = {
           }
         }, _this.v3 ? function () {
           return [localization.toLanguageString(findReplaceReplaceAll, messages[findReplaceReplaceAll])];
-        } : [localization.toLanguageString(findReplaceReplaceAll, messages[findReplaceReplaceAll])])]), checkboxes, navigation];
+        } : [localization.toLanguageString(findReplaceReplaceAll, messages[findReplaceReplaceAll])])]), checkboxes, navigation.call(_this, 'findWhatReplace')];
       } : [h("div", {
         "class": "k-edit-form-container"
-      }, [findWhatLabel, findWhat, replaceWithLabel, replaceWith]), h("div", {
+      }, [findWhatLabel.call(_this, 'findWhatReplace'), findWhat.call(_this, 'findWhatReplace'), replaceWithLabel, replaceWith]), h("div", {
         "class": "k-actions k-hstack k-justify-content-end"
       }, [h(Button, {
         disabled: !Boolean(nextMatch),
@@ -674,7 +697,7 @@ var FindAndReplaceDialogVue2 = {
         }
       }, _this.v3 ? function () {
         return [localization.toLanguageString(findReplaceReplaceAll, messages[findReplaceReplaceAll])];
-      } : [localization.toLanguageString(findReplaceReplaceAll, messages[findReplaceReplaceAll])])]), checkboxes, navigation])])])
+      } : [localization.toLanguageString(findReplaceReplaceAll, messages[findReplaceReplaceAll])])]), checkboxes, navigation.call(_this, 'findWhatReplace')])])])
     ); //    document.body);
   },
   methods: {
@@ -737,7 +760,12 @@ var FindAndReplaceDialogVue2 = {
         var transaction = view.state.tr.setSelection(selectionResult);
         transaction.scrollIntoView();
         view.updateState(view.state.apply(transaction));
+        this._prevMatch = this.nextMatch;
         this.nextMatch = selectionResult;
+
+        if (this._prevMatch !== this.nextMatch) {
+          this.$forceUpdate();
+        }
       }
     },
     onReplace: function onReplace() {
@@ -818,10 +846,12 @@ var FindAndReplaceDialogVue2 = {
         var nextMatch = !this.searchText && matches[0] || matches.find(function (match) {
           return match.from >= selection_1.from;
         }) || this.matchCyclic && matches[0] || undefined;
+        this._prevMatch = this.nextMatch;
         this.matches = matches;
         this.nextMatch = nextMatch;
       } else {
-        this.matches = undefined;
+        this._prevMatch = this.nextMatch;
+        this.matches = [];
         this.nextMatch = undefined;
       }
     }