@difizen/libro-core 0.3.2 → 0.3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/es/libro-model.js CHANGED
@@ -679,7 +679,7 @@ export var LibroModel = (_dec = transient(), _dec2 = inject(NotebookOption), _de
679
679
  //往上交换cell
680
680
  if (startIndex === _this6.activeIndex) {
681
681
  //active在头
682
- _this6.activeIndex = targetIndex - source.length;
682
+ _this6.activeIndex = targetIndex;
683
683
  } else {
684
684
  //active在尾
685
685
  _this6.activeIndex = targetIndex + 1;
@@ -1 +1 @@
1
- {"version":3,"file":"libro-view.d.ts","sourceRoot":"","sources":["../src/libro-view.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"libro-view.d.ts","sourceRoot":"","sources":["../src/libro-view.tsx"],"names":[],"mappings":"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"}
package/es/libro-view.js CHANGED
@@ -651,22 +651,13 @@ export var LibroView = (_dec = transient(), _dec2 = view(notebookViewFactoryId),
651
651
  _this.collapseCell(previousCell, false);
652
652
  }
653
653
  if (_this.model.selections.length !== 0 && _this.isSelected(cell)) {
654
- var _iterator = _createForOfIteratorHelper(_this.model.selections),
655
- _step;
656
- try {
657
- for (_iterator.s(); !(_step = _iterator.n()).done;) {
658
- var selectedCell = _step.value;
659
- var selectIndex = _this.findCellIndex(selectedCell);
660
- if (selectIndex === 0) {
661
- return;
662
- }
663
- _this.model.exchangeCells(_this.model.selections, selectIndex - 1);
664
- }
665
- } catch (err) {
666
- _iterator.e(err);
667
- } finally {
668
- _iterator.f();
654
+ var startIndex = _this.findCellIndex(_this.model.selections[0]);
655
+ var endIndex = _this.findCellIndex(_this.model.selections[_this.model.selections.length - 1]);
656
+ var index = Math.min(startIndex, endIndex);
657
+ if (startIndex === 0) {
658
+ return;
669
659
  }
660
+ _this.model.exchangeCells(_this.model.selections, index - 1);
670
661
  } else {
671
662
  var sourceIndex = _this.findCellIndex(cell);
672
663
  if (sourceIndex > -1) {
@@ -681,13 +672,13 @@ export var LibroView = (_dec = transient(), _dec2 = view(notebookViewFactoryId),
681
672
  _this.collapseCell(nextCell, false);
682
673
  }
683
674
  if (_this.model.selections.length !== 0 && _this.isSelected(cell)) {
684
- for (var i = _this.model.selections.length - 1; i > -1; i--) {
685
- var selectIndex = _this.findCellIndex(_this.model.selections[i]);
686
- if (selectIndex === _this.model.cells.length - 1) {
687
- return;
688
- }
689
- _this.model.exchangeCells(_this.model.selections, selectIndex + 1);
675
+ var startIndex = _this.findCellIndex(_this.model.selections[0]) + 1;
676
+ var endIndex = _this.findCellIndex(_this.model.selections[_this.model.selections.length - 1]) + 1;
677
+ var index = Math.max(startIndex, endIndex);
678
+ if (index === _this.model.cells.length) {
679
+ return;
690
680
  }
681
+ _this.model.exchangeCells(_this.model.selections, index + 1);
691
682
  } else {
692
683
  var sourceIndex = _this.findCellIndex(cell);
693
684
  if (sourceIndex > -1) {
@@ -843,7 +834,7 @@ export var LibroView = (_dec = transient(), _dec2 = view(notebookViewFactoryId),
843
834
  }();
844
835
  _this.invertCell = /*#__PURE__*/function () {
845
836
  var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(cell, type) {
846
- var cellIndex, _iterator2, _step2, selectedCell, cellOptions, cellView, _cellOptions, _cellView;
837
+ var cellIndex, _iterator, _step, selectedCell, cellOptions, cellView, _cellOptions, _cellView;
847
838
  return _regeneratorRuntime().wrap(function _callee14$(_context14) {
848
839
  while (1) switch (_context14.prev = _context14.next) {
849
840
  case 0:
@@ -854,15 +845,15 @@ export var LibroView = (_dec = transient(), _dec2 = view(notebookViewFactoryId),
854
845
  _context14.next = 24;
855
846
  break;
856
847
  }
857
- _iterator2 = _createForOfIteratorHelper(_this.model.selections);
848
+ _iterator = _createForOfIteratorHelper(_this.model.selections);
858
849
  _context14.prev = 3;
859
- _iterator2.s();
850
+ _iterator.s();
860
851
  case 5:
861
- if ((_step2 = _iterator2.n()).done) {
852
+ if ((_step = _iterator.n()).done) {
862
853
  _context14.next = 14;
863
854
  break;
864
855
  }
865
- selectedCell = _step2.value;
856
+ selectedCell = _step.value;
866
857
  cellOptions = {
867
858
  cell: {
868
859
  cell_type: type,
@@ -886,10 +877,10 @@ export var LibroView = (_dec = transient(), _dec2 = view(notebookViewFactoryId),
886
877
  case 16:
887
878
  _context14.prev = 16;
888
879
  _context14.t0 = _context14["catch"](3);
889
- _iterator2.e(_context14.t0);
880
+ _iterator.e(_context14.t0);
890
881
  case 19:
891
882
  _context14.prev = 19;
892
- _iterator2.f();
883
+ _iterator.f();
893
884
  return _context14.finish(19);
894
885
  case 22:
895
886
  _context14.next = 29;
@@ -922,11 +913,11 @@ export var LibroView = (_dec = transient(), _dec2 = view(notebookViewFactoryId),
922
913
  }();
923
914
  _this.clearOutputs = function (cell) {
924
915
  if (_this.model.selections.length !== 0 && _this.isSelected(cell)) {
925
- var _iterator3 = _createForOfIteratorHelper(_this.model.selections),
926
- _step3;
916
+ var _iterator2 = _createForOfIteratorHelper(_this.model.selections),
917
+ _step2;
927
918
  try {
928
- for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
929
- var selectedCell = _step3.value;
919
+ for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
920
+ var selectedCell = _step2.value;
930
921
  if (ExecutableCellView.is(selectedCell) && ExecutableCellModel.is(selectedCell.model)) {
931
922
  selectedCell.clearExecution();
932
923
  selectedCell.model.executing = false;
@@ -934,9 +925,9 @@ export var LibroView = (_dec = transient(), _dec2 = view(notebookViewFactoryId),
934
925
  }
935
926
  }
936
927
  } catch (err) {
937
- _iterator3.e(err);
928
+ _iterator2.e(err);
938
929
  } finally {
939
- _iterator3.f();
930
+ _iterator2.f();
940
931
  }
941
932
  } else {
942
933
  if (ExecutableCellView.is(cell) && ExecutableCellModel.is(cell.model)) {
@@ -949,11 +940,11 @@ export var LibroView = (_dec = transient(), _dec2 = view(notebookViewFactoryId),
949
940
  _this.clearAllOutputs = function () {
950
941
  // 清空所有 cell滚动到最上面
951
942
  _this.model.scrollToView(_this.model.cells[0]);
952
- var _iterator4 = _createForOfIteratorHelper(_this.model.cells),
953
- _step4;
943
+ var _iterator3 = _createForOfIteratorHelper(_this.model.cells),
944
+ _step3;
954
945
  try {
955
- for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
956
- var cell = _step4.value;
946
+ for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
947
+ var cell = _step3.value;
957
948
  if (ExecutableCellView.is(cell) && ExecutableCellModel.is(cell.model)) {
958
949
  cell.clearExecution();
959
950
  cell.model.executing = false;
@@ -961,24 +952,24 @@ export var LibroView = (_dec = transient(), _dec2 = view(notebookViewFactoryId),
961
952
  }
962
953
  }
963
954
  } catch (err) {
964
- _iterator4.e(err);
955
+ _iterator3.e(err);
965
956
  } finally {
966
- _iterator4.f();
957
+ _iterator3.f();
967
958
  }
968
959
  };
969
960
  _this.hideCellCode = function (cell) {
970
961
  if (_this.model.selections.length !== 0 && _this.isSelected(cell)) {
971
- var _iterator5 = _createForOfIteratorHelper(_this.model.selections),
972
- _step5;
962
+ var _iterator4 = _createForOfIteratorHelper(_this.model.selections),
963
+ _step4;
973
964
  try {
974
- for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
975
- var selectedCell = _step5.value;
965
+ for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
966
+ var selectedCell = _step4.value;
976
967
  selectedCell.hasInputHidden = true;
977
968
  }
978
969
  } catch (err) {
979
- _iterator5.e(err);
970
+ _iterator4.e(err);
980
971
  } finally {
981
- _iterator5.f();
972
+ _iterator4.f();
982
973
  }
983
974
  } else {
984
975
  cell.hasInputHidden = true;
@@ -986,17 +977,17 @@ export var LibroView = (_dec = transient(), _dec2 = view(notebookViewFactoryId),
986
977
  };
987
978
  _this.hideOrShowCellCode = function (cell) {
988
979
  if (_this.model.selections.length !== 0 && _this.isSelected(cell)) {
989
- var _iterator6 = _createForOfIteratorHelper(_this.model.selections),
990
- _step6;
980
+ var _iterator5 = _createForOfIteratorHelper(_this.model.selections),
981
+ _step5;
991
982
  try {
992
- for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
993
- var selectedCell = _step6.value;
983
+ for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
984
+ var selectedCell = _step5.value;
994
985
  selectedCell.hasInputHidden = !selectedCell.hasInputHidden;
995
986
  }
996
987
  } catch (err) {
997
- _iterator6.e(err);
988
+ _iterator5.e(err);
998
989
  } finally {
999
- _iterator6.f();
990
+ _iterator5.f();
1000
991
  }
1001
992
  } else {
1002
993
  cell.hasInputHidden = !cell.hasInputHidden;
@@ -1004,19 +995,19 @@ export var LibroView = (_dec = transient(), _dec2 = view(notebookViewFactoryId),
1004
995
  };
1005
996
  _this.hideOutputs = function (cell) {
1006
997
  if (_this.model.selections.length !== 0 && _this.isSelected(cell)) {
1007
- var _iterator7 = _createForOfIteratorHelper(_this.model.selections),
1008
- _step7;
998
+ var _iterator6 = _createForOfIteratorHelper(_this.model.selections),
999
+ _step6;
1009
1000
  try {
1010
- for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
1011
- var selectedCell = _step7.value;
1001
+ for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
1002
+ var selectedCell = _step6.value;
1012
1003
  if (ExecutableCellModel.is(selectedCell.model)) {
1013
1004
  selectedCell.model.hasOutputHidden = true;
1014
1005
  }
1015
1006
  }
1016
1007
  } catch (err) {
1017
- _iterator7.e(err);
1008
+ _iterator6.e(err);
1018
1009
  } finally {
1019
- _iterator7.f();
1010
+ _iterator6.f();
1020
1011
  }
1021
1012
  } else {
1022
1013
  if (ExecutableCellModel.is(cell.model)) {
@@ -1026,19 +1017,19 @@ export var LibroView = (_dec = transient(), _dec2 = view(notebookViewFactoryId),
1026
1017
  };
1027
1018
  _this.hideOrShowOutputs = function (cell) {
1028
1019
  if (_this.model.selections.length !== 0 && _this.isSelected(cell)) {
1029
- var _iterator8 = _createForOfIteratorHelper(_this.model.selections),
1030
- _step8;
1020
+ var _iterator7 = _createForOfIteratorHelper(_this.model.selections),
1021
+ _step7;
1031
1022
  try {
1032
- for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
1033
- var selectedCell = _step8.value;
1023
+ for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
1024
+ var selectedCell = _step7.value;
1034
1025
  if (ExecutableCellModel.is(selectedCell.model)) {
1035
1026
  selectedCell.model.hasOutputHidden = !selectedCell.model.hasOutputHidden;
1036
1027
  }
1037
1028
  }
1038
1029
  } catch (err) {
1039
- _iterator8.e(err);
1030
+ _iterator7.e(err);
1040
1031
  } finally {
1041
- _iterator8.f();
1032
+ _iterator7.f();
1042
1033
  }
1043
1034
  } else {
1044
1035
  if (ExecutableCellModel.is(cell.model)) {
@@ -1047,82 +1038,82 @@ export var LibroView = (_dec = transient(), _dec2 = view(notebookViewFactoryId),
1047
1038
  }
1048
1039
  };
1049
1040
  _this.hideAllOutputs = function () {
1050
- var _iterator9 = _createForOfIteratorHelper(_this.model.cells),
1051
- _step9;
1041
+ var _iterator8 = _createForOfIteratorHelper(_this.model.cells),
1042
+ _step8;
1052
1043
  try {
1053
- for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
1054
- var cell = _step9.value;
1044
+ for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
1045
+ var cell = _step8.value;
1055
1046
  if (ExecutableCellModel.is(cell.model)) {
1056
1047
  cell.model.hasOutputHidden = true;
1057
1048
  }
1058
1049
  }
1059
1050
  } catch (err) {
1060
- _iterator9.e(err);
1051
+ _iterator8.e(err);
1061
1052
  } finally {
1062
- _iterator9.f();
1053
+ _iterator8.f();
1063
1054
  }
1064
1055
  };
1065
1056
  _this.hideAllCellCode = function () {
1066
- var _iterator10 = _createForOfIteratorHelper(_this.model.cells),
1067
- _step10;
1057
+ var _iterator9 = _createForOfIteratorHelper(_this.model.cells),
1058
+ _step9;
1068
1059
  try {
1069
- for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
1070
- var cell = _step10.value;
1060
+ for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
1061
+ var cell = _step9.value;
1071
1062
  cell.hasInputHidden = true;
1072
1063
  }
1073
1064
  } catch (err) {
1074
- _iterator10.e(err);
1065
+ _iterator9.e(err);
1075
1066
  } finally {
1076
- _iterator10.f();
1067
+ _iterator9.f();
1077
1068
  }
1078
1069
  };
1079
1070
  _this.showCellCode = function (cell) {
1080
1071
  if (_this.model.selections.length !== 0 && _this.isSelected(cell)) {
1081
- var _iterator11 = _createForOfIteratorHelper(_this.model.selections),
1082
- _step11;
1072
+ var _iterator10 = _createForOfIteratorHelper(_this.model.selections),
1073
+ _step10;
1083
1074
  try {
1084
- for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
1085
- var selectedCell = _step11.value;
1075
+ for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
1076
+ var selectedCell = _step10.value;
1086
1077
  selectedCell.hasInputHidden = false;
1087
1078
  }
1088
1079
  } catch (err) {
1089
- _iterator11.e(err);
1080
+ _iterator10.e(err);
1090
1081
  } finally {
1091
- _iterator11.f();
1082
+ _iterator10.f();
1092
1083
  }
1093
1084
  } else {
1094
1085
  cell.hasInputHidden = false;
1095
1086
  }
1096
1087
  };
1097
1088
  _this.showAllCellCode = function () {
1098
- var _iterator12 = _createForOfIteratorHelper(_this.model.cells),
1099
- _step12;
1089
+ var _iterator11 = _createForOfIteratorHelper(_this.model.cells),
1090
+ _step11;
1100
1091
  try {
1101
- for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
1102
- var cell = _step12.value;
1092
+ for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
1093
+ var cell = _step11.value;
1103
1094
  cell.hasInputHidden = false;
1104
1095
  }
1105
1096
  } catch (err) {
1106
- _iterator12.e(err);
1097
+ _iterator11.e(err);
1107
1098
  } finally {
1108
- _iterator12.f();
1099
+ _iterator11.f();
1109
1100
  }
1110
1101
  };
1111
1102
  _this.showCellOutputs = function (cell) {
1112
1103
  if (_this.model.selections.length !== 0 && _this.isSelected(cell)) {
1113
- var _iterator13 = _createForOfIteratorHelper(_this.model.selections),
1114
- _step13;
1104
+ var _iterator12 = _createForOfIteratorHelper(_this.model.selections),
1105
+ _step12;
1115
1106
  try {
1116
- for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
1117
- var selectedCell = _step13.value;
1107
+ for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
1108
+ var selectedCell = _step12.value;
1118
1109
  if (ExecutableCellModel.is(selectedCell.model)) {
1119
1110
  selectedCell.model.hasOutputHidden = false;
1120
1111
  }
1121
1112
  }
1122
1113
  } catch (err) {
1123
- _iterator13.e(err);
1114
+ _iterator12.e(err);
1124
1115
  } finally {
1125
- _iterator13.f();
1116
+ _iterator12.f();
1126
1117
  }
1127
1118
  } else {
1128
1119
  if (ExecutableCellModel.is(cell.model)) {
@@ -1131,19 +1122,19 @@ export var LibroView = (_dec = transient(), _dec2 = view(notebookViewFactoryId),
1131
1122
  }
1132
1123
  };
1133
1124
  _this.showAllCellOutputs = function () {
1134
- var _iterator14 = _createForOfIteratorHelper(_this.model.cells),
1135
- _step14;
1125
+ var _iterator13 = _createForOfIteratorHelper(_this.model.cells),
1126
+ _step13;
1136
1127
  try {
1137
- for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
1138
- var cell = _step14.value;
1128
+ for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
1129
+ var cell = _step13.value;
1139
1130
  if (ExecutableCellModel.is(cell.model)) {
1140
1131
  cell.model.hasOutputHidden = false;
1141
1132
  }
1142
1133
  }
1143
1134
  } catch (err) {
1144
- _iterator14.e(err);
1135
+ _iterator13.e(err);
1145
1136
  } finally {
1146
- _iterator14.f();
1137
+ _iterator13.f();
1147
1138
  }
1148
1139
  };
1149
1140
  _this.extendSelectionAbove = function () {
@@ -1190,19 +1181,19 @@ export var LibroView = (_dec = transient(), _dec2 = view(notebookViewFactoryId),
1190
1181
  };
1191
1182
  _this.enableOutputScrolling = function (cell) {
1192
1183
  if (_this.model.selections.length !== 0 && _this.isSelected(cell)) {
1193
- var _iterator15 = _createForOfIteratorHelper(_this.model.selections),
1194
- _step15;
1184
+ var _iterator14 = _createForOfIteratorHelper(_this.model.selections),
1185
+ _step14;
1195
1186
  try {
1196
- for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
1197
- var selectedCell = _step15.value;
1187
+ for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
1188
+ var selectedCell = _step14.value;
1198
1189
  if (ExecutableCellModel.is(selectedCell.model)) {
1199
1190
  selectedCell.model.hasOutputsScrolled = true;
1200
1191
  }
1201
1192
  }
1202
1193
  } catch (err) {
1203
- _iterator15.e(err);
1194
+ _iterator14.e(err);
1204
1195
  } finally {
1205
- _iterator15.f();
1196
+ _iterator14.f();
1206
1197
  }
1207
1198
  } else {
1208
1199
  if (ExecutableCellModel.is(cell.model)) {
@@ -1213,19 +1204,19 @@ export var LibroView = (_dec = transient(), _dec2 = view(notebookViewFactoryId),
1213
1204
  _this.disableOutputScrolling = function (cell) {
1214
1205
  _this.outputsScroll = false;
1215
1206
  if (_this.model.selections.length !== 0 && _this.isSelected(cell)) {
1216
- var _iterator16 = _createForOfIteratorHelper(_this.model.selections),
1217
- _step16;
1207
+ var _iterator15 = _createForOfIteratorHelper(_this.model.selections),
1208
+ _step15;
1218
1209
  try {
1219
- for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
1220
- var selectedCell = _step16.value;
1210
+ for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
1211
+ var selectedCell = _step15.value;
1221
1212
  if (ExecutableCellModel.is(selectedCell.model)) {
1222
1213
  selectedCell.model.hasOutputsScrolled = false;
1223
1214
  }
1224
1215
  }
1225
1216
  } catch (err) {
1226
- _iterator16.e(err);
1217
+ _iterator15.e(err);
1227
1218
  } finally {
1228
- _iterator16.f();
1219
+ _iterator15.f();
1229
1220
  }
1230
1221
  } else {
1231
1222
  if (ExecutableCellModel.is(cell.model)) {
@@ -1235,36 +1226,36 @@ export var LibroView = (_dec = transient(), _dec2 = view(notebookViewFactoryId),
1235
1226
  };
1236
1227
  _this.disableAllOutputScrolling = function () {
1237
1228
  _this.outputsScroll = false;
1238
- var _iterator17 = _createForOfIteratorHelper(_this.model.cells),
1239
- _step17;
1229
+ var _iterator16 = _createForOfIteratorHelper(_this.model.cells),
1230
+ _step16;
1240
1231
  try {
1241
- for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
1242
- var cell = _step17.value;
1232
+ for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
1233
+ var cell = _step16.value;
1243
1234
  if (ExecutableCellModel.is(cell.model)) {
1244
1235
  cell.model.hasOutputsScrolled = false;
1245
1236
  }
1246
1237
  }
1247
1238
  } catch (err) {
1248
- _iterator17.e(err);
1239
+ _iterator16.e(err);
1249
1240
  } finally {
1250
- _iterator17.f();
1241
+ _iterator16.f();
1251
1242
  }
1252
1243
  };
1253
1244
  _this.enableAllOutputScrolling = function () {
1254
1245
  _this.outputsScroll = true;
1255
- var _iterator18 = _createForOfIteratorHelper(_this.model.cells),
1256
- _step18;
1246
+ var _iterator17 = _createForOfIteratorHelper(_this.model.cells),
1247
+ _step17;
1257
1248
  try {
1258
- for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
1259
- var cell = _step18.value;
1249
+ for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
1250
+ var cell = _step17.value;
1260
1251
  if (ExecutableCellModel.is(cell.model)) {
1261
1252
  cell.model.hasOutputsScrolled = true;
1262
1253
  }
1263
1254
  }
1264
1255
  } catch (err) {
1265
- _iterator18.e(err);
1256
+ _iterator17.e(err);
1266
1257
  } finally {
1267
- _iterator18.f();
1258
+ _iterator17.f();
1268
1259
  }
1269
1260
  };
1270
1261
  _this.disposed = false;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@difizen/libro-core",
3
- "version": "0.3.2",
3
+ "version": "0.3.3",
4
4
  "description": "",
5
5
  "keywords": [
6
6
  "libro",
@@ -34,10 +34,10 @@
34
34
  ],
35
35
  "dependencies": {
36
36
  "@ant-design/icons": "^5.1.0",
37
- "@difizen/libro-code-editor": "^0.3.2",
38
- "@difizen/libro-common": "^0.3.2",
39
- "@difizen/libro-shared-model": "^0.3.2",
40
- "@difizen/libro-virtualized": "^0.3.2",
37
+ "@difizen/libro-code-editor": "^0.3.3",
38
+ "@difizen/libro-common": "^0.3.3",
39
+ "@difizen/libro-shared-model": "^0.3.3",
40
+ "@difizen/libro-virtualized": "^0.3.3",
41
41
  "@difizen/mana-app": "latest",
42
42
  "@difizen/mana-l10n": "latest",
43
43
  "@difizen/mana-react": "latest",
@@ -640,7 +640,7 @@ export class LibroModel implements NotebookModel, DndListModel {
640
640
  //往上交换cell
641
641
  if (startIndex === this.activeIndex) {
642
642
  //active在头
643
- this.activeIndex = targetIndex - source.length;
643
+ this.activeIndex = targetIndex;
644
644
  } else {
645
645
  //active在尾
646
646
  this.activeIndex = targetIndex + 1;
@@ -742,13 +742,15 @@ export class LibroView extends BaseView implements NotebookView {
742
742
  this.collapseCell(previousCell, false);
743
743
  }
744
744
  if (this.model.selections.length !== 0 && this.isSelected(cell)) {
745
- for (const selectedCell of this.model.selections) {
746
- const selectIndex = this.findCellIndex(selectedCell);
747
- if (selectIndex === 0) {
748
- return;
749
- }
750
- this.model.exchangeCells(this.model.selections, selectIndex - 1);
745
+ const startIndex = this.findCellIndex(this.model.selections[0]);
746
+ const endIndex = this.findCellIndex(
747
+ this.model.selections[this.model.selections.length - 1],
748
+ );
749
+ const index = Math.min(startIndex, endIndex);
750
+ if (startIndex === 0) {
751
+ return;
751
752
  }
753
+ this.model.exchangeCells(this.model.selections, index - 1);
752
754
  } else {
753
755
  const sourceIndex = this.findCellIndex(cell);
754
756
  if (sourceIndex > -1) {
@@ -764,13 +766,14 @@ export class LibroView extends BaseView implements NotebookView {
764
766
  this.collapseCell(nextCell, false);
765
767
  }
766
768
  if (this.model.selections.length !== 0 && this.isSelected(cell)) {
767
- for (let i = this.model.selections.length - 1; i > -1; i--) {
768
- const selectIndex = this.findCellIndex(this.model.selections[i]);
769
- if (selectIndex === this.model.cells.length - 1) {
770
- return;
771
- }
772
- this.model.exchangeCells(this.model.selections, selectIndex + 1);
769
+ const startIndex = this.findCellIndex(this.model.selections[0]) + 1;
770
+ const endIndex =
771
+ this.findCellIndex(this.model.selections[this.model.selections.length - 1]) + 1;
772
+ const index = Math.max(startIndex, endIndex);
773
+ if (index === this.model.cells.length) {
774
+ return;
773
775
  }
776
+ this.model.exchangeCells(this.model.selections, index + 1);
774
777
  } else {
775
778
  const sourceIndex = this.findCellIndex(cell);
776
779
  if (sourceIndex > -1) {