@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
|
@@ -1,29 +1,29 @@
|
|
|
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 _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
12
|
+
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/asyncToGenerator"));
|
|
13
13
|
|
|
14
|
-
var
|
|
14
|
+
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
|
|
15
15
|
|
|
16
|
-
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
16
|
+
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/classCallCheck"));
|
|
17
17
|
|
|
18
|
-
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
18
|
+
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createClass"));
|
|
19
19
|
|
|
20
|
-
var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
|
|
20
|
+
var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/get"));
|
|
21
21
|
|
|
22
|
-
var
|
|
22
|
+
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/getPrototypeOf"));
|
|
23
23
|
|
|
24
|
-
var
|
|
24
|
+
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/inherits"));
|
|
25
25
|
|
|
26
|
-
var
|
|
26
|
+
var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createSuper"));
|
|
27
27
|
|
|
28
28
|
var _operators = require("rxjs/operators");
|
|
29
29
|
|
|
@@ -31,25 +31,18 @@ var _ServerSideRendererType = _interopRequireDefault(require("./ServerSideRender
|
|
|
31
31
|
|
|
32
32
|
var _dataAdapterCache = require("../../data_adapters/dataAdapterCache");
|
|
33
33
|
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
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; }
|
|
37
|
-
|
|
38
|
-
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
|
|
39
|
-
|
|
40
|
-
function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
|
|
41
|
-
|
|
34
|
+
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
42
35
|
var ComparativeServerSideRenderer = /*#__PURE__*/function (_ServerSideRenderer) {
|
|
43
|
-
(0, _inherits2
|
|
36
|
+
(0, _inherits2["default"])(ComparativeServerSideRenderer, _ServerSideRenderer);
|
|
44
37
|
|
|
45
|
-
var _super =
|
|
38
|
+
var _super = (0, _createSuper2["default"])(ComparativeServerSideRenderer);
|
|
46
39
|
|
|
47
40
|
function ComparativeServerSideRenderer() {
|
|
48
|
-
(0, _classCallCheck2
|
|
41
|
+
(0, _classCallCheck2["default"])(this, ComparativeServerSideRenderer);
|
|
49
42
|
return _super.apply(this, arguments);
|
|
50
43
|
}
|
|
51
44
|
|
|
52
|
-
(0, _createClass2
|
|
45
|
+
(0, _createClass2["default"])(ComparativeServerSideRenderer, [{
|
|
53
46
|
key: "serializeArgsInClient",
|
|
54
47
|
value:
|
|
55
48
|
/**
|
|
@@ -66,18 +59,17 @@ var ComparativeServerSideRenderer = /*#__PURE__*/function (_ServerSideRenderer)
|
|
|
66
59
|
* @returns the same object
|
|
67
60
|
*/
|
|
68
61
|
function serializeArgsInClient(args) {
|
|
69
|
-
var deserializedArgs =
|
|
62
|
+
var deserializedArgs = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, args), {}, {
|
|
70
63
|
displayModel: {}
|
|
71
64
|
});
|
|
72
|
-
|
|
73
|
-
return (0, _get2.default)((0, _getPrototypeOf2.default)(ComparativeServerSideRenderer.prototype), "serializeArgsInClient", this).call(this, deserializedArgs);
|
|
65
|
+
return (0, _get2["default"])((0, _getPrototypeOf2["default"])(ComparativeServerSideRenderer.prototype), "serializeArgsInClient", this).call(this, deserializedArgs);
|
|
74
66
|
} // deserialize some of the results that came back from the worker
|
|
75
67
|
|
|
76
68
|
}, {
|
|
77
69
|
key: "deserializeResultsInClient",
|
|
78
70
|
value: function deserializeResultsInClient(result, args) {
|
|
79
|
-
var deserialized = (0, _get2
|
|
80
|
-
return
|
|
71
|
+
var deserialized = (0, _get2["default"])((0, _getPrototypeOf2["default"])(ComparativeServerSideRenderer.prototype), "deserializeResultsInClient", this).call(this, result, args);
|
|
72
|
+
return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, deserialized), {}, {
|
|
81
73
|
blockKey: args.blockKey
|
|
82
74
|
});
|
|
83
75
|
}
|
|
@@ -89,8 +81,8 @@ var ComparativeServerSideRenderer = /*#__PURE__*/function (_ServerSideRenderer)
|
|
|
89
81
|
}, {
|
|
90
82
|
key: "renderInClient",
|
|
91
83
|
value: function () {
|
|
92
|
-
var _renderInClient = (0, _asyncToGenerator2
|
|
93
|
-
return _regenerator
|
|
84
|
+
var _renderInClient = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(rpcManager, args) {
|
|
85
|
+
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
94
86
|
while (1) {
|
|
95
87
|
switch (_context.prev = _context.next) {
|
|
96
88
|
case 0:
|
|
@@ -128,12 +120,12 @@ var ComparativeServerSideRenderer = /*#__PURE__*/function (_ServerSideRenderer)
|
|
|
128
120
|
}, {
|
|
129
121
|
key: "getFeatures",
|
|
130
122
|
value: function () {
|
|
131
|
-
var _getFeatures = (0, _asyncToGenerator2
|
|
123
|
+
var _getFeatures = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(renderArgs) {
|
|
132
124
|
var _this = this;
|
|
133
125
|
|
|
134
126
|
var signal, sessionId, adapterConfig, _yield$getAdapter, dataAdapter, regions, requestRegions, featureObservable;
|
|
135
127
|
|
|
136
|
-
return _regenerator
|
|
128
|
+
return _regenerator["default"].wrap(function _callee2$(_context2) {
|
|
137
129
|
while (1) {
|
|
138
130
|
switch (_context2.prev = _context2.next) {
|
|
139
131
|
case 0:
|
|
@@ -160,7 +152,7 @@ var ComparativeServerSideRenderer = /*#__PURE__*/function (_ServerSideRenderer)
|
|
|
160
152
|
requestRegions = regions.map(function (r) {
|
|
161
153
|
// make sure the requested region's start and end are integers, if
|
|
162
154
|
// there is a region specification.
|
|
163
|
-
var requestRegion =
|
|
155
|
+
var requestRegion = (0, _objectSpread2["default"])({}, r);
|
|
164
156
|
|
|
165
157
|
if (requestRegion.start) {
|
|
166
158
|
requestRegion.start = Math.floor(requestRegion.start);
|
|
@@ -197,6 +189,6 @@ var ComparativeServerSideRenderer = /*#__PURE__*/function (_ServerSideRenderer)
|
|
|
197
189
|
}()
|
|
198
190
|
}]);
|
|
199
191
|
return ComparativeServerSideRenderer;
|
|
200
|
-
}(_ServerSideRendererType
|
|
192
|
+
}(_ServerSideRendererType["default"]);
|
|
201
193
|
|
|
202
|
-
exports
|
|
194
|
+
exports["default"] = ComparativeServerSideRenderer;
|
|
@@ -1,29 +1,29 @@
|
|
|
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"] = exports.NewFeatureRendererType = void 0;
|
|
9
9
|
|
|
10
10
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
11
11
|
|
|
12
|
-
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
12
|
+
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/asyncToGenerator"));
|
|
13
13
|
|
|
14
|
-
var
|
|
14
|
+
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
|
|
15
15
|
|
|
16
|
-
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
16
|
+
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/classCallCheck"));
|
|
17
17
|
|
|
18
|
-
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
18
|
+
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createClass"));
|
|
19
19
|
|
|
20
|
-
var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
|
|
20
|
+
var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/get"));
|
|
21
21
|
|
|
22
|
-
var
|
|
22
|
+
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/getPrototypeOf"));
|
|
23
23
|
|
|
24
|
-
var
|
|
24
|
+
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/inherits"));
|
|
25
25
|
|
|
26
|
-
var
|
|
26
|
+
var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createSuper"));
|
|
27
27
|
|
|
28
28
|
var _operators = require("rxjs/operators");
|
|
29
29
|
|
|
@@ -35,25 +35,17 @@ var _dataAdapterCache = require("../../data_adapters/dataAdapterCache");
|
|
|
35
35
|
|
|
36
36
|
var _ServerSideRendererType = _interopRequireDefault(require("./ServerSideRendererType"));
|
|
37
37
|
|
|
38
|
-
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; }
|
|
39
|
-
|
|
40
|
-
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; }
|
|
41
|
-
|
|
42
|
-
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
|
|
43
|
-
|
|
44
|
-
function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
|
|
45
|
-
|
|
46
38
|
var FeatureRendererType = /*#__PURE__*/function (_ServerSideRendererTy) {
|
|
47
|
-
(0, _inherits2
|
|
39
|
+
(0, _inherits2["default"])(FeatureRendererType, _ServerSideRendererTy);
|
|
48
40
|
|
|
49
|
-
var _super =
|
|
41
|
+
var _super = (0, _createSuper2["default"])(FeatureRendererType);
|
|
50
42
|
|
|
51
43
|
function FeatureRendererType() {
|
|
52
|
-
(0, _classCallCheck2
|
|
44
|
+
(0, _classCallCheck2["default"])(this, FeatureRendererType);
|
|
53
45
|
return _super.apply(this, arguments);
|
|
54
46
|
}
|
|
55
47
|
|
|
56
|
-
(0, _createClass2
|
|
48
|
+
(0, _createClass2["default"])(FeatureRendererType, [{
|
|
57
49
|
key: "serializeArgsInClient",
|
|
58
50
|
value:
|
|
59
51
|
/**
|
|
@@ -67,16 +59,14 @@ var FeatureRendererType = /*#__PURE__*/function (_ServerSideRendererTy) {
|
|
|
67
59
|
function serializeArgsInClient(args) {
|
|
68
60
|
var displayModel = args.displayModel,
|
|
69
61
|
regions = args.regions;
|
|
70
|
-
|
|
71
|
-
var serializedArgs = _objectSpread(_objectSpread({}, args), {}, {
|
|
62
|
+
var serializedArgs = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, args), {}, {
|
|
72
63
|
displayModel: displayModel && {
|
|
73
64
|
id: displayModel.id,
|
|
74
65
|
selectedFeatureId: displayModel.selectedFeatureId
|
|
75
66
|
},
|
|
76
67
|
regions: JSON.parse(JSON.stringify(regions))
|
|
77
68
|
});
|
|
78
|
-
|
|
79
|
-
return (0, _get2.default)((0, _getPrototypeOf2.default)(FeatureRendererType.prototype), "serializeArgsInClient", this).call(this, serializedArgs);
|
|
69
|
+
return (0, _get2["default"])((0, _getPrototypeOf2["default"])(FeatureRendererType.prototype), "serializeArgsInClient", this).call(this, serializedArgs);
|
|
80
70
|
}
|
|
81
71
|
/**
|
|
82
72
|
* Adds feature deserialization to base server-side result deserialization
|
|
@@ -90,14 +80,14 @@ var FeatureRendererType = /*#__PURE__*/function (_ServerSideRendererTy) {
|
|
|
90
80
|
value: function deserializeResultsInClient(result, args) {
|
|
91
81
|
var deserializedFeatures = new Map();
|
|
92
82
|
result.features.forEach(function (j) {
|
|
93
|
-
var f = _simpleFeature
|
|
83
|
+
var f = _simpleFeature["default"].fromJSON(j);
|
|
94
84
|
|
|
95
85
|
deserializedFeatures.set(String(f.id()), f);
|
|
96
86
|
});
|
|
97
|
-
var deserialized = (0, _get2
|
|
87
|
+
var deserialized = (0, _get2["default"])((0, _getPrototypeOf2["default"])(FeatureRendererType.prototype), "deserializeResultsInClient", this).call(this, (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, result), {}, {
|
|
98
88
|
features: deserializedFeatures
|
|
99
89
|
}), args);
|
|
100
|
-
return
|
|
90
|
+
return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, deserialized), {}, {
|
|
101
91
|
blockKey: args.blockKey,
|
|
102
92
|
features: deserializedFeatures
|
|
103
93
|
});
|
|
@@ -113,8 +103,8 @@ var FeatureRendererType = /*#__PURE__*/function (_ServerSideRendererTy) {
|
|
|
113
103
|
}, {
|
|
114
104
|
key: "serializeResultsInWorker",
|
|
115
105
|
value: function serializeResultsInWorker(result, args) {
|
|
116
|
-
var serialized = (0, _get2
|
|
117
|
-
return
|
|
106
|
+
var serialized = (0, _get2["default"])((0, _getPrototypeOf2["default"])(FeatureRendererType.prototype), "serializeResultsInWorker", this).call(this, result, args);
|
|
107
|
+
return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, serialized), {}, {
|
|
118
108
|
features: (0, _util.iterMap)(result.features.values(), function (f) {
|
|
119
109
|
return f.toJSON();
|
|
120
110
|
})
|
|
@@ -142,12 +132,12 @@ var FeatureRendererType = /*#__PURE__*/function (_ServerSideRendererTy) {
|
|
|
142
132
|
}, {
|
|
143
133
|
key: "getFeatures",
|
|
144
134
|
value: function () {
|
|
145
|
-
var _getFeatures = (0, _asyncToGenerator2
|
|
135
|
+
var _getFeatures = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(renderArgs) {
|
|
146
136
|
var _this = this;
|
|
147
137
|
|
|
148
138
|
var signal, regions, sessionId, adapterConfig, _yield$getAdapter, dataAdapter, features, requestRegions, region, featureObservable;
|
|
149
139
|
|
|
150
|
-
return _regenerator
|
|
140
|
+
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
151
141
|
while (1) {
|
|
152
142
|
switch (_context.prev = _context.next) {
|
|
153
143
|
case 0:
|
|
@@ -171,7 +161,7 @@ var FeatureRendererType = /*#__PURE__*/function (_ServerSideRendererTy) {
|
|
|
171
161
|
requestRegions = regions.map(function (r) {
|
|
172
162
|
// make sure the requested region's start and end are integers, if
|
|
173
163
|
// there is a region specification.
|
|
174
|
-
var requestRegion =
|
|
164
|
+
var requestRegion = (0, _objectSpread2["default"])({}, r);
|
|
175
165
|
|
|
176
166
|
if (requestRegion.start) {
|
|
177
167
|
requestRegion.start = Math.floor(requestRegion.start);
|
|
@@ -243,9 +233,9 @@ var FeatureRendererType = /*#__PURE__*/function (_ServerSideRendererTy) {
|
|
|
243
233
|
}, {
|
|
244
234
|
key: "render",
|
|
245
235
|
value: function () {
|
|
246
|
-
var _render = (0, _asyncToGenerator2
|
|
236
|
+
var _render = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(props) {
|
|
247
237
|
var features, result;
|
|
248
|
-
return _regenerator
|
|
238
|
+
return _regenerator["default"].wrap(function _callee2$(_context2) {
|
|
249
239
|
while (1) {
|
|
250
240
|
switch (_context2.prev = _context2.next) {
|
|
251
241
|
case 0:
|
|
@@ -265,13 +255,13 @@ var FeatureRendererType = /*#__PURE__*/function (_ServerSideRendererTy) {
|
|
|
265
255
|
case 5:
|
|
266
256
|
features = _context2.t0;
|
|
267
257
|
_context2.next = 8;
|
|
268
|
-
return (0, _get2
|
|
258
|
+
return (0, _get2["default"])((0, _getPrototypeOf2["default"])(FeatureRendererType.prototype), "render", this).call(this, (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, props), {}, {
|
|
269
259
|
features: features
|
|
270
260
|
}));
|
|
271
261
|
|
|
272
262
|
case 8:
|
|
273
263
|
result = _context2.sent;
|
|
274
|
-
return _context2.abrupt("return",
|
|
264
|
+
return _context2.abrupt("return", (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, result), {}, {
|
|
275
265
|
features: features
|
|
276
266
|
}));
|
|
277
267
|
|
|
@@ -291,21 +281,21 @@ var FeatureRendererType = /*#__PURE__*/function (_ServerSideRendererTy) {
|
|
|
291
281
|
}()
|
|
292
282
|
}]);
|
|
293
283
|
return FeatureRendererType;
|
|
294
|
-
}(_ServerSideRendererType
|
|
284
|
+
}(_ServerSideRendererType["default"]);
|
|
295
285
|
|
|
296
|
-
exports
|
|
286
|
+
exports["default"] = FeatureRendererType;
|
|
297
287
|
|
|
298
288
|
var NewFeatureRendererType = /*#__PURE__*/function (_ServerSideRendererTy2) {
|
|
299
|
-
(0, _inherits2
|
|
289
|
+
(0, _inherits2["default"])(NewFeatureRendererType, _ServerSideRendererTy2);
|
|
300
290
|
|
|
301
|
-
var _super2 =
|
|
291
|
+
var _super2 = (0, _createSuper2["default"])(NewFeatureRendererType);
|
|
302
292
|
|
|
303
293
|
function NewFeatureRendererType() {
|
|
304
|
-
(0, _classCallCheck2
|
|
294
|
+
(0, _classCallCheck2["default"])(this, NewFeatureRendererType);
|
|
305
295
|
return _super2.apply(this, arguments);
|
|
306
296
|
}
|
|
307
297
|
|
|
308
|
-
return (0, _createClass2
|
|
309
|
-
}(_ServerSideRendererType
|
|
298
|
+
return (0, _createClass2["default"])(NewFeatureRendererType);
|
|
299
|
+
}(_ServerSideRendererType["default"]);
|
|
310
300
|
|
|
311
301
|
exports.NewFeatureRendererType = NewFeatureRendererType;
|
|
@@ -1,29 +1,23 @@
|
|
|
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 _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
12
|
+
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/asyncToGenerator"));
|
|
13
13
|
|
|
14
|
-
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
14
|
+
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/classCallCheck"));
|
|
15
15
|
|
|
16
|
-
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
16
|
+
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createClass"));
|
|
17
17
|
|
|
18
|
-
var
|
|
18
|
+
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/inherits"));
|
|
19
19
|
|
|
20
|
-
var
|
|
21
|
-
|
|
22
|
-
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
23
|
-
|
|
24
|
-
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
25
|
-
|
|
26
|
-
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
20
|
+
var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createSuper"));
|
|
27
21
|
|
|
28
22
|
var _react = _interopRequireDefault(require("react"));
|
|
29
23
|
|
|
@@ -31,24 +25,20 @@ var _mstReflection = require("../../util/mst-reflection");
|
|
|
31
25
|
|
|
32
26
|
var _PluggableElementBase2 = _interopRequireDefault(require("../PluggableElementBase"));
|
|
33
27
|
|
|
34
|
-
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
|
|
35
|
-
|
|
36
|
-
function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
|
|
37
|
-
|
|
38
28
|
var RendererType = /*#__PURE__*/function (_PluggableElementBase) {
|
|
39
|
-
(0, _inherits2
|
|
29
|
+
(0, _inherits2["default"])(RendererType, _PluggableElementBase);
|
|
40
30
|
|
|
41
|
-
var _super =
|
|
31
|
+
var _super = (0, _createSuper2["default"])(RendererType);
|
|
42
32
|
|
|
43
33
|
function RendererType(stuff) {
|
|
44
34
|
var _this;
|
|
45
35
|
|
|
46
|
-
(0, _classCallCheck2
|
|
36
|
+
(0, _classCallCheck2["default"])(this, RendererType);
|
|
47
37
|
_this = _super.call(this, stuff);
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
38
|
+
_this.ReactComponent = void 0;
|
|
39
|
+
_this.supportsSVG = false;
|
|
40
|
+
_this.configSchema = void 0;
|
|
41
|
+
_this.pluginManager = void 0;
|
|
52
42
|
_this.ReactComponent = stuff.ReactComponent;
|
|
53
43
|
_this.configSchema = stuff.configSchema;
|
|
54
44
|
_this.pluginManager = stuff.pluginManager;
|
|
@@ -68,16 +58,16 @@ var RendererType = /*#__PURE__*/function (_PluggableElementBase) {
|
|
|
68
58
|
return _this;
|
|
69
59
|
}
|
|
70
60
|
|
|
71
|
-
(0, _createClass2
|
|
61
|
+
(0, _createClass2["default"])(RendererType, [{
|
|
72
62
|
key: "render",
|
|
73
63
|
value: function () {
|
|
74
|
-
var _render = (0, _asyncToGenerator2
|
|
75
|
-
return _regenerator
|
|
64
|
+
var _render = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(props) {
|
|
65
|
+
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
76
66
|
while (1) {
|
|
77
67
|
switch (_context.prev = _context.next) {
|
|
78
68
|
case 0:
|
|
79
69
|
return _context.abrupt("return", {
|
|
80
|
-
reactElement: /*#__PURE__*/_react
|
|
70
|
+
reactElement: /*#__PURE__*/_react["default"].createElement(this.ReactComponent, props, null)
|
|
81
71
|
});
|
|
82
72
|
|
|
83
73
|
case 1:
|
|
@@ -108,6 +98,6 @@ var RendererType = /*#__PURE__*/function (_PluggableElementBase) {
|
|
|
108
98
|
}
|
|
109
99
|
}]);
|
|
110
100
|
return RendererType;
|
|
111
|
-
}(_PluggableElementBase2
|
|
101
|
+
}(_PluggableElementBase2["default"]);
|
|
112
102
|
|
|
113
|
-
exports
|
|
103
|
+
exports["default"] = RendererType;
|
|
@@ -1,15 +1,15 @@
|
|
|
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
|
-
var
|
|
5
|
+
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard")["default"];
|
|
6
6
|
|
|
7
7
|
Object.defineProperty(exports, "__esModule", {
|
|
8
8
|
value: true
|
|
9
9
|
});
|
|
10
|
-
exports
|
|
10
|
+
exports["default"] = ServerSideRenderedContent;
|
|
11
11
|
|
|
12
|
-
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
|
12
|
+
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
|
|
13
13
|
|
|
14
14
|
var _styles = require("@material-ui/core/styles");
|
|
15
15
|
|
|
@@ -23,16 +23,12 @@ var _util = require("../../util");
|
|
|
23
23
|
|
|
24
24
|
var _excluded = ["theme", "html", "RenderingComponent"];
|
|
25
25
|
|
|
26
|
-
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); }
|
|
27
|
-
|
|
28
|
-
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; }
|
|
29
|
-
|
|
30
26
|
function ServerSideRenderedContent(props) {
|
|
31
27
|
var ssrContainerNode = (0, _react.useRef)(null);
|
|
32
28
|
var theme = props.theme,
|
|
33
29
|
html = props.html,
|
|
34
30
|
RenderingComponent = props.RenderingComponent,
|
|
35
|
-
rest = (0, _objectWithoutProperties2
|
|
31
|
+
rest = (0, _objectWithoutProperties2["default"])(props, _excluded);
|
|
36
32
|
var jbrowseTheme = (0, _ui.createJBrowseTheme)(theme);
|
|
37
33
|
(0, _react.useEffect)(function () {
|
|
38
34
|
var domNode = ssrContainerNode.current;
|
|
@@ -52,9 +48,9 @@ function ServerSideRenderedContent(props) {
|
|
|
52
48
|
// so
|
|
53
49
|
|
|
54
50
|
(0, _util.rIC)(function () {
|
|
55
|
-
(0, _reactDom.hydrate)( /*#__PURE__*/_react
|
|
51
|
+
(0, _reactDom.hydrate)( /*#__PURE__*/_react["default"].createElement(_styles.ThemeProvider, {
|
|
56
52
|
theme: jbrowseTheme
|
|
57
|
-
}, /*#__PURE__*/_react
|
|
53
|
+
}, /*#__PURE__*/_react["default"].createElement(RenderingComponent, rest)), domNode);
|
|
58
54
|
}, {
|
|
59
55
|
timeout: 300
|
|
60
56
|
});
|
|
@@ -68,7 +64,7 @@ function ServerSideRenderedContent(props) {
|
|
|
68
64
|
}
|
|
69
65
|
};
|
|
70
66
|
}, [html, jbrowseTheme, rest, RenderingComponent]);
|
|
71
|
-
return /*#__PURE__*/_react
|
|
67
|
+
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
72
68
|
ref: ssrContainerNode,
|
|
73
69
|
"data-html-size": html.length,
|
|
74
70
|
className: "ssr-container"
|