Merge branch 'master' into develop

Covistra · Mar 23, 2019 · 4e99a99 · 4e99a99
2 parents 3b34794 + d72f9e3
commit 4e99a99
Show file tree

Hide file tree

Showing 13 changed files with 59 additions and 14 deletions.
diff --git a/demo/dist/37cefb9b14a5dabb56df.app.js b/demo/dist/37cefb9b14a5dabb56df.app.js
diff --git a/demo/dist/37cefb9b14a5dabb56df.app.js.map b/demo/dist/37cefb9b14a5dabb56df.app.js.map
diff --git a/demo/dist/6b94cd3f66e35597e6af.app.js b/demo/dist/6b94cd3f66e35597e6af.app.js
diff --git a/demo/dist/6b94cd3f66e35597e6af.app.js.map b/demo/dist/6b94cd3f66e35597e6af.app.js.map
diff --git a/demo/dist/index.html b/demo/dist/index.html
@@ -28,5 +28,5 @@
       alt="Fork me on GitHub"
       data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"/>
     </a>
-  <script type="text/javascript" src="d591705cb70e17587c16.vendor.js"></script><script type="text/javascript" src="6b94cd3f66e35597e6af.app.js"></script></body>
+  <script type="text/javascript" src="d591705cb70e17587c16.vendor.js"></script><script type="text/javascript" src="37cefb9b14a5dabb56df.app.js"></script></body>
 </html>
