@jbrowse/core 1.6.7 → 1.7.0

package/ui/PrerenderedCanvas.js

@@ -11,8 +11,6 @@ exports.default = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -53,30 +51,7 @@ function PrerenderedCanvas(props) {
       return;
     }
 
-    if (imageData.commands) {
-      imageData.commands.forEach(function (command) {
-        if (command.type === 'strokeStyle') {
-          context.strokeStyle = command.style;
-        } else if (command.type === 'fillStyle') {
-          context.fillStyle = command.style;
-        } else if (command.type === 'font') {
-          context.font = command.style;
-        } else {
-          // @ts-ignore
-          context[command.type].apply(context, (0, _toConsumableArray2.default)(command.args));
-        }
-      });
-    } else if (imageData instanceof _offscreenCanvasPonyfill.ImageBitmapType) {
-      context.drawImage(imageData, 0, 0);
-    } else if (imageData.dataURL) {
-      var img = new Image();
-
-      img.onload = function () {
-        return context.drawImage(img, 0, 0);
-      };
-
-      img.src = imageData.dataURL;
-    }
+    (0, _offscreenCanvasPonyfill.drawImageOntoCanvasContext)(imageData, context);
   }, [imageData]);
   var softClipString = showSoftClip ? '_softclipped' : '';
   var blockKeyStr = blockKey ? '_' + blockKey : '';

package/ui/ViewContainer.d.ts

@@ -1,9 +1,9 @@
 import React from 'react';
 import { IBaseViewModel } from '../pluggableElementTypes/models';
-declare const _default: React.ComponentType<{
+declare const ViewContainer: ({ view, onClose, style, children, }: {
     view: IBaseViewModel;
-    style: React.CSSProperties;
-    children: React.ReactNode;
     onClose: () => void;
-} & import("react-sizeme").WithSizeProps>;
-export default _default;
+    style?: React.CSSProperties | undefined;
+    children: React.ReactNode;
+}) => JSX.Element;
+export default ViewContainer;

package/ui/ViewContainer.js

@@ -23,7 +23,7 @@ var _mobxReact = require("mobx-react");
 
 var _mobxStateTree = require("mobx-state-tree");
 
-var _reactSizeme = require("react-sizeme");
+var _reactUseMeasure = _interopRequireDefault(require("react-use-measure"));
 
 var _Close = _interopRequireDefault(require("@material-ui/icons/Close"));
 
@@ -114,16 +114,20 @@ var ViewMenu = (0, _mobxReact.observer)(function (_ref) {
     menuItems: model.menuItems()
   })) : null;
 });
