higlass 1.12.0 → 1.12.2

package/app/scripts/GenomePositionSearchBox.jsx

@@ -623,7 +623,7 @@ class GenomePositionSearchBox extends React.Component {
         let range2 = rangePair[1];
 
         if (!range1) {
-          this.setPositionText(this.origPositionText);
+          this.setPositionText();
           return;
         }
 
@@ -750,11 +750,15 @@ class GenomePositionSearchBox extends React.Component {
     );
   }
 
-  handleAssemblySelect(evt) {
-    this.setSelectedAssembly(evt);
+  handleAssemblySelectEvt(evt) {
+    this.handleAssemblySelect(evt.target.value);
+  }
+
+  handleAssemblySelect(assembly) {
+    this.setSelectedAssembly(assembly);
 
     this.setState({
-      selectedAssembly: evt,
+      selectedAssembly: assembly,
     });
   }
 
@@ -790,12 +794,8 @@ class GenomePositionSearchBox extends React.Component {
             }}
             className={styles['genome-position-search-bar-button']}
             id={this.uid}
-            onSelect={this.handleAssemblySelect.bind(this)}
-            title={
-              this.state.selectedAssembly
-                ? this.state.selectedAssembly
-                : '(none)'
-            }
+            onChange={this.handleAssemblySelectEvt.bind(this)}
+            value={this.state.selectedAssembly || undefined}
           >
             {assemblyMenuItems}
           </select>
@@ -835,7 +835,11 @@ class GenomePositionSearchBox extends React.Component {
             </div>
           )}
           renderMenu={this.handleRenderMenu.bind(this)}
-          value={this.positionText}
+          value={
+            this.state.selectedAssembly
+              ? this.positionText
+              : 'No valid assembly selected'
+          }
           wrapperStyle={{ width: '100%' }}
         />
 

package/app/scripts/HiGlassComponent.jsx

@@ -5130,7 +5130,13 @@ class HiGlassComponent extends React.Component {
                 )
               }
               trackSourceServers={this.state.viewConfig.trackSourceServers}
-              twoD={true}
+              twoD={
+                !!(
+                  view.tracks.left.length ||
+                  view.tracks.right.length ||
+                  view.tracks.center.length
+                )
+              }
             />
           );
         };

package/app/scripts/icons.jsx

@@ -382,11 +382,12 @@ export const svgArrowheadDomainsIcon = parser.parseFromString(
   'text/xml',
 ).documentElement;
 