diff --git a/es/class/line.js b/es/class/line.js
@@ -140,7 +140,8 @@ var Line = function () {
 
       //add splitted lines to the original line's group
       var lineGroups = state.getIn(['scene', 'groups']).filter(function (group) {
-        return group.getIn(['elements', layerID, 'lines']).contains(lineID);
+        var lines = group.getIn(['elements', layerID, 'lines']);
+        return lines && lines.contains(lineID);
       });
 
       lineGroups.forEach(function (group) {
@@ -593,7 +594,8 @@ var Line = function () {
 
       var lineGroups = state //get groups membership if present
       .getIn(['scene', 'groups']).filter(function (group) {
-        return group.getIn(['elements', layerID, 'lines']).contains(lineID);
+        var lines = group.getIn(['elements', layerID, 'lines']);
+        return lines && lines.contains(lineID);
       });
 
       state = Layer.mergeEqualsVertices(state, layerID, line.vertices.get(0)).updatedState;

diff --git a/es/class/vertex.js b/es/class/vertex.js
@@ -198,7 +198,8 @@ var Vertex = function () {
           var lineProps = reducedState.getIn(['scene', 'layers', layerID, 'lines', lineID, 'properties']);
           var lineGroups = reducedState //get groups membership if present
           .getIn(['scene', 'groups']).filter(function (group) {
-            return group.getIn(['elements', layerID, 'lines']).contains(lineID);
+            var lines = group.getIn(['elements', layerID, 'lines']);
+            return lines && lines.contains(lineID);
           });
 
           reducedState = Layer.removeZeroLengthLines(reducedState, layerID).updatedState;

diff --git a/es/styles/tabs.css b/es/styles/tabs.css
@@ -0,0 +1,30 @@
+.react-tabs__tab-list {
+  border-bottom: 1px solid #aaa;
+  margin: 0 0 10px;
+  padding: 0;
+}
+
+.react-tabs__tab {
+  display: inline-block;
+  border: 1px solid transparent;
+  border-bottom: none;
+  bottom: -1px;
+  position: relative;
+  list-style: none;
+  padding: 6px 12px;
+  cursor: pointer;
+}
+
+.react-tabs__tab--selected, .react-tabs__tab:focus {
+  border-color: #aaa;
+  color: #1CA6FC;
+  outline: none;
+}
+
+.react-tabs__tab-panel {
+  display: none;
+}
+
+.react-tabs__tab-panel--selected {
+  display: block;
+}
diff --git a/lib/class/line.js b/lib/class/line.js
@@ -150,7 +150,8 @@ var Line = function () {
 
       //add splitted lines to the original line's group
       var lineGroups = state.getIn(['scene', 'groups']).filter(function (group) {
-        return group.getIn(['elements', layerID, 'lines']).contains(lineID);
+        var lines = group.getIn(['elements', layerID, 'lines']);
+        return lines && lines.contains(lineID);
       });
 
       lineGroups.forEach(function (group) {
@@ -603,7 +604,8 @@ var Line = function () {
 
       var lineGroups = state //get groups membership if present
       .getIn(['scene', 'groups']).filter(function (group) {
-        return group.getIn(['elements', layerID, 'lines']).contains(lineID);
+        var lines = group.getIn(['elements', layerID, 'lines']);
+        return lines && lines.contains(lineID);
       });
 
       state = _export.Layer.mergeEqualsVertices(state, layerID, line.vertices.get(0)).updatedState;

diff --git a/lib/class/vertex.js b/lib/class/vertex.js
@@ -209,7 +209,8 @@ var Vertex = function () {
           var lineProps = reducedState.getIn(['scene', 'layers', layerID, 'lines', lineID, 'properties']);
           var lineGroups = reducedState //get groups membership if present
           .getIn(['scene', 'groups']).filter(function (group) {
-            return group.getIn(['elements', layerID, 'lines']).contains(lineID);
+            var lines = group.getIn(['elements', layerID, 'lines']);
+            return lines && lines.contains(lineID);
           });
 
           reducedState = _export2.Layer.removeZeroLengthLines(reducedState, layerID).updatedState;

diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "start": "webpack-dev-server --inline --config demo/webpack.config.js --port 9000 --mode development",
     "build-demo": "webpack --config demo/webpack.config.js --mode production",
     "build-commonjs": "cross-env BABEL_ENV=commonjs babel src --out-dir lib",
-    "build-es": "cross-env BABEL_ENV=es babel src --out-dir es",
+    "build-es": "cross-env BABEL_ENV=es babel src --copy-files --out-dir es",
     "build": "npm run clean && npm run build-demo && npm run build-commonjs && npm run build-es",
     "add-build-to-vcs": "git add -A src/version.js && git add -A es && git add -A lib && git add -A demo/dist",
     "clean": "rimraf lib es demo/dist",

diff --git a/src/class/line.js b/src/class/line.js
@@ -122,7 +122,10 @@ class Line{
     //add splitted lines to the original line's group
     let lineGroups = state
       .getIn(['scene', 'groups'])
-      .filter( group => group.getIn(['elements', layerID, 'lines']).contains(lineID) );
+      .filter( group => {
+        const lines = group.getIn(['elements', layerID, 'lines']);
+        return lines && lines.contains(lineID);
+      });
 
     lineGroups.forEach( group => {
       state = Group.addElement( state, group.id, layerID, 'lines', line0.id ).updatedState;
@@ -481,7 +484,10 @@ class Line{
 
     let lineGroups = state   //get groups membership if present
       .getIn(['scene', 'groups'])
-      .filter( group => group.getIn(['elements', layerID, 'lines']).contains(lineID) );
+      .filter( group => {
+        const lines = group.getIn(['elements', layerID, 'lines']);
+        return lines && lines.contains(lineID);
+      });
 
     state = Layer.mergeEqualsVertices( state, layerID, line.vertices.get(0) ).updatedState;
     state = Layer.mergeEqualsVertices( state, layerID, line.vertices.get(1) ).updatedState;

diff --git a/src/class/vertex.js b/src/class/vertex.js
@@ -165,7 +165,10 @@ class Vertex{
           let lineProps = reducedState.getIn(['scene', 'layers', layerID, 'lines', lineID, 'properties']);
           let lineGroups = reducedState   //get groups membership if present
             .getIn(['scene', 'groups'])
-            .filter( group => group.getIn(['elements', layerID, 'lines']).contains(lineID) );
+            .filter( group => {
+              const lines = group.getIn(['elements', layerID, 'lines']);
+              return lines && lines.contains(lineID);
+            });
 
           reducedState = Layer.removeZeroLengthLines( reducedState, layerID ).updatedState;
           reducedState = Layer.mergeEqualsVertices( reducedState, layerID, vertexID ).updatedState;