Update to v4.1.0 (#373)

* Readme file updated for react set up * Updated the doc with proper formatting & segregation * Handled double render for div tag * Double render issue for textarea & other tag handled * Update to v4.1.0 --------- Co-authored-by: shrutichatti <[email protected]>
froala · Jul 12, 2023 · 400d5a3 · 400d5a3
1 parent 87d0038
commit 400d5a3
Show file tree

Hide file tree

Showing 8 changed files with 318 additions and 175 deletions.
diff --git a/Readme.md b/Readme.md
diff --git a/demo/src/init_on_button.jsx b/demo/src/init_on_button.jsx
@@ -2,7 +2,7 @@
 import 'froala-editor/css/froala_editor.pkgd.min.css';
 import 'froala-editor/css/froala_style.css';
 import 'file-loader?name=[name].[ext]!./init_on_button.html';
-
+import 'froala-editor/js/plugins.pkgd.min.js';
 import FroalaEditorButton from 'react-froala-wysiwyg/FroalaEditorButton';
 import React from 'react';
 import ReactDOM from 'react-dom';

diff --git a/demo/src/init_on_image.jsx b/demo/src/init_on_image.jsx
@@ -2,6 +2,7 @@
 
 import 'froala-editor/css/froala_editor.pkgd.min.css';
 import 'froala-editor/css/froala_style.css';
+import 'froala-editor/js/plugins.pkgd.min.js';
 import 'file-loader?name=[name].[ext]!./init_on_image.html';
 
 

diff --git a/demo/src/init_on_input.jsx b/demo/src/init_on_input.jsx
@@ -1,6 +1,6 @@
 // Note that Froala Editor has to be required separately
 import 'froala-editor/css/froala_editor.pkgd.min.css';
-
+import 'froala-editor/js/plugins.pkgd.min.js';
 import 'froala-editor/css/froala_style.css';
 import 'file-loader?name=[name].[ext]!./init_on_input.html';
 

diff --git a/demo/src/init_on_link.jsx b/demo/src/init_on_link.jsx
@@ -2,7 +2,7 @@
 
 import 'froala-editor/css/froala_editor.pkgd.min.css';
 import 'froala-editor/css/froala_style.css';
-
+import 'froala-editor/js/plugins.pkgd.min.js';
 
 
 import FroalaEditorA from 'react-froala-wysiwyg/FroalaEditorA';

diff --git a/lib/FroalaEditorFunctionality.jsx b/lib/FroalaEditorFunctionality.jsx
@@ -200,6 +200,19 @@ export default class FroalaEditorFunctionality extends React.Component {
       this.listeningEvents.length = 0;
       this.element = null;
       this.editorInitialized = false;
+      this.config = {
+        immediateReactModelUpdate: false,
+        reactIgnoreAttrs: null
+      };
+      let tagName = this.el.tagName.toLowerCase();
+      if (this.SPECIAL_TAGS.indexOf(tagName) == -1) {
+        if(this.editor && this.editor.destrying && !this.props.onManualControllerReady && this.tag == 'textarea'){
+          this.editor.$box.remove()
+        }
+      }
+      if(this.tag != 'textarea'){
+        this.editor.$wp = '';
+      }
     }
   }
 
@@ -262,9 +275,12 @@ export default class FroalaEditorFunctionality extends React.Component {
     let self = this;
 
     // bind contentChange and keyup event to froalaModel
-    this.editor.events.on('contentChanged', function () {
-      self.updateModel();
-    });
+    if(this.editor && this.editor.events){
+      this.editor.events.on('contentChanged', function () {
+        self.updateModel();
+      });
+    }
+
     if (this.config.immediateReactModelUpdate) {
       this.editor.events.on('keyup', function () {
         self.updateModel();

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-froala-wysiwyg",
-  "version": "4.0.19",
+  "version": "4.1.0",
   "description": "React component for Froala WYSIWYG HTML rich text editor.",
   "main": "index.js",
   "types": "./lib/index.d.ts",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "create-react-class": "^15.5.2",
-    "froala-editor": "4.0.19"
+    "froala-editor": "4.1.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.0.0",

diff --git a/version.json b/version.json
@@ -6,5 +6,5 @@
         "dev": "1",
         "qa": "2",
         "qe": "2",
-        "stg": "1"
+        "stg": "2"
 }