-export function SearchIcon({ theStyle }) {
+export function SearchIcon({ theStyle, onClick }) {
   return (
     <svg
       className={classes[theStyle]}
       viewBox="0 0 12 13"
+      onClick={onClick}
       xmlns="http://www.w3.org/2000/svg"
     >
       <g fill="none" stroke="#6c6c6c" strokeWidth="2">

package/dist/hglib.js

@@ -14326,7 +14326,7 @@ function _toPrimitive2(input, hint) {
     return usedTrack;
   };
   const map$5 = (f2) => (x) => Array.prototype.map.call(x, f2);
-  const getXylofon = () => [window, map$5((c2) => c2.charCodeAt(0))("1.12.0").map((number3) => number3 <= 999 ? `00${number3}`.slice(-3) : number3).join("")];
+  const getXylofon = () => [window, map$5((c2) => c2.charCodeAt(0))("1.12.2").map((number3) => number3 <= 999 ? `00${number3}`.slice(-3) : number3).join("")];
   let isInit = false;
   const listen = () => {
     if (isInit)
@@ -49457,8 +49457,8 @@ function _toPrimitive2(input, hint) {
 </svg>
 `;
   const svgArrowheadDomainsIcon = parser.parseFromString(arrowHeadDomainsStr, "text/xml").documentElement;
-  function SearchIcon({ theStyle }) {
-    return /* @__PURE__ */ React__default.default.createElement("svg", { className: stylesMTHeader[theStyle], viewBox: "0 0 12 13", xmlns: "http://www.w3.org/2000/svg" }, /* @__PURE__ */ React__default.default.createElement("g", { fill: "none", stroke: "#6c6c6c", strokeWidth: "2" }, /* @__PURE__ */ React__default.default.createElement("path", { d: "M11.29 11.71l-4-4" }), /* @__PURE__ */ React__default.default.createElement("circle", { cx: "5", cy: "5", r: "4" })));
+  function SearchIcon({ theStyle, onClick }) {
+    return /* @__PURE__ */ React__default.default.createElement("svg", { className: stylesMTHeader[theStyle], viewBox: "0 0 12 13", onClick, xmlns: "http://www.w3.org/2000/svg" }, /* @__PURE__ */ React__default.default.createElement("g", { fill: "none", stroke: "#6c6c6c", strokeWidth: "2" }, /* @__PURE__ */ React__default.default.createElement("path", { d: "M11.29 11.71l-4-4" }), /* @__PURE__ */ React__default.default.createElement("circle", { cx: "5", cy: "5", r: "4" })));
   }
   const osm = { type: "osm-tiles", datatype: ["map-tiles"], local: true, orientation: "2d", hidden: true, name: "OSM Tiles", thumbnail: svgGeoMapIcon, availableOptions: ["minPos", "maxPos", "maxZoom", "labelPosition", "labelLeftMargin", "labelRightMargin", "labelTopMargin", "labelBottomMargin", "name"], defaultOptions: { minPos: -180, maxPos: 180, maxZoom: 19, labelPosition: "bottomRight", labelLeftMargin: 0, labelRightMargin: 0, labelTopMargin: 0, labelBottomMargin: 0 } };
   const mapbox = { type: "mapbox-tiles", datatype: ["map-tiles"], local: true, orientation: "2d", hidden: true, name: "Mapbox Tiles", thumbnail: svgGeoMapIcon, availableOptions: ["style", "labelPosition", "labelLeftMargin", "labelRightMargin", "labelTopMargin", "labelBottomMargin", "name"], defaultOptions: { style: "mapbox.streets", labelPosition: "bottomRight", labelLeftMargin: 0, labelRightMargin: 0, labelTopMargin: 0, labelBottomMargin: 0 } };
@@ -68600,7 +68600,7 @@ function _toPrimitive2(input, hint) {
     }
     return new DataFetcher(dataConfig, pubSub);
   };
-  const version = "1.12.0";
+  const version = "1.12.2";
   const libraries = { d3Array, d3Axis, d3Brush, d3Color, d3Drag, d3Dsv, d3Format, d3Geo, d3Queue, d3Request, d3Scale, d3Selection, d3Transition, d3Zoom, PIXI: GLOBALS.PIXI, mix, slugid };
   const tracks$1 = { Annotations1dTrack, Annotations2dTrack, ArrowheadDomainsTrack, BarTrack, BedLikeTrack, CNVIntervalTrack, Chromosome2DAnnotations, Chromosome2DLabels, ChromosomeGrid, CombinedTrack, CrossRule, DivergentBarTrack, HeatmapTiledPixiTrack, Horizontal1dHeatmapTrack, Horizontal2DDomainsTrack, HorizontalChromosomeLabels, HorizontalGeneAnnotationsTrack, HorizontalHeatmapTrack, HorizontalLine1DPixiTrack, HorizontalMultivecTrack, HorizontalPoint1DPixiTrack, HorizontalRule, HorizontalTiled1DPixiTrack, HorizontalTiledPlot, HorizontalTrack, Id2DTiledPixiTrack, IdHorizontal1DTiledPixiTrack, IdVertical1DTiledPixiTrack, LeftAxisTrack, MapboxTilesTrack, MoveableTrack, OSMTileIdsTrack, OSMTilesTrack, OverlayTrack, PixiTrack, RasterTilesTrack, SVGTrack, SquareMarkersTrack, Tiled1DPixiTrack, TiledPixiTrack, TopAxisTrack, Track, ValueIntervalTrack, VerticalRule, VerticalTiled1DPixiTrack, VerticalTrack, ViewportTracker2D: ViewportTracker2D$1, ViewportTracker2DPixi: ViewportTracker2D, ViewportTrackerHorizontal, ViewportTrackerVertical };
   const factories = { ContextMenuItem, DataFetcher, LruCache };
@@ -73932,7 +73932,7 @@ function _toPrimitive2(input, hint) {
           const range1 = rangePair[0];
           let range2 = rangePair[1];
           if (!range1) {
-            this.setPositionText(this.origPositionText);
+            this.setPositionText();
             return;
           }
           if (range1 && (Number.isNaN(+range1[0]) || Number.isNaN(+range1[1])) || range2 && (Number.isNaN(+range2[0]) || Number.isNaN(+range2[1]))) {
@@ -73988,9 +73988,11 @@ function _toPrimitive2(input, hint) {
       this.setState({ menuOpened: isOpen });
     } }, { key: "handleRenderMenu", value: function handleRenderMenu(items2) {
       return /* @__PURE__ */ React__default.default.createElement(PopupMenu, null, /* @__PURE__ */ React__default.default.createElement("div", { className: styles$2["genome-position-search-bar-suggestions"], style: { left: this.menuPosition.left, top: this.menuPosition.top } }, items2));
-    } }, { key: "handleAssemblySelect", value: function handleAssemblySelect(evt) {
-      this.setSelectedAssembly(evt);
-      this.setState({ selectedAssembly: evt });
+    } }, { key: "handleAssemblySelectEvt", value: function handleAssemblySelectEvt(evt) {
+      this.handleAssemblySelect(evt.target.value);
+    } }, { key: "handleAssemblySelect", value: function handleAssemblySelect(assembly) {
+      this.setSelectedAssembly(assembly);
+      this.setState({ selectedAssembly: assembly });
     } }, { key: "focusHandler", value: function focusHandler(isFocused) {
       this.setState({ isFocused });
     } }, { key: "render", value: function render2() {
@@ -73999,9 +74001,9 @@ function _toPrimitive2(input, hint) {
         this.gpsbForm = c2;
       }, className: clsx({ [styles$2["genome-position-search-focus"]]: this.state.isFocused, [styles$2["genome-position-search"]]: !this.state.isFocused, [styles$2["genome-position-search-dark"]]: this.props.theme === THEME_DARK }) }, !this.props.hideAvailableAssemblies && /* @__PURE__ */ React__default.default.createElement("select", { ref: (c2) => {
         this.assemblyPickButton = c2;
-      }, className: styles$2["genome-position-search-bar-button"], id: this.uid, onSelect: this.handleAssemblySelect.bind(this), title: this.state.selectedAssembly ? this.state.selectedAssembly : "(none)" }, assemblyMenuItems), /* @__PURE__ */ React__default.default.createElement(Autocomplete, { ref: (c2) => {
+      }, className: styles$2["genome-position-search-bar-button"], id: this.uid, onChange: this.handleAssemblySelectEvt.bind(this), value: this.state.selectedAssembly || void 0 }, assemblyMenuItems), /* @__PURE__ */ React__default.default.createElement(Autocomplete, { ref: (c2) => {
         this.autocompleteMenu = c2;
-      }, getItemValue: (item) => item.geneName, inputProps: { className: styles$2["genome-position-search-bar"], title: "Current location: enter a symbol or location to change the position of the current view" }, items: this.state.genes, menuStyle: { position: "absolute", left: this.menuPosition.left, top: this.menuPosition.top, border: "1px solid black" }, onChange: this.onAutocompleteChange.bind(this), onFocus: this.focusHandler.bind(this), onMenuVisibilityChange: this.handleMenuVisibilityChange.bind(this), onSelect: (value2, objct) => this.geneSelected(value2, objct), onSubmit: this.searchFieldSubmit.bind(this), renderItem: (item, isHighlighted) => /* @__PURE__ */ React__default.default.createElement("div", { key: item.refseqid, id: item.refseqid, style: isHighlighted ? this.styles.highlightedItem : this.styles.item }, item.geneName), renderMenu: this.handleRenderMenu.bind(this), value: this.positionText, wrapperStyle: { width: "100%" } }), /* @__PURE__ */ React__default.default.createElement(SearchIcon, { onClick: this.buttonClick.bind(this), theStyle: "multitrack-header-icon" }));
+      }, getItemValue: (item) => item.geneName, inputProps: { className: styles$2["genome-position-search-bar"], title: "Current location: enter a symbol or location to change the position of the current view" }, items: this.state.genes, menuStyle: { position: "absolute", left: this.menuPosition.left, top: this.menuPosition.top, border: "1px solid black" }, onChange: this.onAutocompleteChange.bind(this), onFocus: this.focusHandler.bind(this), onMenuVisibilityChange: this.handleMenuVisibilityChange.bind(this), onSelect: (value2, objct) => this.geneSelected(value2, objct), onSubmit: this.searchFieldSubmit.bind(this), renderItem: (item, isHighlighted) => /* @__PURE__ */ React__default.default.createElement("div", { key: item.refseqid, id: item.refseqid, style: isHighlighted ? this.styles.highlightedItem : this.styles.item }, item.geneName), renderMenu: this.handleRenderMenu.bind(this), value: this.state.selectedAssembly ? this.positionText : "No valid assembly selected", wrapperStyle: { width: "100%" } }), /* @__PURE__ */ React__default.default.createElement(SearchIcon, { onClick: this.buttonClick.bind(this), theStyle: "multitrack-header-icon" }));
     } }]);
     return GenomePositionSearchBox2;
   }(React__default.default.Component);
@@ -82911,7 +82913,7 @@ ${svgString}`;
               return null;
             return /* @__PURE__ */ React__default.default.createElement(GenomePositionSearchBox$1, { key: `gpsb${view.uid}`, ref: (c2) => {
               this.genomePositionSearchBoxes[view.uid] = c2;
-            }, autocompleteId: view.genomePositionSearchBox.autocompleteId, autocompleteServer: view.genomePositionSearchBox.autocompleteServer, chromInfoId: view.genomePositionSearchBox.chromInfoId, chromInfoPath: view.genomePositionSearchBox.chromInfoPath, chromInfoServer: view.genomePositionSearchBox.chromInfoServer, hideAvailableAssemblies: view.genomePositionSearchBox.hideAvailableAssemblies, isFocused, onFocus, onGeneSearch: this.geneSearchHandler.bind(this), onSelectedAssemblyChanged: (x, y, server) => this.handleSelectedAssemblyChanged(view.uid, x, y, server), registerViewportChangedListener: (listener) => this.addScalesChangedListener(view.uid, view.uid, listener), removeViewportChangedListener: () => this.removeScalesChangedListener(view.uid, view.uid), setCenters: (centerX, centerY, k, animateTime) => this.setCenters[view.uid](centerX, centerY, k, false, animateTime), trackSourceServers: this.state.viewConfig.trackSourceServers, twoD: true });
+            }, autocompleteId: view.genomePositionSearchBox.autocompleteId, autocompleteServer: view.genomePositionSearchBox.autocompleteServer, chromInfoId: view.genomePositionSearchBox.chromInfoId, chromInfoPath: view.genomePositionSearchBox.chromInfoPath, chromInfoServer: view.genomePositionSearchBox.chromInfoServer, hideAvailableAssemblies: view.genomePositionSearchBox.hideAvailableAssemblies, isFocused, onFocus, onGeneSearch: this.geneSearchHandler.bind(this), onSelectedAssemblyChanged: (x, y, server) => this.handleSelectedAssemblyChanged(view.uid, x, y, server), registerViewportChangedListener: (listener) => this.addScalesChangedListener(view.uid, view.uid, listener), removeViewportChangedListener: () => this.removeScalesChangedListener(view.uid, view.uid), setCenters: (centerX, centerY, k, animateTime) => this.setCenters[view.uid](centerX, centerY, k, false, animateTime), trackSourceServers: this.state.viewConfig.trackSourceServers, twoD: !!(view.tracks.left.length || view.tracks.right.length || view.tracks.center.length) });
           };
           const multiTrackHeader = this.isEditable() && !this.isViewHeaderDisabled() && !this.state.viewConfig.hideHeader ? /* @__PURE__ */ React__default.default.createElement(ViewHeader$1, { ref: (c2) => {
             this.viewHeaders[view.uid] = c2;