diff --git a/docs/_data/outlines.json b/docs/_data/outlines.json index 2a80b019..9674ba11 100644 --- a/docs/_data/outlines.json +++ b/docs/_data/outlines.json @@ -20,6 +20,10 @@ "Interfaces", "Variables" ], + "vegadeckgl.defaults.md": [ + "Functions", + "Variables" + ], "vegadeckgl.md": [ "Classes", "Enums", diff --git a/docs/app/css/sanddance-app.css b/docs/app/css/sanddance-app.css index 2f5e1f03..484b03c2 100644 --- a/docs/app/css/sanddance-app.css +++ b/docs/app/css/sanddance-app.css @@ -67,6 +67,9 @@ .sanddance-details-scroll { padding-bottom: 1em; } +.sanddance-tooltip { + z-index: 1; } + .sanddance-tooltip table { background: #333; color: #fff; diff --git a/docs/app/js/sanddance-app.js b/docs/app/js/sanddance-app.js index 01d1c931..600b8366 100644 --- a/docs/app/js/sanddance-app.js +++ b/docs/app/js/sanddance-app.js @@ -81359,7 +81359,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.createStage = createStage; -exports.min3dDepth = exports.defaultView = exports.lineZ = exports.groupStrokeWidth = exports.defaultPresenterConfig = exports.defaultPresenterStyle = exports.minWidth = exports.minHeight = void 0; +exports.minPixelSize = exports.min3dDepth = exports.defaultView = exports.lineZ = exports.groupStrokeWidth = exports.defaultPresenterConfig = exports.defaultPresenterStyle = exports.minWidth = exports.minHeight = void 0; const minHeight = '100px'; exports.minHeight = minHeight; const minWidth = '100px'; @@ -81420,6 +81420,8 @@ const defaultView = "2d"; exports.defaultView = defaultView; const min3dDepth = 0.05; exports.min3dDepth = min3dDepth; +const minPixelSize = 0.5; +exports.minPixelSize = minPixelSize; },{}],"EWji":[function(require,module,exports) { "use strict"; @@ -81469,10 +81471,13 @@ varying vec4 vColor; void main(void) { + float x = instanceSizes.x > 0.0 ? max(instanceSizes.x, ${_defaults.minPixelSize.toFixed(1)}) : 0.0; + float y = instanceSizes.y > 0.0 ? max(instanceSizes.y, ${_defaults.minPixelSize.toFixed(1)}) : 0.0; + // if alpha == 0.0, do not render element float noRender = float(instanceColors.a == 0.0); - float finalXScale = project_scale(instanceSizes.x) * mix(1.0, 0.0, noRender); - float finalYScale = project_scale(instanceSizes.y) * mix(1.0, 0.0, noRender); + float finalXScale = project_scale(x) * mix(1.0, 0.0, noRender); + float finalYScale = project_scale(y) * mix(1.0, 0.0, noRender); float finalZScale = project_scale(instanceSizes.z) * mix(1.0, 0.0, noRender); // cube geometry vertics are between -1 to 1, scale and transform it to between 0, 1 @@ -81488,7 +81493,7 @@ void main(void) { float lightWeight = 1.0; //allow for a small amount of error around the min3dDepth - if (instanceSizes.z >= ${_defaults.min3dDepth} - 0.0001) { + if (instanceSizes.z >= ${_defaults.min3dDepth.toFixed(4)} - 0.0001) { lightWeight = lighting_getLightWeight( position_worldspace.xyz, // the w component is always 1.0 normals @@ -83785,6 +83790,7 @@ var _exportNames = { controls: true, types: true, util: true, + defaults: true, base: true, use: true, Presenter: true, @@ -83814,7 +83820,7 @@ Object.defineProperty(exports, "ViewGl", { return _viewGl.ViewGl; } }); -exports.util = exports.types = exports.controls = exports.constants = void 0; +exports.defaults = exports.util = exports.types = exports.controls = exports.constants = void 0; var constants = _interopRequireWildcard(require("./constants")); @@ -83832,6 +83838,10 @@ var util = _interopRequireWildcard(require("./exports/util")); exports.util = util; +var defaults = _interopRequireWildcard(require("./defaults")); + +exports.defaults = defaults; + var _base = require("./base"); var _presenter = require("./presenter"); @@ -83852,7 +83862,7 @@ Object.keys(_enums).forEach(function (key) { }); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } } -},{"./constants":"UDh+","./exports/controls":"PMmP","./exports/types":"9Nb4","./exports/util":"s5vi","./base":"wQUU","./presenter":"xl35","./vega-classes/viewGl":"7JtQ","./enums":"dSli"}],"zviN":[function(require,module,exports) { +},{"./constants":"UDh+","./exports/controls":"PMmP","./exports/types":"9Nb4","./exports/util":"s5vi","./defaults":"oGPA","./base":"wQUU","./presenter":"xl35","./vega-classes/viewGl":"7JtQ","./enums":"dSli"}],"zviN":[function(require,module,exports) { "use strict"; Object.defineProperty(exports, "__esModule", { @@ -85433,40 +85443,7 @@ function xy(namespace) { }]; return transforms; } -},{"./transform.qualitative":"XkHf","./transform.quantitative":"0e1V","../../array":"2vEf","../constants":"lE7J","../facet":"G5nM","../top":"Wjzt"}],"lYO7":[function(require,module,exports) { -"use strict"; - -Object.defineProperty(exports, "__esModule", { - value: true -}); -exports.zeroIfCollapsed = zeroIfCollapsed; -exports.collapseY = collapseY; - -var _constants = require("./constants"); - -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT license. -function testForCollapseSelection() { - return `datum.${_constants.FieldNames.Collapsed}`; -} - -function zeroIfCollapsed(numericValueRef) { - const rules = [{ - "test": testForCollapseSelection(), - "value": 0 - }, numericValueRef]; - return rules; -} - -function collapseY(numericValueRef) { - const rules = [{ - "scale": _constants.ScaleNames.Y, - "test": testForCollapseSelection(), - "signal": `${_constants.SignalNames.YDomain}[0]` - }, numericValueRef]; - return rules; -} -},{"./constants":"lE7J"}],"zTeX":[function(require,module,exports) { +},{"./transform.qualitative":"XkHf","./transform.quantitative":"0e1V","../../array":"2vEf","../constants":"lE7J","../facet":"G5nM","../top":"Wjzt"}],"zTeX":[function(require,module,exports) { "use strict"; Object.defineProperty(exports, "__esModule", { @@ -85488,7 +85465,22 @@ function fill(colorColumn, specViewOptions) { "value": _vegaDeck.util.colorToString(specViewOptions.colors.defaultCube) }; } -},{"./constants":"lE7J","../vega-deck.gl":"+sBB"}],"F4o9":[function(require,module,exports) { +},{"./constants":"lE7J","../vega-deck.gl":"+sBB"}],"lYO7":[function(require,module,exports) { +"use strict"; + +Object.defineProperty(exports, "__esModule", { + value: true +}); +exports.testForCollapseSelection = testForCollapseSelection; + +var _constants = require("./constants"); + +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT license. +function testForCollapseSelection() { + return `datum.${_constants.FieldNames.Collapsed}`; +} +},{"./constants":"lE7J"}],"F4o9":[function(require,module,exports) { "use strict"; Object.defineProperty(exports, "__esModule", { @@ -85496,12 +85488,16 @@ Object.defineProperty(exports, "__esModule", { }); exports.default = _default; -var _selection = require("../selection"); +var VegaDeckGl = _interopRequireWildcard(require("../../vega-deck.gl")); var _constants = require("../constants"); var _fill = require("../fill"); +var _selection = require("../selection"); + +function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } } + // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. function _default(namespace, columns, specViewOptions) { @@ -85520,22 +85516,35 @@ function _default(namespace, columns, specViewOptions) { "field": namespace.__column } }, - "width": { + "width": [{ + "test": `bandwidth('xnewinternalscale') < 1`, + "value": VegaDeckGl.defaults.minPixelSize + }, { "scale": "xnewinternalscale", - "band": true - }, - "y": (0, _selection.collapseY)({ + "band": 1 + }], + "y": [{ + "scale": _constants.ScaleNames.Y, + "test": (0, _selection.testForCollapseSelection)(), + "signal": `${_constants.SignalNames.YDomain}[0]` + }, { "scale": _constants.ScaleNames.Y, "field": namespace.__row, - "band": true, + "band": 1, "offset": { "signal": `-bandwidth('${_constants.ScaleNames.Y}')-1` } - }), - "height": (0, _selection.zeroIfCollapsed)({ + }], + "height": [{ + "test": (0, _selection.testForCollapseSelection)(), + "value": 0 + }, { + "test": `bandwidth('${_constants.ScaleNames.Y}') < 1`, + "value": VegaDeckGl.defaults.minPixelSize + }, { "scale": _constants.ScaleNames.Y, - "band": true - }), + "band": 1 + }], "fill": (0, _fill.fill)(columns.color, specViewOptions) } } @@ -85546,15 +85555,18 @@ function _default(namespace, columns, specViewOptions) { update.z = { "value": 0 }; - update.depth = (0, _selection.zeroIfCollapsed)({ + update.depth = [{ + "test": (0, _selection.testForCollapseSelection)(), + "value": 0 + }, { "scale": _constants.ScaleNames.Z, "field": columns.z.name - }); + }]; } return [mark]; } -},{"../selection":"lYO7","../constants":"lE7J","../fill":"zTeX"}],"5xAc":[function(require,module,exports) { +},{"../../vega-deck.gl":"+sBB","../constants":"lE7J","../fill":"zTeX","../selection":"lYO7"}],"5xAc":[function(require,module,exports) { "use strict"; Object.defineProperty(exports, "__esModule", { @@ -85784,7 +85796,7 @@ function _default(namespace, insight, columns) { "signal": "0" }], "padding": 0.1, - "round": true, + "round": false, "reverse": false, "align": 1, "domain": { @@ -86338,10 +86350,13 @@ function _default(columns, specViewOptions) { update.z = { "value": 0 }; - update.depth = (0, _selection.zeroIfCollapsed)({ + update.depth = [{ + "test": (0, _selection.testForCollapseSelection)(), + "value": 0 + }, { "scale": _constants.ScaleNames.Z, "field": columns.z.name - }); + }]; } return [mark]; @@ -86696,10 +86711,13 @@ function _default(data, columns, specViewOptions) { update.z = { "value": 0 }; - update.depth = (0, _selection.zeroIfCollapsed)({ + update.depth = [{ + "test": (0, _selection.testForCollapseSelection)(), + "value": 0 + }, { "scale": _constants2.ScaleNames.Z, "field": columns.z.name - }); + }]; } return marks; @@ -86947,12 +86965,12 @@ Object.defineProperty(exports, "__esModule", { }); exports.default = _default; -var _selection = require("../selection"); - var _constants = require("../constants"); var _fill = require("../fill"); +var _selection = require("../selection"); + // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. function _default(columns, specViewOptions) { @@ -86972,16 +86990,23 @@ function _default(columns, specViewOptions) { "width": { "signal": _constants.SignalNames.PointSize }, - "y": (0, _selection.collapseY)({ + "y": [{ + "scale": _constants.ScaleNames.Y, + "test": (0, _selection.testForCollapseSelection)(), + "signal": `${_constants.SignalNames.YDomain}[0]` + }, { "scale": _constants.ScaleNames.Y, "field": columns.y.name, "offset": { "signal": `-${_constants.SignalNames.PointSize}` } - }), - "height": (0, _selection.zeroIfCollapsed)({ + }], + "height": [{ + "test": (0, _selection.testForCollapseSelection)(), + "value": 0 + }, { "signal": _constants.SignalNames.PointSize - }), + }], "fill": (0, _fill.fill)(columns.color, specViewOptions) } } @@ -86989,10 +87014,13 @@ function _default(columns, specViewOptions) { if (columns.z) { const update = marks[0].encode.update; - update.z = (0, _selection.zeroIfCollapsed)({ + update.z = [{ + "test": (0, _selection.testForCollapseSelection)(), + "value": 0 + }, { "scale": _constants.ScaleNames.Z, "field": columns.z.name - }); + }]; update.depth = { "signal": _constants.SignalNames.PointSize }; @@ -87000,7 +87028,7 @@ function _default(columns, specViewOptions) { return marks; } -},{"../selection":"lYO7","../constants":"lE7J","../fill":"zTeX"}],"hrDZ":[function(require,module,exports) { +},{"../constants":"lE7J","../fill":"zTeX","../selection":"lYO7"}],"hrDZ":[function(require,module,exports) { "use strict"; Object.defineProperty(exports, "__esModule", { @@ -87832,10 +87860,13 @@ function _default(data, columns, specViewOptions) { update.z = { "value": 0 }; - update.depth = (0, _selection.zeroIfCollapsed)({ + update.depth = [{ + "test": (0, _selection.testForCollapseSelection)(), + "value": 0 + }, { "scale": _constants.ScaleNames.Z, "field": columns.z.name - }); + }]; } return marks; @@ -89739,7 +89770,7 @@ class Viewer { deActivate() { return new Promise((resolve, reject) => { - if (this._dataScope.active) { + if (this._dataScope && this._dataScope.active) { this._animator.deactivate().then(() => { this._details.render(); @@ -89805,7 +89836,7 @@ Object.defineProperty(exports, "__esModule", { exports.version = void 0; // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. -const version = "1.4.3"; +const version = "1.5.0"; exports.version = version; },{}],"tCOI":[function(require,module,exports) { "use strict"; @@ -90072,7 +90103,7 @@ Object.defineProperty(exports, "__esModule", { exports.version = void 0; // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. -const version = "1.1.0"; +const version = "1.1.1"; exports.version = version; },{}],"miZu":[function(require,module,exports) { "use strict"; @@ -95836,7 +95867,7 @@ Object.defineProperty(exports, "__esModule", { exports.version = void 0; // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. -const version = "1.5.2"; +const version = "1.5.3"; exports.version = version; },{}],"d6VM":[function(require,module,exports) { "use strict"; diff --git a/docs/dist/sanddance-explorer/v1/sanddance-explorer.css b/docs/dist/sanddance-explorer/v1/sanddance-explorer.css index 152b22d2..93729e85 100644 --- a/docs/dist/sanddance-explorer/v1/sanddance-explorer.css +++ b/docs/dist/sanddance-explorer/v1/sanddance-explorer.css @@ -57,6 +57,9 @@ .sanddance-details-scroll { padding-bottom: 1em; } +.sanddance-tooltip { + z-index: 1; } + .sanddance-tooltip table { background: #333; color: #fff; diff --git a/docs/dist/sanddance-explorer/v1/sanddance-explorer.js b/docs/dist/sanddance-explorer/v1/sanddance-explorer.js index a855abbc..3add69af 100644 --- a/docs/dist/sanddance-explorer/v1/sanddance-explorer.js +++ b/docs/dist/sanddance-explorer/v1/sanddance-explorer.js @@ -6860,7 +6860,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.createStage = createStage; -exports.min3dDepth = exports.defaultView = exports.lineZ = exports.groupStrokeWidth = exports.defaultPresenterConfig = exports.defaultPresenterStyle = exports.minWidth = exports.minHeight = void 0; +exports.minPixelSize = exports.min3dDepth = exports.defaultView = exports.lineZ = exports.groupStrokeWidth = exports.defaultPresenterConfig = exports.defaultPresenterStyle = exports.minWidth = exports.minHeight = void 0; const minHeight = '100px'; exports.minHeight = minHeight; const minWidth = '100px'; @@ -6921,6 +6921,8 @@ const defaultView = "2d"; exports.defaultView = defaultView; const min3dDepth = 0.05; exports.min3dDepth = min3dDepth; +const minPixelSize = 0.5; +exports.minPixelSize = minPixelSize; },{}],"3LG2":[function(require,module,exports) { "use strict"; @@ -6970,10 +6972,13 @@ varying vec4 vColor; void main(void) { + float x = instanceSizes.x > 0.0 ? max(instanceSizes.x, ${_defaults.minPixelSize.toFixed(1)}) : 0.0; + float y = instanceSizes.y > 0.0 ? max(instanceSizes.y, ${_defaults.minPixelSize.toFixed(1)}) : 0.0; + // if alpha == 0.0, do not render element float noRender = float(instanceColors.a == 0.0); - float finalXScale = project_scale(instanceSizes.x) * mix(1.0, 0.0, noRender); - float finalYScale = project_scale(instanceSizes.y) * mix(1.0, 0.0, noRender); + float finalXScale = project_scale(x) * mix(1.0, 0.0, noRender); + float finalYScale = project_scale(y) * mix(1.0, 0.0, noRender); float finalZScale = project_scale(instanceSizes.z) * mix(1.0, 0.0, noRender); // cube geometry vertics are between -1 to 1, scale and transform it to between 0, 1 @@ -6989,7 +6994,7 @@ void main(void) { float lightWeight = 1.0; //allow for a small amount of error around the min3dDepth - if (instanceSizes.z >= ${_defaults.min3dDepth} - 0.0001) { + if (instanceSizes.z >= ${_defaults.min3dDepth.toFixed(4)} - 0.0001) { lightWeight = lighting_getLightWeight( position_worldspace.xyz, // the w component is always 1.0 normals @@ -9286,6 +9291,7 @@ var _exportNames = { controls: true, types: true, util: true, + defaults: true, base: true, use: true, Presenter: true, @@ -9315,7 +9321,7 @@ Object.defineProperty(exports, "ViewGl", { return _viewGl.ViewGl; } }); -exports.util = exports.types = exports.controls = exports.constants = void 0; +exports.defaults = exports.util = exports.types = exports.controls = exports.constants = void 0; var constants = _interopRequireWildcard(require("./constants")); @@ -9333,6 +9339,10 @@ var util = _interopRequireWildcard(require("./exports/util")); exports.util = util; +var defaults = _interopRequireWildcard(require("./defaults")); + +exports.defaults = defaults; + var _base = require("./base"); var _presenter = require("./presenter"); @@ -9353,7 +9363,7 @@ Object.keys(_enums).forEach(function (key) { }); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } } -},{"./constants":"ipKi","./exports/controls":"P7sC","./exports/types":"28lv","./exports/util":"y8T8","./base":"nnlJ","./presenter":"Ft4K","./vega-classes/viewGl":"C81u","./enums":"tDiU"}],"SLia":[function(require,module,exports) { +},{"./constants":"ipKi","./exports/controls":"P7sC","./exports/types":"28lv","./exports/util":"y8T8","./defaults":"JuFU","./base":"nnlJ","./presenter":"Ft4K","./vega-classes/viewGl":"C81u","./enums":"tDiU"}],"SLia":[function(require,module,exports) { "use strict"; Object.defineProperty(exports, "__esModule", { @@ -10934,40 +10944,7 @@ function xy(namespace) { }]; return transforms; } -},{"./transform.qualitative":"jWo5","./transform.quantitative":"sqk8","../../array":"b//p","../constants":"b0rV","../facet":"7Ifg","../top":"83Xo"}],"Dq8R":[function(require,module,exports) { -"use strict"; - -Object.defineProperty(exports, "__esModule", { - value: true -}); -exports.zeroIfCollapsed = zeroIfCollapsed; -exports.collapseY = collapseY; - -var _constants = require("./constants"); - -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT license. -function testForCollapseSelection() { - return `datum.${_constants.FieldNames.Collapsed}`; -} - -function zeroIfCollapsed(numericValueRef) { - const rules = [{ - "test": testForCollapseSelection(), - "value": 0 - }, numericValueRef]; - return rules; -} - -function collapseY(numericValueRef) { - const rules = [{ - "scale": _constants.ScaleNames.Y, - "test": testForCollapseSelection(), - "signal": `${_constants.SignalNames.YDomain}[0]` - }, numericValueRef]; - return rules; -} -},{"./constants":"b0rV"}],"S7Dm":[function(require,module,exports) { +},{"./transform.qualitative":"jWo5","./transform.quantitative":"sqk8","../../array":"b//p","../constants":"b0rV","../facet":"7Ifg","../top":"83Xo"}],"S7Dm":[function(require,module,exports) { "use strict"; Object.defineProperty(exports, "__esModule", { @@ -10989,7 +10966,22 @@ function fill(colorColumn, specViewOptions) { "value": _vegaDeck.util.colorToString(specViewOptions.colors.defaultCube) }; } -},{"./constants":"b0rV","../vega-deck.gl":"Uns8"}],"3Y6I":[function(require,module,exports) { +},{"./constants":"b0rV","../vega-deck.gl":"Uns8"}],"Dq8R":[function(require,module,exports) { +"use strict"; + +Object.defineProperty(exports, "__esModule", { + value: true +}); +exports.testForCollapseSelection = testForCollapseSelection; + +var _constants = require("./constants"); + +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT license. +function testForCollapseSelection() { + return `datum.${_constants.FieldNames.Collapsed}`; +} +},{"./constants":"b0rV"}],"3Y6I":[function(require,module,exports) { "use strict"; Object.defineProperty(exports, "__esModule", { @@ -10997,12 +10989,16 @@ Object.defineProperty(exports, "__esModule", { }); exports.default = _default; -var _selection = require("../selection"); +var VegaDeckGl = _interopRequireWildcard(require("../../vega-deck.gl")); var _constants = require("../constants"); var _fill = require("../fill"); +var _selection = require("../selection"); + +function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } } + // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. function _default(namespace, columns, specViewOptions) { @@ -11021,22 +11017,35 @@ function _default(namespace, columns, specViewOptions) { "field": namespace.__column } }, - "width": { + "width": [{ + "test": `bandwidth('xnewinternalscale') < 1`, + "value": VegaDeckGl.defaults.minPixelSize + }, { "scale": "xnewinternalscale", - "band": true - }, - "y": (0, _selection.collapseY)({ + "band": 1 + }], + "y": [{ + "scale": _constants.ScaleNames.Y, + "test": (0, _selection.testForCollapseSelection)(), + "signal": `${_constants.SignalNames.YDomain}[0]` + }, { "scale": _constants.ScaleNames.Y, "field": namespace.__row, - "band": true, + "band": 1, "offset": { "signal": `-bandwidth('${_constants.ScaleNames.Y}')-1` } - }), - "height": (0, _selection.zeroIfCollapsed)({ + }], + "height": [{ + "test": (0, _selection.testForCollapseSelection)(), + "value": 0 + }, { + "test": `bandwidth('${_constants.ScaleNames.Y}') < 1`, + "value": VegaDeckGl.defaults.minPixelSize + }, { "scale": _constants.ScaleNames.Y, - "band": true - }), + "band": 1 + }], "fill": (0, _fill.fill)(columns.color, specViewOptions) } } @@ -11047,15 +11056,18 @@ function _default(namespace, columns, specViewOptions) { update.z = { "value": 0 }; - update.depth = (0, _selection.zeroIfCollapsed)({ + update.depth = [{ + "test": (0, _selection.testForCollapseSelection)(), + "value": 0 + }, { "scale": _constants.ScaleNames.Z, "field": columns.z.name - }); + }]; } return [mark]; } -},{"../selection":"Dq8R","../constants":"b0rV","../fill":"S7Dm"}],"X355":[function(require,module,exports) { +},{"../../vega-deck.gl":"Uns8","../constants":"b0rV","../fill":"S7Dm","../selection":"Dq8R"}],"X355":[function(require,module,exports) { "use strict"; Object.defineProperty(exports, "__esModule", { @@ -11285,7 +11297,7 @@ function _default(namespace, insight, columns) { "signal": "0" }], "padding": 0.1, - "round": true, + "round": false, "reverse": false, "align": 1, "domain": { @@ -11839,10 +11851,13 @@ function _default(columns, specViewOptions) { update.z = { "value": 0 }; - update.depth = (0, _selection.zeroIfCollapsed)({ + update.depth = [{ + "test": (0, _selection.testForCollapseSelection)(), + "value": 0 + }, { "scale": _constants.ScaleNames.Z, "field": columns.z.name - }); + }]; } return [mark]; @@ -12197,10 +12212,13 @@ function _default(data, columns, specViewOptions) { update.z = { "value": 0 }; - update.depth = (0, _selection.zeroIfCollapsed)({ + update.depth = [{ + "test": (0, _selection.testForCollapseSelection)(), + "value": 0 + }, { "scale": _constants2.ScaleNames.Z, "field": columns.z.name - }); + }]; } return marks; @@ -12448,12 +12466,12 @@ Object.defineProperty(exports, "__esModule", { }); exports.default = _default; -var _selection = require("../selection"); - var _constants = require("../constants"); var _fill = require("../fill"); +var _selection = require("../selection"); + // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. function _default(columns, specViewOptions) { @@ -12473,16 +12491,23 @@ function _default(columns, specViewOptions) { "width": { "signal": _constants.SignalNames.PointSize }, - "y": (0, _selection.collapseY)({ + "y": [{ + "scale": _constants.ScaleNames.Y, + "test": (0, _selection.testForCollapseSelection)(), + "signal": `${_constants.SignalNames.YDomain}[0]` + }, { "scale": _constants.ScaleNames.Y, "field": columns.y.name, "offset": { "signal": `-${_constants.SignalNames.PointSize}` } - }), - "height": (0, _selection.zeroIfCollapsed)({ + }], + "height": [{ + "test": (0, _selection.testForCollapseSelection)(), + "value": 0 + }, { "signal": _constants.SignalNames.PointSize - }), + }], "fill": (0, _fill.fill)(columns.color, specViewOptions) } } @@ -12490,10 +12515,13 @@ function _default(columns, specViewOptions) { if (columns.z) { const update = marks[0].encode.update; - update.z = (0, _selection.zeroIfCollapsed)({ + update.z = [{ + "test": (0, _selection.testForCollapseSelection)(), + "value": 0 + }, { "scale": _constants.ScaleNames.Z, "field": columns.z.name - }); + }]; update.depth = { "signal": _constants.SignalNames.PointSize }; @@ -12501,7 +12529,7 @@ function _default(columns, specViewOptions) { return marks; } -},{"../selection":"Dq8R","../constants":"b0rV","../fill":"S7Dm"}],"vZre":[function(require,module,exports) { +},{"../constants":"b0rV","../fill":"S7Dm","../selection":"Dq8R"}],"vZre":[function(require,module,exports) { "use strict"; Object.defineProperty(exports, "__esModule", { @@ -13333,10 +13361,13 @@ function _default(data, columns, specViewOptions) { update.z = { "value": 0 }; - update.depth = (0, _selection.zeroIfCollapsed)({ + update.depth = [{ + "test": (0, _selection.testForCollapseSelection)(), + "value": 0 + }, { "scale": _constants.ScaleNames.Z, "field": columns.z.name - }); + }]; } return marks; @@ -15240,7 +15271,7 @@ class Viewer { deActivate() { return new Promise((resolve, reject) => { - if (this._dataScope.active) { + if (this._dataScope && this._dataScope.active) { this._animator.deactivate().then(() => { this._details.render(); @@ -15306,7 +15337,7 @@ Object.defineProperty(exports, "__esModule", { exports.version = void 0; // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. -const version = "1.4.3"; +const version = "1.5.0"; exports.version = version; },{}],"rZaE":[function(require,module,exports) { "use strict"; @@ -16445,7 +16476,7 @@ Object.defineProperty(exports, "__esModule", { exports.version = void 0; // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. -const version = "1.1.0"; +const version = "1.1.1"; exports.version = version; },{}],"MjKu":[function(require,module,exports) { "use strict"; @@ -23230,7 +23261,7 @@ Object.defineProperty(exports, "__esModule", { exports.version = void 0; // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. -var version = "1.5.2"; +var version = "1.5.3"; exports.version = version; },{}],"zKGJ":[function(require,module,exports) { "use strict"; diff --git a/docs/dist/sanddance/v1/sanddance.css b/docs/dist/sanddance/v1/sanddance.css index 52587a26..aa4a7fba 100644 --- a/docs/dist/sanddance/v1/sanddance.css +++ b/docs/dist/sanddance/v1/sanddance.css @@ -54,18 +54,19 @@ .sanddance-details-scroll { padding-bottom: 1em; } -.sanddance-tooltip table { - background: #333; - color: #fff; - font-size: smaller; - margin: 1em; - min-width: 16em; - padding: 6px; - position: absolute; } - -.sanddance-tooltip td { - text-align: left; - vertical-align: top; - width: 75%; } - .sanddance-tooltip td:first-child { - width: 25%; } +.sanddance-tooltip { + z-index: 1; } + .sanddance-tooltip table { + background: #333; + color: #fff; + font-size: smaller; + margin: 1em; + min-width: 16em; + padding: 6px; + position: absolute; } + .sanddance-tooltip td { + text-align: left; + vertical-align: top; + width: 75%; } + .sanddance-tooltip td:first-child { + width: 25%; } diff --git a/docs/dist/sanddance/v1/sanddance.js b/docs/dist/sanddance/v1/sanddance.js index 4c63c86b..6e61d885 100644 --- a/docs/dist/sanddance/v1/sanddance.js +++ b/docs/dist/sanddance/v1/sanddance.js @@ -6174,6 +6174,20 @@ void main(void) { const lineZ = -1; const defaultView = "2d"; const min3dDepth = 0.05; + const minPixelSize = 0.5; + + var defaults = /*#__PURE__*/Object.freeze({ + minHeight: minHeight, + minWidth: minWidth, + defaultPresenterStyle: defaultPresenterStyle, + defaultPresenterConfig: defaultPresenterConfig, + createStage: createStage, + groupStrokeWidth: groupStrokeWidth, + lineZ: lineZ, + defaultView: defaultView, + min3dDepth: min3dDepth, + minPixelSize: minPixelSize + }); // Copyright (c) 2015 - 2017 Uber Technologies, Inc. var vs$1 = `\ @@ -6196,10 +6210,13 @@ varying vec4 vColor; void main(void) { + float x = instanceSizes.x > 0.0 ? max(instanceSizes.x, ${minPixelSize.toFixed(1)}) : 0.0; + float y = instanceSizes.y > 0.0 ? max(instanceSizes.y, ${minPixelSize.toFixed(1)}) : 0.0; + // if alpha == 0.0, do not render element float noRender = float(instanceColors.a == 0.0); - float finalXScale = project_scale(instanceSizes.x) * mix(1.0, 0.0, noRender); - float finalYScale = project_scale(instanceSizes.y) * mix(1.0, 0.0, noRender); + float finalXScale = project_scale(x) * mix(1.0, 0.0, noRender); + float finalYScale = project_scale(y) * mix(1.0, 0.0, noRender); float finalZScale = project_scale(instanceSizes.z) * mix(1.0, 0.0, noRender); // cube geometry vertics are between -1 to 1, scale and transform it to between 0, 1 @@ -6215,7 +6232,7 @@ void main(void) { float lightWeight = 1.0; //allow for a small amount of error around the min3dDepth - if (instanceSizes.z >= ${min3dDepth} - 0.0001) { + if (instanceSizes.z >= ${min3dDepth.toFixed(4)} - 0.0001) { lightWeight = lighting_getLightWeight( position_worldspace.xyz, // the w component is always 1.0 normals @@ -7335,6 +7352,7 @@ void main(void) { var index$2 = /*#__PURE__*/Object.freeze({ constants: constants$1, controls: controls, + defaults: defaults, types: types$1, util: util, base: base, @@ -8578,32 +8596,6 @@ void main(void) { return transforms; } - // Copyright (c) Microsoft Corporation. All rights reserved. - function testForCollapseSelection() { - return `datum.${FieldNames.Collapsed}`; - } - function zeroIfCollapsed(numericValueRef) { - const rules = [ - { - "test": testForCollapseSelection(), - "value": 0 - }, - numericValueRef - ]; - return rules; - } - function collapseY(numericValueRef) { - const rules = [ - { - "scale": ScaleNames.Y, - "test": testForCollapseSelection(), - "signal": `${SignalNames.YDomain}[0]` - }, - numericValueRef - ]; - return rules; - } - // Copyright (c) Microsoft Corporation. All rights reserved. function fill(colorColumn, specViewOptions) { return colorColumn ? @@ -8617,6 +8609,11 @@ void main(void) { }; } + // Copyright (c) Microsoft Corporation. All rights reserved. + function testForCollapseSelection() { + return `datum.${FieldNames.Collapsed}`; + } + // Copyright (c) Microsoft Corporation. All rights reserved. function getMarks (namespace, columns, specViewOptions) { const mark = { @@ -8634,22 +8631,45 @@ void main(void) { "field": namespace.__column } }, - "width": { - "scale": "xnewinternalscale", - "band": true - }, - "y": collapseY({ - "scale": ScaleNames.Y, - "field": namespace.__row, - "band": true, - "offset": { - "signal": `-bandwidth('${ScaleNames.Y}')-1` + "width": [ + { + "test": `bandwidth('xnewinternalscale') < 1`, + "value": minPixelSize + }, + { + "scale": "xnewinternalscale", + "band": 1 } - }), - "height": zeroIfCollapsed({ - "scale": ScaleNames.Y, - "band": true - }), + ], + "y": [ + { + "scale": ScaleNames.Y, + "test": testForCollapseSelection(), + "signal": `${SignalNames.YDomain}[0]` + }, + { + "scale": ScaleNames.Y, + "field": namespace.__row, + "band": 1, + "offset": { + "signal": `-bandwidth('${ScaleNames.Y}')-1` + } + } + ], + "height": [ + { + "test": testForCollapseSelection(), + "value": 0 + }, + { + "test": `bandwidth('${ScaleNames.Y}') < 1`, + "value": minPixelSize + }, + { + "scale": ScaleNames.Y, + "band": 1 + } + ], "fill": fill(columns.color, specViewOptions) } } @@ -8659,10 +8679,16 @@ void main(void) { update.z = { "value": 0 }; - update.depth = zeroIfCollapsed({ - "scale": ScaleNames.Z, - "field": columns.z.name - }); + update.depth = [ + { + "test": testForCollapseSelection(), + "value": 0 + }, + { + "scale": ScaleNames.Z, + "field": columns.z.name + } + ]; } return [mark]; } @@ -8859,7 +8885,7 @@ void main(void) { } ], "padding": 0.1, - "round": true, + "round": false, "reverse": false, "align": 1, "domain": { @@ -9345,10 +9371,16 @@ void main(void) { update.z = { "value": 0 }; - update.depth = zeroIfCollapsed({ - "scale": ScaleNames.Z, - "field": columns.z.name - }); + update.depth = [ + { + "test": testForCollapseSelection(), + "value": 0 + }, + { + "scale": ScaleNames.Z, + "field": columns.z.name + } + ]; } return [mark]; } @@ -9639,10 +9671,16 @@ void main(void) { update.z = { "value": 0 }; - update.depth = zeroIfCollapsed({ - "scale": ScaleNames.Z, - "field": columns.z.name - }); + update.depth = [ + { + "test": testForCollapseSelection(), + "value": 0 + }, + { + "scale": ScaleNames.Z, + "field": columns.z.name + } + ]; } return marks; } @@ -9819,14 +9857,29 @@ void main(void) { "offset": 1 }, "width": { "signal": SignalNames.PointSize }, - "y": collapseY({ - "scale": ScaleNames.Y, - "field": columns.y.name, - "offset": { - "signal": `-${SignalNames.PointSize}` + "y": [ + { + "scale": ScaleNames.Y, + "test": testForCollapseSelection(), + "signal": `${SignalNames.YDomain}[0]` + }, + { + "scale": ScaleNames.Y, + "field": columns.y.name, + "offset": { + "signal": `-${SignalNames.PointSize}` + } } - }), - "height": zeroIfCollapsed({ "signal": SignalNames.PointSize }), + ], + "height": [ + { + "test": testForCollapseSelection(), + "value": 0 + }, + { + "signal": SignalNames.PointSize + } + ], "fill": fill(columns.color, specViewOptions) } } @@ -9834,10 +9887,16 @@ void main(void) { ]; if (columns.z) { const update = marks[0].encode.update; - update.z = zeroIfCollapsed({ - "scale": ScaleNames.Z, - "field": columns.z.name - }); + update.z = [ + { + "test": testForCollapseSelection(), + "value": 0 + }, + { + "scale": ScaleNames.Z, + "field": columns.z.name + } + ]; update.depth = { "signal": SignalNames.PointSize }; } return marks; @@ -10557,10 +10616,16 @@ void main(void) { update.z = { "value": 0 }; - update.depth = zeroIfCollapsed({ - "scale": ScaleNames.Z, - "field": columns.z.name - }); + update.depth = [ + { + "test": testForCollapseSelection(), + "value": 0 + }, + { + "scale": ScaleNames.Z, + "field": columns.z.name + } + ]; } return marks; } @@ -11942,7 +12007,7 @@ void main(void) { */ deActivate() { return new Promise((resolve, reject) => { - if (this._dataScope.active) { + if (this._dataScope && this._dataScope.active) { this._animator.deactivate().then(() => { this._details.render(); resolve(); @@ -11999,7 +12064,7 @@ void main(void) { // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. - const version = "1.4.3"; + const version = "1.5.0"; // Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/docs/docs/sanddance/v1/api/index.md b/docs/docs/sanddance/v1/api/index.md index fbe2e538..a01efdb9 100644 --- a/docs/docs/sanddance/v1/api/index.md +++ b/docs/docs/sanddance/v1/api/index.md @@ -99,4 +99,4 @@ string [NamespaceImport-4]: vegadeckgl#vegadeckgl [VariableDeclaration-0]: index#colorschemes [InterfaceDeclaration-0]: types#colorscheme -[VariableDeclaration-10]: index#version \ No newline at end of file +[VariableDeclaration-19]: index#version \ No newline at end of file diff --git a/docs/docs/sanddance/v1/api/vegadeckgl.defaults.md b/docs/docs/sanddance/v1/api/vegadeckgl.defaults.md new file mode 100644 index 00000000..36c32959 --- /dev/null +++ b/docs/docs/sanddance/v1/api/vegadeckgl.defaults.md @@ -0,0 +1,148 @@ +--- +layout: api +--- + +# sanddance .VegaDeckGl.defaults + +## Functions + +### createStage + +```typescript +function createStage(view: View): Stage; +``` + +**Parameters** + +| Name | Type | +| ---- | ------------------------------ | +| view | [View][TypeAliasDeclaration-7] | + +**Return type** + +[Stage][InterfaceDeclaration-29] + +## Variables + +### minHeight + +```typescript +const minHeight: "100px"; +``` + +**Type** + +"100px" + +---------- + +### minWidth + +```typescript +const minWidth: "100px"; +``` + +**Type** + +"100px" + +---------- + +### defaultPresenterStyle + +```typescript +const defaultPresenterStyle: PresenterStyle; +``` + +**Type** + +[PresenterStyle][InterfaceDeclaration-48] + +---------- + +### defaultPresenterConfig + +```typescript +const defaultPresenterConfig: PresenterConfig; +``` + +**Type** + +[PresenterConfig][InterfaceDeclaration-53] + +---------- + +### groupStrokeWidth + +```typescript +const groupStrokeWidth: 1; +``` + +**Type** + +1 + +---------- + +### lineZ + +```typescript +const lineZ: -1; +``` + +**Type** + +-1 + +---------- + +### defaultView + +```typescript +const defaultView: View; +``` + +**Type** + +[View][TypeAliasDeclaration-7] + +---------- + +### min3dDepth + +```typescript +const min3dDepth: 0.05; +``` + +**Type** + +0.05 + +---------- + +### minPixelSize + +```typescript +const minPixelSize: 0.5; +``` + +**Type** + +0.5 + +[NamespaceImport-7]: vegadeckgl.defaults#defaults +[FunctionDeclaration-11]: vegadeckgl.defaults#createstage +[TypeAliasDeclaration-7]: vegadeckgl.types#view +[InterfaceDeclaration-29]: vegadeckgl.types#stage +[VariableDeclaration-10]: vegadeckgl.defaults#minheight +[VariableDeclaration-11]: vegadeckgl.defaults#minwidth +[VariableDeclaration-12]: vegadeckgl.defaults#defaultpresenterstyle +[InterfaceDeclaration-48]: vegadeckgl.types#presenterstyle +[VariableDeclaration-13]: vegadeckgl.defaults#defaultpresenterconfig +[InterfaceDeclaration-53]: vegadeckgl.types#presenterconfig +[VariableDeclaration-14]: vegadeckgl.defaults#groupstrokewidth +[VariableDeclaration-15]: vegadeckgl.defaults#linez +[VariableDeclaration-16]: vegadeckgl.defaults#defaultview +[TypeAliasDeclaration-7]: vegadeckgl.types#view +[VariableDeclaration-17]: vegadeckgl.defaults#min3ddepth +[VariableDeclaration-18]: vegadeckgl.defaults#minpixelsize \ No newline at end of file diff --git a/docs/docs/sanddance/v1/api/vegadeckgl.md b/docs/docs/sanddance/v1/api/vegadeckgl.md index 5629c799..94b5e7a3 100644 --- a/docs/docs/sanddance/v1/api/vegadeckgl.md +++ b/docs/docs/sanddance/v1/api/vegadeckgl.md @@ -73,12 +73,17 @@ Class which presents a Stage of chart data using Deck.gl to render. ---------- -### [types][NamespaceImport-2] +### [defaults][NamespaceImport-2] ---------- -### [util][NamespaceImport-3] +### [types][NamespaceImport-3] + + +---------- + +### [util][NamespaceImport-4] ## Variables @@ -120,8 +125,9 @@ typeof ViewGl_Class [ClassDeclaration-0]: vegadeckgl.presenter#presenter [NamespaceImport-0]: vegadeckgl.constants#constants [NamespaceImport-1]: vegadeckgl.controls#controls -[NamespaceImport-2]: vegadeckgl.types#types -[NamespaceImport-3]: vegadeckgl.util#util +[NamespaceImport-2]: vegadeckgl.defaults#defaults +[NamespaceImport-3]: vegadeckgl.types#types +[NamespaceImport-4]: vegadeckgl.util#util [VariableDeclaration-0]: vegadeckgl#base [InterfaceDeclaration-0]: vegadeckgl.types#base [VariableDeclaration-1]: vegadeckgl#viewgl \ No newline at end of file diff --git a/docs/docs/sanddance/v1/api/vegadeckgl.types.md b/docs/docs/sanddance/v1/api/vegadeckgl.types.md index 3703d8ea..2dc5a608 100644 --- a/docs/docs/sanddance/v1/api/vegadeckgl.types.md +++ b/docs/docs/sanddance/v1/api/vegadeckgl.types.md @@ -591,7 +591,7 @@ type View = "2d" | "3d"; "2d" | "3d" -[NamespaceImport-7]: vegadeckgl.types#types +[NamespaceImport-8]: vegadeckgl.types#types [InterfaceDeclaration-34]: vegadeckgl.types#axis [InterfaceDeclaration-35]: vegadeckgl.types#styledline [InterfaceDeclaration-35]: vegadeckgl.types#styledline diff --git a/docs/docs/sanddance/v1/api/vegadeckgl.util.md b/docs/docs/sanddance/v1/api/vegadeckgl.util.md index 9e745cde..0df0de3c 100644 --- a/docs/docs/sanddance/v1/api/vegadeckgl.util.md +++ b/docs/docs/sanddance/v1/api/vegadeckgl.util.md @@ -211,15 +211,15 @@ function outerSize(el: HTMLElement): { }; { } -[NamespaceImport-8]: vegadeckgl.util#util -[FunctionDeclaration-11]: vegadeckgl.util#adddiv -[FunctionDeclaration-12]: vegadeckgl.util#addel -[FunctionDeclaration-13]: vegadeckgl.util#clone -[FunctionDeclaration-14]: vegadeckgl.util#colorfromstring -[FunctionDeclaration-15]: vegadeckgl.util#colorisequal -[FunctionDeclaration-16]: vegadeckgl.util#colortostring -[FunctionDeclaration-17]: vegadeckgl.util#deepmerge -[FunctionDeclaration-18]: vegadeckgl.util#getcubelayer -[FunctionDeclaration-19]: vegadeckgl.util#getcubes +[NamespaceImport-9]: vegadeckgl.util#util +[FunctionDeclaration-12]: vegadeckgl.util#adddiv +[FunctionDeclaration-13]: vegadeckgl.util#addel +[FunctionDeclaration-14]: vegadeckgl.util#clone +[FunctionDeclaration-15]: vegadeckgl.util#colorfromstring +[FunctionDeclaration-16]: vegadeckgl.util#colorisequal +[FunctionDeclaration-17]: vegadeckgl.util#colortostring +[FunctionDeclaration-18]: vegadeckgl.util#deepmerge +[FunctionDeclaration-19]: vegadeckgl.util#getcubelayer +[FunctionDeclaration-20]: vegadeckgl.util#getcubes [InterfaceDeclaration-30]: vegadeckgl.types#cube -[FunctionDeclaration-20]: vegadeckgl.util#outersize \ No newline at end of file +[FunctionDeclaration-21]: vegadeckgl.util#outersize \ No newline at end of file diff --git a/docs/tests/es6/js/sanddance.js b/docs/tests/es6/js/sanddance.js index 42c21532..7b3935cc 100644 --- a/docs/tests/es6/js/sanddance.js +++ b/docs/tests/es6/js/sanddance.js @@ -141644,7 +141644,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.createStage = createStage; -exports.min3dDepth = exports.defaultView = exports.lineZ = exports.groupStrokeWidth = exports.defaultPresenterConfig = exports.defaultPresenterStyle = exports.minWidth = exports.minHeight = void 0; +exports.minPixelSize = exports.min3dDepth = exports.defaultView = exports.lineZ = exports.groupStrokeWidth = exports.defaultPresenterConfig = exports.defaultPresenterStyle = exports.minWidth = exports.minHeight = void 0; const minHeight = '100px'; exports.minHeight = minHeight; const minWidth = '100px'; @@ -141705,6 +141705,8 @@ const defaultView = "2d"; exports.defaultView = defaultView; const min3dDepth = 0.05; exports.min3dDepth = min3dDepth; +const minPixelSize = 0.5; +exports.minPixelSize = minPixelSize; },{}],"bvPc":[function(require,module,exports) { "use strict"; @@ -141754,10 +141756,13 @@ varying vec4 vColor; void main(void) { + float x = instanceSizes.x > 0.0 ? max(instanceSizes.x, ${_defaults.minPixelSize.toFixed(1)}) : 0.0; + float y = instanceSizes.y > 0.0 ? max(instanceSizes.y, ${_defaults.minPixelSize.toFixed(1)}) : 0.0; + // if alpha == 0.0, do not render element float noRender = float(instanceColors.a == 0.0); - float finalXScale = project_scale(instanceSizes.x) * mix(1.0, 0.0, noRender); - float finalYScale = project_scale(instanceSizes.y) * mix(1.0, 0.0, noRender); + float finalXScale = project_scale(x) * mix(1.0, 0.0, noRender); + float finalYScale = project_scale(y) * mix(1.0, 0.0, noRender); float finalZScale = project_scale(instanceSizes.z) * mix(1.0, 0.0, noRender); // cube geometry vertics are between -1 to 1, scale and transform it to between 0, 1 @@ -141773,7 +141778,7 @@ void main(void) { float lightWeight = 1.0; //allow for a small amount of error around the min3dDepth - if (instanceSizes.z >= ${_defaults.min3dDepth} - 0.0001) { + if (instanceSizes.z >= ${_defaults.min3dDepth.toFixed(4)} - 0.0001) { lightWeight = lighting_getLightWeight( position_worldspace.xyz, // the w component is always 1.0 normals @@ -144070,6 +144075,7 @@ var _exportNames = { controls: true, types: true, util: true, + defaults: true, base: true, use: true, Presenter: true, @@ -144099,7 +144105,7 @@ Object.defineProperty(exports, "ViewGl", { return _viewGl.ViewGl; } }); -exports.util = exports.types = exports.controls = exports.constants = void 0; +exports.defaults = exports.util = exports.types = exports.controls = exports.constants = void 0; var constants = _interopRequireWildcard(require("./constants")); @@ -144117,6 +144123,10 @@ var util = _interopRequireWildcard(require("./exports/util")); exports.util = util; +var defaults = _interopRequireWildcard(require("./defaults")); + +exports.defaults = defaults; + var _base = require("./base"); var _presenter = require("./presenter"); @@ -144137,7 +144147,7 @@ Object.keys(_enums).forEach(function (key) { }); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } } -},{"./constants":"185m","./exports/controls":"3nV4","./exports/types":"6LYd","./exports/util":"eSjG","./base":"n7GK","./presenter":"3nCH","./vega-classes/viewGl":"9Dl4","./enums":"lsU9"}],"rb48":[function(require,module,exports) { +},{"./constants":"185m","./exports/controls":"3nV4","./exports/types":"6LYd","./exports/util":"eSjG","./defaults":"Y9iw","./base":"n7GK","./presenter":"3nCH","./vega-classes/viewGl":"9Dl4","./enums":"lsU9"}],"rb48":[function(require,module,exports) { "use strict"; Object.defineProperty(exports, "__esModule", { @@ -145718,40 +145728,7 @@ function xy(namespace) { }]; return transforms; } -},{"./transform.qualitative":"ZcnC","./transform.quantitative":"yfr7","../../array":"FvDz","../constants":"4RaL","../facet":"kjBE","../top":"1z3H"}],"rIKp":[function(require,module,exports) { -"use strict"; - -Object.defineProperty(exports, "__esModule", { - value: true -}); -exports.zeroIfCollapsed = zeroIfCollapsed; -exports.collapseY = collapseY; - -var _constants = require("./constants"); - -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT license. -function testForCollapseSelection() { - return `datum.${_constants.FieldNames.Collapsed}`; -} - -function zeroIfCollapsed(numericValueRef) { - const rules = [{ - "test": testForCollapseSelection(), - "value": 0 - }, numericValueRef]; - return rules; -} - -function collapseY(numericValueRef) { - const rules = [{ - "scale": _constants.ScaleNames.Y, - "test": testForCollapseSelection(), - "signal": `${_constants.SignalNames.YDomain}[0]` - }, numericValueRef]; - return rules; -} -},{"./constants":"4RaL"}],"2shd":[function(require,module,exports) { +},{"./transform.qualitative":"ZcnC","./transform.quantitative":"yfr7","../../array":"FvDz","../constants":"4RaL","../facet":"kjBE","../top":"1z3H"}],"2shd":[function(require,module,exports) { "use strict"; Object.defineProperty(exports, "__esModule", { @@ -145773,7 +145750,22 @@ function fill(colorColumn, specViewOptions) { "value": _vegaDeck.util.colorToString(specViewOptions.colors.defaultCube) }; } -},{"./constants":"4RaL","../vega-deck.gl":"FsRX"}],"3zgQ":[function(require,module,exports) { +},{"./constants":"4RaL","../vega-deck.gl":"FsRX"}],"rIKp":[function(require,module,exports) { +"use strict"; + +Object.defineProperty(exports, "__esModule", { + value: true +}); +exports.testForCollapseSelection = testForCollapseSelection; + +var _constants = require("./constants"); + +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT license. +function testForCollapseSelection() { + return `datum.${_constants.FieldNames.Collapsed}`; +} +},{"./constants":"4RaL"}],"3zgQ":[function(require,module,exports) { "use strict"; Object.defineProperty(exports, "__esModule", { @@ -145781,12 +145773,16 @@ Object.defineProperty(exports, "__esModule", { }); exports.default = _default; -var _selection = require("../selection"); +var VegaDeckGl = _interopRequireWildcard(require("../../vega-deck.gl")); var _constants = require("../constants"); var _fill = require("../fill"); +var _selection = require("../selection"); + +function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } } + // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. function _default(namespace, columns, specViewOptions) { @@ -145805,22 +145801,35 @@ function _default(namespace, columns, specViewOptions) { "field": namespace.__column } }, - "width": { + "width": [{ + "test": `bandwidth('xnewinternalscale') < 1`, + "value": VegaDeckGl.defaults.minPixelSize + }, { "scale": "xnewinternalscale", - "band": true - }, - "y": (0, _selection.collapseY)({ + "band": 1 + }], + "y": [{ + "scale": _constants.ScaleNames.Y, + "test": (0, _selection.testForCollapseSelection)(), + "signal": `${_constants.SignalNames.YDomain}[0]` + }, { "scale": _constants.ScaleNames.Y, "field": namespace.__row, - "band": true, + "band": 1, "offset": { "signal": `-bandwidth('${_constants.ScaleNames.Y}')-1` } - }), - "height": (0, _selection.zeroIfCollapsed)({ + }], + "height": [{ + "test": (0, _selection.testForCollapseSelection)(), + "value": 0 + }, { + "test": `bandwidth('${_constants.ScaleNames.Y}') < 1`, + "value": VegaDeckGl.defaults.minPixelSize + }, { "scale": _constants.ScaleNames.Y, - "band": true - }), + "band": 1 + }], "fill": (0, _fill.fill)(columns.color, specViewOptions) } } @@ -145831,15 +145840,18 @@ function _default(namespace, columns, specViewOptions) { update.z = { "value": 0 }; - update.depth = (0, _selection.zeroIfCollapsed)({ + update.depth = [{ + "test": (0, _selection.testForCollapseSelection)(), + "value": 0 + }, { "scale": _constants.ScaleNames.Z, "field": columns.z.name - }); + }]; } return [mark]; } -},{"../selection":"rIKp","../constants":"4RaL","../fill":"2shd"}],"8P4D":[function(require,module,exports) { +},{"../../vega-deck.gl":"FsRX","../constants":"4RaL","../fill":"2shd","../selection":"rIKp"}],"8P4D":[function(require,module,exports) { "use strict"; Object.defineProperty(exports, "__esModule", { @@ -146069,7 +146081,7 @@ function _default(namespace, insight, columns) { "signal": "0" }], "padding": 0.1, - "round": true, + "round": false, "reverse": false, "align": 1, "domain": { @@ -146623,10 +146635,13 @@ function _default(columns, specViewOptions) { update.z = { "value": 0 }; - update.depth = (0, _selection.zeroIfCollapsed)({ + update.depth = [{ + "test": (0, _selection.testForCollapseSelection)(), + "value": 0 + }, { "scale": _constants.ScaleNames.Z, "field": columns.z.name - }); + }]; } return [mark]; @@ -146981,10 +146996,13 @@ function _default(data, columns, specViewOptions) { update.z = { "value": 0 }; - update.depth = (0, _selection.zeroIfCollapsed)({ + update.depth = [{ + "test": (0, _selection.testForCollapseSelection)(), + "value": 0 + }, { "scale": _constants2.ScaleNames.Z, "field": columns.z.name - }); + }]; } return marks; @@ -147232,12 +147250,12 @@ Object.defineProperty(exports, "__esModule", { }); exports.default = _default; -var _selection = require("../selection"); - var _constants = require("../constants"); var _fill = require("../fill"); +var _selection = require("../selection"); + // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. function _default(columns, specViewOptions) { @@ -147257,16 +147275,23 @@ function _default(columns, specViewOptions) { "width": { "signal": _constants.SignalNames.PointSize }, - "y": (0, _selection.collapseY)({ + "y": [{ + "scale": _constants.ScaleNames.Y, + "test": (0, _selection.testForCollapseSelection)(), + "signal": `${_constants.SignalNames.YDomain}[0]` + }, { "scale": _constants.ScaleNames.Y, "field": columns.y.name, "offset": { "signal": `-${_constants.SignalNames.PointSize}` } - }), - "height": (0, _selection.zeroIfCollapsed)({ + }], + "height": [{ + "test": (0, _selection.testForCollapseSelection)(), + "value": 0 + }, { "signal": _constants.SignalNames.PointSize - }), + }], "fill": (0, _fill.fill)(columns.color, specViewOptions) } } @@ -147274,10 +147299,13 @@ function _default(columns, specViewOptions) { if (columns.z) { const update = marks[0].encode.update; - update.z = (0, _selection.zeroIfCollapsed)({ + update.z = [{ + "test": (0, _selection.testForCollapseSelection)(), + "value": 0 + }, { "scale": _constants.ScaleNames.Z, "field": columns.z.name - }); + }]; update.depth = { "signal": _constants.SignalNames.PointSize }; @@ -147285,7 +147313,7 @@ function _default(columns, specViewOptions) { return marks; } -},{"../selection":"rIKp","../constants":"4RaL","../fill":"2shd"}],"fLst":[function(require,module,exports) { +},{"../constants":"4RaL","../fill":"2shd","../selection":"rIKp"}],"fLst":[function(require,module,exports) { "use strict"; Object.defineProperty(exports, "__esModule", { @@ -148117,10 +148145,13 @@ function _default(data, columns, specViewOptions) { update.z = { "value": 0 }; - update.depth = (0, _selection.zeroIfCollapsed)({ + update.depth = [{ + "test": (0, _selection.testForCollapseSelection)(), + "value": 0 + }, { "scale": _constants.ScaleNames.Z, "field": columns.z.name - }); + }]; } return marks; @@ -150024,7 +150055,7 @@ class Viewer { deActivate() { return new Promise((resolve, reject) => { - if (this._dataScope.active) { + if (this._dataScope && this._dataScope.active) { this._animator.deactivate().then(() => { this._details.render(); @@ -150090,7 +150121,7 @@ Object.defineProperty(exports, "__esModule", { exports.version = void 0; // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. -const version = "1.4.3"; +const version = "1.5.0"; exports.version = version; },{}],"vUvc":[function(require,module,exports) { "use strict";