Merge pull request #24 from 3yaa3yaa/dev

1.5.6-beta.0
3yaa3yaa · Dec 19, 2019 · 9f3c1c7 · 9f3c1c7
2 parents 93487a1 + e3ea587
commit 9f3c1c7
Show file tree

Hide file tree

Showing 5 changed files with 116 additions and 110 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,28 +1,30 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# production
-/build
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-yarn.lock
-package-lock.json
-
-# idea
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+linkWithLocalReact.sh
+
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+yarn.lock
+package-lock.json
+
+# idea
 .idea
diff --git a/.npmignore b/.npmignore
@@ -1,22 +1,24 @@
-src/
-test/
-.github/
-.idea/
-node_modules/
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-yarn.lock
-package-lock.json
-webpack.config.js
-.travis.yml
-.babelrc
-.gitignore
+src/
+test/
+.github/
+.idea/
+node_modules/
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+linkWithLocalReact.sh
+
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+yarn.lock
+package-lock.json
+webpack.config.js
+.travis.yml
+.babelrc
+.gitignore
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "treemindmap",
-  "version": "1.5.5",
+  "version": "1.5.6-beta.0",
   "description": "",
   "main": "build/bundle.js",
   "repository": {
@@ -21,24 +21,25 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@3yaa3yaa/markdowntextbox": "0.3.6",
+    "@3yaa3yaa/markdowntextbox": "^0.4.0",
     "html2canvas": "^1.0.0-rc.5",
     "file-saver": "^2.0.2",
-    "react": "~16.12.0",
+    "yarn": "^1.15.2",
     "react-dnd": "^7.4.5",
     "react-dnd-html5-backend": "^7.4.5",
-    "react-dom": "^16.12.0",
-    "react-redux": "^6.0.1",
-    "redux": "~4.0.4",
-    "webpack": "^4.12.0",
-    "yarn": "^1.15.2"
+    "react-redux": "^7.1.3",
+    "redux": "~4.0.4"
+  },
+  "peerDependencies": {
+    "react": "^16.12.0"
   },
   "devDependencies": {
+    "webpack": "^4.12.0",
     "@babel/cli": "^7.0.0",
     "@babel/core": "^7.0.0",
     "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
-    "@babel/plugin-transform-react-jsx": "^7.0.0",
-    "@babel/preset-env": "^7.5.5",
+    "@babel/plugin-transform-react-jsx": "^7.7.7",
+    "@babel/preset-env": "^7.7.7",
     "babel-core": "^7.0.0-bridge.0",
     "babel-jest": "24.9.0",
     "babel-loader": "^8.0.0",

diff --git a/src/Leaf.js b/src/Leaf.js
@@ -58,7 +58,7 @@ class Leaf extends Component {
         }
     }
 
-    onChangeHandler(e)
+    onBlurHandler(e)
     {
         let newleaf = Object.assign({},this.props.leafdata)
         newleaf.description=e.target.value
@@ -141,7 +141,7 @@ class Leaf extends Component {
                     <div className="Leaf-Row">
                         <div className="Leaf-Colomuns">
                             <MarkDownTextBoxWrapper leafdata={this.props.leafdata}
-                                             onChange={(e)=>this.onChangeHandler(e)}
+                                             onBlur={(e)=>this.onBlurHandler(e)}
                                              focus={this._getIsFocused()}
                                              descriptionStyle={this._getDescriptionStyle()}
                                              textAreaStyle={{height:"170px",fontFamily:"sans-serif", fontSize:"100%"}}

diff --git a/webpack.config.js b/webpack.config.js
@@ -1,50 +1,51 @@
-
-var path = require('path');
-module.exports = {
-    entry: './src/index.js',
-    output: {
-        path: path.resolve(__dirname, 'build'),
-        filename: 'bundle.js',
-        libraryTarget: 'commonjs2'
-    },
-    module: {
-        rules: [
-            {
-                test: /\.js$/,
-                include: path.resolve(__dirname, 'src'),
-                use: {
-                    loader: 'babel-loader',
-                    options: {
-                        presets: ['@babel/preset-env'],
-                    }
-                }
-            },
-            {
-                test: /\.css/,
-                include: path.resolve(__dirname, 'src'),
-                use: [
-                    'style-loader',
-                    {
-                        loader: 'css-loader',
-                        options: {
-                            url: false
-                        },
-                    }
-                ]
-            },
-            {
-                test: /\.(png|jpe?g|gif)$/i,
-                include: path.resolve(__dirname, 'src'),
-                use: {
-                    loader: 'url-loader',
-                    options: {
-                        limit: 10000,
-                    },
-                },
-            },
-        ]
-    },
-    externals: {
-        'react': 'commonjs react'
-    }
+
+var path = require('path');
+module.exports = {
+    entry: './src/index.js',
+    output: {
+        path: path.resolve(__dirname, 'build'),
+        filename: 'bundle.js',
+        libraryTarget: 'commonjs2'
+    },
+    module: {
+        rules: [
+            {
+                test: /\.js$/,
+                include: path.resolve(__dirname, 'src'),
+                use: {
+                    loader: 'babel-loader',
+                    options: {
+                        presets: ['@babel/preset-env'],
+                    }
+                }
+            },
+            {
+                test: /\.css/,
+                include: path.resolve(__dirname, 'src'),
+                use: [
+                    'style-loader',
+                    {
+                        loader: 'css-loader',
+                        options: {
+                            url: false
+                        },
+                    }
+                ]
+            },
+            {
+                test: /\.(png|jpe?g|gif)$/i,
+                include: path.resolve(__dirname, 'src'),
+                use: {
+                    loader: 'url-loader',
+                    options: {
+                        limit: 10000,
+                    },
+                },
+            },
+        ]
+    },
+    externals: {
+         'react': 'commonjs react'
+    }
+
 };