@jbrowse/core 1.5.5 → 1.5.9
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/BaseFeatureWidget/BaseFeatureDetail.js +78 -91
- package/BaseFeatureWidget/SequenceFeatureDetails.js +56 -64
- package/BaseFeatureWidget/SequenceFeatureDetails.test.js +9 -9
- package/BaseFeatureWidget/index.js +1 -1
- package/BaseFeatureWidget/index.test.js +3 -3
- package/BaseFeatureWidget/types.js +5 -1
- package/BaseFeatureWidget/util.js +9 -13
- package/CorePlugin.js +19 -31
- package/Plugin.js +11 -13
- package/PluginLoader.js +32 -37
- package/PluginManager.js +55 -56
- package/ReExports/index.js +4 -4
- package/ReExports/list.js +2 -2
- package/ReExports/material-ui-colors.js +20 -20
- package/ReExports/modules.js +47 -51
- package/TextSearch/BaseResults.js +24 -34
- package/TextSearch/BaseResults.test.js +3 -7
- package/TextSearch/TextSearchManager.js +15 -16
- package/assemblyManager/assembly.js +33 -38
- package/assemblyManager/assemblyConfigSchema.js +2 -2
- package/assemblyManager/assemblyManager.js +15 -19
- package/assemblyManager/index.js +3 -3
- package/configuration/configurationSchema.js +17 -19
- package/configuration/configurationSlot.js +11 -11
- package/configuration/configurationSlot.test.js +5 -5
- package/configuration/util.js +5 -5
- package/data_adapters/BaseAdapter.js +37 -39
- package/data_adapters/BaseAdapter.test.js +23 -29
- package/data_adapters/CytobandAdapter.js +15 -21
- package/data_adapters/dataAdapterCache.js +8 -8
- package/package.json +3 -4
- package/pluggableElementTypes/AdapterType.js +21 -30
- package/pluggableElementTypes/ConnectionType.js +18 -28
- package/pluggableElementTypes/DisplayType.js +17 -27
- package/pluggableElementTypes/InternetAccountType.js +14 -24
- package/pluggableElementTypes/PluggableElementBase.js +8 -10
- package/pluggableElementTypes/RpcMethodType.js +40 -54
- package/pluggableElementTypes/RpcMethodType.test.js +16 -22
- package/pluggableElementTypes/TextSearchAdapterType.js +15 -25
- package/pluggableElementTypes/TrackType.js +15 -25
- package/pluggableElementTypes/ViewType.js +15 -25
- package/pluggableElementTypes/WidgetType.js +17 -27
- package/pluggableElementTypes/index.js +11 -11
- package/pluggableElementTypes/models/BaseConnectionModelFactory.js +5 -5
- package/pluggableElementTypes/models/BaseDisplayModel.js +5 -8
- package/pluggableElementTypes/models/BaseTrackModel.js +8 -11
- package/pluggableElementTypes/models/BaseViewModel.js +3 -3
- package/pluggableElementTypes/models/InternetAccountModel.js +4 -4
- package/pluggableElementTypes/models/baseConnectionConfig.js +2 -2
- package/pluggableElementTypes/models/baseTrackConfig.js +4 -7
- package/pluggableElementTypes/models/index.js +4 -4
- package/pluggableElementTypes/renderers/BoxRendererType.js +38 -48
- package/pluggableElementTypes/renderers/CircularChordRendererType.js +12 -18
- package/pluggableElementTypes/renderers/ComparativeServerSideRendererType.js +26 -34
- package/pluggableElementTypes/renderers/FeatureRendererType.js +35 -45
- package/pluggableElementTypes/renderers/RendererType.js +20 -30
- package/pluggableElementTypes/renderers/ServerSideRenderedContent.js +8 -12
- package/pluggableElementTypes/renderers/ServerSideRendererType.js +30 -43
- package/pluggableElementTypes/renderers/index.js +8 -8
- package/pluggableElementTypes/renderers/util/serializableFilterChain.js +8 -10
- package/pluggableElementTypes/renderers/util/serializableFilterChain.test.js +2 -2
- package/rpc/BaseRpcDriver.js +37 -40
- package/rpc/BaseRpcDriver.test.js +48 -62
- package/rpc/MainThreadRpcDriver.js +21 -31
- package/rpc/RpcManager.js +19 -18
- package/rpc/WebWorkerRpcDriver.js +28 -37
- package/rpc/configSchema.js +2 -2
- package/rpc/coreRpcMethods.js +71 -81
- package/rpc/remoteAbortSignals.js +3 -3
- package/ui/AboutDialog.js +16 -20
- package/ui/App.js +38 -42
- package/ui/AssemblySelector.js +5 -5
- package/ui/Drawer.js +7 -7
- package/ui/DrawerWidget.js +33 -37
- package/ui/DropDownMenu.js +9 -21
- package/ui/EditableTypography.js +19 -30
- package/ui/ErrorMessage.js +5 -5
- package/ui/FactoryResetDialog.js +8 -8
- package/ui/FatalErrorDialog.js +12 -29
- package/ui/FatalErrorDialog.test.js +10 -10
- package/ui/FileSelector/FileSelector.js +32 -42
- package/ui/FileSelector/LocalFileChooser.js +9 -9
- package/ui/FileSelector/UrlChooser.js +4 -4
- package/ui/FileSelector/index.js +4 -4
- package/ui/Icons.js +9 -9
- package/ui/Logo.js +19 -19
- package/ui/Menu.js +35 -46
- package/ui/NewSessionCards.js +19 -29
- package/ui/PrerenderedCanvas.js +10 -27
- package/ui/ResizeHandle.js +10 -17
- package/ui/SanitizedHTML.js +5 -5
- package/ui/SanitizedHTML.test.js +4 -4
- package/ui/Snackbar.js +12 -16
- package/ui/SnackbarModel.js +1 -1
- package/ui/Tooltip.js +7 -11
- package/ui/ViewContainer.js +20 -30
- package/ui/index.js +13 -17
- package/ui/theme.js +11 -15
- package/util/Base1DViewModel.js +10 -14
- package/util/Base1DViewModel.test.js +5 -5
- package/util/QuickLRU.js +26 -30
- package/util/aborting.js +15 -25
- package/util/analytics.js +6 -6
- package/util/blockTypes.js +39 -49
- package/util/calculateDynamicBlocks.js +4 -4
- package/util/calculateDynamicBlocks.test.js +10 -14
- package/util/calculateStaticBlocks.js +1 -1
- package/util/calculateStaticBlocks.test.js +15 -15
- package/util/compositeMap.js +27 -30
- package/util/idMaker.js +4 -4
- package/util/index.js +34 -45
- package/util/index.test.js +7 -11
- package/util/io/RemoteFileWithRangeCache.js +28 -40
- package/util/io/index.js +5 -5
- package/util/jexl.js +8 -5
- package/util/jexlStrings.js +2 -2
- package/util/jexlStrings.test.js +2 -2
- package/util/layouts/BaseLayout.js +5 -1
- package/util/layouts/GranularRectLayout.js +27 -33
- package/util/layouts/GranularRectLayout.test.js +10 -10
- package/util/layouts/MultiLayout.js +14 -19
- package/util/layouts/PrecomputedLayout.js +14 -16
- package/util/layouts/PrecomputedMultiLayout.js +17 -23
- package/util/layouts/SceneGraph.js +18 -18
- package/util/layouts/index.js +6 -6
- package/util/offscreenCanvasPonyfill.js +28 -30
- package/util/offscreenCanvasUtils.js +5 -5
- package/util/range.test.js +20 -20
- package/util/rxjs.js +2 -2
- package/util/simpleFeature.js +19 -24
- package/util/simpleFeature.test.js +3 -3
- package/util/stats.js +6 -10
- package/util/stats.test.js +14 -14
- package/util/types/index.js +32 -34
- package/util/types/mst.js +15 -19
- package/util/types/util.js +5 -1
- package/util/when.js +5 -5
- package/babel.config.d.ts +0 -15
- package/babel.config.js +0 -19
package/ui/ViewContainer.js
CHANGED
|
@@ -1,19 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard")["default"];
|
|
4
4
|
|
|
5
|
-
var
|
|
5
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
|
|
6
6
|
|
|
7
7
|
Object.defineProperty(exports, "__esModule", {
|
|
8
8
|
value: true
|
|
9
9
|
});
|
|
10
|
-
exports
|
|
10
|
+
exports["default"] = void 0;
|
|
11
11
|
|
|
12
|
-
var
|
|
12
|
+
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
|
|
13
13
|
|
|
14
|
-
var
|
|
15
|
-
|
|
16
|
-
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
14
|
+
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
|
|
17
15
|
|
|
18
16
|
var _core = require("@material-ui/core");
|
|
19
17
|
|
|
@@ -35,14 +33,6 @@ var _EditableTypography = _interopRequireDefault(require("./EditableTypography")
|
|
|
35
33
|
|
|
36
34
|
var _Menu2 = _interopRequireDefault(require("./Menu"));
|
|
37
35
|
|
|
38
|
-
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
39
|
-
|
|
40
|
-
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
41
|
-
|
|
42
|
-
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; }
|
|
43
|
-
|
|
44
|
-
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; }
|
|
45
|
-
|
|
46
36
|
var useStyles = (0, _core.makeStyles)(function (theme) {
|
|
47
37
|
return {
|
|
48
38
|
viewContainer: {
|
|
@@ -88,14 +78,14 @@ var ViewMenu = (0, _mobxReact.observer)(function (_ref) {
|
|
|
88
78
|
IconProps = _ref.IconProps;
|
|
89
79
|
|
|
90
80
|
var _useState = (0, _react.useState)(),
|
|
91
|
-
_useState2 = (0, _slicedToArray2
|
|
81
|
+
_useState2 = (0, _slicedToArray2["default"])(_useState, 2),
|
|
92
82
|
anchorEl = _useState2[0],
|
|
93
83
|
setAnchorEl = _useState2[1];
|
|
94
84
|
|
|
95
85
|
var menuItems = model.menuItems; // <=1.3.3 didn't use a function
|
|
96
86
|
|
|
97
87
|
var items = typeof menuItems === 'function' ? menuItems() : menuItems;
|
|
98
|
-
return items !== null && items !== void 0 && items.length ? /*#__PURE__*/_react
|
|
88
|
+
return items !== null && items !== void 0 && items.length ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_core.IconButton, Object.assign({}, IconButtonProps, {
|
|
99
89
|
"aria-label": "more",
|
|
100
90
|
"aria-controls": "view-menu",
|
|
101
91
|
"aria-haspopup": "true",
|
|
@@ -103,7 +93,7 @@ var ViewMenu = (0, _mobxReact.observer)(function (_ref) {
|
|
|
103
93
|
setAnchorEl(event.currentTarget);
|
|
104
94
|
},
|
|
105
95
|
"data-testid": "view_menu_icon"
|
|
106
|
-
}), /*#__PURE__*/_react
|
|
96
|
+
}), /*#__PURE__*/_react["default"].createElement(_Menu["default"], IconProps)), /*#__PURE__*/_react["default"].createElement(_Menu2["default"], {
|
|
107
97
|
anchorEl: anchorEl,
|
|
108
98
|
open: Boolean(anchorEl),
|
|
109
99
|
onMenuItemClick: function onMenuItemClick(_event, callback) {
|
|
@@ -154,19 +144,19 @@ var _default = (0, _reactMeasure.withContentRect)('bounds')((0, _mobxReact.obser
|
|
|
154
144
|
});
|
|
155
145
|
}
|
|
156
146
|
}, []);
|
|
157
|
-
return /*#__PURE__*/_react
|
|
147
|
+
return /*#__PURE__*/_react["default"].createElement(_core.Paper, {
|
|
158
148
|
elevation: 12,
|
|
159
149
|
ref: measureRef,
|
|
160
150
|
className: classes.viewContainer,
|
|
161
|
-
style:
|
|
151
|
+
style: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, style), {}, {
|
|
162
152
|
padding: "0px ".concat(padWidth, "px ").concat(padWidth, "px")
|
|
163
153
|
})
|
|
164
|
-
}, /*#__PURE__*/_react
|
|
154
|
+
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
165
155
|
ref: scrollRef,
|
|
166
156
|
style: {
|
|
167
157
|
display: 'flex'
|
|
168
158
|
}
|
|
169
|
-
}, /*#__PURE__*/_react
|
|
159
|
+
}, /*#__PURE__*/_react["default"].createElement(ViewMenu, {
|
|
170
160
|
model: view,
|
|
171
161
|
IconButtonProps: {
|
|
172
162
|
classes: {
|
|
@@ -177,12 +167,12 @@ var _default = (0, _reactMeasure.withContentRect)('bounds')((0, _mobxReact.obser
|
|
|
177
167
|
IconProps: {
|
|
178
168
|
className: classes.icon
|
|
179
169
|
}
|
|
180
|
-
}), /*#__PURE__*/_react
|
|
170
|
+
}), /*#__PURE__*/_react["default"].createElement("div", {
|
|
181
171
|
className: classes.grow
|
|
182
|
-
}), /*#__PURE__*/_react
|
|
172
|
+
}), /*#__PURE__*/_react["default"].createElement(_core.Tooltip, {
|
|
183
173
|
title: "Rename view",
|
|
184
174
|
arrow: true
|
|
185
|
-
}, /*#__PURE__*/_react
|
|
175
|
+
}, /*#__PURE__*/_react["default"].createElement(_EditableTypography["default"], {
|
|
186
176
|
value: view.displayName || ( // @ts-ignore
|
|
187
177
|
view.assemblyNames ? // @ts-ignore
|
|
188
178
|
view.assemblyNames.join(',') : 'Untitled view'),
|
|
@@ -196,18 +186,18 @@ var _default = (0, _reactMeasure.withContentRect)('bounds')((0, _mobxReact.obser
|
|
|
196
186
|
inputRoot: classes.inputRoot,
|
|
197
187
|
inputFocused: classes.inputFocused
|
|
198
188
|
}
|
|
199
|
-
})), /*#__PURE__*/_react
|
|
189
|
+
})), /*#__PURE__*/_react["default"].createElement("div", {
|
|
200
190
|
className: classes.grow
|
|
201
|
-
}), /*#__PURE__*/_react
|
|
191
|
+
}), /*#__PURE__*/_react["default"].createElement(_core.IconButton, {
|
|
202
192
|
"data-testid": "close_view",
|
|
203
193
|
classes: {
|
|
204
194
|
root: classes.iconRoot
|
|
205
195
|
},
|
|
206
196
|
edge: "end",
|
|
207
197
|
onClick: onClose
|
|
208
|
-
}, /*#__PURE__*/_react
|
|
198
|
+
}, /*#__PURE__*/_react["default"].createElement(_Close["default"], {
|
|
209
199
|
className: classes.icon
|
|
210
|
-
}))), /*#__PURE__*/_react
|
|
200
|
+
}))), /*#__PURE__*/_react["default"].createElement(_core.Paper, null, children));
|
|
211
201
|
}));
|
|
212
202
|
|
|
213
|
-
exports
|
|
203
|
+
exports["default"] = _default;
|
package/ui/index.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard")["default"];
|
|
4
4
|
|
|
5
|
-
var
|
|
5
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
|
|
6
6
|
|
|
7
7
|
Object.defineProperty(exports, "__esModule", {
|
|
8
8
|
value: true
|
|
@@ -24,31 +24,31 @@ var _exportNames = {
|
|
|
24
24
|
Object.defineProperty(exports, "App", {
|
|
25
25
|
enumerable: true,
|
|
26
26
|
get: function get() {
|
|
27
|
-
return _App
|
|
27
|
+
return _App["default"];
|
|
28
28
|
}
|
|
29
29
|
});
|
|
30
30
|
Object.defineProperty(exports, "EditableTypography", {
|
|
31
31
|
enumerable: true,
|
|
32
32
|
get: function get() {
|
|
33
|
-
return _EditableTypography
|
|
33
|
+
return _EditableTypography["default"];
|
|
34
34
|
}
|
|
35
35
|
});
|
|
36
36
|
Object.defineProperty(exports, "FactoryResetDialog", {
|
|
37
37
|
enumerable: true,
|
|
38
38
|
get: function get() {
|
|
39
|
-
return _FactoryResetDialog
|
|
39
|
+
return _FactoryResetDialog["default"];
|
|
40
40
|
}
|
|
41
41
|
});
|
|
42
42
|
Object.defineProperty(exports, "FatalErrorDialog", {
|
|
43
43
|
enumerable: true,
|
|
44
44
|
get: function get() {
|
|
45
|
-
return _FatalErrorDialog
|
|
45
|
+
return _FatalErrorDialog["default"];
|
|
46
46
|
}
|
|
47
47
|
});
|
|
48
48
|
Object.defineProperty(exports, "FileSelector", {
|
|
49
49
|
enumerable: true,
|
|
50
50
|
get: function get() {
|
|
51
|
-
return _FileSelector
|
|
51
|
+
return _FileSelector["default"];
|
|
52
52
|
}
|
|
53
53
|
});
|
|
54
54
|
Object.defineProperty(exports, "LogoFull", {
|
|
@@ -66,31 +66,31 @@ Object.defineProperty(exports, "Logomark", {
|
|
|
66
66
|
Object.defineProperty(exports, "Menu", {
|
|
67
67
|
enumerable: true,
|
|
68
68
|
get: function get() {
|
|
69
|
-
return _Menu
|
|
69
|
+
return _Menu["default"];
|
|
70
70
|
}
|
|
71
71
|
});
|
|
72
72
|
Object.defineProperty(exports, "PrerenderedCanvas", {
|
|
73
73
|
enumerable: true,
|
|
74
74
|
get: function get() {
|
|
75
|
-
return _PrerenderedCanvas
|
|
75
|
+
return _PrerenderedCanvas["default"];
|
|
76
76
|
}
|
|
77
77
|
});
|
|
78
78
|
Object.defineProperty(exports, "ResizeHandle", {
|
|
79
79
|
enumerable: true,
|
|
80
80
|
get: function get() {
|
|
81
|
-
return _ResizeHandle
|
|
81
|
+
return _ResizeHandle["default"];
|
|
82
82
|
}
|
|
83
83
|
});
|
|
84
84
|
Object.defineProperty(exports, "SanitizedHTML", {
|
|
85
85
|
enumerable: true,
|
|
86
86
|
get: function get() {
|
|
87
|
-
return _SanitizedHTML
|
|
87
|
+
return _SanitizedHTML["default"];
|
|
88
88
|
}
|
|
89
89
|
});
|
|
90
90
|
Object.defineProperty(exports, "Tooltip", {
|
|
91
91
|
enumerable: true,
|
|
92
92
|
get: function get() {
|
|
93
|
-
return _Tooltip
|
|
93
|
+
return _Tooltip["default"];
|
|
94
94
|
}
|
|
95
95
|
});
|
|
96
96
|
|
|
@@ -140,8 +140,4 @@ Object.keys(_Menu).forEach(function (key) {
|
|
|
140
140
|
});
|
|
141
141
|
});
|
|
142
142
|
|
|
143
|
-
var _SanitizedHTML = _interopRequireDefault(require("./SanitizedHTML"));
|
|
144
|
-
|
|
145
|
-
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
146
|
-
|
|
147
|
-
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
143
|
+
var _SanitizedHTML = _interopRequireDefault(require("./SanitizedHTML"));
|
package/ui/theme.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
|
|
4
4
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
@@ -10,7 +10,7 @@ exports.createJBrowseDefaultProps = createJBrowseDefaultProps;
|
|
|
10
10
|
exports.createJBrowseTheme = createJBrowseTheme;
|
|
11
11
|
exports.jbrowseDefaultPalette = exports.jbrowseBaseTheme = void 0;
|
|
12
12
|
|
|
13
|
-
var
|
|
13
|
+
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
|
|
14
14
|
|
|
15
15
|
var _colors = require("@material-ui/core/colors");
|
|
16
16
|
|
|
@@ -20,10 +20,6 @@ var _createPalette = require("@material-ui/core/styles/createPalette");
|
|
|
20
20
|
|
|
21
21
|
var _deepmerge = _interopRequireDefault(require("deepmerge"));
|
|
22
22
|
|
|
23
|
-
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; }
|
|
24
|
-
|
|
25
|
-
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; }
|
|
26
|
-
|
|
27
23
|
var midnight = '#0D233F';
|
|
28
24
|
var grape = '#721E63';
|
|
29
25
|
var forest = '#135560';
|
|
@@ -115,7 +111,7 @@ createJBrowseDefaultProps() {
|
|
|
115
111
|
|
|
116
112
|
function createJBrowseDefaultOverrides() {
|
|
117
113
|
var palette = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
118
|
-
var generatedPalette = (0, _deepmerge
|
|
114
|
+
var generatedPalette = (0, _deepmerge["default"])(jbrowseDefaultPalette, palette);
|
|
119
115
|
return {
|
|
120
116
|
MuiIconButton: {
|
|
121
117
|
colorSecondary: {
|
|
@@ -201,24 +197,24 @@ function createJBrowseTheme(theme) {
|
|
|
201
197
|
}
|
|
202
198
|
|
|
203
199
|
if ((_theme$palette = theme.palette) !== null && _theme$palette !== void 0 && _theme$palette.tertiary) {
|
|
204
|
-
theme =
|
|
205
|
-
palette:
|
|
200
|
+
theme = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, theme), {}, {
|
|
201
|
+
palette: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, theme.palette), {}, {
|
|
206
202
|
tertiary: refTheme.palette.augmentColor(theme.palette.tertiary)
|
|
207
203
|
})
|
|
208
204
|
});
|
|
209
205
|
}
|
|
210
206
|
|
|
211
207
|
if ((_theme$palette2 = theme.palette) !== null && _theme$palette2 !== void 0 && _theme$palette2.quaternary) {
|
|
212
|
-
theme =
|
|
213
|
-
palette:
|
|
208
|
+
theme = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, theme), {}, {
|
|
209
|
+
palette: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, theme.palette), {}, {
|
|
214
210
|
quaternary: refTheme.palette.augmentColor(theme.palette.quaternary)
|
|
215
211
|
})
|
|
216
212
|
});
|
|
217
213
|
}
|
|
218
214
|
|
|
219
|
-
theme =
|
|
220
|
-
props: (0, _deepmerge
|
|
221
|
-
overrides: (0, _deepmerge
|
|
215
|
+
theme = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, theme), {}, {
|
|
216
|
+
props: (0, _deepmerge["default"])(createJBrowseDefaultProps(), theme.props || {}),
|
|
217
|
+
overrides: (0, _deepmerge["default"])(createJBrowseDefaultOverrides(theme.palette), theme.overrides || {})
|
|
222
218
|
});
|
|
223
|
-
return (0, _styles.createTheme)((0, _deepmerge
|
|
219
|
+
return (0, _styles.createTheme)((0, _deepmerge["default"])(jbrowseBaseTheme, theme));
|
|
224
220
|
}
|
package/util/Base1DViewModel.js
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
|
|
4
4
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
|
-
exports
|
|
8
|
+
exports["default"] = void 0;
|
|
9
9
|
|
|
10
|
-
var
|
|
10
|
+
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
|
|
11
11
|
|
|
12
12
|
var _mobxStateTree = require("mobx-state-tree");
|
|
13
13
|
|
|
@@ -19,17 +19,13 @@ var _calculateDynamicBlocks = _interopRequireDefault(require("./calculateDynamic
|
|
|
19
19
|
|
|
20
20
|
var _calculateStaticBlocks = _interopRequireDefault(require("./calculateStaticBlocks"));
|
|
21
21
|
|
|
22
|
-
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; }
|
|
23
|
-
|
|
24
|
-
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; }
|
|
25
|
-
|
|
26
22
|
var Base1DView = _mobxStateTree.types.model('Base1DView', {
|
|
27
23
|
displayedRegions: _mobxStateTree.types.array(_mst.Region),
|
|
28
24
|
bpPerPx: 0,
|
|
29
25
|
offsetPx: 0,
|
|
30
26
|
interRegionPaddingWidth: _mobxStateTree.types.optional(_mobxStateTree.types.number, 0),
|
|
31
27
|
minimumBlockWidth: _mobxStateTree.types.optional(_mobxStateTree.types.number, 0)
|
|
32
|
-
})
|
|
28
|
+
})["volatile"](function () {
|
|
33
29
|
return {
|
|
34
30
|
features: undefined,
|
|
35
31
|
volatileWidth: 0
|
|
@@ -128,7 +124,7 @@ var Base1DView = _mobxStateTree.types.model('Base1DView', {
|
|
|
128
124
|
if (bp < 0) {
|
|
129
125
|
var region = self.displayedRegions[0];
|
|
130
126
|
var offset = bp;
|
|
131
|
-
return
|
|
127
|
+
return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, (0, _mobxStateTree.getSnapshot)(region)), {}, {
|
|
132
128
|
oob: true,
|
|
133
129
|
coord: region.reversed ? Math.floor(region.end - offset) + 1 : Math.floor(region.start + offset) + 1,
|
|
134
130
|
offset: offset,
|
|
@@ -146,7 +142,7 @@ var Base1DView = _mobxStateTree.types.model('Base1DView', {
|
|
|
146
142
|
var _offset = bp - bpSoFar;
|
|
147
143
|
|
|
148
144
|
if (len + bpSoFar > bp && bpSoFar <= bp) {
|
|
149
|
-
return
|
|
145
|
+
return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, (0, _mobxStateTree.getSnapshot)(_region)), {}, {
|
|
150
146
|
oob: false,
|
|
151
147
|
offset: _offset,
|
|
152
148
|
coord: _region.reversed ? Math.floor(_region.end - _offset) + 1 : Math.floor(_region.start + _offset) + 1,
|
|
@@ -170,7 +166,7 @@ var Base1DView = _mobxStateTree.types.model('Base1DView', {
|
|
|
170
166
|
|
|
171
167
|
var _offset2 = bp - bpSoFar + _len;
|
|
172
168
|
|
|
173
|
-
return
|
|
169
|
+
return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, (0, _mobxStateTree.getSnapshot)(_region2)), {}, {
|
|
174
170
|
oob: true,
|
|
175
171
|
offset: _offset2,
|
|
176
172
|
coord: _region2.reversed ? Math.floor(_region2.end - _offset2) + 1 : Math.floor(_region2.start + _offset2) + 1,
|
|
@@ -193,11 +189,11 @@ var Base1DView = _mobxStateTree.types.model('Base1DView', {
|
|
|
193
189
|
}).views(function (self) {
|
|
194
190
|
return {
|
|
195
191
|
get dynamicBlocks() {
|
|
196
|
-
return (0, _calculateDynamicBlocks
|
|
192
|
+
return (0, _calculateDynamicBlocks["default"])(self);
|
|
197
193
|
},
|
|
198
194
|
|
|
199
195
|
get staticBlocks() {
|
|
200
|
-
return (0, _calculateStaticBlocks
|
|
196
|
+
return (0, _calculateStaticBlocks["default"])(self);
|
|
201
197
|
},
|
|
202
198
|
|
|
203
199
|
get currBp() {
|
|
@@ -326,4 +322,4 @@ var Base1DView = _mobxStateTree.types.model('Base1DView', {
|
|
|
326
322
|
});
|
|
327
323
|
|
|
328
324
|
var _default = Base1DView;
|
|
329
|
-
exports
|
|
325
|
+
exports["default"] = _default;
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
|
|
4
4
|
|
|
5
5
|
var _Base1DViewModel = _interopRequireDefault(require("./Base1DViewModel"));
|
|
6
6
|
|
|
7
7
|
test('create Base1DView and set displayedRegions', function () {
|
|
8
|
-
var model = _Base1DViewModel
|
|
8
|
+
var model = _Base1DViewModel["default"].create({
|
|
9
9
|
bpPerPx: 1,
|
|
10
10
|
offsetPx: 0
|
|
11
11
|
});
|
|
@@ -28,7 +28,7 @@ test('create Base1DView and set displayedRegions', function () {
|
|
|
28
28
|
expect(model.displayedRegions).toBeTruthy();
|
|
29
29
|
});
|
|
30
30
|
test('Able to set bpPerPx, width and calculate widths', function () {
|
|
31
|
-
var model = _Base1DViewModel
|
|
31
|
+
var model = _Base1DViewModel["default"].create({
|
|
32
32
|
bpPerPx: 0,
|
|
33
33
|
offsetPx: 0
|
|
34
34
|
});
|
|
@@ -56,7 +56,7 @@ test('Able to set bpPerPx, width and calculate widths', function () {
|
|
|
56
56
|
expect(model.minimumBlockWidth).toEqual(0);
|
|
57
57
|
});
|
|
58
58
|
test('Able to set and showAll Regions', function () {
|
|
59
|
-
var model = _Base1DViewModel
|
|
59
|
+
var model = _Base1DViewModel["default"].create({
|
|
60
60
|
bpPerPx: 0,
|
|
61
61
|
offsetPx: 0
|
|
62
62
|
});
|
|
@@ -85,7 +85,7 @@ test('Able to set and showAll Regions', function () {
|
|
|
85
85
|
expect(model.bpPerPx).toEqual(53);
|
|
86
86
|
});
|
|
87
87
|
test('Navigate to displayedRegions', function () {
|
|
88
|
-
var model = _Base1DViewModel
|
|
88
|
+
var model = _Base1DViewModel["default"].create({
|
|
89
89
|
bpPerPx: 0,
|
|
90
90
|
offsetPx: 0
|
|
91
91
|
});
|
package/util/QuickLRU.js
CHANGED
|
@@ -1,25 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
|
|
4
4
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
|
-
exports
|
|
8
|
+
exports["default"] = void 0;
|
|
9
9
|
|
|
10
10
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
11
11
|
|
|
12
|
-
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
12
|
+
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
|
|
13
13
|
|
|
14
|
-
var
|
|
14
|
+
var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createForOfIteratorHelper"));
|
|
15
15
|
|
|
16
|
-
var
|
|
16
|
+
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/classCallCheck"));
|
|
17
17
|
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
21
|
-
|
|
22
|
-
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
|
|
18
|
+
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createClass"));
|
|
23
19
|
|
|
24
20
|
/* eslint-disable no-underscore-dangle */
|
|
25
21
|
|
|
@@ -31,7 +27,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
|
|
|
31
27
|
var QuickLRU = /*#__PURE__*/function (_Symbol$iterator) {
|
|
32
28
|
function QuickLRU() {
|
|
33
29
|
var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
34
|
-
(0, _classCallCheck2
|
|
30
|
+
(0, _classCallCheck2["default"])(this, QuickLRU);
|
|
35
31
|
|
|
36
32
|
if (!(options.maxSize && options.maxSize > 0)) {
|
|
37
33
|
throw new TypeError('`maxSize` must be a number greater than 0');
|
|
@@ -43,7 +39,7 @@ var QuickLRU = /*#__PURE__*/function (_Symbol$iterator) {
|
|
|
43
39
|
this._size = 0;
|
|
44
40
|
}
|
|
45
41
|
|
|
46
|
-
(0, _createClass2
|
|
42
|
+
(0, _createClass2["default"])(QuickLRU, [{
|
|
47
43
|
key: "_set",
|
|
48
44
|
value: function _set(key, value) {
|
|
49
45
|
this.cache.set(key, value);
|
|
@@ -64,7 +60,7 @@ var QuickLRU = /*#__PURE__*/function (_Symbol$iterator) {
|
|
|
64
60
|
|
|
65
61
|
if (this.oldCache.has(key)) {
|
|
66
62
|
var value = this.oldCache.get(key);
|
|
67
|
-
this.oldCache
|
|
63
|
+
this.oldCache["delete"](key);
|
|
68
64
|
|
|
69
65
|
this._set(key, value);
|
|
70
66
|
|
|
@@ -105,13 +101,13 @@ var QuickLRU = /*#__PURE__*/function (_Symbol$iterator) {
|
|
|
105
101
|
}, {
|
|
106
102
|
key: "delete",
|
|
107
103
|
value: function _delete(key) {
|
|
108
|
-
var deleted = this.cache
|
|
104
|
+
var deleted = this.cache["delete"](key);
|
|
109
105
|
|
|
110
106
|
if (deleted) {
|
|
111
107
|
this._size -= 1;
|
|
112
108
|
}
|
|
113
109
|
|
|
114
|
-
return this.oldCache
|
|
110
|
+
return this.oldCache["delete"](key) || deleted;
|
|
115
111
|
}
|
|
116
112
|
}, {
|
|
117
113
|
key: "clear",
|
|
@@ -122,14 +118,14 @@ var QuickLRU = /*#__PURE__*/function (_Symbol$iterator) {
|
|
|
122
118
|
}
|
|
123
119
|
}, {
|
|
124
120
|
key: "keys",
|
|
125
|
-
value: /*#__PURE__*/_regenerator
|
|
121
|
+
value: /*#__PURE__*/_regenerator["default"].mark(function keys() {
|
|
126
122
|
var _iterator, _step, _step$value, key;
|
|
127
123
|
|
|
128
|
-
return _regenerator
|
|
124
|
+
return _regenerator["default"].wrap(function keys$(_context) {
|
|
129
125
|
while (1) {
|
|
130
126
|
switch (_context.prev = _context.next) {
|
|
131
127
|
case 0:
|
|
132
|
-
_iterator =
|
|
128
|
+
_iterator = (0, _createForOfIteratorHelper2["default"])(this);
|
|
133
129
|
_context.prev = 1;
|
|
134
130
|
|
|
135
131
|
_iterator.s();
|
|
@@ -140,7 +136,7 @@ var QuickLRU = /*#__PURE__*/function (_Symbol$iterator) {
|
|
|
140
136
|
break;
|
|
141
137
|
}
|
|
142
138
|
|
|
143
|
-
_step$value = (0, _slicedToArray2
|
|
139
|
+
_step$value = (0, _slicedToArray2["default"])(_step.value, 1), key = _step$value[0];
|
|
144
140
|
_context.next = 7;
|
|
145
141
|
return key;
|
|
146
142
|
|
|
@@ -174,14 +170,14 @@ var QuickLRU = /*#__PURE__*/function (_Symbol$iterator) {
|
|
|
174
170
|
})
|
|
175
171
|
}, {
|
|
176
172
|
key: "values",
|
|
177
|
-
value: /*#__PURE__*/_regenerator
|
|
173
|
+
value: /*#__PURE__*/_regenerator["default"].mark(function values() {
|
|
178
174
|
var _iterator2, _step2, _step2$value, value;
|
|
179
175
|
|
|
180
|
-
return _regenerator
|
|
176
|
+
return _regenerator["default"].wrap(function values$(_context2) {
|
|
181
177
|
while (1) {
|
|
182
178
|
switch (_context2.prev = _context2.next) {
|
|
183
179
|
case 0:
|
|
184
|
-
_iterator2 =
|
|
180
|
+
_iterator2 = (0, _createForOfIteratorHelper2["default"])(this);
|
|
185
181
|
_context2.prev = 1;
|
|
186
182
|
|
|
187
183
|
_iterator2.s();
|
|
@@ -192,7 +188,7 @@ var QuickLRU = /*#__PURE__*/function (_Symbol$iterator) {
|
|
|
192
188
|
break;
|
|
193
189
|
}
|
|
194
190
|
|
|
195
|
-
_step2$value = (0, _slicedToArray2
|
|
191
|
+
_step2$value = (0, _slicedToArray2["default"])(_step2.value, 2), value = _step2$value[1];
|
|
196
192
|
_context2.next = 7;
|
|
197
193
|
return value;
|
|
198
194
|
|
|
@@ -226,14 +222,14 @@ var QuickLRU = /*#__PURE__*/function (_Symbol$iterator) {
|
|
|
226
222
|
})
|
|
227
223
|
}, {
|
|
228
224
|
key: _Symbol$iterator,
|
|
229
|
-
value: /*#__PURE__*/_regenerator
|
|
225
|
+
value: /*#__PURE__*/_regenerator["default"].mark(function value() {
|
|
230
226
|
var _iterator3, _step3, item, _iterator4, _step4, _item, _item2, key;
|
|
231
227
|
|
|
232
|
-
return _regenerator
|
|
228
|
+
return _regenerator["default"].wrap(function value$(_context3) {
|
|
233
229
|
while (1) {
|
|
234
230
|
switch (_context3.prev = _context3.next) {
|
|
235
231
|
case 0:
|
|
236
|
-
_iterator3 =
|
|
232
|
+
_iterator3 = (0, _createForOfIteratorHelper2["default"])(this.cache);
|
|
237
233
|
_context3.prev = 1;
|
|
238
234
|
|
|
239
235
|
_iterator3.s();
|
|
@@ -270,7 +266,7 @@ var QuickLRU = /*#__PURE__*/function (_Symbol$iterator) {
|
|
|
270
266
|
return _context3.finish(14);
|
|
271
267
|
|
|
272
268
|
case 17:
|
|
273
|
-
_iterator4 =
|
|
269
|
+
_iterator4 = (0, _createForOfIteratorHelper2["default"])(this.oldCache);
|
|
274
270
|
_context3.prev = 18;
|
|
275
271
|
|
|
276
272
|
_iterator4.s();
|
|
@@ -282,7 +278,7 @@ var QuickLRU = /*#__PURE__*/function (_Symbol$iterator) {
|
|
|
282
278
|
}
|
|
283
279
|
|
|
284
280
|
_item = _step4.value;
|
|
285
|
-
_item2 = (0, _slicedToArray2
|
|
281
|
+
_item2 = (0, _slicedToArray2["default"])(_item, 1), key = _item2[0];
|
|
286
282
|
|
|
287
283
|
if (this.cache.has(key)) {
|
|
288
284
|
_context3.next = 26;
|
|
@@ -325,7 +321,7 @@ var QuickLRU = /*#__PURE__*/function (_Symbol$iterator) {
|
|
|
325
321
|
get: function get() {
|
|
326
322
|
var oldCacheSize = 0;
|
|
327
323
|
|
|
328
|
-
var _iterator5 =
|
|
324
|
+
var _iterator5 = (0, _createForOfIteratorHelper2["default"])(this.oldCache.keys()),
|
|
329
325
|
_step5;
|
|
330
326
|
|
|
331
327
|
try {
|
|
@@ -349,4 +345,4 @@ var QuickLRU = /*#__PURE__*/function (_Symbol$iterator) {
|
|
|
349
345
|
}(Symbol.iterator);
|
|
350
346
|
|
|
351
347
|
var _default = QuickLRU;
|
|
352
|
-
exports
|
|
348
|
+
exports["default"] = _default;
|