-
-var _default = (0, _reactSizeme.withSize)()((0, _mobxReact.observer)(function (_ref2) {
+var ViewContainer = (0, _mobxReact.observer)(function (_ref2) {
   var view = _ref2.view,
       onClose = _ref2.onClose,
       style = _ref2.style,
-      children = _ref2.children,
-      width = _ref2.size.width;
+      children = _ref2.children;
   var classes = useStyles();
   var theme = (0, _core.useTheme)();
   var padWidth = theme.spacing(1);
+
+  var _useMeasure = (0, _reactUseMeasure.default)(),
+      _useMeasure2 = (0, _slicedToArray2.default)(_useMeasure, 2),
+      ref = _useMeasure2[0],
+      width = _useMeasure2[1].width;
+
   (0, _react.useEffect)(function () {
     if (width && (0, _mobxStateTree.isAlive)(view)) {
       view.setWidth(width - padWidth * 2);
@@ -141,6 +145,7 @@ var _default = (0, _reactSizeme.withSize)()((0, _mobxReact.observer)(function (_
     });
   }, []);
   return /*#__PURE__*/_react.default.createElement(_core.Paper, {
+    ref: ref,
     elevation: 12,
     className: classes.viewContainer,
     style: _objectSpread(_objectSpread({}, style), {}, {
@@ -193,6 +198,6 @@ var _default = (0, _reactSizeme.withSize)()((0, _mobxReact.observer)(function (_
   }, /*#__PURE__*/_react.default.createElement(_Close.default, {
     className: classes.icon
   }))), /*#__PURE__*/_react.default.createElement(_core.Paper, null, children));
-}));
-
+});
+var _default = ViewContainer;
 exports.default = _default;

package/util/index.d.ts

@@ -1,7 +1,8 @@
 import { IAnyStateTreeNode } from 'mobx-state-tree';
 import { IReactionPublic, IReactionOptions } from 'mobx';
 import SimpleFeature, { Feature, isFeature } from './simpleFeature';
-import { TypeTestedByPredicate, Region, AssemblyManager } from './types';
+import { AssemblyManager, Region, TypeTestedByPredicate } from './types';
+export type { Feature };
 export * from './types';
 export * from './aborting';
 export * from './when';
@@ -121,9 +122,9 @@ export declare function clamp(num: number, min: number, max: number): number;
  * @param region -
  * @param bpPerPx -
  */
-export declare function bpToPx(bp: number, region: {
-    start: number;
-    end: number;
+export declare function bpToPx(bp: number, { reversed, end, start, }: {
+    start?: number;
+    end?: number;
     reversed?: boolean;
 }, bpPerPx: number): number;
 export declare function radToDeg(radians: number): number;
@@ -227,7 +228,7 @@ export declare function stringify({ refName, coord, oob, }: {
 export declare const isElectron: boolean;
 export declare function revcom(seqString: string): string;
 export declare const complement: (seqString: string) => string;
-export declare function blobToDataURL(blob: Blob): Promise<unknown>;
+export declare function blobToDataURL(blob: Blob): Promise<string>;
 export declare const rIC: (((callback: IdleRequestCallback, options?: IdleRequestOptions | undefined) => number) & typeof requestIdleCallback) | ((cb: Function) => any);
 export declare function measureText(str: unknown, fontSize?: number): number;
 export declare const defaultStarts: string[];
@@ -340,3 +341,9 @@ export declare function viewBpToPx({ refName, coord, regionNumber, self, }: {
     offsetPx: number;
 } | undefined;
 export declare function getBpDisplayStr(totalBp: number): string;
+export declare function getViewParams(model: IAnyStateTreeNode, exportSVG?: boolean): {
+    offsetPx: number;
+    offsetPx1: number;
+    start: any;
+    end: any;
+};

package/util/index.js

@@ -57,6 +57,7 @@ var _exportNames = {
   bytesForRegions: true,
   viewBpToPx: true,
   getBpDisplayStr: true,
+  getViewParams: true,
   SimpleFeature: true,
   isFeature: true
 };
@@ -87,6 +88,7 @@ exports.getContainingDisplay = getContainingDisplay;
 exports.getContainingTrack = getContainingTrack;
 exports.getContainingView = getContainingView;
 exports.getSession = getSession;
+exports.getViewParams = getViewParams;
 exports.hashCode = hashCode;
 exports.isElectron = exports.inProduction = exports.inDevelopment = void 0;
 Object.defineProperty(exports, "isFeature", {
@@ -129,14 +131,14 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
+var _react = require("react");
+
 var _mobxStateTree = require("mobx-state-tree");
 
 var _mobx = require("mobx");
 
 var _object = _interopRequireDefault(require("object.fromentries"));
 
-var _react = require("react");
-
 var _deepmerge = _interopRequireDefault(require("deepmerge"));
 
 var _simpleFeature = _interopRequireWildcard(require("./simpleFeature"));
@@ -731,12 +733,13 @@ function roundToNearestPointOne(num) {
  */
 
 
-function bpToPx(bp, region, bpPerPx) {
-  if (region.reversed) {
-    return roundToNearestPointOne((region.end - bp) / bpPerPx);
-  }
-
-  return roundToNearestPointOne((bp - region.start) / bpPerPx);
+function bpToPx(bp, _ref, bpPerPx) {
+  var reversed = _ref.reversed,
+      _ref$end = _ref.end,
+      end = _ref$end === void 0 ? 0 : _ref$end,
+      _ref$start = _ref.start,
+      start = _ref$start === void 0 ? 0 : _ref$start;
+  return roundToNearestPointOne((reversed ? end - bp : bp - start) / bpPerPx);
 }
 
 var oneEightyOverPi = 180.0 / Math.PI;
@@ -881,7 +884,7 @@ function makeAbortableReaction(self, dataFunction, asyncReactionFunction, reacti
       return undefined;
     }
   }, /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(data, mobxReactionHandle) {
+    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(data, mobxReactionHandle) {
       var thisInProgress, result;
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) {
@@ -936,7 +939,7 @@ function makeAbortableReaction(self, dataFunction, asyncReactionFunction, reacti
     }));
 
     return function (_x, _x2) {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }(), reactionOptions);
   (0, _mobxStateTree.addDisposer)(self, reactionDisposer);
@@ -1002,7 +1005,7 @@ function _renameRegionsIfNeeded() {
             _context3.t0 = Object;
             _context3.next = 7;
             return Promise.all(assemblyNames.map( /*#__PURE__*/function () {
-              var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(assemblyName) {
+              var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(assemblyName) {
                 return _regenerator.default.wrap(function _callee2$(_context2) {
                   while (1) {
                     switch (_context2.prev = _context2.next) {
@@ -1024,7 +1027,7 @@ function _renameRegionsIfNeeded() {
               }));
 
               return function (_x10) {
-                return _ref4.apply(this, arguments);
+                return _ref5.apply(this, arguments);
               };
             }()));
 
@@ -1053,10 +1056,10 @@ function minmax(a, b) {
   return [Math.min(a, b), Math.max(a, b)];
 }
 
-function stringify(_ref2) {
-  var refName = _ref2.refName,
-      coord = _ref2.coord,
-      oob = _ref2.oob;
+function stringify(_ref3) {
+  var refName = _ref3.refName,
+      coord = _ref3.coord,
+      oob = _ref3.oob;
   return "".concat(refName, ":").concat(coord.toLocaleString('en-US')).concat(oob ? ' (out of bounds)' : '');
 } // this is recommended in a later comment in https://github.com/electron/electron/issues/2288
 // for detecting electron in a renderer process, which is the one that has node enabled for us
@@ -1356,11 +1359,11 @@ function _bytesForRegions() {
   return _bytesForRegions.apply(this, arguments);
 }
 
-function viewBpToPx(_ref3) {
-  var refName = _ref3.refName,
-      coord = _ref3.coord,
-      regionNumber = _ref3.regionNumber,
-      self = _ref3.self;
+function viewBpToPx(_ref4) {
+  var refName = _ref4.refName,
+      coord = _ref4.coord,
+      regionNumber = _ref4.regionNumber,
+      self = _ref4.self;
   var offsetBp = 0;
   var interRegionPaddingBp = self.interRegionPaddingWidth * self.bpPerPx;
   var minimumBlockBp = self.minimumBlockWidth * self.bpPerPx;
@@ -1397,15 +1400,33 @@ function viewBpToPx(_ref3) {
 }
 
 function getBpDisplayStr(totalBp) {
-  var displayBp;
+  var str;
 
   if (Math.floor(totalBp / 1000000) > 0) {
-    displayBp = "".concat(parseFloat((totalBp / 1000000).toPrecision(3)), "Mbp");
+    str = "".concat(parseFloat((totalBp / 1000000).toPrecision(3)), "Mbp");
   } else if (Math.floor(totalBp / 1000) > 0) {
-    displayBp = "".concat(parseFloat((totalBp / 1000).toPrecision(3)), "Kbp");
+    str = "".concat(parseFloat((totalBp / 1000).toPrecision(3)), "Kbp");
   } else {
-    displayBp = "".concat(Math.floor(totalBp), "bp");
+    str = "".concat(Math.floor(totalBp), "bp");
   }
 
-  return displayBp;
+  return str;
+}
+
+function getViewParams(model, exportSVG) {
+  // @ts-ignore
+  var _getContainingView = getContainingView(model),
+      dynamicBlocks = _getContainingView.dynamicBlocks,
+      staticBlocks = _getContainingView.staticBlocks,
+      offsetPx = _getContainingView.offsetPx;
+
+  var block = (dynamicBlocks === null || dynamicBlocks === void 0 ? void 0 : dynamicBlocks.contentBlocks[0]) || {};
+  var staticblock = (staticBlocks === null || staticBlocks === void 0 ? void 0 : staticBlocks.contentBlocks[0]) || {};
+  var staticblock1 = (staticBlocks === null || staticBlocks === void 0 ? void 0 : staticBlocks.contentBlocks[1]) || {};
+  return {
+    offsetPx: exportSVG ? 0 : offsetPx - staticblock.offsetPx,
+    offsetPx1: exportSVG ? 0 : offsetPx - staticblock1.offsetPx,
+    start: block.start,
+    end: block.end
+  };
 }

package/util/io/index.js

@@ -30,6 +30,8 @@ var _tracks = require("../tracks");
 
 var _detectNode = _interopRequireDefault(require("detect-node"));
 
+var _util = require("@jbrowse/core/util");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -52,7 +54,7 @@ function openLocation(location, pluginManager) {
       throw new Error('No local path provided');
     }
 
-    if (_detectNode.default) {
+    if (_detectNode.default || _util.isElectron) {
       return new _genericFilehandle.LocalFile(location.localPath);
     } else {
       throw new Error("can't use local files in the browser");

package/util/layouts/BaseLayout.d.ts

@@ -2,6 +2,7 @@ export declare type RectTuple = [number, number, number, number];
 export interface SerializedLayout {
     rectangles: Record<string, RectTuple>;
     totalHeight: number;
+    containsNoTransferables: true;
     maxHeightReached: boolean;
 }
 export interface Rectangle<T> {

package/util/layouts/GranularRectLayout.js

@@ -580,6 +580,7 @@ var GranularRectLayout = /*#__PURE__*/function () {
 
       return {
         rectangles: regionRectangles,
+        containsNoTransferables: true,
         totalHeight: this.getTotalHeight(),
         maxHeightReached: maxHeightReached
       };
@@ -590,6 +591,7 @@ var GranularRectLayout = /*#__PURE__*/function () {
       var rectangles = (0, _index.objectFromEntries)(this.getRectangles());
       return {
         rectangles: rectangles,
+        containsNoTransferables: true,
         totalHeight: this.getTotalHeight(),
         maxHeightReached: this.maxHeightReached
       };

package/util/layouts/PrecomputedLayout.js

@@ -118,7 +118,8 @@ var PrecomputedLayout = /*#__PURE__*/function () {
       return {
         rectangles: (0, _.objectFromEntries)(this.rectangles),
         totalHeight: this.totalHeight,
-        maxHeightReached: false
+        maxHeightReached: false,
+        containsNoTransferables: true
       };
     }
   }]);

package/util/offscreenCanvas/Canvas2DContextShim/Canvas2DContextShim.test.d.ts

@@ -0,0 +1 @@
+export {};

package/util/offscreenCanvas/Canvas2DContextShim/Canvas2DContextShim.test.js

@@ -0,0 +1,15 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _ = _interopRequireDefault(require("."));
+
+test('serialize a single command and read back out', function () {
+  var ctx = new _.default(100, 100);
+  ctx.arc(20, 21, 22, 23, 24);
+  var cmds = Array.from(ctx.getCommands());
+  expect(cmds).toEqual([{
+    name: 'arc',
+    args: [20, 21, 22, 23, 24]
+  }]);
+});

package/util/offscreenCanvas/Canvas2DContextShim/context.d.ts

@@ -0,0 +1,56 @@
+/// <reference types="react" />
+/// <reference types="offscreencanvas" />
+import { Command } from './types';
+/** get the params type of real method in OffscreenCanvasRenderingContext2D */
+declare type RealP<METHODNAME extends keyof OffscreenCanvasRenderingContext2D> = OffscreenCanvasRenderingContext2D[METHODNAME] extends (...arg0: any[]) => any ? Parameters<OffscreenCanvasRenderingContext2D[METHODNAME]> : never;
+/** get the return type of real method in OffscreenCanvasRenderingContext2D */
+declare type RealRet<METHODNAME extends keyof OffscreenCanvasRenderingContext2D> = OffscreenCanvasRenderingContext2D[METHODNAME] extends (...arg0: any[]) => any ? ReturnType<OffscreenCanvasRenderingContext2D[METHODNAME]> : never;
+/** get the type of the params of a method of the canvas shim */
+export declare type ShimP<METHODNAME extends keyof OffscreenCanvasRenderingContext2DShim> = OffscreenCanvasRenderingContext2DShim[METHODNAME] extends (...arg0: any[]) => any ? Parameters<OffscreenCanvasRenderingContext2DShim[METHODNAME]> : never;
+/** decode all the commands in the given buffer and replay them onto the given context */
+export declare function replayCommandsOntoContext(targetContext: CanvasRenderingContext2D, encodedCommands: Iterable<Command>): void;
+export default class OffscreenCanvasRenderingContext2DShim {
+    width: number;
+    height: number;
+    currentFont: string;
+    currentStrokeStyle: string;
+    currentFillStyle: string;
+    recordedCommands: Command[];
+    constructor(width: number, height: number);
+    private pushMethodCall;
+    private pushSetterCall;
+    getSerializedCommands(): Command[];
+    getSerializedSvg(): JSX.Element;
+    getCommands(): Command[];
+    set strokeStyle(style: string);
+    set fillStyle(style: string);
+    set font(style: string);
+    arc(...args: RealP<'arc'>): RealRet<'arc'>;
+    arcTo(...args: RealP<'arcTo'>): RealRet<'arcTo'>;
+    beginPath(...args: RealP<'beginPath'>): RealRet<'beginPath'>;
+    clearRect(...args: RealP<'clearRect'>): RealRet<'clearRect'>;
+    closePath(...args: RealP<'closePath'>): RealRet<'closePath'>;
+    ellipse(...args: RealP<'ellipse'>): RealRet<'ellipse'>;
+    fill(...args: RealP<'fill'>): RealRet<'fill'>;
+    fillRect(...args: RealP<'fillRect'>): RealRet<'fillRect'>;
+    fillText(...args: RealP<'fillText'>): RealRet<'fillText'>;
+    lineTo(...args: RealP<'lineTo'>): RealRet<'lineTo'>;
+    measureText(...args: RealP<'measureText'>): {
+        width: number;
+        height: number;
+    };
+    moveTo(...args: RealP<'moveTo'>): RealRet<'moveTo'>;
+    quadraticCurveTo(...args: RealP<'quadraticCurveTo'>): RealRet<'quadraticCurveTo'>;
+    rect(...args: RealP<'rect'>): RealRet<'rect'>;
+    restore(...args: RealP<'restore'>): RealRet<'restore'>;
+    rotate(...args: RealP<'rotate'>): RealRet<'rotate'>;
+    save(...args: RealP<'save'>): RealRet<'save'>;
+    setTransform(...args: RealP<'setTransform'>): RealRet<'setTransform'>;
+    scale(...args: RealP<'scale'>): RealRet<'scale'>;
+    stroke(): RealRet<'stroke'>;
+    strokeRect(...args: RealP<'strokeRect'>): RealRet<'strokeRect'>;
+    strokeText(...args: RealP<'strokeText'>): RealRet<'strokeText'>;
+    transform(...args: RealP<'transform'>): RealRet<'transform'>;
+    translate(...args: RealP<'translate'>): RealRet<'translate'>;
+}
+export {};