higlass 2.3.1 → 2.3.3

package/app/scripts/BarTrack.js

@@ -90,6 +90,10 @@ class BarTrack extends HorizontalLine1DPixiTrack {
     }
 
     const { graphics } = tile;
+    const numBins =
+      this.tilesetInfo.tile_size ||
+      this.tilesetInfo.bins_per_dimension ||
+      tile.tileData.dense.length;
 
     // Reset svg data to avoid overplotting
     tile.svgData = undefined;
@@ -97,7 +101,7 @@ class BarTrack extends HorizontalLine1DPixiTrack {
     const { tileX, tileWidth } = this.getTilePosAndDimensions(
       tile.tileData.zoomLevel,
       tile.tileData.tilePos,
-      this.tilesetInfo.bins_per_dimension || this.tilesetInfo.tile_size,
+      numBins,
     );
     const tileValues = tile.tileData.dense;
 
@@ -142,10 +146,7 @@ class BarTrack extends HorizontalLine1DPixiTrack {
     // this scale should go from an index in the data array to
     // a position in the genome coordinates
     const tileXScale = scaleLinear()
-      .domain([
-        0,
-        this.tilesetInfo.tile_size || this.tilesetInfo.bins_per_dimension,
-      ])
+      .domain([0, numBins])
       .range([tileX, tileX + tileWidth]);
 
     const strokeWidth = 0;

package/app/scripts/Tiled1DPixiTrack.js

@@ -212,13 +212,17 @@ class Tiled1DPixiTrack extends TiledPixiTrack {
     const { tileX, tileWidth } = this.getTilePosAndDimensions(
       tile.tileData.zoomLevel,
       tile.tileData.tilePos,
-      this.tilesetInfo.bins_per_dimension || this.tilesetInfo.tile_size,
+      this.tilesetInfo.bins_per_dimension ||
+        this.tilesetInfo.tile_size ||
+        tile.tileData.dense.length,
     );
 
     const tileXScale = scaleLinear()
       .domain([
         0,
-        this.tilesetInfo.tile_size || this.tilesetInfo.bins_per_dimension,
+        this.tilesetInfo.tile_size ||
+          this.tilesetInfo.bins_per_dimension ||
+          tile.tileData.dense.length,
       ])
       .range([tileX, tileX + tileWidth]);
 

package/app/scripts/TrackRenderer.jsx

@@ -1400,7 +1400,7 @@ export class TrackRenderer extends React.Component {
     if (!isWheelEvent(event.sourceEvent)) {
       return;
     }
-    const mdy = event.sourceEvent.deltaY;
+    const mdy = event.sourceEvent.deltaY || event.sourceEvent.deltaX;
     const mdm = event.sourceEvent.deltaMode;
 
     /**
@@ -1467,7 +1467,11 @@ export class TrackRenderer extends React.Component {
     if (trackOrientation && event.sourceEvent) {
       // if somebody is holding down the shift key and is zooming over
       // a 1d track, try to apply value scale zooming
-      if (event.shiftKey || this.valueScaleZooming) {
+      if (
+        event.shiftKey ||
+        this.valueScaleZooming ||
+        event.sourceEvent?.shiftKey
+      ) {
         if (event.sourceEvent.deltaY !== undefined) {
           this.valueScaleZoom(event, trackOrientation);
           return;

package/app/scripts/data-fetchers/DataFetcher.js

@@ -450,7 +450,7 @@ export default class DataFetcher {
       // we need to extract the row corresponding to the data we need
 
       const tilesetUid = dictValues(returnedTiles)[0].tilesetUid;
-      // console.log('tilesetUid:', tilesetUid);
+
       /** @type {Record<string, Tile>} */
       const newTiles = {};
 
@@ -486,6 +486,7 @@ export default class DataFetcher {
             sliceIndex,
             1,
           );
+
           for (let j = 0; j < dataSlice.length; j++) {
             dataSlice[j] += mirroredDataSlice[j];
           }

package/app/scripts/services/tile-proxy.js

@@ -483,7 +483,11 @@ export function calculateTileAndPosInTile(
     : 256;
 
   if (!isLegacyTilesetInfo(tilesetInfo)) {
-    tileWidth = tilesetInfo.resolutions[zoomLevel] * pixelsPerTile;
+    const sortedResolutions = tilesetInfo.resolutions
+      .map((x) => +x)
+      .sort((a, b) => b - a);
+
+    tileWidth = sortedResolutions[zoomLevel] * pixelsPerTile;
   } else {
     tileWidth = maxDim / 2 ** zoomLevel;
   }

package/dist/hglib.js

@@ -12606,7 +12606,7 @@
     /** @type {const} */
     [window, map$4((c) => c.charCodeAt(0))(
       // @ts-expect-error - A global added by `vite.config.js`.
-      "2.3.1"
+      "2.3.3"
     ).map((number3) => number3 <= 999 ? `00${number3}`.slice(-3) : number3).join("")]
   );
   const gradient = (steps, width = 1, height = 100, fromX = 0, fromY = 0, toX = 0, toY = 100) => {
@@ -49038,7 +49038,8 @@
     let tileWidth = null;
     const pixelsPerTile = isLegacyTilesetInfo(tilesetInfo) ? tilesetInfo.bins_per_dimension ?? 256 : 256;
     if (!isLegacyTilesetInfo(tilesetInfo)) {
-      tileWidth = tilesetInfo.resolutions[zoomLevel] * pixelsPerTile;
+      const sortedResolutions = tilesetInfo.resolutions.map((x) => +x).sort((a, b) => b - a);
+      tileWidth = sortedResolutions[zoomLevel] * pixelsPerTile;
     } else {
       tileWidth = maxDim / 2 ** zoomLevel;
     }
@@ -78861,8 +78862,8 @@ ${x}` : x, "");
         const {
           tileX,
           tileWidth
-        } = this.getTilePosAndDimensions(tile.tileData.zoomLevel, tile.tileData.tilePos, this.tilesetInfo.bins_per_dimension || this.tilesetInfo.tile_size);
-        const tileXScale = linear().domain([0, this.tilesetInfo.tile_size || this.tilesetInfo.bins_per_dimension]).range([tileX, tileX + tileWidth]);
+        } = this.getTilePosAndDimensions(tile.tileData.zoomLevel, tile.tileData.tilePos, this.tilesetInfo.bins_per_dimension || this.tilesetInfo.tile_size || tile.tileData.dense.length);
+        const tileXScale = linear().domain([0, this.tilesetInfo.tile_size || this.tilesetInfo.bins_per_dimension || tile.tileData.dense.length]).range([tileX, tileX + tileWidth]);
         const start2 = Math.max(0, Math.round(tileXScale.invert(this._xScale.invert(visible[0]))));
         const end2 = Math.min(tile.tileData.dense.length, Math.round(tileXScale.invert(this._xScale.invert(visible[1]))));
         return [start2, end2];
@@ -83317,11 +83318,12 @@ ${x}` : x, "");
         const {
           graphics
         } = tile;
+        const numBins = this.tilesetInfo.tile_size || this.tilesetInfo.bins_per_dimension || tile.tileData.dense.length;
         tile.svgData = void 0;
         const {
           tileX,
           tileWidth
-        } = this.getTilePosAndDimensions(tile.tileData.zoomLevel, tile.tileData.tilePos, this.tilesetInfo.bins_per_dimension || this.tilesetInfo.tile_size);
+        } = this.getTilePosAndDimensions(tile.tileData.zoomLevel, tile.tileData.tilePos, numBins);
         const tileValues = tile.tileData.dense;
         if (tileValues.length === 0) return;
         const [valueScale, pseudocount] = this.makeValueScale(this.minValue(), this.medianVisibleValue, this.maxValue(), 0);
@@ -83337,7 +83339,7 @@ ${x}` : x, "");
           return;
         }
         const stroke = colorToHex(this.options.lineStrokeColor || "blue");
-        const tileXScale = linear().domain([0, this.tilesetInfo.tile_size || this.tilesetInfo.bins_per_dimension]).range([tileX, tileX + tileWidth]);
+        const tileXScale = linear().domain([0, numBins]).range([tileX, tileX + tileWidth]);
         const strokeWidth = 0;
         graphics.lineStyle(strokeWidth, stroke, 1);
         const color2 = this.options.barFillColor || "grey";
@@ -93787,7 +93789,7 @@ ${x}` : x, "");
     toJSON,
     toString
   });
-  const version = "2.3.1";
+  const version = "2.3.3";
   const configs = {
     ..._configs,
     IS_TRACK_RANGE_SELECTABLE,
@@ -94629,7 +94631,7 @@ ${x}` : x, "");
         if (!isWheelEvent(event.sourceEvent)) {
           return;
         }
-        const mdy = event.sourceEvent.deltaY;
+        const mdy = event.sourceEvent.deltaY || event.sourceEvent.deltaX;
         const mdm = event.sourceEvent.deltaMode;
         const myWheelDelta = (dy, dm) => dy * (dm ? 120 : 1) / 500;
         const mwd = myWheelDelta(mdy, mdm);
@@ -94669,7 +94671,7 @@ ${x}` : x, "");
           }
         }
         if (trackOrientation && event.sourceEvent) {
-          if (event.shiftKey || this.valueScaleZooming) {
+          if (event.shiftKey || this.valueScaleZooming || event.sourceEvent?.shiftKey) {
             if (event.sourceEvent.deltaY !== void 0) {
               this.valueScaleZoom(event, trackOrientation);
               return;