- fix bug: selection out of range isn't rendered correctly if current view is closer to origin point.

 - bump version

Author: zbryikt

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Logs
 
+## v0.5.6
+
+ - fix bug: selection out of range isn't rendered correctly if current view is closer to origin point.
+
+
 ## v0.5.5
 
  - support `menu.on` and `menu.off` event

dist/index.js

@@ -1004,7 +1004,7 @@
       var r, x, y, ref$, base;
       opt == null && (opt = {});
       r = opt.roughly;
-      if (opt.col != null) {
+      if (opt.col != null || opt.row != null) {
         if (opt.col < this.frozen.col) {
           x = opt.col;
         } else if (opt.col - this.pos.col < this.frozen.col) {
@@ -1053,7 +1053,7 @@
         : this._editing = !!v;
     },
     renderSelection: function(sel, o){
-      var ref$, sc, ec, sr, er, rbox, c0, c1, c2, c3, c4, b0, b1, b2, b3, b4, x1, y1, colOut, rowOut, x2, y2, w, h, snode, sbox, dom;
+      var ref$, sc, ec, sr, er, rbox, c0, c1, c2, c3, c4, c5, b0, b1, b2, b3, b4, b5, x1, y1, colOut, rowOut, x2, y2, w, h, snode, sbox, dom;
       o == null && (o = {});
       if (!sel) {
         sel = this.les;
@@ -1092,25 +1092,29 @@
         row: er,
         roughly: true
       });
-      ref$ = [c0, c1, c2, c3, c4].map(function(it){
+      c5 = this.cell({
+        col: this.pos.col + this.dim.col - 2,
+        row: this.pos.row + this.dim.row - 2
+      });
+      ref$ = [c0, c1, c2, c3, c4, c5].map(function(it){
         if (it) {
           return it.getBoundingClientRect();
         } else {
           return null;
         }
-      }), b0 = ref$[0], b1 = ref$[1], b2 = ref$[2], b3 = ref$[3], b4 = ref$[4];
+      }), b0 = ref$[0], b1 = ref$[1], b2 = ref$[2], b3 = ref$[3], b4 = ref$[4], b5 = ref$[5];
       b0.width = 0;
       b0.height = 0;
-      x1 = (b1 || b2 || b0).x - rbox.x;
-      y1 = (b1 || b3 || b0).y - rbox.y;
+      x1 = (b1 || b2 || (sc > this.pos.col ? b5 : b0)).x - rbox.x;
+      y1 = (b1 || b3 || (sr > this.pos.row ? b5 : b0)).y - rbox.y;
       colOut = ec - this.pos.col < 0;
       rowOut = er - this.pos.row < 0;
-      x2 = (b3 || b4 || b0).x + (colOut
+      x2 = (b3 || b4 || b5 || b0).x + (colOut
         ? 0
-        : (b3 || b4 || b0).width) - rbox.x;
-      y2 = (b2 || b4 || b0).y + (rowOut
+        : (b3 || b4 || b5 || b0).width) - rbox.x;
+      y2 = (b2 || b4 || b5 || b0).y + (rowOut
         ? 0
-        : (b2 || b4 || b0).height) - rbox.y;
+        : (b2 || b4 || b5 || b0).height) - rbox.y;
       w = x2 - x1 + 1;
       h = y2 - y1 + 1;
       if (ec == null) {

dist/index.min.js

@@ -3,7 +3,7 @@
   "name": "@plotdb/sheet",
   "license": "MIT",
   "description": "spreadsheet",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "style": "dist/index.min.css",
   "browser": "dist/index.min.js",
   "main": "dist/index.min.js",

package-lock.json

@@ -498,7 +498,7 @@ sheet.prototype = Object.create(Object.prototype) <<< do
 
   cell: (opt = {}) ->
     r = opt.roughly
-    if opt.col? =>
+    if opt.col? or opt.row? =>
       if opt.col < @frozen.col => x = opt.col
       else if opt.col - @pos.col < @frozen.col =>
         if r => x = @frozen.col else return null
@@ -534,14 +534,15 @@ sheet.prototype = Object.create(Object.prototype) <<< do
     c2 = @cell {col: sc, row: er, roughly: true}
     c3 = @cell {col: ec, row: sr, roughly: true}
     c4 = @cell {col: ec, row: er, roughly: true}
-    [b0,b1,b2,b3,b4] = [c0,c1,c2,c3,c4].map -> if it => it.getBoundingClientRect! else null
+    c5 = @cell {col: @pos.col + @dim.col - 2, row: @pos.row + @dim.row - 2}
+    [b0,b1,b2,b3,b4,b5] = [c0,c1,c2,c3,c4,c5].map -> if it => it.getBoundingClientRect! else null
     b0 <<< {width: 0, height: 0}
-    x1 = (b1 or b2 or b0).x - rbox.x
-    y1 = (b1 or b3 or b0).y - rbox.y
+    x1 = (b1 or b2 or (if sc > @pos.col => b5 else b0)).x - rbox.x
+    y1 = (b1 or b3 or (if sr > @pos.row => b5 else b0)).y - rbox.y
     col-out = ec - @pos.col < 0
     row-out = er - @pos.row < 0
-    x2 = (b3 or b4 or b0).x + (if col-out => 0 else (b3 or b4 or b0).width) - rbox.x
-    y2 = (b2 or b4 or b0).y + (if row-out => 0 else (b2 or b4 or b0).height) - rbox.y
+    x2 = (b3 or b4 or b5 or b0).x + (if col-out => 0 else (b3 or b4 or b5 or b0).width) - rbox.x
+    y2 = (b2 or b4 or b5 or b0).y + (if row-out => 0 else (b2 or b4 or b5 or b0).height) - rbox.y
     w = x2 - x1 + 1
     h = y2 - y1 + 1
 

package.json

@@ -1004,7 +1004,7 @@
       var r, x, y, ref$, base;
       opt == null && (opt = {});
       r = opt.roughly;
-      if (opt.col != null) {
+      if (opt.col != null || opt.row != null) {
         if (opt.col < this.frozen.col) {
           x = opt.col;
         } else if (opt.col - this.pos.col < this.frozen.col) {
@@ -1053,7 +1053,7 @@
         : this._editing = !!v;
     },
     renderSelection: function(sel, o){
-      var ref$, sc, ec, sr, er, rbox, c0, c1, c2, c3, c4, b0, b1, b2, b3, b4, x1, y1, colOut, rowOut, x2, y2, w, h, snode, sbox, dom;
+      var ref$, sc, ec, sr, er, rbox, c0, c1, c2, c3, c4, c5, b0, b1, b2, b3, b4, b5, x1, y1, colOut, rowOut, x2, y2, w, h, snode, sbox, dom;
       o == null && (o = {});
       if (!sel) {
         sel = this.les;
@@ -1092,25 +1092,29 @@
         row: er,
         roughly: true
       });
-      ref$ = [c0, c1, c2, c3, c4].map(function(it){
+      c5 = this.cell({
+        col: this.pos.col + this.dim.col - 2,
+        row: this.pos.row + this.dim.row - 2
+      });
+      ref$ = [c0, c1, c2, c3, c4, c5].map(function(it){
         if (it) {
           return it.getBoundingClientRect();
         } else {
           return null;
         }
-      }), b0 = ref$[0], b1 = ref$[1], b2 = ref$[2], b3 = ref$[3], b4 = ref$[4];
+      }), b0 = ref$[0], b1 = ref$[1], b2 = ref$[2], b3 = ref$[3], b4 = ref$[4], b5 = ref$[5];
       b0.width = 0;
       b0.height = 0;
-      x1 = (b1 || b2 || b0).x - rbox.x;
-      y1 = (b1 || b3 || b0).y - rbox.y;
+      x1 = (b1 || b2 || (sc > this.pos.col ? b5 : b0)).x - rbox.x;
+      y1 = (b1 || b3 || (sr > this.pos.row ? b5 : b0)).y - rbox.y;
       colOut = ec - this.pos.col < 0;
       rowOut = er - this.pos.row < 0;
-      x2 = (b3 || b4 || b0).x + (colOut
+      x2 = (b3 || b4 || b5 || b0).x + (colOut
         ? 0
-        : (b3 || b4 || b0).width) - rbox.x;
-      y2 = (b2 || b4 || b0).y + (rowOut
+        : (b3 || b4 || b5 || b0).width) - rbox.x;
+      y2 = (b2 || b4 || b5 || b0).y + (rowOut
         ? 0
-        : (b2 || b4 || b0).height) - rbox.y;
+        : (b2 || b4 || b5 || b0).height) - rbox.y;
       w = x2 - x1 + 1;
       h = y2 - y1 + 1;
       if (ec == null) {