Update to 1.0.38

#62

Author: imnapo

expo-demo/App.js

@@ -26,20 +26,17 @@ class App extends Component {
 
     constructor(props) {
         super(props);
-        
-
+                 
         this.state = {
             selectedTag : 'body',
             selectedColor : 'default',
             selectedHighlight: 'default',
             colors : ['red', 'green', 'blue'],
             highlights:['yellow_hl','pink_hl', 'orange_hl', 'green_hl','purple_hl','blue_hl'],
             selectedStyles : [],
-            value: [getInitialObject]
+            value: [getInitialObject()]
         };
 
-        this.state.value = [getInitialObject()];
-
         this.editor = null;
 
     }
@@ -299,6 +296,8 @@ class App extends Component {
     }
 
     render() {
+        let customStyles = {...defaultStyles, body: {fontSize: 12}, heading : {fontSize: 16}, title : {fontSize: 20}};
+        
         return (
             <KeyboardAvoidingView 
             behavior="padding" 
@@ -315,7 +314,7 @@ class App extends Component {
                             onSelectedStyleChanged={this.onSelectedStyleChanged}
                             value={this.state.value}
                             style={styles.editor}
-                            styleList={defaultStyles}
+                            styleList={customStyles}
                             foreColor='dimgray' // optional (will override default fore-color)
                             onValueChanged={this.onValueChanged}
                             onRemoveImage={this.onRemoveImage}

expo-demo/app.json

@@ -9,7 +9,7 @@
       "ios",
       "android"
     ],
-    "version": "1.0.7",
+    "version": "1.0.8",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "splash": {

expo-demo/package.json

@@ -10,7 +10,7 @@
     "expo": "^31.0.2",
     "react": "16.5.0",
     "react-native": "https://github.com/expo/react-native/archive/sdk-31.0.0.tar.gz",
-    "react-native-cn-richtext-editor": "^1.0.37",
+    "react-native-cn-richtext-editor": "^1.0.38",
     "react-native-popup-menu": "^0.14.2"
   },
   "devDependencies": {

expo-demo/yarn.lock

@@ -3730,10 +3730,10 @@ react-native-branch@2.2.5:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/react-native-branch/-/react-native-branch-2.2.5.tgz#4074dd63b4973e6397d9ce50e97b57c77a518e9d"
 
-react-native-cn-richtext-editor@^1.0.37:
-  version "1.0.37"
-  resolved "https://registry.yarnpkg.com/react-native-cn-richtext-editor/-/react-native-cn-richtext-editor-1.0.37.tgz#dc1fe33b2a36e82aed3782a9523ef79c45f3bbcb"
-  integrity sha512-qdetqUf+9rhi2HRyd6881U57FUdMCRyNYIfuiIY98OhKVuu4F+JyUO2d55YAv7iCqBJ/vFLGOXg8Eo5x6WlzxA==
+react-native-cn-richtext-editor@^1.0.38:
+  version "1.0.38"
+  resolved "https://registry.yarnpkg.com/react-native-cn-richtext-editor/-/react-native-cn-richtext-editor-1.0.38.tgz#77c9da58e4391416a1ac795481177c5e39b313de"
+  integrity sha512-SJ7hBmscKR7Oj91wPD0dEAco0CvwnE4l6VeibJk4aUGbMqXiab/lmsTR6eE52fFg4ASemLGfEa6uCrD2/svAEA==
   dependencies:
     diff-match-patch "^1.0.4"
     immutability-helper "^2.8.1"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-cn-richtext-editor",
-  "version": "1.0.37",
+  "version": "1.0.38",
   "description": "RichText Editor for React-Native",
   "main": "index.js",
   "scripts": {

src/CNRichTextEditor.js

@@ -6,7 +6,7 @@ import {
 } from 'react-native';
 import _ from 'lodash';
 import update from 'immutability-helper';
-import { getInitialObject, defaultStyles } from './Convertors';
+import { getInitialObject, getDefaultStyles } from './Convertors';
 import CNTextInput from './CNTextInput';
 
 const shortid = require('shortid');
@@ -38,10 +38,7 @@ class CNRichTextEditor extends Component {
       this.focusOnNextUpdate = -1;
       this.selectionOnFocus = null;
       this.scrollOffset = 0;
-    }
-
-    componentDidMount() {
-
+      this.defaultStyles = getDefaultStyles();
     }
 
     componentDidUpdate(prevProps, prevState) {
@@ -403,7 +400,7 @@ class CNRichTextEditor extends Component {
     }
 
     renderInput(input, index, isLast, measureScroll = true) {
-      const styles = this.props.styleList ? this.props.styleList : defaultStyles;
+      const styles = this.props.styleList ? this.props.styleList : this.defaultStyles;
       return (
         <View
           key={input.id}
@@ -540,7 +537,7 @@ class CNRichTextEditor extends Component {
       const {
         value, style, contentContainerStyle, measureInputScroll = true,
       } = this.props;
-      const styleList = this.props.styleList ? this.props.styleList : defaultStyles;
+      const styleList = this.props.styleList ? this.props.styleList : this.defaultStyles;
 
       return (
         <View

src/CNTextInput.js

@@ -42,6 +42,19 @@ class CNTextInput extends Component {
     DiffMatchPatch.DIFF_EQUAL = 0;
   }
 
+  componentWillMount() {
+    const { items } = this.props;
+    if(items && Array.isArray(items) === true) {
+      let content = items;
+      for (let i = 0; i < content.length; i++) {
+        content[i].styleList = StyleSheet.flatten(this.convertStyleList(content[i].stype));
+      }
+      if (this.props.onContentChanged) {
+        this.props.onContentChanged(content);
+      }
+    }   
+  }
+
   componentDidMount() {
     if (this.props.items) {
       this.textLength = 0;
@@ -1293,19 +1306,20 @@ class CNTextInput extends Component {
 
     render() {
       const {
-        items, foreColor, style, returnKeyType,
+        items, foreColor, style, returnKeyType, styleList
       } = this.props;
       const { selection } = this.state;
       const color = foreColor || '#000';
-
+      const fontSize =styleList && styleList.body && styleList.body.fontSize ? styleList.body.fontSize : 20;
+      
       return (
         <TextInput
           underlineColorAndroid="rgba(0,0,0,0)"
           onSelectionChange={this.onSelectionChange}
           multiline
           style={[{
             color,
-            fontSize: 20,
+            fontSize: fontSize,
             paddingTop: 5,
             paddingBottom: 5,
             paddingLeft: 2,
@@ -1322,7 +1336,7 @@ class CNTextInput extends Component {
           onFocus={this.onFocus}
           onBlur={this.onBlur}
           onContentSizeChange={this.handleContentSizeChange}
-		  placeholder={this.props.placeholder}
+		      placeholder={this.props.placeholder}
         >
           {
               _.map(items, item => (