@difizen/libro-core 0.3.41 → 0.3.42

package/es/cell/libro-cell-view.d.ts

@@ -41,21 +41,16 @@ export declare class LibroCellView extends BaseView implements CellView {
     toJSON(): LibroCell;
     toJSONWithoutId: () => {
         [x: string]: import("@difizen/libro-common").PartialJSONValue | undefined;
-        metadata: Partial<import("./libro-cell-protocol.js").LibroCellMetadata>;
-        cell_type: string;
+        id?: string | undefined;
+        cell_type: "raw";
+        metadata: Partial<import("@difizen/libro-common").IRawCellMetadata>;
+        attachments?: import("@difizen/libro-common").IAttachments | undefined;
         source: import("@difizen/libro-common").MultilineString;
     } | {
         [x: string]: import("@difizen/libro-common").PartialJSONValue | undefined;
         cell_type: string;
         source: import("@difizen/libro-common").MultilineString;
         metadata: Partial<import("@difizen/libro-common").ICellMetadata>;
-    } | {
-        [x: string]: import("@difizen/libro-common").PartialJSONValue | undefined;
-        id?: string | undefined;
-        cell_type: "raw";
-        metadata: Partial<import("@difizen/libro-common").IRawCellMetadata>;
-        attachments?: import("@difizen/libro-common").IAttachments | undefined;
-        source: import("@difizen/libro-common").MultilineString;
     } | {
         [x: string]: import("@difizen/libro-common").PartialJSONValue | undefined;
         id?: string | undefined;
@@ -71,6 +66,11 @@ export declare class LibroCellView extends BaseView implements CellView {
         outputs: import("@difizen/libro-common").IOutput[];
         execution_count: import("@difizen/libro-common").ExecutionCount;
         source: import("@difizen/libro-common").MultilineString;
+    } | {
+        [x: string]: import("@difizen/libro-common").PartialJSONValue | undefined;
+        metadata: Partial<import("./libro-cell-protocol.js").LibroCellMetadata>;
+        cell_type: string;
+        source: import("@difizen/libro-common").MultilineString;
     };
 }
 //# sourceMappingURL=libro-cell-view.d.ts.map

package/es/components/libro-virtualized-render.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"libro-virtualized-render.d.ts","sourceRoot":"","sources":["../../src/components/libro-virtualized-render.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAIvC,OAAO,KAAK,EAAE,QAAQ,EAAgB,MAAM,sBAAsB,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAIlD,UAAU,wBAAwB;IAChC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,IAAI,EAAE,QAAQ,CAAC;CAChB;AAED,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,wBAAwB,CAkBlE,CAAC;AAGF,eAAO,MAAM,sBAAsB,EAAE,KAAK,CAAC,EAAE,CAAC;IAC5C,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,SAAS,CAAC;CAC3B,CAkKA,CAAC"}
+{"version":3,"file":"libro-virtualized-render.d.ts","sourceRoot":"","sources":["../../src/components/libro-virtualized-render.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAIvC,OAAO,KAAK,EAAE,QAAQ,EAAgB,MAAM,sBAAsB,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAIlD,UAAU,wBAAwB;IAChC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,IAAI,EAAE,QAAQ,CAAC;CAChB;AAED,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,wBAAwB,CAkBlE,CAAC;AAGF,eAAO,MAAM,sBAAsB,EAAE,KAAK,CAAC,EAAE,CAAC;IAC5C,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,SAAS,CAAC;CAC3B,CAgMA,CAAC"}

package/es/components/libro-virtualized-render.js

@@ -43,6 +43,8 @@ export var LibroCellsOutputRender = function LibroCellsOutputRender(_ref2) {
   var parentRef = useRef(null);
   var listRef = useRef(null);
   var noEditorAreaRef = useRef(null);
+  var scrollTopRef = useRef(0);
+  var viewportHeightRef = useRef(0);
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     editorsOffset = _useState2[0],
@@ -113,13 +115,33 @@ export var LibroCellsOutputRender = function LibroCellsOutputRender(_ref2) {
       return;
     }
     libroView.model.onScrollToCellView(function (params) {
-      // listRef.current!.scrollToRow(index);
-      listRef.current.scrollToCellPosition(params.cellIndex, params.cellOffset);
+      var index = params.cellIndex;
+      var offset = params.cellOffset || 0;
+      var top = (editorsOffset[index] || 0) + offset;
+      var height = (noEditorAreaHeight[index] || 0) + (editorAreaHeight[index] || 0);
+      var viewportTop = scrollTopRef.current;
+      var viewportHeight = viewportHeightRef.current;
+      if (viewportHeight && height) {
+        if (top > viewportTop && top + height < viewportTop + viewportHeight) {
+          // 在可视范围内就不需要滚动
+          return;
+        }
+        if (top < viewportTop) {
+          listRef.current.scrollToCellPosition(index, offset);
+        } else {
+          var prevCellNoEditorHeight = noEditorAreaHeight[index - 1] || 0;
+          var prevCellEditorHeight = editorAreaHeight[index - 1] || 0;
+          var centerOffset = offset - viewportHeight / 2 - (prevCellNoEditorHeight - prevCellEditorHeight);
+          listRef.current.scrollToCellPosition(index, centerOffset); // 把目标 cell 的顶部放到视窗的中间位置
+        }
+      } else {
+        listRef.current.scrollToCellPosition(index, offset);
+      }
     });
     return function () {
       libroView.model.disposeScrollToCellViewEmitter();
     };
-  }, [listRef, libroView]);
+  }, [listRef, libroView, editorsOffset, noEditorAreaHeight, editorAreaHeight]);
 
   // 在Cell的高度变化时，触发重新计算所有Cell的高度偏移值
   useEffect(function () {
@@ -141,7 +163,7 @@ export var LibroCellsOutputRender = function LibroCellsOutputRender(_ref2) {
       newCellOffsets[index] = offsetTop + offset;
     });
     setEditorsOffset(newCellOffsets);
-  }, [noEditorAreaRef.current, cells]);
+  }, [cells]);
   return /*#__PURE__*/_jsx(AutoSizer, {
     style: {
       height: '100%',
@@ -151,6 +173,7 @@ export var LibroCellsOutputRender = function LibroCellsOutputRender(_ref2) {
     children: function children(_ref3) {
       var width = _ref3.width,
         height = _ref3.height;
+      viewportHeightRef.current = height;
       return /*#__PURE__*/_jsx(List, {
         ref: listRef,
         width: width,
@@ -174,6 +197,8 @@ export var LibroCellsOutputRender = function LibroCellsOutputRender(_ref2) {
         noEditorArea: noEditorArea,
         editorsOffset: editorsOffset,
         onScroll: function onScroll(scrollParams) {
+          scrollTopRef.current = scrollParams.scrollTop;
+          viewportHeightRef.current = scrollParams.clientHeight;
           libroView.cellScrollEmitter.fire({
             scrollingContainer: scrollParams.scrollingContainer,
             scrollTop: scrollParams.scrollTop

package/es/libro-model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"libro-model.d.ts","sourceRoot":"","sources":["../src/libro-model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"libro-model.d.ts","sourceRoot":"","sources":["../src/libro-model.ts"],"names":[],"mappings":"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"}

package/es/libro-model.js

@@ -561,9 +561,9 @@ export var LibroModel = (_dec = transient(), _dec2 = inject(NotebookOption), _de
         if (offsetTop < _scrollTop) {
           target.offsetParent.parentElement.scrollTop = offsetTop;
         } else {
-          //目标cell的高度大于屏幕的高度
+          // 目标 cell 的高度大于屏幕的高度
           if (_targetheight >= _height) {
-            target.offsetParent.parentElement.scrollTop = offsetTop - _height / 2;
+            target.offsetParent.parentElement.scrollTop = offsetTop - _height / 2; // 把目标 cell 的顶部放到视窗的中间位置
           } else {
             target.offsetParent.parentElement.scrollTop = offsetTop + _targetheight - _height + 30; // 加缓冲向上不贴底部
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@difizen/libro-core",
-  "version": "0.3.41",
+  "version": "0.3.42",
   "description": "",
   "keywords": [
     "libro",
@@ -34,10 +34,10 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^5.1.0",
-    "@difizen/libro-code-editor": "^0.3.41",
-    "@difizen/libro-common": "^0.3.41",
-    "@difizen/libro-shared-model": "^0.3.41",
-    "@difizen/libro-virtualized": "^0.3.41",
+    "@difizen/libro-code-editor": "^0.3.42",
+    "@difizen/libro-common": "^0.3.42",
+    "@difizen/libro-shared-model": "^0.3.42",
+    "@difizen/libro-virtualized": "^0.3.42",
     "@difizen/mana-app": "latest",
     "@difizen/mana-l10n": "latest",
     "@difizen/mana-react": "latest",

package/src/components/libro-virtualized-render.tsx

@@ -43,6 +43,8 @@ export const LibroCellsOutputRender: React.FC<{
   const parentRef = useRef(null);
   const listRef = useRef<List | null>(null);
   const noEditorAreaRef = useRef<HTMLDivElement | null>(null);
+  const scrollTopRef = useRef(0);
+  const viewportHeightRef = useRef(0);
 
   const [editorsOffset, setEditorsOffset] = useState<number[]>([]);
 
@@ -128,13 +130,38 @@ export const LibroCellsOutputRender: React.FC<{
     }
 
     libroView.model.onScrollToCellView((params: ScrollParams) => {
-      // listRef.current!.scrollToRow(index);
-      listRef.current!.scrollToCellPosition(params.cellIndex, params.cellOffset);
+      const index = params.cellIndex;
+      const offset = params.cellOffset || 0;
+      const top = (editorsOffset[index] || 0) + offset;
+      const height = (noEditorAreaHeight[index] || 0) + (editorAreaHeight[index] || 0);
+      const viewportTop = scrollTopRef.current;
+      const viewportHeight = viewportHeightRef.current;
+
+      if (viewportHeight && height) {
+        if (top > viewportTop && top + height < viewportTop + viewportHeight) {
+          // 在可视范围内就不需要滚动
+          return;
+        }
+        if (top < viewportTop) {
+          listRef.current!.scrollToCellPosition(index, offset);
+        } else {
+          const prevCellNoEditorHeight = noEditorAreaHeight[index - 1] || 0;
+          const prevCellEditorHeight = editorAreaHeight[index - 1] || 0;
+          const centerOffset =
+            offset -
+            viewportHeight / 2 -
+            (prevCellNoEditorHeight - prevCellEditorHeight);
+          listRef.current!.scrollToCellPosition(index, centerOffset); // 把目标 cell 的顶部放到视窗的中间位置
+        }
+      } else {
+        listRef.current!.scrollToCellPosition(index, offset);
+      }
     });
+
     return () => {
       libroView.model.disposeScrollToCellViewEmitter();
     };
-  }, [listRef, libroView]);
+  }, [listRef, libroView, editorsOffset, noEditorAreaHeight, editorAreaHeight]);
 
   // 在Cell的高度变化时，触发重新计算所有Cell的高度偏移值
   useEffect(() => {
@@ -166,6 +193,7 @@ export const LibroCellsOutputRender: React.FC<{
   return (
     <AutoSizer style={{ height: '100%', width: '100%' }} ref={parentRef}>
       {({ width, height }: { width: number; height: number }) => {
+        viewportHeightRef.current = height;
         return (
           <List
             ref={listRef}
@@ -188,6 +216,8 @@ export const LibroCellsOutputRender: React.FC<{
               scrollTop: number;
               scrollingContainer: Element;
             }) => {
+              scrollTopRef.current = scrollParams.scrollTop;
+              viewportHeightRef.current = scrollParams.clientHeight;
               libroView.cellScrollEmitter.fire({
                 scrollingContainer: scrollParams.scrollingContainer,
                 scrollTop: scrollParams.scrollTop,

package/src/libro-model.ts

@@ -422,9 +422,11 @@ export class LibroModel implements NotebookModel, DndListModel {
       target = target?.offsetParent as HTMLElement;
       offsetTop += target?.offsetTop || 0;
     }
+
     if (target?.offsetParent?.parentElement && _targetheight) {
       const _height = target.offsetParent.parentElement.clientHeight;
       const _scrollTop = target.offsetParent.parentElement.scrollTop;
+
       if (offsetTop > _scrollTop && offsetTop + _targetheight < _height + _scrollTop) {
         // 在可视范围内就不需要滚动
         return;
@@ -432,9 +434,9 @@ export class LibroModel implements NotebookModel, DndListModel {
       if (offsetTop < _scrollTop) {
         target.offsetParent.parentElement.scrollTop = offsetTop;
       } else {
-        //目标cell的高度大于屏幕的高度
+        // 目标 cell 的高度大于屏幕的高度
         if (_targetheight >= _height) {
-          target.offsetParent.parentElement.scrollTop = offsetTop - _height / 2;
+          target.offsetParent.parentElement.scrollTop = offsetTop - _height / 2; // 把目标 cell 的顶部放到视窗的中间位置
         } else {
           target.offsetParent.parentElement.scrollTop =
             offsetTop + _targetheight - _height + 30; // 加缓冲向上不贴底部